active_collection 0.2.1 → 0.2.3

data/VERSION.yml

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

data/active_collection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_collection}
-  s.version = "0.2.1"
+  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-14}
+  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 = [
@@ -27,9 +27,11 @@ Gem::Specification.new do |s|
      "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",

data/lib/active_collection.rb

@@ -4,10 +4,12 @@ require 'active_support'
 
 module ActiveCollection
   autoload :Base, 'active_collection/base'
+  autoload :MemberClass, 'active_collection/member_class'
   autoload :Scope, 'active_collection/scope'
   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

@@ -37,30 +37,6 @@ module ActiveCollection
       proxy_respond_to?(*args) || collection.respond_to?(*args)
     end
 
-    def self.model_class
-      @model_class ||= name.sub(/Collection$/,'').constantize
-    end
-
-    def model_class
-      self.class.model_class
-    end
-
-    def self.table_name
-      model_class.table_name
-    end
-
-    def table_name
-      self.class.table_name
-    end
-
-    def self.human_name
-      table_name.gsub(/_/,' ')
-    end
-
-    def human_name
-      self.class.human_name
-    end
-
     # Forwards <tt>===</tt> explicitly to the collection because the instance method
     # removal above doesn't catch it. Loads the collection if needed.
     def ===(other)
@@ -75,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)
@@ -191,23 +137,11 @@ module ActiveCollection
     def raise_if_loaded
       raise AlreadyLoadedError, "Cannot modify a collection that has already been loaded." if loaded?
     end
-
-    # Extracted from AR:B
-    # Object#to_a is deprecated, though it does have the desired behavior
-    def safe_to_array(o)
-      case o
-      when NilClass
-        []
-      when Array
-        o
-      else
-        [o]
-      end
-    end
   end
 
   Base.class_eval do
+    include MemberClass
     include Scope
-    include Includes, Order, Pagination
+    include Includes, Order, Pagination, Serialization
   end
 end

data/lib/active_collection/member_class.rb

@@ -0,0 +1,33 @@
+module ActiveCollection
+  module MemberClass
+    def self.included(mod)
+      mod.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def model_class
+        @model_class ||= name.sub(/Collection$/,'').constantize
+      end
+
+      def table_name
+        model_class.table_name
+      end
+
+      def human_name(*args)
+        model_class.human_name(*args).pluralize
+      end
+    end
+
+    def model_class
+      self.class.model_class
+    end
+
+    def table_name
+      self.class.table_name
+    end
+
+    def human_name(*args)
+      self.class.human_name(*args)
+    end
+  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/active_collection_spec.rb

@@ -4,11 +4,18 @@ class BeerCollection < ActiveCollection::Base
 end
 
 class Beer
+  def self.human_name(*args)
+    "Beer"
+  end
 end
 
 describe ActiveCollection do
   subject { BeerCollection.new }
 
+  it "passes human_name to the member class and then pluralizes" do
+    subject.human_name(:locale => 'en-us').should == "Beers"
+  end
+
   context "(empty)" do
     describe "(count methods)" do
       before do

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: active_collection
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  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 
@@ -42,9 +42,11 @@ files:
 - 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