ranked-model 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa03565f2d58125cad4f32d6e9e9eb71287a7c33
-  data.tar.gz: 7dc3963857902ef6872a26d90a0156869622a1be
+  metadata.gz: dcff2571a186c754b8b163ed3d80709dcaaf81c8
+  data.tar.gz: c51f12aea789f0b771cac3d84d0fee6d3524607e
 SHA512:
-  metadata.gz: 21d43557aa038bd4a588dcb5b2742f67661398557a51367f2cd759b37727b2f96bf00cfcc3952d4985a61409a4f1d6ab39b634d35c4dd1bd927bf7f506529018
-  data.tar.gz: 0e6d81072a17f1c6c6abe519a38f2750181685dc174f320c6cb96e3866a78403316b68ecc363258a2e01ada3a2064b366ed38652743cc17249bd62ceaa6c932f
+  metadata.gz: 7b91a45c679724c3625e587a8118441f53de967e2c614e00bcd76f8103bc4007d2e1149dc159222c4c4839b7ffa86ab3f03f9e8d42e7863d3840bf7dad40a1d5
+  data.tar.gz: 46e6dca0c5f42e0b11a7e32b8f152675a336e15061657676ae32c80cfee4c8fffda441740bc66729c4f0daff19851be18ccdcd9c84e0b40eb8c2c551b522fef6

data/.travis.yml

@@ -3,3 +3,16 @@ rvm:
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
+env:
+  - "ACTIVERECORD_VERSION=4.0.0"
+  - "ACTIVERECORD_VERSION=3.2.13"
+  - "ACTIVERECORD_VERSION=3.1.12"
+  - "ACTIVERECORD_VERSION=master"
+matrix:
+  exclude:
+    - env: "ACTIVERECORD_VERSION=4.0.0"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=master"
+      rvm: "1.9.2"
+  allow_failures:
+    - env: "ACTIVERECORD_VERSION=master"

data/Gemfile

@@ -2,3 +2,14 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ranked-model.gemspec
 gemspec
+
+ar_version = ENV["ACTIVERECORD_VERSION"] || "default"
+
+ar_gem_version = case ar_version
+when "master"
+  gem "activerecord", {github: "rails/rails"}
+when "default"
+  # Allow the gemspec to specify
+else
+  gem "activerecord", "~> #{ar_version}"
+end

data/Readme.mkd

