active_hash 0.7.7 → 0.7.8

data/CHANGELOG

@@ -1,6 +1,11 @@
+2010-01-18
+  - Added stub for #destroyed? method, since Rails associations now depend on it
+
 2009-12-19
   - Added ActiveHash::Enum (John Pignata)
   - Deprecated include ActiveHash::Associations in favor of extend ActiveHash::Associations
+  - Fixed bug where you can't set nil to an association
+  - Calling #belongs_to now creates the underlying field if it's not already there (belongs_to :city will create the :city_id field)
 
 2009-12-10
   - Fixed a bug where belongs_to associations would raise an error instead of returning

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.7.8

data/active_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.7.7"
+  s.version = "0.7.8"
 
   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"]
-  s.date = %q{2009-12-19}
+  s.date = %q{2010-01-18}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/geminstaller.yml

@@ -1,13 +1,13 @@
 defaults:
-  install_options: --source=http://gemcutter.org --source=http://gems.rubyforge.org --include-dependencies --no-ri --no-rdoc
+  install_options: --source=http://gemcutter.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
+  version: >= 1.3.0
 - name: fixjour
-  version: 0.2.0
+  version: 0.3.0
 - name: jeweler
-  version: 1.2.1
+  version: 1.4.0

data/lib/active_hash/base.rb

@@ -252,6 +252,10 @@ module ActiveHash
       ! self.class.all.include?(self)
     end
 
+    def destroyed?
+      false
+    end
+
     def readonly?
       true
     end

data/lib/associations/associations.rb

@@ -31,12 +31,14 @@ module ActiveHash
           :foreign_key => association_id.to_s.foreign_key
         }.merge(options)
 
+        field options[:foreign_key].to_sym
+
         define_method(association_id) do
           options[:class_name].constantize.find_by_id(send(options[:foreign_key]))
         end
 
         define_method("#{association_id}=") do |new_value|
-          attributes[ options[:foreign_key].to_sym ] = new_value.id
+          attributes[ options[:foreign_key].to_sym ] = new_value ? new_value.id : nil
         end
 
       end

data/lib/enum/enum.rb

@@ -1,7 +1,7 @@
 module ActiveHash
   module Enum
 
-    DuplicateConstant = Class.new(RuntimeError)
+    DuplicateEnumAccessor = Class.new(RuntimeError)
 
     def enum_accessor(field_name)
       @enum_accessor = field_name
@@ -10,30 +10,36 @@ module ActiveHash
 
     def insert(record)
       super
-      set_constant(record) if enum_accessor?
+      set_constant(record) if @enum_accessor.present?
     end
 
-    private :insert
-
-    def set_constant(record)
-      if constant = constant_for(record.attributes[@enum_accessor])
-        self.const_set(constant, record)
+    def delete_all
+      if @enum_accessor.present?
+        @records.each do |record|
+          constant = constant_for(record.attributes[@enum_accessor])
+          remove_const(constant) if const_defined?(constant)
+        end
       end
+      super
     end
 
-    private :set_constant
+    def set_constant(record)
+      constant = constant_for(record.attributes[@enum_accessor])
+      return nil if constant.blank?
 
-    def enum_accessor?
-      !@enum_accessor.nil?
+      unless const_defined?(constant)
+        const_set(constant, record)
+      else
+        raise DuplicateEnumAccessor, "#{constant} already defined for #{self.class}" unless const_get(constant) == record
+      end
     end
 
-    private :enum_accessor?
+    private :set_constant
 
     def constant_for(field_value)
-      if constant = field_value.dup
+      if constant = field_value.try(:dup)
         constant.gsub!(/[^A-Za-z]*/, "") 
         constant.upcase!
-        raise DuplicateConstant, "#{constant} is already defined on #{self.class.name}" if const_defined?(constant)            
         constant
       end
     end

data/spec/associations/associations_spec.rb

@@ -37,14 +37,11 @@ describe ActiveHash::Base, "associations" do
     end
 
     class City < ActiveHash::Base
-      field :country_id
       extend ActiveHash::Associations
     end
 
     class Author < ActiveHash::Base
       extend ActiveHash::Associations
-      field :publisher_id
-      field :city_id
     end
 
     build_model :books do
@@ -75,6 +72,7 @@ describe ActiveHash::Base, "associations" do
 
     context "with ActiveHash children" do
       before do
+        Author.field :city_id
         @included_author_1  = Author.create :city_id => 1
         @included_author_2  = Author.create :city_id => 1
         @excluded_author    = Author.create :city_id => 2
@@ -144,6 +142,16 @@ describe ActiveHash::Base, "associations" do
         author.city_id.should == @city.id
         author.city.should == @city
       end
+
+      it "works with nil" do
+        author = Author.new :city => @city
+        author.city_id.should == @city.id
+        author.city.should == @city
+
+        author.city = nil
+        author.city_id.should be_nil
+        author.city.should be_nil
+      end
     end
 
     describe "with a different foreign key" do

data/spec/enum/enum_spec.rb

@@ -8,6 +8,7 @@ describe ActiveHash::Base, "enum" do
     class Borough < ActiveYaml::Base
       extend ActiveHash::Enum
       fields :name, :county, :population
+      enum_accessor :name
     end
   end
 
@@ -17,10 +18,9 @@ describe ActiveHash::Base, "enum" do
 
   describe "#enum_accessor" do
     it "sets the field used for accessing records by constants" do
-      Borough.enum_accessor :name
       Borough::BROOKLYN.should == Borough.find_by_name("Brooklyn")
     end
-    
+
     it "ensures that values stored in the field specified are unique" do
       lambda do
         Class.new(ActiveHash::Base) do
@@ -32,7 +32,7 @@ describe ActiveHash::Base, "enum" do
           ]
           enum_accessor :name 
         end
-      end.should raise_error(ActiveHash::Enum::DuplicateConstant)
+      end.should raise_error(ActiveHash::Enum::DuplicateEnumAccessor)
     end
 
     it "removes non-word characters from values before setting constants" do
@@ -52,4 +52,35 @@ describe ActiveHash::Base, "enum" do
     end
   end
 
+  context "ActiveHash with an enum_accessor set" do
+    describe "#save" do
+      it "resets the constant's value to the updated record" do
+        Borough::BROOKLYN.population.should == 2556598
+        brooklyn = Borough.find_by_name("Brooklyn")
+        brooklyn.population = 2556600
+        brooklyn.save.should be_true
+        Borough::BROOKLYN.population.should == 2556600
+      end
+    end
+
+    describe ".create" do
+      it "creates constants for new records" do
+        bronx = Borough.create!(:name => "Bronx")
+        Borough::BRONX.should == bronx
+      end
+
+      it "doesn't create constants for records missing the enum accessor field" do
+        Borough.create(:name => "").should be_true
+        Borough.create(:population => 12).should be_true
+      end
+    end
+
+    describe ".delete_all" do
+      it "unsets all constants for deleted records" do
+        Borough.const_defined?("STATENISLAND").should be_true
+        Borough.delete_all.should be_true
+        Borough.const_defined?("STATENISLAND").should be_false
+      end
+    end
+  end
 end

data/spec/fixtures/boroughs.yml

@@ -11,10 +11,6 @@
   county: Queens
   population: 2293007
 - id: 4
-  name: Bronx
-  county: Bronx
-  population: 1391903
-- id: 5
   name: Staten Island
   county: Richmond
   population: 487407

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors: 
 - Jeff Dean
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 -05:00
+date: 2010-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency