active_hash 0.6.1 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+2009-10-12
+  - auto-assign fields after calling data= instead of after calling .all
+  - remove require 'rubygems', so folks with non-gem setups can still use AH
+  - added more specific activesupport dependency to ensure that metaclass is available
+  - AH no longer calls to_i on ids.  If you pass in a string as an id, you'll get a string back
+  - Fancy finders, such as find_all_by_id_and_name, will compare the to_s values of the fields, so you can pass in strings
+  - You can now use ActiveHash models as the parents of polymorphic belongs_to associations
+  - save, save!, create and create! now add items to the in-memory collection, and naively adds autoincrementing id
+  - new_record? returns false if the record is part of the collection
+  - ActiveHash now works with Fixjour!
+
 2009-08-19
   - Added custom finders for multiple fields, such as .find_all_by_name_and_age
 
@@ -10,4 +21,4 @@
   - ActiveFile no longer reloads files by default
   - Added ActiveFile.reload_active_file= so you can cause ActiveFile to reload
   - Setting data to nil correctly causes .all to return an empty array
-  - Added reload(force) method, so that you can force a reload from files in ActiveFile, useful for tests
+  - Added reload(force) method, so that you can force a reload from files in ActiveFile, useful for tests

data/README.md

@@ -193,10 +193,6 @@ NOTE:  By default, .full_path refers to the current working directory.  In a rai
 
 Written by Jeff Dean, Mike Dalessio and Ben Woosley 
 
-## Development
-
-The only thing I think I'd really like to add here is support for typecasting the fields.
-
 == Copyright
 
 Copyright (c) 2009 Jeff Dean. See LICENSE for details.

data/Rakefile

@@ -5,12 +5,11 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "active_hash"
-    gem.summary = %Q{An ActiveRecord-like model that uses a hash as a datasource}
+    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"]
-    gem.add_dependency('activesupport')
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency('activesupport', [">= 2.2.2"])
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/active_hash.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   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"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2009-10-13}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "active_hash.gemspec",
+     "geminstaller.yml",
      "lib/active_file/base.rb",
      "lib/active_hash.rb",
      "lib/active_hash/base.rb",
@@ -31,12 +32,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.1}
-  s.summary = %q{An ActiveRecord-like model that uses a hash as a datasource}
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{An ActiveRecord-like model that uses a hash or file as a datasource}
   s.test_files = [
     "spec/active_file/base_spec.rb",
      "spec/active_hash/base_spec.rb",
@@ -46,14 +46,14 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.2.2"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.2.2"])
   end
 end

data/geminstaller.yml

@@ -0,0 +1,11 @@
+defaults:
+  install_options: --source=http://gemcutter.org --source=http://gems.rubyforge.org --include-dependencies --no-ri --no-rdoc
+gems:
+- name: acts_as_fu
+  version: 0.0.5
+- name: activesupport
+  version: >= 2.2.2
+- name: rspec
+  version: >= 1.2.8
+- name: fixjour
+  version: 0.2.0

data/lib/active_hash.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
 require 'activesupport'
 require 'active_hash/base'
 require 'active_file/base'
-require 'active_yaml/base'
+require 'active_yaml/base'

data/lib/active_hash/base.rb

@@ -7,13 +7,40 @@ module ActiveHash
       def data=(array_of_hashes)
         @records = nil
         write_inheritable_attribute(:data, array_of_hashes)
+        auto_assign_fields( array_of_hashes )
+      end
+
+      def insert(record)
+        @records ||= []
+        record.attributes[:id] ||= next_id
+        @records << record
+      end
+
+      def next_id
+        max_record = all.max {|a, b| a.id <=> b.id }
+        if max_record.nil?
+          1
+        elsif max_record.id.is_a?(Numeric)
+          max_record.id.succ
+        end
+      end
+
+      def create(attributes)
+        record = new(attributes)
+        record.save
+        record
+      end
+
+      def create!(attributes)
+        record = new(attributes)
+        record.save!
+        record
       end
 
       def all
         unless @records
           records = read_inheritable_attribute(:data) || []
           @records = records.collect {|hash| new(hash)}
-          auto_assign_fields( records )
         end
         @records
       end
@@ -22,6 +49,12 @@ module ActiveHash
         all.length
       end
 
+      def transaction
+        yield
+      rescue ActiveRecord::Rollback
+
+      end
+
       def find(id, *args)
         case id
           when :all
@@ -60,7 +93,9 @@ module ActiveHash
         super ||
           begin
             config = configuration_for_custom_finder(method_name)
-            config && config[:fields].all? { |field| field_names.include?(field.to_sym) }
+            config && config[:fields].all? do |field|
+              field_names.include?(field.to_sym) || field.to_sym == :id
+            end
           end
       end
 
