Merge pull request #98 from socialcast/ruby-1.9.3

Add ruby-1.9.3 compatibility

.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1.2
   - 2.1.5

lib/masamune/cached_filesystem.rb

@@ -73,9 +73,10 @@ def stat(file_or_dir)
     CACHE_DEPTH = 1
     EMPTY_SET   = Set.new
 
-    def glob_stat(file_or_glob, depth: 0, &block)
+    def glob_stat(file_or_glob, options = {}, &block)
       return if file_or_glob.blank?
       return if root_path?(file_or_glob)
+      depth = options.fetch(:depth, 0)
       return if depth > MAX_DEPTH || depth > CACHE_DEPTH
 
       glob_stat(dirname(file_or_glob), depth: depth + 1, &block)
@@ -97,7 +98,8 @@ def glob_stat(file_or_glob, depth: 0, &block)
       end if depth == 0
     end
 
-    def recursive_paths(root, path, depth: 0, &block)
+    def recursive_paths(root, path, options = {}, &block)
+      depth = options.fetch(:depth, 0)
       return if depth > MAX_DEPTH
       return if root == path
       yield path

lib/masamune/filesystem.rb

@@ -418,12 +418,12 @@ def mktempdir!(path)
       end
     end
 
-    def glob_split(input, recursive: false)
-      [ input.include?('*') ? input.split('*').first + '*' : input, glob_to_regexp(input, recursive: recursive) ]
+    def glob_split(input, options = {})
+      [ input.include?('*') ? input.split('*').first + '*' : input, glob_to_regexp(input, options) ]
     end
 
-    def glob_to_regexp(input, recursive: false)
-      if input.include?('*') || recursive
+    def glob_to_regexp(input, options = {})
+      if input.include?('*') || options.fetch(:recursive, false)
         %r|\A#{Regexp.escape(input).gsub('\\*', '.*?').gsub(%r{\/\.\*\?\z}, '/?.*?')}|
       else
         /\A#{Regexp.escape(input)}\z/

lib/masamune/schema/column.rb

@@ -199,9 +199,9 @@ def csv_value(value)
       when :boolean
         value ? 'TRUE' : 'FALSE'
       when :yaml
-        value.to_h.to_yaml
+        value.to_hash.to_yaml
       when :json, :key_value
-        value.to_h.to_json
+        value.to_hash.to_json
       when :date
         value.to_s
       when :timestamp

lib/masamune/transform/stage_dimension.rb

@@ -59,9 +59,9 @@ def insert_values(source)
       method_with_last_element :insert_values
 
       def join_conditions(source)
-        join_columns = shared_columns(source).values.flatten.lazy
-        join_columns = join_columns.select { |column| column.reference }.lazy
-        join_columns = join_columns.group_by { |column| column.reference }.lazy
+        join_columns = shared_columns(source).values.flatten
+        join_columns = join_columns.select { |column| column.reference }
+        join_columns = join_columns.group_by { |column| column.reference }
 
         conditions = Hash.new { |h,k| h[k] = Set.new }
         join_columns.each do |reference, columns|

lib/masamune/transform/stage_fact.rb

@@ -57,9 +57,9 @@ def insert_values(source)
       method_with_last_element :insert_values
 
       def join_conditions(source)
-        join_columns = shared_columns(source).values.flatten.lazy
-        join_columns = join_columns.select { |column| column.reference }.lazy
-        join_columns = join_columns.group_by { |column| column.reference }.lazy
+        join_columns = shared_columns(source).values.flatten
+        join_columns = join_columns.select { |column| column.reference }
+        join_columns = join_columns.group_by { |column| column.reference }
 
         dependencies = Masamune::TopologicalHash.new
         conditions = Hash.new { |h,k| h[k] = [] }