active_hash 0.7.9 → 0.8.0

data/.gitignore

@@ -5,3 +5,4 @@ rdoc
 pkg
 .idea
 junk.*
+.bundle/*

data/CHANGELOG

@@ -1,3 +1,7 @@
+2010-04-25
+ - When ActiveRecord model belongs_to an ActiveHash and the associated id is nil, returns nil instead of raising RecordNotFound (Jeremy Weiskotten)
+ - Merged Nakajima's "add" alias for "create" - gotta save those ASCII characters :)
+
 2010-03-01
   - Removed "extend"-related deprecations - they didn't play well with rails class loading
 

data/Gemfile

@@ -0,0 +1,8 @@
+source :gemcutter
+
+gem "activerecord", "3.0.0.beta2"
+gem "activesupport", "3.0.0.beta2"
+gem "rspec", ">= 1.3.0"
+gem "fixjour", "0.4.1"
+gem "acts_as_fu", "0.0.5"
+gem "jeweler", "1.4.0"

data/README.md

@@ -40,6 +40,20 @@ A quick example would be:
     country.name  # => "Mexico"
     country.name? # => true
 
+You can also use _create_:
+
+    class Country < ActiveHash::Base
+      create :id => 1, :name => "US"
+      create :id => 2, :name => "Canada"
+    end
+
+If you are Pat Nakajima,  you probably prefer _add_:
+
+    class Country < ActiveHash::Base
+      add :id => 1, :name => "US"
+      add :id => 2, :name => "Canada"
+    end
+
 ## Auto-Defined fields
 
 ActiveHash will auto-define all fields for you when you load the hash.  For example, if you have the following class:

data/Rakefile

@@ -8,21 +8,9 @@ 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"]
+    gem.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Jeremy Weiskotten"]
     gem.add_dependency('activesupport', [">= 2.2.2"])
-    gem.post_install_message = %q{NOTE: Breaking change!  Please change any extend statements to include statements:
-      
-      extend ActiveHash::Associations
-      extend ActiveHash::Enum
-  
-  becomes
-  
-      include ActiveHash::Associations
-      include ActiveHash::Enum
-
-  Sorry for the inconvenience.
-  
-}
+    gem.post_install_message = ""
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.8.0

data/active_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.7.9"
+  s.version = "0.8.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", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata"]
-  s.date = %q{2010-03-01}
+  s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Jeremy Weiskotten"]
+  s.date = %q{2010-04-25}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "CHANGELOG",
+     "Gemfile",
      "LICENSE",
      "README.md",
      "Rakefile",
      "VERSION",
      "active_hash.gemspec",
-     "geminstaller.yml",
      "lib/active_file/base.rb",
      "lib/active_hash.rb",
      "lib/active_hash/base.rb",
@@ -44,22 +44,10 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/zilkey/active_hash}
-  s.post_install_message = %q{NOTE: Breaking change!  Please change any extend statements to include statements:
-      
-      extend ActiveHash::Associations
-      extend ActiveHash::Enum
-  
-  becomes
-  
-      include ActiveHash::Associations
-      include ActiveHash::Enum
-
-  Sorry for the inconvenience.
-  
-}
+  s.post_install_message = %q{}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   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",

data/lib/active_hash/base.rb

@@ -39,6 +39,7 @@ module ActiveHash
         record.save
         record
       end
+      alias_method :add, :create
 
       def create!(attributes = {})
         record = new(attributes)
@@ -66,6 +67,8 @@ module ActiveHash
 
       def find(id, *args)
         case id
+          when nil
+            nil
           when :all
             all
           when Array
@@ -211,13 +214,13 @@ module ActiveHash
       def base_class
         ActiveHash::Base
       end
-      
+
       def reload
         self.data = read_inheritable_attribute(:data)
       end
-      
+
       private :reload
-      
+
     end
 
     attr_reader :attributes

data/spec/active_hash/base_spec.rb

@@ -68,6 +68,28 @@ describe ActiveHash, "Base" do
     end
   end
 
+  describe ".add" do
+    before do
+      Country.fields :name
+    end
+
+    it "adds a record" do
+      proc {
+        Country.add :name => "Russia"
+      }.should change { Country.count }
+    end
+
+    it "returns the record" do
+      record = Country.add :name => "Russia"
+      record.name.should == "Russia"
+    end
+
+    it "should populate the id" do
+      record = Country.add :name => "Russia"
+      record.id.should_not be_nil
+    end
+  end
+
   describe ".all" do
     before do
       Country.field :name
@@ -726,7 +748,7 @@ describe ActiveHash, "Base" do
 
     before do
       Country.field :name
-      Fixjour do
+      Fixjour :allow_redundancy => true do
         define_builder(Country) do |klass, overrides|
           klass.new(:name => 'Pat')
         end

data/spec/associations/associations_spec.rb

@@ -6,6 +6,10 @@ describe ActiveHash::Base, "associations" do
     build_model :countries do
     end
 
+    build_model :schools do
+      integer :city_id
+    end
+
     class City < ActiveHash::Base
       include ActiveHash::Associations
     end
@@ -65,6 +69,21 @@ describe ActiveHash::Base, "associations" do
 
   describe "#belongs_to" do
 
+    context "with an ActiveRecord child" do
+      it "finds the correct records" do
+        School.belongs_to :city
+        city = City.create
+        school = School.create :city_id => city.id
+        school.city.should == city
+      end
+
+      it "returns nil when the record does not exist" do
+        School.belongs_to :city
+        school = School.create :city_id => nil
+        school.city.should be_nil
+      end
+    end
+
     context "with an ActiveRecord parent" do
       it "find the correct records" do
         City.belongs_to :country

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
 require 'spec'
 require 'spec/autorun'
+require 'activerecord'
 require 'acts_as_fu'
 require 'fixjour'
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jeff Dean
@@ -12,23 +17,28 @@ authors:
 - Brian Takita
 - Pat Nakajima
 - John Pignata
+- Jeremy Weiskotten
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: jeff@zilkey.com
 executables: []
@@ -42,12 +52,12 @@ files:
 - .document
 - .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
 - active_hash.gemspec
-- geminstaller.yml
 - lib/active_file/base.rb
 - lib/active_hash.rb
 - lib/active_hash/base.rb
@@ -69,20 +79,7 @@ has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
 licenses: []
 
-post_install_message: |
-  NOTE: Breaking change!  Please change any extend statements to include statements:
-        
-        extend ActiveHash::Associations
-        extend ActiveHash::Enum
-    
-    becomes
-    
-        include ActiveHash::Associations
-        include ActiveHash::Enum
-  
-    Sorry for the inconvenience.
-    
-
+post_install_message: ""
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -91,18 +88,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource

data/geminstaller.yml

@@ -1,13 +0,0 @@
-defaults:
-  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.3.0
-- name: fixjour
-  version: 0.3.0
-- name: jeweler
-  version: 1.4.0