@@ -69,7 +104,7 @@ 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) == value } }
+        matches = all.select { |base| attribute_pairs.all? { |field, value| base.send(field).to_s == value.to_s } }
         config[:all?] ? matches : matches.first
       end
 
@@ -82,6 +117,8 @@ module ActiveHash
         end
       end
 
+      private :configuration_for_custom_finder
+
       def define_getter_method(field, default_value)
         unless instance_methods.include?(field.to_s)
           define_method(field) do
@@ -96,7 +133,7 @@ module ActiveHash
         method_name = "#{field}?"
         unless instance_methods.include?(method_name)
           define_method(method_name) do
-            attributes[field].present?
+            send(field).present?
           end
         end
       end
@@ -132,7 +169,7 @@ module ActiveHash
       private :define_custom_find_all_method
 
       def auto_assign_fields(array_of_hashes)
-        array_of_hashes.inject([]) do |array, row|
+        (array_of_hashes || []).inject([]) do |array, row|
           row.symbolize_keys!
           row.keys.each do |key|
             unless key.to_s == "id"
@@ -147,6 +184,11 @@ module ActiveHash
 
       private :auto_assign_fields
 
+      # Needed for ActiveRecord polymorphic associations
+      def base_class
+        ActiveHash::Base
+      end
+
     end
 
     attr_reader :attributes
@@ -157,13 +199,13 @@ module ActiveHash
     end
 
     def id
-      attributes[:id] ? attributes[:id].to_i : nil
+      attributes[:id] ? attributes[:id] : nil
     end
 
     alias quoted_id id
 
     def new_record?
-      false
+      ! self.class.all.include?(self)
     end
 
     def readonly?
@@ -184,5 +226,16 @@ module ActiveHash
       id.hash
     end
 
+    def save
+      self.class.insert(self)
+      true
+    end
+
+    alias save! save
+
+    def valid?
+      true
+    end
+
   end
 end

data/spec/active_hash/base_spec.rb

@@ -185,7 +185,7 @@ describe ActiveHash, "Base" do
       end
 
       it "returns all matching ids" do
-        Country.find([1,3]).should =~ [Country.new(:id => 1), Country.new(:id => 3)]
+        Country.find([1, 3]).should =~ [Country.new(:id => 1), Country.new(:id => 3)]
       end
     end
   end
@@ -289,6 +289,12 @@ describe ActiveHash, "Base" do
         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 "returns nil" do
           Country.find_by_name_and_monarch("US", "The Crown of England").should be_nil
@@ -322,7 +328,6 @@ describe ActiveHash, "Base" do
     end
   end
 
-
   describe "#attributes" do
     it "returns the hash passed in the initializer" do
       country = Country.new(:foo => :bar)
@@ -381,7 +386,7 @@ describe ActiveHash, "Base" do
 
     it "returns false if the given attribute is blank" do
       country = Country.new(:name => " ")
-      country.should_not be_name
+      country.name?.should == false
     end
 
     it "returns false if the given attribute was not passed" do
@@ -391,12 +396,6 @@ describe ActiveHash, "Base" do
   end
 
   describe "#id" do
-    context "when passed an id" do
-      it "returns the id as an integer" do
-        country = Country.new :id => "1"
-        country.id.should == 1
-      end
-    end
     context "when not passed an id" do
       it "returns nil" do
         country = Country.new
@@ -405,12 +404,6 @@ describe ActiveHash, "Base" do
     end
   end
 
-  describe "#new_record?" do
-    it "should be false" do
-      Country.new.should_not be_new_record
-    end
-  end
-
   describe "#quoted_id" do
     it "should return id" do
       Country.new(:id => 2).quoted_id.should == 2
@@ -495,8 +488,6 @@ describe ActiveHash, "Base" do
         {:field3 => "biz"}
       ]
 
-      Country.all
-
       [:field1, :field2, :field3].each do |field|
         Country.should respond_to("find_by_#{field}")
         Country.should respond_to("find_all_by_#{field}")
@@ -538,4 +529,188 @@ describe ActiveHash, "Base" do
     end
   end
 
