active_hash 0.8.4 → 0.8.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+2010-10-20
+  - Allow find_by_* methods to accept an options hash, so rails associations don't blow up
+
 2010-10-07
  - Add conditions to ActiveHash#all (Ryan Garver)
  - Add #cache_key to ActiveHash::Base (Tom Stuart)

data/Rakefile

@@ -8,7 +8,20 @@ begin
     gem.summary = %Q{An ActiveRecord-like model that uses a hash or file as a datasource}
     gem.email = "jeff@zilkey.com"
     gem.homepage = "http://github.com/zilkey/active_hash"
-    gem.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Michael Schubert", "Jeremy Weiskotten"]
+    gem.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",
+    ]
     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."
   end

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/active_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.8.4"
+  s.version = "0.8.5"
 
   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"]
-  s.date = %q{2010-10-07}
+  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.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/active_hash/base.rb

@@ -131,7 +131,7 @@ module ActiveHash
           end
       end
 
-      def method_missing(method_name, * args)
+      def method_missing(method_name, *args)
         return super unless respond_to? method_name
 
         config = configuration_for_custom_finder(method_name)
@@ -198,8 +198,10 @@ module ActiveHash
         method_name = "find_by_#{field_name}"
         unless singleton_methods.include?(method_name)
           the_meta_class.instance_eval do
-            define_method(method_name) do |name|
-              all.detect { |record| record.send(field_name) == name }
+            define_method(method_name) do |*args|
+              options = args.extract_options!
+              identifier = args[0]
+              all.detect { |record| record.send(field_name) == identifier }
             end
           end
         end
@@ -212,8 +214,10 @@ module ActiveHash
         unless singleton_methods.include?(method_name)
           the_meta_class.instance_eval do
             unless singleton_methods.include?(method_name)
-              define_method(method_name) do |name|
-                all.select { |record| record.send(field_name) == name }
+              define_method(method_name) do |*args|
+                options = args.extract_options!
+                identifier = args[0]
+                all.select { |record| record.send(field_name) == identifier }
               end
             end
           end

data/spec/active_hash/base_spec.rb

@@ -65,6 +65,16 @@ describe ActiveHash, "Base" do
       Country.should_not respond_to(:find_all_by_name_and_iso_name!)
       Country.should_not respond_to(:find_all_by_iso_name_and_name!)
     end
+
+    it "allows you to pass options to the built-in find_by_* methods (but ignores the hash for now)" do
+      Country.find_by_name("Canada", :select => nil).should be_nil
+      Country.find_all_by_name("Canada", :select => nil).should == []
+    end
+
+    it "allows you to pass options to the custom find_by_* methods (but ignores the hash for now)" do
+      Country.find_by_name_and_iso_name("Canada", "CA", :select => nil).should be_nil
+      Country.find_all_by_name_and_iso_name("Canada", "CA", :select => nil).should == []
+    end
   end
 
   describe ".data=" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Jeff Dean
@@ -20,11 +20,13 @@ authors:
 - John Pignata
 - Michael Schubert
 - Jeremy Weiskotten
+- Ryan Garver
+- Tom Stuart
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -06:00
+date: 2010-10-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency