active_collection 0.2.0 → 0.2.1

data/Rakefile

@@ -5,8 +5,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "active_collection"
-    gem.summary = %Q{Lazy-loaded array of records}
-    gem.description = %Q{Lazy-loaded array of records}
+    gem.summary = %{A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.}
+    gem.description = %{A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.}
     gem.email = "martin.emde@gmail.com"
     gem.homepage = "http://github.com/martinemde/active_collection"
     gem.authors = ["Martin Emde"]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 1
 :major: 0
 :minor: 2
-:patch: 0

data/active_collection.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_collection}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Emde"]
   s.date = %q{2009-09-14}
-  s.description = %q{Lazy-loaded array of records}
+  s.description = %q{A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.}
   s.email = %q{martin.emde@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{collection}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Lazy-loaded array of records}
+  s.summary = %q{A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.}
   s.test_files = [
     "spec/active_collection_spec.rb",
      "spec/pagination_spec.rb",

data/lib/active_collection/includes.rb

@@ -34,7 +34,7 @@ module ActiveCollection
     end
 
     def include_options
-      @includes.blank?? {} : { :include => @includes }
+      { :include => @includes } unless @includes.blank?
     end
 
     protected

data/lib/active_collection/order.rb

@@ -24,7 +24,7 @@ module ActiveCollection
     end
 
     def order_options
-      order ? { :order => order } : {}
+      { :order => order } if order
     end
 
     module ClassMethods

data/lib/active_collection/pagination.rb

@@ -182,7 +182,7 @@ module ActiveCollection
 
     # Find options for pagination.
     def pagination_options
-      paginated?? { :offset => offset, :limit => per_page } : {}
+      { :offset => offset, :limit => per_page } if paginated?
     end
 
   end

data/lib/active_collection/scope.rb

@@ -79,7 +79,10 @@ module ActiveCollection
       end
 
       def to_options(object)
-        inject({}) { |h, callback| h.merge( callback.call(object) ) }
+        inject({}) do |h, callback|
+          res = callback.call(object)
+          res ? h.merge(res) : h
+        end
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_collection
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Martin Emde
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Lazy-loaded array of records
+description: A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.
 email: martin.emde@gmail.com
 executables: []
 
@@ -76,7 +76,7 @@ rubyforge_project: collection
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Lazy-loaded array of records
+summary: A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.
 test_files: 
 - spec/active_collection_spec.rb
 - spec/pagination_spec.rb