-end
+  describe "using with belongs_to in ActiveRecord" do
+    before do
+      Country.data = [
+        {:id => 1, :name => "foo"}
+      ]
+
+      build_model :books do
+        text :subject_type
+        integer :subject_id
+        belongs_to :subject, :polymorphic => true
+        belongs_to :country
+      end
+    end
+
+    it "should be possible to use it as a parent" do
+      book = Book.new
+      book.country = Country.first
+      book.country.should == Country.first
+    end
+
+    it "should be possible to use it as a polymorphic parent" do
+      book = Book.new
+      book.subject = Country.first
+      book.subject.should == Country.first
+    end
+
+  end
+
+  describe "#save" do
+
+    before do
+      Country.field :name
+    end
+
+    it "adds the new object to the data collection" do
+      Country.all.should be_empty
+      country = Country.new :id => 1, :name => "foo"
+      country.save.should be_true
+      Country.all.should == [country] 
+    end
+
+    it "adds the new object to the data collection" do
+      Country.all.should be_empty
+      country = Country.new :id => 1, :name => "foo"
+      country.save!.should be_true
+      Country.all.should == [country]
+    end
+
+  end
+
+  describe ".create" do
+
+    before do
+      Country.field :name
+    end
+
+    it "adds the new object to the data collection" do
+      Country.all.should be_empty
+      country = Country.create :id => 1, :name => "foo"
+      country.id.should == 1
+      country.name.should == "foo"
+      Country.all.should == [country]
+    end
+
+    it "adds an auto-incrementing id if the id is nil" do
+      country1 = Country.new :name => "foo"
+      country1.save
+      country1.id.should == 1
+
+      country2 = Country.new :name => "bar"
+      country2.save
+      country2.id.should == 2
+    end
+
+    it "does not add auto-incrementing id if the id is present" do
+      country1 = Country.new :id => 456, :name => "foo"
+      country1.save
+      country1.id.should == 456
+    end
+
+    it "does not blow up with strings" do
+      country1 = Country.new :id => "foo", :name => "foo"
+      country1.save
+      country1.id.should == "foo"
+
+      country2 = Country.new :name => "foo"
+      country2.save
+      country2.id.should be_nil
+    end
+
+    it "adds the new object to the data collection" do
+      Country.all.should be_empty
+      country = Country.create! :id => 1, :name => "foo"
+      country.id.should == 1
+      country.name.should == "foo"
+      Country.all.should == [country]
+    end
+
+  end
+
+  describe "#valid?" do
+
+    it "should return true" do
+      Country.new.should be_valid
+    end
+
+  end
+
+  describe "#new_record?" do
+    before do
+      Country.field :name
+      Country.data = [
+        :id => 1, :name => "foo"
+      ]
+    end
+
+    it "returns false when the object is already part of the collection" do
+      Country.new(:id => 1).should_not be_new_record
+    end
+    
+    it "returns true when the object is not part of the collection" do
+      Country.new(:id => 2).should be_new_record
+    end
+
+  end
+
+  describe ".transaction" do
+
+    it "execute the block given to it" do
+      foo = Object.new
+      foo.should_receive(:bar)
+      Country.transaction do
+        foo.bar
+      end
+    end
+
+    it "swallows ActiveRecord::Rollback errors" do
+      proc do
+        Country.transaction do
+          raise ActiveRecord::Rollback
+        end
+      end.should_not raise_error
+    end
+
+    it "passes other errors through" do
+      proc do
+        Country.transaction do
+          raise "hell"
+        end
+      end.should raise_error("hell")
+    end
+
+  end
+
+  describe "using with Fixjour" do
+
+    before do
+      Country.field :name
+      Fixjour do
+        define_builder(Country) do |klass, overrides|
+          klass.new(:name => 'Pat')
+        end
+      end
+    end
+
+    it "should verify" do
+      Fixjour.verify!
+    end
+
+    it "should work with the create builder" do
+      proc do
+        create_country
+      end.should change(Country, :count).by(1)
+    end
+
+    it "should work with the new builder" do
+      proc do
+        country = new_country :name => "foo"
+        country.name.should == "foo"
+      end.should_not change(Country, :count)
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,9 +1,20 @@
 require 'spec'
+require 'acts_as_fu'
+require 'fixjour'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'active_hash'
 
+ActiveHash::Base.class_eval do
+  def self.to_ary
+  end
+
+  def self.to_str
+  end
+end
+
 Spec::Runner.configure do |config|
-  
+  config.include ActsAsFu
+  config.include Fixjour
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jeff Dean
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -04:00
+date: 2009-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.2.2
     version: 
 description: 
 email: jeff@zilkey.com
@@ -43,6 +43,7 @@ files:
 - Rakefile
 - VERSION
 - active_hash.gemspec
+- geminstaller.yml
 - lib/active_file/base.rb
 - lib/active_hash.rb
 - lib/active_hash/base.rb
@@ -78,8 +79,8 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
-summary: An ActiveRecord-like model that uses a hash as a datasource
+specification_version: 3
+summary: An ActiveRecord-like model that uses a hash or file as a datasource
 test_files: 
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb