ruby_reportable 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536fc58a8672343c53cbe20116d38f21a88e12b7
-  data.tar.gz: d4569ed9acd976c4f77572a22c02c22f644615ec
+  metadata.gz: effff5f0aa5831dc7975c1e4e4aa00254e86f8ee
+  data.tar.gz: 793f07f4c7d9a1e44ab07a45abecd190dcb25936
 SHA512:
-  metadata.gz: ed6b34325043147e672966a1eb10db12afe6563787b62157f0fe2f7c5ae06f330183efc2aaac4fcb76a9b254879ed8d2ea9636acb15214d9d0d85a2842ff3001
-  data.tar.gz: dd3543f110217752f0415a7bc2003c9b894299b2839f7640d1545b531ee6702e2479050e97e9cfa13ff1b32d78701c2a4ea27a36ddff05c7748340fe929d850f
+  metadata.gz: d7f1a8f31e08ccc91df8bb4d689fec211d1aafbbe9f09859a248a415f3622779c38de4b62cd461942dbbf9eb619f5d18ce8a66a8b5fd1cebb7867c14b8f38be5
+  data.tar.gz: d8ef115a80db54548a33a594a0d283be240b6d893531f48a4cd48c5beca7393de3c811e2d5ddc03bdb7540d897f94707789a18fdcf38789948eb3f08a53bd1be

data/lib/ruby_reportable/report.rb

@@ -10,6 +10,8 @@ module RubyReportable
       @data_source = nil
       @report = self.to_s
       @category = 'Reports'
+      @allow_group = true
+      @allow_sort = true
       @meta = {}
       @benchmarks = {}
       @records_returned = 0
@@ -53,6 +55,22 @@ module RubyReportable
       end
     end
 
+    def allow_group(string = nil)
+      if string.nil?
+        @allow_group
+      else
+        @allow_group = string
+      end
+    end
+
+    def allow_sort(string = nil)
+      if string.nil?
+        @allow_sort
+      else
+        @allow_sort = string
+      end
+    end
+
     def category(string = nil)
       if string.nil?
         @category
@@ -158,8 +176,14 @@ module RubyReportable
       else
         sort = [sort] unless sort.is_a?(Array)
 
-        data.sort_by {|element| sort.map {|column| element[column]} }
+        #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
       end
+      return data
     end
 
     def _group(group, data, options = {})

data/lib/ruby_reportable/version.rb

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

data/ruby_reportable.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "ruby_reportable"
   s.version     = RubyReportable::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.license     = 'MIT'
   s.authors     = ["John 'asceth' Long"]
   s.email       = ["machinist@asceth.com"]
   s.homepage    = "http://github.com/asceth/ruby_reportable"
@@ -21,4 +22,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rr'
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_reportable
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - John 'asceth' Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -74,7 +74,8 @@ files:
 - spec/source_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/asceth/ruby_reportable
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []