martinemde-active_collection 0.2.1 → 0.2.2

data/VERSION.yml

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

data/lib/active_collection.rb

@@ -4,6 +4,7 @@ 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'

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)
@@ -191,22 +167,10 @@ 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
   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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: martinemde-active_collection
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Martin Emde
@@ -38,10 +38,10 @@ files:
 - 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
@@ -51,7 +51,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/martinemde/active_collection
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -72,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: collection
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A lazy-loading, Array-like collection proxy for ActiveRecord that understands conditions and paging.

data/active_collection.gemspec

@@ -1,62 +0,0 @@
-# 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.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{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/order.rb",
-     "lib/active_collection/pagination.rb",
-     "lib/active_collection/scope.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