zilkey-active_hash 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+2009-08-19
+  - Added custom finders for multiple fields, such as .find_all_by_name_and_age
+
 2009-07-23
   - Added support for auto-defining methods based on hash keys in ActiveHash::Base
   - Changed the :field and :fields API so that they don't overwrite existing methods (useful when ActiveHash auto-defines methods)

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = %Q{An ActiveRecord-like model that uses a hash as a datasource}
     gem.email = "jeff@zilkey.com"
     gem.homepage = "http://github.com/zilkey/active_hash"
-    gem.authors = ["Jeff Dean", "Mike Dalessio"]
+    gem.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros"]
     gem.add_dependency('activesupport')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/active_hash.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Dean", "Mike Dalessio"]
-  s.date = %q{2009-07-24}
+  s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros"]
+  s.date = %q{2009-08-19}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,10 +31,11 @@ Gem::Specification.new do |s|
      "spec/active_yaml/sample.yml",
      "spec/spec_helper.rb"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/zilkey/active_hash}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{An ActiveRecord-like model that uses a hash as a datasource}
   s.test_files = [
     "spec/active_file/base_spec.rb",
@@ -45,7 +46,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])

data/lib/active_hash/base.rb

@@ -2,6 +2,7 @@ module ActiveHash
   class Base
     class_inheritable_accessor :data
     class << self
+      attr_reader :field_names
 
       def data=(array_of_hashes)
         @records = nil
@@ -46,12 +47,42 @@ module ActiveHash
       end
 
       def field(field_name, options = {})
+        @field_names ||= []
+        @field_names << field_name
+
         define_getter_method(field_name, options[:default])
         define_interrogator_method(field_name)
         define_custom_find_method(field_name)
         define_custom_find_all_method(field_name)
       end
 
+      def respond_to?(method_name)
+        super ||
+          begin
+            config = configuration_for_custom_finder(method_name)
+            config && config[:fields].all? { |field| field_names.include?(field.to_sym) }
+          end
+      end
+
+      def method_missing(method_name, *args)
+        config = configuration_for_custom_finder(method_name)
+
+        return super unless config
+
+        attribute_pairs = config[:fields].zip(args)
+        matches = all.select { |base| attribute_pairs.all? { |field, value| base.send(field) == value } }
+        config[:all?] ? matches : matches.first
+      end
+
+      def configuration_for_custom_finder(finder_name)
+        if finder_name.to_s.match(/^find_(all_)?by_(.*)/)
+          {
+            :all?   => !!$1,
+            :fields => $2.split('_and_')
+          }
+        end
+      end
+
       def define_getter_method(field, default_value)
         unless instance_methods.include?(field.to_s)
           define_method(field) do

data/spec/active_hash/base_spec.rb

@@ -35,6 +35,16 @@ describe ActiveHash, "Base" do
       Country.should respond_to(:find_all_by_name)
       Country.should respond_to(:find_all_by_iso_name)
     end
+
+    it "defines single finder methods for all combinations of fields" do
+      Country.should respond_to(:find_by_name_and_iso_name)
+      Country.should respond_to(:find_by_iso_name_and_name)
+    end
+
+    it "defines array finder methods for all combinations of fields" do
+      Country.should respond_to(:find_all_by_name_and_iso_name)
+      Country.should respond_to(:find_all_by_iso_name_and_name)
+    end
   end
 
   describe ".data=" do
@@ -209,47 +219,96 @@ describe ActiveHash, "Base" do
 
   describe "custom finders" do
     before do
-      Country.field :name
+      Country.fields :name, :monarch
+
+      # Start ids above 4 lest we get nil and think it's an AH::Base model with id=4.
       Country.data = [
-        {:id => 1, :name => "US"},
-        {:id => 2, :name => "US"},
-        {:id => 3, :name => "Canada"}
+        {:id => 11, :name => nil, :monarch => nil, :language => "Latin"},
+        {:id => 12, :name => "US", :monarch => nil, :language => "English"},
+        {:id => 13, :name => "Canada", :monarch => "The Crown of England", :language => "English"},
+        {:id => 14, :name => "UK", :monarch => "The Crown of England", :language => "English"}
       ]
     end
 
     describe "find_by_<field_name>" do
-      context "with a name" do
-        it "returns the first record matching that name" do
-          Country.find_by_name("US").id.should == 1
+      describe "with a match" do
+        context "for a non-nil argument" do
+          it "returns the first matching record" do
+            Country.find_by_name("US").id.should == 12
+          end
+        end
+
+        context "for a nil argument" do
+          it "returns the first matching record" do
+            Country.find_by_name(nil).id.should == 11
+          end
         end
       end
 
-      context "with nil" do
-        it "returns nil" do
-          Country.find_by_name(nil).should be_nil
+      describe "without a match" do
+        before do
+          Country.data = []
+        end
+
+        context "for a non-nil argument" do
+          it "returns nil" do
+            Country.find_by_name("Mexico").should be_nil
+          end
+        end
+
+        context "for a nil argument" do
+          it "returns nil" do
+            Country.find_by_name(nil).should be_nil
+          end
+        end
+      end
+    end
+
+    describe "find_all_by_<field_name>" do
+      describe "with matches" do
+        it "returns all matching records" do
+          countries = Country.find_all_by_monarch("The Crown of England")
+          countries.length.should == 2
+          countries.first.name.should == "Canada"
+          countries.last.name.should == "UK"
+        end
+      end
+
+      describe "without matches" do
+        it "returns an empty array" do
+          Country.find_all_by_name("Mexico").should be_empty
+        end
+      end
+    end
+
+    describe "find_by_<field_one>_and_<field_two>" do
+      describe "with a match" do
+        it "returns the first matching record" do
+          Country.find_by_name_and_monarch("Canada", "The Crown of England").id.should == 13
+          Country.find_by_monarch_and_name("The Crown of England", "Canada").id.should == 13
         end
       end
 
-      context "with a name not present" do
+      describe "without a match" do
         it "returns nil" do
-          Country.find_by_name("foo").should be_nil
+          Country.find_by_name_and_monarch("US", "The Crown of England").should be_nil
         end
       end
     end
 
-    describe "find_all_by_<field_name>" do
-      context "with a name" do
-        it "returns the records matching that name" do
-          countries = Country.find_all_by_name("US")
+    describe "find_all_by_<field_one>_and_<field_two>" do
+      describe "with matches" do
+        it "returns all matching records" do
+          countries = Country.find_all_by_monarch_and_language("The Crown of England", "English")
           countries.length.should == 2
-          countries.first.name.should == "US"
-          countries.last.name.should == "US"
+          countries.first.name.should == "Canada"
+          countries.last.name.should == "UK"
         end
       end
 
-      context "with a name not present" do
+      describe "without matches" do
         it "returns an empty array" do
-          Country.find_all_by_name("foo").should be_empty
+          Country.find_all_by_monarch_and_language("Shaka Zulu", "Zulu").should be_empty
         end
       end
     end

metadata

@@ -1,16 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: zilkey-active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jeff Dean
 - Mike Dalessio
+- Corey Innis
+- Peter Jaros
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,8 +52,9 @@ files:
 - spec/active_yaml/base_spec.rb
 - spec/active_yaml/sample.yml
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -72,9 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: An ActiveRecord-like model that uses a hash as a datasource
 test_files: 
 - spec/active_file/base_spec.rb