martinemde-active_collection 0.2.2 → 0.2.3

data/VERSION.yml

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

data/active_collection.gemspec

@@ -0,0 +1,64 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{active_collection}
+  s.version = "0.2.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Martin Emde"]
+  s.date = %q{2009-09-16}
+  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",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "active_collection.gemspec",
+     "lib/active_collection.rb",
+     "lib/active_collection/base.rb",
+     "lib/active_collection/includes.rb",
+     "lib/active_collection/member_class.rb",
+     "lib/active_collection/order.rb",
+     "lib/active_collection/pagination.rb",
+     "lib/active_collection/scope.rb",
+     "lib/active_collection/serialization.rb",
+     "spec/active_collection_spec.rb",
+     "spec/pagination_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/martinemde/active_collection}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{collection}
+  s.rubygems_version = %q{1.3.5}
+  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",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end

data/lib/active_collection.rb

@@ -9,6 +9,7 @@ module ActiveCollection
   autoload :Order, 'active_collection/order'
   autoload :Includes, 'active_collection/includes'
   autoload :Pagination, 'active_collection/pagination'
+  autoload :Serialization, 'active_collection/serialization'
 
   Base
 end

data/lib/active_collection/base.rb

@@ -51,36 +51,6 @@ module ActiveCollection
       end
     end
 
-    # Turn the params into a hash suitable for passing the collection directly as an arg to a named path.
-    def to_param
-      params.empty?? nil : params.to_param
-    end
-
-    def as_data_hash
-      data_hash = { "collection" => collection.as_json }
-      data_hash["total_entries"] = total_entries
-      data_hash
-    end
-
-    def to_xml(options = {})
-      collect
-      options[:indent] ||= 2
-      xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
-      xml.instruct! unless options[:skip_instruct]
-      xml.tag!(table_name) do
-        xml.total_entries(total_entries, :type => "integer")
-        xml.collection(:type => "array") do
-          collection.each do |item|
-            item.to_xml(:indent => options[:indent], :builder => xml, :skip_instruct => true)
-          end
-        end
-      end
-    end
-
-    def as_json(options = nil)
-      {table_name => as_data_hash}.as_json(options)
-    end
-
     # Implements Enumerable
     def each(&block)
       collection.each(&block)
@@ -172,6 +142,6 @@ module ActiveCollection
   Base.class_eval do
     include MemberClass
     include Scope
-    include Includes, Order, Pagination
+    include Includes, Order, Pagination, Serialization
   end
 end

data/lib/active_collection/pagination.rb

@@ -31,7 +31,13 @@ module ActiveCollection
     # Loads total entries and calculates the size from that.
     def size_with_pagination
       if paginated?
-        last_page?? size_without_pagination % per_page : per_page
+        if out_of_bounds?
+          0
+        elsif last_page?
+          size_without_pagination % per_page
+        else
+          per_page
+        end
       else
         size_without_pagination
       end
@@ -92,7 +98,7 @@ module ActiveCollection
     # 
     # may load total_entries if not already loaded.
     def last_page?
-      next_page.nil?
+      !out_of_bounds? && next_page.nil?
     end
 
     # New Collection for current_page - 1 or nil.

data/lib/active_collection/serialization.rb

@@ -0,0 +1,34 @@
+module ActiveCollection
+  module Serialization
+    # Turn the params into a hash suitable such that passing the collection
+    # directly to a named path generates the path for the current collection.
+    def to_param
+      params.empty?? nil : params.to_param
+    end
+
+    def as_data_hash
+      data_hash = { table_name => collection.as_json }
+      data_hash["total_entries"] = total_entries
+      data_hash
+    end
+
+    def to_xml(options = {})
+      collect
+      options[:indent] ||= 2
+      xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+      xml.instruct! unless options[:skip_instruct]
+      xml.collection do
+        xml.total_entries(total_entries, :type => "integer")
+        xml.tag!(table_name, :type => "array") do
+          collection.each do |item|
+            item.to_xml(:indent => options[:indent], :builder => xml, :skip_instruct => true)
+          end
+        end
+      end
+    end
+
+    def as_json(options = nil)
+      {"collection" => as_data_hash}.as_json(options)
+    end
+  end
+end

data/spec/pagination_spec.rb

@@ -59,6 +59,14 @@ describe ActiveCollection do
       it "is on page 2" do
         subject.current_page.should == 2
       end
+
+      it "is empty" do
+        subject.should be_empty
+      end
+
+      it "has 0 size" do
+        subject.size.should == 0
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: martinemde-active_collection
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Martin Emde
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- active_collection.gemspec
 - lib/active_collection.rb
 - lib/active_collection/base.rb
 - lib/active_collection/includes.rb
@@ -45,12 +46,14 @@ files:
 - lib/active_collection/order.rb
 - lib/active_collection/pagination.rb
 - lib/active_collection/scope.rb
+- lib/active_collection/serialization.rb
 - spec/active_collection_spec.rb
 - spec/pagination_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/martinemde/active_collection
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -71,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: collection
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.