acts_as_ordinalized 0.1.5 → 0.2.3

data/README.rdoc

@@ -32,7 +32,7 @@ This is a simple acts_as gem providing the active record models with ordinal num
     end
 
     sphinx_collection = OrdinalizedWithSphinx.search
-    ordinalized_collection.first.ordinal_number
+    sphinx_collection.first.ordinal_number
     => 1
 
 === Note on Patches/Pull Requests

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "mandaryyyn@gmail.com"
     gem.homepage = "http://github.com/mandaryn/acts_as_ordinalized"
     gem.authors = ["mandaryn"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency "will_paginate"
+    gem.add_dependency "rails", "~> 2.3.5"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.3

data/acts_as_ordinalized.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_ordinalized}
-  s.version = "0.1.5"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mandaryn"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-08-19}
   s.description = %q{This is a simple acts_as gem providing the active record models with ordinal numbers. The ordinals numbering is per query, but should work nicely with will paginate showing correct ordinal numbers on paginated results.}
   s.email = %q{mandaryyyn@gmail.com}
   s.extra_rdoc_files = [
@@ -41,12 +41,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 2.3.5"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<will_paginate>, [">= 0"])
+      s.add_dependency(%q<rails>, ["~> 2.3.5"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<will_paginate>, [">= 0"])
+    s.add_dependency(%q<rails>, ["~> 2.3.5"])
   end
 end
 

data/lib/acts_as_ordinalized.rb

@@ -16,13 +16,11 @@ module ActsAsOrdinalized
 
       #wrap various find methods with adding ordinal numbers to all returned models
       wrapped_methods.each do |method_name|
-        if self.respond_to?(method_name)
-          class_eval <<-EOV
-            def self.#{method_name}(*args)
-              ActsAsOrdinalized.ordinalize(super(*args))
-            end
-          EOV
-        end
+        class_eval <<-EOV
+          def self.#{method_name}(*args)
+            ActsAsOrdinalized.ordinalize(super(*args))
+          end
+        EOV
       end
     end
   end
@@ -46,4 +44,6 @@ module ActsAsOrdinalized
   end
 end
 
-ActiveRecord::Base.class_eval { include ActsAsOrdinalized }
+ActiveRecord::Base.class_eval { include ActsAsOrdinalized }
+ActiveRecord::Associations::AssociationCollection.class_eval { undef_method(:paginate) }
+ActiveRecord::Associations::AssociationCollection.class_eval { alias_method :method_missing, :method_missing_without_paginate }

data/test/test_ordinalized.rb

@@ -3,6 +3,8 @@ require 'test/unit'
 require 'rubygems'
 gem 'activerecord'
 require 'active_record'
+require 'will_paginate'
+WillPaginate.enable_activerecord
 
 require "#{File.dirname(__FILE__)}/../lib/acts_as_ordinalized"
 
@@ -14,6 +16,12 @@ def setup_db
       t.column :test_order, :integer
       t.column :switch, :boolean
     end
+
+    create_table :more_ordinals do |t|
+      t.column :test_order, :integer
+      t.column :switch, :boolean
+      t.column :ordinal_id, :integer
+    end
   end
 end
 
@@ -25,6 +33,7 @@ end
 
 class Ordinal < ActiveRecord::Base
   acts_as_ordinalized
+  has_many :more_ordinals
 end
 
 class OrdinalTest < Test::Unit::TestCase
@@ -54,14 +63,6 @@ class OrdinalTest < Test::Unit::TestCase
     assert_equal nil, empty
   end
 end
-begin
-require 'will_paginate'
-WillPaginate.enable_activerecord
-
-class OrdinalWithPagination < ActiveRecord::Base
-  acts_as_ordinalized
-  set_table_name "ordinals"
-end
 
 class OrdinalWithPaginationTest < Test::Unit::TestCase
 
@@ -75,12 +76,38 @@ class OrdinalWithPaginationTest < Test::Unit::TestCase
   end
 
   def test_ordinal_with_pagination
-    ordinals = OrdinalWithPagination.paginate(:page => 1, :per_page => 5, :order => "test_order ASC")
+    ordinals = Ordinal.paginate(:page => 1, :per_page => 5, :order => "test_order ASC")
     assert_equal [[1,1], [2,2], [3,3], [4,4], [5,5]], ordinals.map{|o| [o.test_order, o.ordinal_number] }
-    ordinals2 = OrdinalWithPagination.paginate(:page => 2, :per_page => 5, :order => "test_order ASC")
+    ordinals2 = Ordinal.paginate(:page => 2, :per_page => 5, :order => "test_order ASC")
+    assert_equal [[6,6], [7,7], [8,8], [9,9], [10,10]], ordinals2.map{|o| [o.test_order, o.ordinal_number] }
+  end
+
+end
+
+class MoreOrdinal < ActiveRecord::Base
+  acts_as_ordinalized
+
+  named_scope :ordered, :order => "test_order ASC"
+end
+
+class OrdinalAssociationWithPaginationTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    ordinal = Ordinal.create!(:test_order => 0)
+    (1..10).each { |counter| ordinal.more_ordinals.create!(:test_order => "#{counter}", :switch => counter.even?) }
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_ordinal_associations_with_pagination
+    ordinal = Ordinal.first
+    ordinals2 = ordinal.more_ordinals.ordered.paginate(:page => 2, :per_page => 5)
     assert_equal [[6,6], [7,7], [8,8], [9,9], [10,10]], ordinals2.map{|o| [o.test_order, o.ordinal_number] }
+    ordinals = ordinal.more_ordinals.ordered.paginate(:page => 1, :per_page => 5)
+    assert_equal [[1,1], [2,2], [3,3], [4,4], [5,5]], ordinals.map{|o| [o.test_order, o.ordinal_number] }
   end
 
 end
-rescue
-end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - mandaryn
@@ -15,25 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +02:00
+date: 2010-08-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: will_paginate
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 0
+        version: "0"
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  version_requirements: *id002
 description: This is a simple acts_as gem providing the active record models with ordinal numbers. The ordinals numbering is per query, but should work nicely with will paginate showing correct ordinal numbers on paginated results.
 email: mandaryyyn@gmail.com
 executables: []