@@ -1,4 +1,4 @@
-**ranked-model** is a modern row sorting library built for Rails 3.  It uses ARel aggressively and is better optimized than most other libraries.
+**ranked-model** is a modern row sorting library built for Rails 3 & 4.  It uses ARel aggressively and is better optimized than most other libraries.
 
 [![Build Status](https://travis-ci.org/mixonic/ranked-model.png)](https://travis-ci.org/mixonic/ranked-model)
 
@@ -128,4 +128,4 @@ A hearty thanks to these contributors:
 * [yabawock](https://github.com/yabawock)
 * [AndrewRadev](https://github.com/AndrewRadev)
 * [adheerajkumar](https://github.com/adheerajkumar)
-* [mikeycgto](https://github.com/mikeycgto)
+* [mikeycgto](https://github.com/mikeycgto)

data/lib/ranked-model/ranker.rb

@@ -197,14 +197,17 @@ module RankedModel
       def finder
         @finder ||= begin
           _finder = instance_class
+          columns = [instance_class.arel_table[instance_class.primary_key], instance_class.arel_table[ranker.column]]
           if ranker.scope
             _finder = _finder.send ranker.scope
           end
           case ranker.with_same
             when Symbol
+              columns << instance_class.arel_table[ranker.with_same]
               _finder = _finder.where \
                 instance_class.arel_table[ranker.with_same].eq(instance.attributes["#{ranker.with_same}"])
             when Array
+              ranker.with_same.each {|c| columns.push instance_class.arel_table[c] }
               _finder = _finder.where(
                 ranker.with_same[1..-1].inject(
                   instance_class.arel_table[ranker.with_same.first].eq(
@@ -223,7 +226,7 @@ module RankedModel
             _finder = _finder.where \
               instance_class.arel_table[instance_class.primary_key].not_eq(instance.id)
           end
-          _finder.order(instance_class.arel_table[ranker.column].asc).select([instance_class.arel_table[instance_class.primary_key], instance_class.arel_table[ranker.column]])
+          _finder.order(instance_class.arel_table[ranker.column].asc).select(columns)
         end
       end
 
@@ -264,7 +267,7 @@ module RankedModel
 
       def neighbors_at_position _pos
         if _pos > 0
-          if (ordered_instances = finder.offset(_pos-1).limit(2).all)
+          if (ordered_instances = finder.offset(_pos-1).limit(2).to_a)
             if ordered_instances[1]
               { :lower => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[0] ),
                 :upper => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[1] ) }

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.2.1"
+  VERSION = "0.3"
 end

data/ranked-model.gemspec

@@ -8,18 +8,17 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matthew Beale"]
   s.email       = ["matt.beale@madhatted.com"]
-  s.homepage    = "https://github.com/harvesthq/ranked-model"
-  s.summary     = %q{An acts_as_sortable replacement built for Rails 3}
-  s.description = %q{ranked-model is a modern row sorting library built for Rails 3. It uses ARel aggressively and is better optimized than most other libraries.}
+  s.homepage    = "https://github.com/mixonic/ranked-model"
+  s.summary     = %q{An acts_as_sortable replacement built for Rails 3 & 4}
+  s.description = %q{ranked-model is a modern row sorting library built for Rails 3 & 4. It uses ARel aggressively and is better optimized than most other libraries.}
 
-  s.add_dependency "activerecord", ">= 3.0.3"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-rails", "~> 2.12.0"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "genspec"
-  s.add_development_dependency "mocha"
-
-  # s.rubyforge_project = "ranked-model"
+  s.add_dependency "activerecord", ">= 3.1.12"
+  s.add_development_dependency "rspec", "~> 2.13.0"
+  s.add_development_dependency "sqlite3", "~> 1.3.7"
+  s.add_development_dependency "genspec", "~> 0.2.8"
+  s.add_development_dependency "mocha", "~> 0.14.0"
+  s.add_development_dependency "database_cleaner", "~> 1.0.1"
+  s.add_development_dependency "rake", "~> 10.1.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/duck-model/duck_spec.rb

@@ -59,7 +59,7 @@ describe Duck do
       @ducks[:wingy].update_attribute :size_position, 2
     }
 
-    subject { Duck.in_shin_pond.rank(:size).all }
+    subject { Duck.in_shin_pond.rank(:size).to_a }
 
     its(:size) { should == 3 }
     
@@ -76,7 +76,7 @@ describe Duck do
       @ducks[:wingy].update_attribute :age_position, 0
     }
 
-    subject { Duck.where(:pond => 'Shin').rank(:age).all }
+    subject { Duck.where(:pond => 'Shin').rank(:age).to_a }
 
     its(:size) { should == 3 }
     
@@ -95,7 +95,7 @@ describe Duck do
       @ducks[:wingy].update_attribute :row_position, 6
     }
 
-    subject { Duck.rank(:row).all }
+    subject { Duck.rank(:row).to_a }
 
     its(:size) { should == 6 }
     
@@ -119,7 +119,7 @@ describe Duck do
 
     describe "row" do 
 
-      subject { Duck.rank(:row).all }
+      subject { Duck.rank(:row).to_a }
 
       its(:size) { should == 6 }
       
@@ -131,7 +131,7 @@ describe Duck do
 
     describe "row" do 
 
-      subject { Duck.in_shin_pond.rank(:size).all }
+      subject { Duck.in_shin_pond.rank(:size).to_a }
 
       its(:size) { should == 3 }
       
@@ -389,7 +389,7 @@ describe Duck do
       @ducks[:wingy].update_attribute :landing_order_position, 1
     }
 
-    subject { Duck.in_lake_and_flock(0,0).rank(:landing_order).all }
+    subject { Duck.in_lake_and_flock(0,0).rank(:landing_order).to_a }
 
     its(:size) { should == 3 }
     

data/spec/ego-model/ego_spec.rb

@@ -23,7 +23,7 @@ describe Ego do
       @egos[:sally].update_attribute :size_position, 2
     }
 
-    subject { Ego.rank(:size).all }
+    subject { Ego.rank(:size).to_a }
 
     its(:size) { should == 3 }
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'database_cleaner'
 
 require 'ranked-model' # and any other gems you need
 
@@ -7,7 +8,20 @@ Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each {|f| require f}
 
 RSpec.configure do |config|
   config.mock_with :mocha
-  config.use_transactional_fixtures = true
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
 end
 
 RSpec::Matchers.define :define_constant do |expected|

data/spec/support/active_record.rb

@@ -1,8 +1,6 @@
 require 'active_record'
 require 'sqlite3'
 require 'logger'
-require 'rspec/rails/adapters'
-require 'rspec/rails/fixture_support'
 
 ROOT = File.join(File.dirname(__FILE__), '..')
 
@@ -63,7 +61,7 @@ class Duck < ActiveRecord::Base
   ranks :landing_order, :with_same => [:lake_id, :flock_id]
   scope :in_lake_and_flock, lambda {|lake, flock| where(:lake_id => lake, :flock_id => flock) }
 
-  scope :in_shin_pond, where(:pond => 'Shin')
+  scope :in_shin_pond, lambda { where(:pond => 'Shin') }
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,86 +16,100 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.1.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 1.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: genspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
-  name: genspec
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: ranked-model is a modern row sorting library built for Rails 3. It uses
-  ARel aggressively and is better optimized than most other libraries.
+        version: 10.1.0
+description: ranked-model is a modern row sorting library built for Rails 3 & 4. It
+  uses ARel aggressively and is better optimized than most other libraries.
 email:
 - matt.beale@madhatted.com
 executables: []
@@ -127,7 +141,7 @@ files:
 - spec/support/active_record.rb
 - spec/support/database.yml
 - tmp/.gitignore
-homepage: https://github.com/harvesthq/ranked-model
+homepage: https://github.com/mixonic/ranked-model
 licenses: []
 metadata: {}
 post_install_message: 
@@ -146,10 +160,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: An acts_as_sortable replacement built for Rails 3
+summary: An acts_as_sortable replacement built for Rails 3 & 4
 test_files:
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb