will_paginate 2.2.0 → 2.2.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 2.2.1, released 2008-04-08
+
+* take less risky path when monkeypatching named_scope; fix that it no longer
+  requires ActiveRecord::VERSION
+* use strings in "respond_to?" calls to work around a bug in acts_as_ferret
+  stable (ugh)
+* add rake release task
+
+
 == 2.2.0, released 2008-04-07
 
 === API changes
@@ -30,4 +39,5 @@
     
 * Add "paginated_each" method for iterating through every record by loading only
   one page of records at the time
-* Rails 2: Rescue from WillPaginate::InvalidPage error with 404 Not Found by default
+* Rails 2: Rescue from WillPaginate::InvalidPage error with 404 Not Found by
+  default

data/Rakefile

@@ -87,6 +87,33 @@ task :manifest do
   end
 end
 
+desc 'Package and upload the release to rubyforge.'
+task :release do
+  require 'yaml'
+  require 'rubyforge'
+  
+  meta = YAML::load open('.gemified')
+  version = meta[:version]
+  
+  v = ENV['VERSION'] or abort "Must supply VERSION=x.y.z"
+  abort "Version doesn't match #{version}" if v != version
+  
+  gem = "#{meta[:name]}-#{version}.gem"
+  project = meta[:rubyforge_project]
+ 
+  rf = RubyForge.new
+  puts "Logging in to RubyForge"
+  rf.login
+ 
+  c = rf.userconfig
+  c['release_notes'] = meta[:summary]
+  c['release_changes'] = File.read('CHANGELOG').split(/^== .+\n/)[1].strip
+  c['preformatted'] = true
+ 
+  puts "Releasing #{meta[:name]} #{version}"
+  rf.add_release project, project, version, gem
+end
+
 task :examples do
   %x(haml examples/index.haml examples/index.html)
   %x(sass examples/pagination.sass examples/pagination.css)

data/lib/will_paginate/named_scope_patch.rb

@@ -11,23 +11,12 @@ end
     ActiveRecord::Associations::HasManyThroughAssociation ].each do |klass|
   klass.class_eval do
     protected
-    def method_missing_without_paginate(method, *args)
-      if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
-        if block_given?
-          super { |*block_args| yield(*block_args) }
-        else
-          super
-        end
-      elsif @reflection.klass.scopes.include?(method)
-        @reflection.klass.scopes[method].call(self, *args)
+    alias :method_missing_without_scopes :method_missing_without_paginate
+    def method_missing_without_paginate(method, *args, &block)
+      if @reflection.klass.scopes.include?(method)
+        @reflection.klass.scopes[method].call(self, *args, &block)
       else
-        with_scope construct_scope do
-          if block_given?
-            @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) }
-          else
-            @reflection.klass.send(method, *args)
-          end
-        end
+        method_missing_without_scopes(method, *args, &block)
       end
     end
   end
@@ -47,4 +36,4 @@ ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
       end
     end
   end
-end if ActiveRecord::VERSION::MAJOR < 2
+end if ActiveRecord::Base.respond_to? :find_first

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers.rb

@@ -140,7 +140,7 @@ module WillPaginate
     end
 
     def self.total_pages_for_collection(collection) #:nodoc:
-      if collection.respond_to? :page_count and !collection.respond_to? :total_pages
+      if collection.respond_to?('page_count') and !collection.respond_to?('total_pages')
         WillPaginate::Deprecation.warn <<-MSG
           You are using a paginated collection of class #{collection.class.name}
           which conforms to the old API of WillPaginate::Collection by using

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: will_paginate
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-07 00:00:00 +02:00
+date: 2008-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: []