sorted-activerecord 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73c6a1710bf109f92c675c82bfb51adbae2e83fe
-  data.tar.gz: f839fef7e88e8ca7632f3e9055467a217d7e2a96
+  metadata.gz: dc58014f05b2a80f9238bb33d98e76e3dec941c5
+  data.tar.gz: 1ead6ecd557dd19f0c3a03ee11a154fc90c86665
 SHA512:
-  metadata.gz: be76ff4089fe1a2062ad37b001f1084f76b92401ca8011b356a480a8499036b4de359fc3ae6cf1e6b62da7a9655e914b805a0c028eba102758ec0145dbb0c853
-  data.tar.gz: d65155d4a62a460667c0e38e8fd1a3832bba1e0f6f9b0e43a837848f21d2e92f6610bed1bcaa286d769b9ee7c01682d59faf71580f0806f578042fefe48f88a1
+  metadata.gz: f7a8c3e36ddc370b777204b0eb58fbcc3851d59d4532c8b3295c939fc5f4dac841a3269677e6d6cdaca959e597b0abf388feec5ae1e72bcb298bd737d2c84317
+  data.tar.gz: 1379753406f3ea0d17e7046487417b8572d13bb899e7aadfb5a15d0fd433dee73010a8451e608847b74dcb097b8ec09cd3bb9cb5511f477aee1ec2f51c7691b3

data/README.md

@@ -31,8 +31,7 @@ except that if you provide a string to the sort argument it expects a
 `Sorted::URIQuery` encoded string:
 
 ```ruby
-@users = User.sorted(sort: 'created_asc!orders_count_asc'
-                     order: 'orders_count ASC, created_at DESC')
+@users = User.sorted(sort: 'created_asc!orders_count_asc', order: 'orders_count ASC, created_at DESC')
 ```
 
 See https://github.com/mynameisrufus/sorted-actionview for a view helper to
@@ -42,16 +41,14 @@ A `resorted` method is also available and works the same way as the `reorder`
 method in Rails. It forces the order to be the one passed in:
 
 ```ruby
-@users = User.order(:id).sorted(order: 'name DESC')
-             .resorted(sort: params[:sort], order: 'email ASC')
+@users = User.order(:id).sorted(order: 'name DESC').resorted(sort: params[:sort], order: 'email ASC')
 ```
 
 If you want to prevent people creating 500s by messing with the sort url string
 you can use a white list:
 
 ```ruby
-@users = User.sorted(sort: 'created_asc!explode_me_asc'
-                     whitelist: %w(created_at))
+@users = User.sorted(sort: 'created_asc!explode_me_asc', whitelist: %w(created_at))
 ```
 
 ## Contributing

data/lib/sorted/activerecord/builder.rb

@@ -17,6 +17,7 @@ module Sorted
       end
 
       def parse_sort(sort)
+        return ::Sorted::Set.new if sort.nil?
         case sort.class.name
         when 'String'
           ::Sorted::URIQuery.parse(sort)
@@ -28,6 +29,7 @@ module Sorted
       end
 
       def parse_order(order)
+        return ::Sorted::Set.new if order.nil?
         case order.class.name
         when 'String'
           ::Sorted::SQLQuery.parse(order)
@@ -55,6 +57,12 @@ module Sorted
           memo
         end
       end
+
+      # We return sym here becuase rails 4.0.0 does not like string for values
+      # and keys.
+      def to_hash
+        @set.to_a.inject({}) { |a, e| a.merge(Hash[e[0].to_sym, e[1].to_sym]) }
+      end
     end
   end
 end

data/lib/sorted/activerecord/helper.rb

@@ -12,14 +12,14 @@ module Sorted
           builder = ::Sorted::ActiveRecord::Builder.new(sort: sort,
                                                         order: order,
                                                         whitelist: whitelist)
-          order(builder.set.to_hash)
+          order(builder.to_hash)
         end
 
         def self.resorted(sort: [], order: [], whitelist: [])
           builder = ::Sorted::ActiveRecord::Builder.new(sort: sort,
                                                         order: order,
                                                         whitelist: whitelist)
-          reorder(builder.set.to_hash)
+          reorder(builder.to_hash)
         end
       end
     end

data/lib/sorted/activerecord/version.rb

@@ -1,5 +1,5 @@
 module Sorted
   module Activerecord
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/sorted-activerecord.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 4.0.0'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'sorted', '~> 2.0.0'
+  spec.add_dependency 'sorted', '~> 2.0.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -28,6 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'guard-rspec'
-  # spec.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
   spec.add_development_dependency 'sqlite3', '>= 1.3.5'
 end

data/spec/sorted/activerecord_spec.rb

@@ -80,4 +80,12 @@ describe Sorted::ActiveRecord do
     expect(subject.sorted(sort: 'orders_count_asc!created_at_desc',
                           whitelist: %(created_at)).to_sql).to match(order_by)
   end
+
+  it 'should not raise error with nil value' do
+    expect(-> { subject.sorted(sort: nil) }).to_not raise_error
+  end
+
+  it 'should not raise error with empty string' do
+    expect(-> { subject.sorted(sort: '') }).to_not raise_error
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorted-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rufus Post
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement