active_hash 0.8.5 → 0.8.6

data/.gitignore

@@ -5,4 +5,5 @@ rdoc
 pkg
 .idea
 junk.*
-.bundle/*
+.bundle/*
+.rvmrc

data/CHANGELOG

@@ -1,3 +1,6 @@
+2010-11-07
+  - Get ActiveHash::Associations to return a scope for has_many active record relationships (mocoso)
+
 2010-10-20
   - Allow find_by_* methods to accept an options hash, so rails associations don't blow up
 

data/README.md

@@ -325,20 +325,6 @@ Constants are formed by first stripping all non-word characters and then upcasin
 
 The field specified as the _enum_accessor_ must contain unique data values.
 
-## Authors
-
- * Jeff Dean
- * Mike Dalessio
- * Ben Woosley
- * John Pignata
- * Pat Nakajima
- * Brandon Keene
- * Dave Yeu
- * Brian Takita
- * Corey Innis
- * Peter Jaros
- * Michael Schubert
-
 ## Copyright
 
-Copyright (c) 2009 Jeff Dean. See LICENSE for details.
+Copyright (c) 2010 Jeff Dean. See LICENSE for details.

data/Rakefile

@@ -21,9 +21,10 @@ begin
       "Jeremy Weiskotten",
       "Ryan Garver",
       "Tom Stuart",
+      "Joel Chippindale"
     ]
     gem.add_dependency('activesupport', [">= 2.2.2"])
-    gem.post_install_message = "NOTE:  Enums have changed to use underscores.\n\nYou may have to do a search and replace to get your suite green."
+    # gem.post_install_message = ""
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/active_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Michael Schubert", "Jeremy Weiskotten", "Ryan Garver", "Tom Stuart"]
-  s.date = %q{2010-10-20}
+  s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Michael Schubert", "Jeremy Weiskotten", "Ryan Garver", "Tom Stuart", "Joel Chippindale"]
+  s.date = %q{2010-11-07}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -45,9 +45,6 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/zilkey/active_hash}
-  s.post_install_message = %q{NOTE:  Enums have changed to use underscores.
-
-You may have to do a search and replace to get your suite green.}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}

data/lib/associations/associations.rb

@@ -14,9 +14,14 @@ module ActiveHash
             :foreign_key => self.class.to_s.foreign_key
           }.merge(options)
 
-          options[:class_name].constantize.send("find_all_by_#{options[:foreign_key]}", id)
-        end
+          klass = options[:class_name].constantize
 
+          if klass.respond_to?(:scoped)
+            klass.scoped(:conditions => { options[:foreign_key] => id })
+          else
+            klass.send("find_all_by_#{options[:foreign_key]}", id)
+          end
+        end
       end
 
       def belongs_to(association_id, options = {})

data/spec/associations/associations_spec.rb

@@ -27,7 +27,9 @@ describe ActiveHash::Base, "associations" do
       establish_connection :adapter => "sqlite3", :database => ":memory:"
       connection.create_table(:books, :force => true) do |t|
         t.integer :author_id
+        t.boolean :published
       end
+      named_scope :published, { :conditions => { :published => true } }
     end
   end
 
@@ -43,9 +45,9 @@ describe ActiveHash::Base, "associations" do
 
     context "with ActiveRecord children" do
       before do
-        @included_book_1  = Book.create! :author_id => 1
-        @included_book_2  = Book.create! :author_id => 1
-        @excluded_book    = Book.create! :author_id => 2
+        @included_book_1  = Book.create! :author_id => 1, :published => true
+        @included_book_2  = Book.create! :author_id => 1, :published => false
+        @excluded_book    = Book.create! :author_id => 2, :published => true
       end
 
       it "find the correct records" do
@@ -53,6 +55,12 @@ describe ActiveHash::Base, "associations" do
         author = Author.create :id => 1
         author.books.should =~ [@included_book_1, @included_book_2]
       end
+
+      it "return a scope so that we can apply further scopes" do
+        Author.has_many :books
+        author = Author.create :id => 1
+        author.books.published.should =~ [@included_book_1]
+      end
     end
 
     context "with ActiveHash children" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Jeff Dean
@@ -22,11 +22,12 @@ authors:
 - Jeremy Weiskotten
 - Ryan Garver
 - Tom Stuart
+- Joel Chippindale
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -06:00
+date: 2010-11-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,10 +87,7 @@ has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
 licenses: []
 
-post_install_message: |-
-  NOTE:  Enums have changed to use underscores.
-  
-  You may have to do a search and replace to get your suite green.
+post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: