djc 0.2.0 → 0.3.0

data/lib/djc.rb

@@ -12,10 +12,6 @@ module DJC
 
   class ::Array
 
-    def valfor(obj)
-
-    end
-
     def walk(obj)
       path = self.dup
       key = path.shift.to_s
@@ -31,16 +27,16 @@ module DJC
                   path.clear
                   sub
                 end
-              elsif /^[\d,-]+$/.match(key)
-                selected = key.split(',').map do |dex|
-                  range = /(\d+)(?:-|\.\.\.?)(\d+)/.match(dex)
-                  if range
-                    range = range.captures
-                    obj[range.first.to_i..range.last.to_i]
-                  else
-                    obj[dex.to_i]
+              elsif /^[\d,\+-\.]+$/.match(key)
+                selected = nil
+                key.split('|').each do |option|
+                  locators = option.split(',').map do |dex|
+                    range = /(?<start>\d+)(?:-|\+|\.\.(?<exclusive>\.)?)?(?<end>-?\d+)/.match(dex)
+                    range ? Range.new(range['start'].to_i, (range['end'] || -1).to_i, range['exclusive']) : dex.to_i
                   end
-                end.flatten
+                  selected = obj.values_at(*locators)
+                  break if selected
+                end
                 selected.size == 1 ? selected.first : selected
               end
             elsif obj.is_a? Hash
@@ -61,6 +57,28 @@ module DJC
       path.empty? ? val : path.walk(val)
     end
 
+    def collate
+      collated = [[]]
+      fill = {}
+      each_with_index do |obj, index|
+        if obj.is_a?(Array)
+          obj.each_with_index do |item, row|
+            collated[row] ||= []
+            collated[row][index] = item
+          end
+        end
+      end
+      collated.each do |row|
+        each_with_index do |obj, index|
+          unless obj.is_a?(Array)
+            row[index] = obj
+          end
+        end
+      end
+      collated.size == 1 ? collated.first : collated
+    end
+
+
     def cross
       crossed = [[]]
 
@@ -85,8 +103,13 @@ module DJC
 
   class Rule
     def parse(paths)
-      rules = paths.split('|').map do |path|
-        path.scan(/\/[^\/]+\/|\<[^\<]\>|[^\[\]\{\}\|\.]+/)
+
+      regex = /\/[^\/]+\//
+      lookup = /\<[^\<]\>/
+      indexes = /(?:-?\d+(?:(?:\.\.\.?|-|\+)(?:-?\d+)?)?,?)+/
+      node = /[^\[\]\{\}\|\.]+/
+      rules = paths.split('||').map do |path|
+        path.scan(/#{regex}|#{lookup}|#{indexes}|#{node}/)
       end
 
       rules
@@ -101,6 +124,10 @@ module DJC
       end
     end
 
+    def to_s
+      "#{paths}:#{type}:#{block}"
+    end
+
     def sum
       @type, @block = 'sum', proc { |array| array.map(&:to_i).inject(0, :+) if array }
       self
@@ -121,8 +148,27 @@ module DJC
       self
     end
 
+    def sort(&sort_block)
+      @type, @block = 'sort', proc { |sort| sort.is_a?(Array) ? sort.compact.sort(&sort_block) : sort.sort(&sort_block) }
+      self
+    end
+
     def match(matcher)
-      @type, @block = 'match', proc { |val| val.scan(matcher).flatten }
+      @type, @block = 'match', proc do |val|
+        if val
+          if val.is_a?(Array)
+            val.map do |v|
+              if v
+                match = v.scan(matcher).flatten
+                match.size == 1 ? match.first : match
+              end
+            end
+          else
+            match = val.scan(matcher).flatten
+            match.size == 1 ? match.first : match
+          end
+        end
+      end
       self
     end
 
@@ -218,12 +264,13 @@ module DJC
       rows = []
       if json.is_a? Array
         json.each do |row|
-          rows << @columns.map do |column|
+          row = @columns.map do |column|
             column.rule.apply(row)
           end
+          rows << row
         end
       else
-        rows = @columns.map do |column|
+        rows << @columns.map do |column|
           column.rule.apply(json)
         end
       end
@@ -241,15 +288,12 @@ module DJC
 
       out = CSV.generate do |csv|
         csv << builder.header
-        builder.build(json).cross.each do |row|
+        builder.build(json).each do |row|
           csv << row
         end
       end
       out
     end
-
   end
 
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec