sorted 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0262798feaab6b58860df0dd56c6eda414263e58
-  data.tar.gz: dde3ec5870721ddc59198f98132ea9ca03c7c763
+  metadata.gz: cc893cb851e4226ef3548dcba99ae5e44592d9c6
+  data.tar.gz: 9ee8b89780d7f29798643338f186846e58756508
 SHA512:
-  metadata.gz: 8dc76069eeb8b172e3c6096588f9bc12404d44c747800fc3332f5e82344d476e1d22cab0a8bcc2110aa0c3292cc8c72fe3e6839cd28d0e92e2bb663696ab01d6
-  data.tar.gz: 18aec9e23e623f26be39632328d190c4213d7f960abb162b65337cfd2a9e7191775e303cee573ed63c471ae814b5368bd2d2d634c9ead24e8582df3c2db02b80
+  metadata.gz: 1f0d30cbf53dfabf7d54f46c391218dd81674758655decf875531c014111ec2f1c6841c0a6e73af56249b41d8538525f064744574ece3e4e717b96d59eb5de86
+  data.tar.gz: 3f95d6fb84711892c6838a529f9caef5c006279322576c7dacd3ac2b0eb2e9167642880974f95983e82ebf64d8895828c3b303435fc22464610b68fac3148fca

data/.gitignore

@@ -19,5 +19,6 @@ rdoc
 pkg
 .rvmrc
 Gemfile.lock
+.bundle
 
 ## PROJECT::SPECIFIC

data/gemfiles/mongoid_30.gemfile

@@ -1,12 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'railties', '>= 4'
-gem 'mongoid', '~> 4', github: 'mongoid/mongoid', require: 'mongoid'
+gem 'mongoid', '~> 4'
 gem 'rspec-rails', '>= 2.0'
-gem 'origin'
-gem 'moped'
-gem 'nokogiri'
-gem 'xpath'
-gem 'mime-types'
 
 gemspec path: '../'

data/gemfiles/mongoid_30.gemfile.lock

@@ -1,89 +1,84 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: 9b3bc1264032209b7a6c0e82d0ca656f401e476b
-  specs:
-    mongoid (4.0.0)
-      activemodel (~> 4.0.0)
-      moped (~> 2.0.beta3)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.37)
-
 PATH
-  remote: /Users/rufuspost/Projects/ruby/gems/sorted
+  remote: ../
   specs:
     sorted (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
-    bson (2.0.0.rc3)
-    bson (2.0.0.rc3-java)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
+      tzinfo (~> 1.1)
+    bson (2.3.0)
+    bson (2.3.0-java)
+    builder (3.2.2)
+    connection_pool (2.0.0)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    i18n (0.6.5)
-    mime-types (2.0)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    moped (2.0.0.beta3)
-      bson (~> 2.0.0.rc3)
-      optionable (~> 0.1.1)
-    multi_json (1.8.2)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.0-java)
-      mini_portile (~> 0.5.0)
-    optionable (0.1.1)
-    origin (1.1.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    json (1.8.1-java)
+    minitest (5.4.0)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.0)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    optionable (0.2.0)
+    origin (2.1.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
-    tzinfo (0.3.38)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   java
@@ -93,14 +88,9 @@ DEPENDENCIES
   actionpack (>= 3.0.0)
   activesupport (>= 3.0.0)
   bundler (>= 1.0.0)
-  mime-types
-  mongoid (~> 4)!
-  moped
-  nokogiri
-  origin
+  mongoid (~> 4)
   railties (>= 4)
   rake
   rspec (>= 2.0.0)
   rspec-rails (>= 2.0)
   sorted!
-  xpath

data/lib/sorted/orms/active_record.rb

@@ -8,9 +8,25 @@ module Sorted
 
       included do
         def self.sorted(sort, default_order = nil)
-          sorter = ::Sorted::Parser.new(sort, default_order)
-          quoter = ->(frag) { connection.quote_column_name(frag) }
-          order sorter.to_sql(quoter)
+          order sort_sql(sort, default_order)
+        end
+
+        def self.resorted(sort, default_order = nil)
+          reorder sort_sql(sort, default_order)
+        end
+
+        private
+
+        def self.sort_sql(sort, default_order)
+          sorter(sort, default_order).to_sql(quoter)
+        end
+
+        def self.sorter(sort, default_order)
+          ::Sorted::Parser.new(sort, default_order)
+        end
+
+        def self.quoter
+          ->(frag) { connection.quote_column_name(frag) }
         end
       end
     end

data/lib/sorted/toggler.rb

@@ -21,7 +21,7 @@ module Sorted
     def to_a
       @array
     end
-    
+
     def toggle_sorts
       if @order_keys == @sort_keys.take(@order_keys.size)
         @order_keys.select do |order|

data/lib/sorted/version.rb

@@ -1,3 +1,3 @@
 module Sorted
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/sorted/orms/active_record_spec.rb

@@ -16,6 +16,7 @@ if defined? ActiveRecord
 
     it "should integrate with ActiveRecord::Base" do
       SortedActiveRecordTest.should respond_to(:sorted)
+      SortedActiveRecordTest.should respond_to(:resorted)
     end
 
     it "should play nice with other scopes" do
@@ -23,5 +24,10 @@ if defined? ActiveRecord
       SortedActiveRecordTest.where(:name => 'bob').page.sorted(nil, 'name ASC').to_sql.should == sql
       SortedActiveRecordTest.page.sorted(nil, 'name ASC').where(:name => 'bob').to_sql.should == sql
     end
+
+    it "should override the provided order" do
+      sql = "SELECT  \"sorted_active_record_tests\".* FROM \"sorted_active_record_tests\"  WHERE \"sorted_active_record_tests\".\"name\" = 'bob'  ORDER BY \"name\" ASC LIMIT 50"
+      SortedActiveRecordTest.page.where(:name => 'bob').order(:id).sorted(nil, 'name DESC').resorted(nil, 'name ASC').to_sql.should == sql
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorted
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Rufus Post
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Allows you to sort large datasets over many pages, without losing state.
@@ -89,9 +89,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -125,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: sorted
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Data sorting library