mincer 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c74759caf1e6c25531831b8826956f646100c748
-  data.tar.gz: 9aeaeef5b0179d8a5ac4abf8eaedd685babab45b
+  metadata.gz: 5b5c443e2818115e62416949527c18a14b8af182
+  data.tar.gz: 10906282d26a6690af1655e20e9975446cbf1610
 SHA512:
-  metadata.gz: e5a0292afa6da4666085e69d7300aa8c1767a7a622d8152c52586384529dc5d14390008b967bd2f39774636b60e0deb6156f3a50e63db6f77341d916f561f165
-  data.tar.gz: f9a42a835a506a4d36894f4ac8d42c232fd31672e09479080b1f2f0aa2316fd6a899448d80b813b0e3336c7038384809893e66fa0882cd8a06ab73fbb22fb099
+  metadata.gz: 38952e626c0e84e6708aeceebd9d2f5711286df3b508a5fd7f8a7fc05e774f7d1c7ecbd11de0a7e818857dd87c68ec5e226b7be7a2206112f5b2599a7cedc1b7
+  data.tar.gz: 9004f37a50fb8a18e3c55ebe8ed39e2bcf846e916f331398723cd5e3453a6f18d7f1273a9d8545149120afab80e5dfa68b28523894fe7e0b8b127915ebbe9843

data/lib/mincer/processors/sorting/processor.rb

@@ -7,17 +7,17 @@ module Mincer
         end
 
         def apply
-          relation = @relation.order(sort_string)
-          @mincer.sort_attribute, @mincer.sort_order = sort_attr.to_s, order_attr.to_s
-          relation
+          sorting_sting = sort_string
+          if sorting_sting.present?
+            @mincer.sort_attribute, @mincer.sort_order = sort_attr.to_s, order_attr.to_s
+            @relation.order(sorting_sting)
+          else
+            @relation
+          end
         end
 
         def sort_string
-          if sort_attr
-            "#{sort_attr} #{order_attr || default_order}"
-          else
-            "#{default_sort} #{order_attr || default_order}"
-          end
+          [(sort_attr || default_sort), (order_attr || default_order)].compact.uniq.join(' ')
         end
 
         def sort_attr

data/lib/mincer/version.rb

@@ -1,7 +1,7 @@
 module Mincer
 
   def self.version
-    Gem::Version.new '0.2.4'
+    Gem::Version.new '0.2.6'
   end
 
   module VERSION #:nodoc:

data/mincer.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '= 4.2'
+  spec.add_dependency 'activerecord', '~> 4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mincer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Alex Krasinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::Relation wrapper for pagination, order, json, search, cache_digest