ruby_reportable 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: effff5f0aa5831dc7975c1e4e4aa00254e86f8ee
-  data.tar.gz: 793f07f4c7d9a1e44ab07a45abecd190dcb25936
+  metadata.gz: 1d0cd73a1582735d357ee4416825b5d5196ff38f
+  data.tar.gz: 2ea92387f5ae939dd1157b71a5bc1844da7fe67c
 SHA512:
-  metadata.gz: d7f1a8f31e08ccc91df8bb4d689fec211d1aafbbe9f09859a248a415f3622779c38de4b62cd461942dbbf9eb619f5d18ce8a66a8b5fd1cebb7867c14b8f38be5
-  data.tar.gz: d8ef115a80db54548a33a594a0d283be240b6d893531f48a4cd48c5beca7393de3c811e2d5ddc03bdb7540d897f94707789a18fdcf38789948eb3f08a53bd1be
+  metadata.gz: 2a01b3ca5daa501cf06a54009beba2792fed844b25ee9d05cacfb9f347ea25eae0e8ce1c0661ec9f635b792b52c42295a526635a4757bf30f131cc3dba51dbf9
+  data.tar.gz: cf827b20f91ce1aa86e60a2ed0cc3a8a5c7eabd79c6be93f47ee69101b05cc7b267bed9b201190ea004843f529108871501671bf840eb876a56d0622bbe53668

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p195
+2.0.0-p247

data/Gemfile.lock

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

data/lib/ruby_reportable/report.rb

@@ -1,4 +1,5 @@
 require 'benchmark'
+require 'date'
 
 module RubyReportable
   module Report
@@ -170,20 +171,27 @@ module RubyReportable
       end
     end
 
+    def _convert_for_sort(value)
+      case value.class
+      when NilClass
+        value.to_s
+      when Date, DateTime, Time
+        value
+      when Array
+        value.map {|sub| _convert_for_sort(sub)}
+      else
+        value.to_s
+      end
+    end
+
     def _sort(sort, data, options = {})
       if sort.to_s.empty?
         data
       else
         sort = [sort] unless sort.is_a?(Array)
 
-        #data.sort_by {|element| sort.map {|column| element[column]} }
-        sort.map.each do |element|
-          parts = data.partition { |d| d[element].blank? }
-          sorted = parts.last.sort { |a,b| a[element] <=> b[element] }
-          data = sorted + parts.first
-        end
+        data.sort_by {|element| sort.map {|column| _convert_for_sort(element[column]) }}
       end
-      return data
     end
 
     def _group(group, data, options = {})

data/lib/ruby_reportable/version.rb

@@ -1,3 +1,3 @@
 module RubyReportable
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/report_spec.rb

@@ -196,7 +196,16 @@ describe RubyReportable::Report do
     it "should sort results" do
       @report.source do
         logic do
-          Object.methods
+          [
+           '!',
+           '==',
+           'const_missing',
+           'try',
+           'to_s',
+           'zebra',
+           'const_get',
+           '_output'
+          ]
         end
       end
 
@@ -207,7 +216,51 @@ describe RubyReportable::Report do
       source_data = @report._data(@report._source).source
       final = @report._sort('name', @report._output(source_data))
 
-      final.should == Object.methods.sort.map {|method| {'name' => method}}
+      final.should == [
+                       '!',
+                       '==',
+                       '_output',
+                       'const_get',
+                       'const_missing',
+                       'to_s',
+                       'try',
+                       'zebra'
+                      ].map {|e| {'name' => e}}
+    end
+
+    it "should handle multiple sorts" do
+      @report.source do
+        logic do
+          [
+           {'country' => 'USA',    'name' => 'Tinker'},
+           {'country' => 'Sweden', 'name' => 'Charmander'},
+           {'country' => 'USA',    'name' => 'Pikachu'},
+           {'country' => 'Norway', 'name' => 'Slink'},
+           {'country' => 'Sweden', 'name' => 'Katarina'},
+           {'country' => nil,      'name' => 'Slyfox'}
+          ]
+        end
+      end
+
+      @report.output('country') do
+        element['country']
+      end
+
+      @report.output('name') do
+        element['name']
+      end
+
+      source_data = @report._data(@report._source).source
+      final = @report._sort(['country', 'name'], @report._output(source_data))
+
+      final.should == [
+                       {'country' => nil,      'name' => 'Slyfox'},
+                       {'country' => 'Norway', 'name' => 'Slink'},
+                       {'country' => 'Sweden', 'name' => 'Charmander'},
+                       {'country' => 'Sweden', 'name' => 'Katarina'},
+                       {'country' => 'USA',    'name' => 'Pikachu'},
+                       {'country' => 'USA',    'name' => 'Tinker'},
+                      ]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_reportable
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - John 'asceth' Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby_reportable
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby Reporting