active_hash 0.8.3 → 0.8.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+2010-10-07
+ - Add conditions to ActiveHash#all (Ryan Garver)
+ - Add #cache_key to ActiveHash::Base (Tom Stuart)
+ - Add banged dynamic finder support to ActiveHash::Base (Tom Stuart)
+
 2010-09-16
  - Enum format now uses underscores instead of removing all characters
  - Removed test dependency on acts_as_fu

data/Gemfile

@@ -5,4 +5,5 @@ gem "activesupport", "2.3.8"
 gem "rspec", ">= 1.3.0"
 gem "fixjour", "0.4.1"
 gem "jeweler", "1.4.0"
-gem "sqlite3-ruby", ">= 1.2.5"
+gem "sqlite3-ruby", ">= 1.2.5"
+gem 'rake'

data/Gemfile.lock

@@ -13,6 +13,7 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
+    rake (0.8.7)
     rspec (1.3.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
@@ -26,5 +27,6 @@ DEPENDENCIES
   activesupport (= 2.3.8)
   fixjour (= 0.4.1)
   jeweler (= 1.4.0)
+  rake
   rspec (>= 1.3.0)
   sqlite3-ruby (>= 1.2.5)

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/active_hash.gemspec

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

data/lib/active_file/base.rb

@@ -5,7 +5,7 @@ module ActiveFile
 
     class << self
 
-      def all
+      def all(options={})
         reload unless data_loaded
         super
       end

data/lib/active_hash/base.rb

@@ -57,8 +57,14 @@ module ActiveHash
         record
       end
 
-      def all
-        @records || []
+      def all(options={})
+        if options.has_key?(:conditions)
+          (@records || []).select do |record|
+            options[:conditions].all? {|col, match| record[col] == match}
+          end
+        else
+          @records || []
+        end
       end
 
       def count
@@ -131,13 +137,24 @@ module ActiveHash
         config = configuration_for_custom_finder(method_name)
         attribute_pairs = config[:fields].zip(args)
         matches = all.select { |base| attribute_pairs.all? { |field, value| base.send(field).to_s == value.to_s } }
-        config[:all?] ? matches : matches.first
+
+        if config[:all?]
+          matches
+        else
+          result = matches.first
+          if config[:bang?]
+            result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attribute_pairs.collect {|pair| "#{pair.first} = #{pair.second}"}.join(', ')}")
+          else
+            result
+          end
+        end
       end
 
       def configuration_for_custom_finder(finder_name)
-        if finder_name.to_s.match(/^find_(all_)?by_(.*)/)
+        if finder_name.to_s.match(/^find_(all_)?by_(.*?)(!)?$/) && !($1 && $3)
           {
             :all?   => !!$1,
+            :bang?  => !!$3,
             :fields => $2.split('_and_')
           }
         end
@@ -301,6 +318,17 @@ module ActiveHash
       id.hash
     end
 
+    def cache_key
+      case
+      when new_record?
+        "#{self.class.model_name.cache_key}/new"
+      when timestamp = self[:updated_at]
+        "#{self.class.model_name.cache_key}/#{id}-#{timestamp.to_s(:number)}"
+      else
+        "#{self.class.model_name.cache_key}/#{id}"
+      end
+    end
+
     def save
       self.class.insert(self)
       true

data/spec/active_hash/base_spec.rb

@@ -31,20 +31,40 @@ describe ActiveHash, "Base" do
       Country.should respond_to(:find_by_iso_name)
     end
 
+    it "defines banged single finder methods for each field" do
+      Country.should respond_to(:find_by_name!)
+      Country.should respond_to(:find_by_iso_name!)
+    end
+
     it "defines array finder methods for each field" do
       Country.should respond_to(:find_all_by_name)
       Country.should respond_to(:find_all_by_iso_name)
     end
 
+    it "does not define banged array finder methods for each field" do
+      Country.should_not respond_to(:find_all_by_name!)
+      Country.should_not 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 banged 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
+
+    it "does not define banged array finder methods for all combinations of fields" 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
   end
 
   describe ".data=" do
@@ -137,6 +157,13 @@ describe ActiveHash, "Base" do
       records.first.name.should == "Canada"
       records.length.should == 1
     end
+    
+    it "filters the records from a AR-like conditions hash" do
+      record = Country.all(:conditions => {:name => 'US'})
+      record.count.should == 1
+      record.first.id.should == 1
+      record.first.name.should == 'US'
+    end
   end
 
   describe ".count" do
@@ -304,6 +331,40 @@ describe ActiveHash, "Base" do
       end
     end
 
+    describe "find_by_<field_name>!" do
+      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
+
+      describe "without a match" do
+        before do
+          Country.data = []
+        end
+
+        context "for a non-nil argument" do
+          it "raises ActiveHash::RecordNotFound" do
+            lambda { Country.find_by_name!("Mexico") }.should raise_error(ActiveHash::RecordNotFound, /Couldn't find Country with name = Mexico/)
+          end
+        end
+
+        context "for a nil argument" do
+          it "raises ActiveHash::RecordNotFound" do
+            lambda { Country.find_by_name!(nil) }.should raise_error(ActiveHash::RecordNotFound, /Couldn't find Country with name = /)
+          end
+        end
+      end
+    end
+
     describe "find_all_by_<field_name>" do
       describe "with matches" do
         it "returns all matching records" do
@@ -350,6 +411,35 @@ describe ActiveHash, "Base" do
       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
+
+      describe "with a match based on to_s" do
+        it "returns the first matching record" do
+          Country.find_by_name_and_id!("Canada", "13").id.should == 13
+        end
+      end
+
+      describe "without a match" do
+        it "raises ActiveHash::RecordNotFound" do
+          lambda { Country.find_by_name_and_monarch!("US", "The Crown of England") }.should raise_error(ActiveHash::RecordNotFound, /Couldn't find Country with name = US, monarch = The Crown of England/)
+        end
+      end
+
+      describe "for fields the class doesn't have" do
+        it "raises a NoMethodError" do
+          lambda {
+            Country.find_by_name_and_shoe_size!("US", 10)
+          }.should raise_error(NoMethodError, "undefined method `find_by_name_and_shoe_size!' for Country:Class")
+        end
+      end
+    end
+
     describe "find_all_by_<field_one>_and_<field_two>" do
       describe "with matches" do
         it "returns all matching records" do
@@ -619,6 +709,30 @@ describe ActiveHash, "Base" do
 
   end
 
+  describe "#cache_key" do
+    it 'should use the class\'s cache_key and id' do
+      Country.data = [
+        {:id => 1, :name => "foo"}
+      ]
+
+      Country.first.cache_key.should == 'countries/1'
+    end
+
+    it 'should use the record\'s updated_at if present' do
+      timestamp = Time.now
+
+      Country.data = [
+        {:id => 1, :name => "foo", :updated_at => timestamp}
+      ]
+
+      Country.first.cache_key.should == "countries/1-#{timestamp.to_s(:number)}"
+    end
+
+    it 'should use "new" instead of the id for a new record' do
+      Country.new(:id => 1).cache_key.should == 'countries/new'
+    end
+  end
+
   describe "#save" do
 
     before do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Jeff Dean
@@ -24,7 +24,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 -04:00
+date: 2010-10-07 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency