ruby_reportable 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce6c1156d97b85a115a1da80e42bfcc8e42b412
-  data.tar.gz: 7585d34ffae9d66e8b1e929ee2ddb4b635acaf7b
+  metadata.gz: 105e1e74042eaae1eaa26a163b12e78fd79212fe
+  data.tar.gz: 3f617be2415d29d5d1df070a87acf616faa06548
 SHA512:
-  metadata.gz: f20eab08a891aba3b2239e607639dbe60eb5cb2acbc82099a06d01c35d51c3b132852781d072ba03f2e3a9127557668fa305a4a8926a73aa7a2581c36a7e29f5
-  data.tar.gz: 147774a281b825ce2a0713b1a18bbbdb2e0104aefcd45fa67c1a0af682d78e7f4eb92ccbf8a245807b0cceaaba6faf6209e09fcb372d45642ff20760d5475acb
+  metadata.gz: 99b6e66e7c4b6bb142c24abc7218d28b7668c8f927d0a03d736f57abe6d0dc9867eff501a45c9fa66d2111c6ce90c2d4f4ca0e35750601bf2683cf53254611e6
+  data.tar.gz: 371b88318c0cd2d1d2ba3922ef2beb03178a6a0a6684bf262ed9cc8e95dc0cdc5e5a06dc193ff443bda10767d79ad80d62e49a26039714d80117078dc52a53ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_reportable (0.3.0)
+    ruby_reportable (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/ruby_reportable/report.rb

@@ -2,7 +2,7 @@ require 'benchmark'
 
 module RubyReportable
   module Report
-    attr_accessor :data_source, :filters
+    attr_accessor :data_source, :filters, :records_returned
 
     def clear
       @outputs = []
@@ -12,6 +12,7 @@ module RubyReportable
       @category = 'Reports'
       @meta = {}
       @benchmarks = {}
+      @records_returned = 0
     end
 
     # :sandbox, :filters, :finalize, :output, :group, :sort
@@ -137,12 +138,12 @@ module RubyReportable
       # build sandbox for building outputs
       sandbox = RubyReportable::Sandbox.new(:meta => @meta, @data_source[:as] => nil)
 
-      source_data.inject({:results => []}) do |rows, element|
+      source_data.inject([]) do |rows, element|
         # fill sandbox with data element
         sandbox[@data_source[:as]] = element
 
         # grab outputs
-        rows[:results] << @outputs.inject({}) do |row, output|
+        rows << @outputs.inject({}) do |row, output|
           row[output.name] = sandbox.instance_eval(&output.logic)
           row
         end
@@ -151,27 +152,51 @@ module RubyReportable
       end
     end
 
-    def _group(group, data, options = {})
-      unless group.to_s.empty?
-        data[:results].inject({}) do |hash, element|
-          key = element[group]
-          hash[key] ||= []
-          hash[key] << element
-          hash
-        end
-      else
+    def _sort(sort, data, options = {})
+      if sort.to_s.empty?
         data
+      else
+        data.sort_by {|element| element[sort]}
       end
     end
 
-    def _sort(sort, data, options = {})
-      unless sort.to_s.empty?
-        data.inject(Hash.new([])) do |hash, (group, elements)|
-          hash[group] = elements.sort_by {|element| element[sort]}
+    def _group(group, data, options = {})
+      # Run through elements in data which are ordered
+      # from the previous call to #_sort via #run
+      #
+      # Since the elements are already sorted, as we pop
+      # them into their grouping they will remain sorted as
+      # intended
+      #
+      if group.to_s.empty?
+        {:results => data}
+      else
+        group = [group] unless group.is_a?(Array)
+        group.map!(&:to_s)
+
+        # the last group critieria should contain an array
+        # so lets pop it off for special use
+        last_group = group.pop
+
+        data.inject({}) do |hash, element|
+          # grab a local reference to the hash
+          ref = hash
+
+          # run through initial groupings to grab local ref
+          # and default them to {}
+          group.map do |grouping|
+            key = element[grouping]
+            ref[key] ||= {}
+            ref = ref[key]
+          end
+
+          # handle our last grouping
+          key = element[last_group]
+          ref[key] ||= []
+          ref[key] << element
+
           hash
         end
-      else
-        data
       end
     end
 
@@ -198,14 +223,18 @@ module RubyReportable
         _output(source_data, options)
       end
 
-      # transform into {group => [outputs => values]}
-      grouped = benchmark(:group) do
-        _group(options[:group], data, options)
+      # now that we have all of our data go ahead and cache the size
+      records_returned = data.size
+
+      # sort the data first cause that makes sense you know
+      sorted = benchmark(:sort) do
+        _sort(options[:sort], data, options)
       end
 
-      # sort grouped data
-      benchmark(:sort) do
-        _sort(options[:sort], grouped, options)
+      # transform into {group => {group => [outputs => values]}}
+      # level of grouping depends on how many groups are passed in
+      benchmark(:group) do
+        _group(options[:group], sorted, options)
       end
     end # end def run
 

data/lib/ruby_reportable/version.rb

@@ -1,3 +1,3 @@
 module RubyReportable
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/report_spec.rb

@@ -135,6 +135,61 @@ describe RubyReportable::Report do
 
       @report._group('letter', @report._output(source_data)).should == {"m" => [{'name' => :method, 'letter' => 'm'}]}
     end
+
+    it "should handle multiple groupings" do
+
+      raw = []
+      raw[0] = ['test1', 29201, 'road']
+      raw[1] = ['test2', 29201, 'road']
+      raw[2] = ['test3', 29201, 'drive']
+      raw[3] = ['test4', 29204, 'road']
+
+      output = []
+      [0, 1, 2, 3].map do |index|
+        output[index] = {
+          'name' => raw[index][0],
+          'zip' => raw[index][1],
+          'path' => raw[index][2]
+        }
+      end
+
+      result = {
+        29201 => {
+          'road' => [output[0], output[1]],
+          'drive' => [output[2]]
+        },
+        29204 => {
+          'road' => [output[3]]
+        }
+      }
+
+      @report.source do
+        logic do
+          [
+           raw[0],
+           raw[1],
+           raw[2],
+           raw[3]
+          ]
+        end
+      end
+
+      @report.output('name') do
+        element[0]
+      end
+
+      @report.output('zip') do
+        element[1]
+      end
+
+      @report.output('path') do
+        element[2]
+      end
+
+      source_data = @report._data(@report._source).source
+
+      @report._group(['zip', 'path'], @report._output(source_data)).should == result
+    end
   end
 
   context "#_sort" do
@@ -152,7 +207,7 @@ describe RubyReportable::Report do
       source_data = @report._data(@report._source).source
       final = @report._sort('name', @report._output(source_data))
 
-      final.should == {:results => Object.methods.sort.map {|method| {'name' => method}}}
+      final.should == Object.methods.sort.map {|method| {'name' => method}}
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_reportable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - John 'asceth' Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec