active_hash 0.9.10 → 0.9.11

data/CHANGELOG

@@ -1,3 +1,9 @@
+2012-07-16
+  - Validate IDs are unique by caching them in a set (desmondmonster)
+
+2012-04-14
+  - Support for has_one associations (kbrock)
+
 2012-04-05
   - Allow gems like simple_form to read metadata about belongs_to associations that point to active hash objects (kbrock)
 

data/active_hash.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
     "Kevin Olsen",
     "Vladimir Andrijevik",
     "Adam Anderson",
-    "Keenan Brock"
+    "Keenan Brock",
+    "Desmond Bowe"
   ]
   s.date = %q{2012-01-18}
   s.email = %q{jeff@zilkey.com}

data/lib/active_hash/base.rb

@@ -6,8 +6,13 @@ module ActiveHash
   class ReservedFieldError < StandardError
   end
 
+  class IdError < StandardError
+  end
+
   class Base
 
+    require 'set'
+
     if respond_to?(:class_attribute)
       class_attribute :_data, :dirty
     else
@@ -54,6 +59,7 @@ module ActiveHash
       def data=(array_of_hashes)
         mark_dirty
         @records = nil
+        reset_ids
         self._data = array_of_hashes
         if array_of_hashes
           auto_assign_fields(array_of_hashes)
@@ -66,7 +72,10 @@ module ActiveHash
       def insert(record)
         @records ||= []
         record.attributes[:id] ||= next_id
+        validate_unique_id(record) if dirty
         mark_dirty
+
+        ids << record.id
         @records << record
       end
 
@@ -79,6 +88,24 @@ module ActiveHash
         end
       end
 
+      def ids
+        @ids ||= Set.new
+      end
+
+      private :ids
+
+      def reset_ids
+        ids.clear
+      end
+
+      private :reset_ids
+
+      def validate_unique_id(record)
+        raise IdError.new("Duplicate Id found for record #{record.attributes}") if ids.include?(record.id)
+      end
+
+      private :validate_unique_id
+
       def create(attributes = {})
         record = new(attributes)
         record.save
@@ -121,6 +148,7 @@ module ActiveHash
 
       def delete_all
         mark_dirty
+        reset_ids
         @records = []
       end
 
@@ -298,6 +326,7 @@ module ActiveHash
       end
 
       def reload
+        reset_ids
         self.data = _data
         mark_clean
       end

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "0.9.10"
+    VERSION = "0.9.11"
   end
 end

data/spec/active_hash/base_spec.rb

@@ -198,7 +198,7 @@ describe ActiveHash, "Base" do
       Country.data = [
         {:id => 1, :name => "US", :language => 'English'},
         {:id => 2, :name => "Canada", :language => 'English'},
-        {:id => 2, :name => "Mexico", :language => 'Spanish'}
+        {:id => 3, :name => "Mexico", :language => 'Spanish'}
       ]
     end
 
@@ -236,6 +236,16 @@ describe ActiveHash, "Base" do
       record.first.id.should == 1
       record.first.name.should == 'US'
     end
+
+    it "raises an error if ids aren't unique" do
+      proc do
+        Country.data = [
+          {:id => 1, :name => "US", :language => 'English'},
+          {:id => 2, :name => "Canada", :language => 'English'},
+          {:id => 2, :name => "Mexico", :language => 'Spanish'}
+        ]
+      end.should raise_error(ActiveHash::IdError)
+    end
   end
 
   describe ".count" do

metadata

@@ -1,14 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_hash
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 10
-  version: 0.9.10
+version: !ruby/object:Gem::Version
+  version: 0.9.11
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeff Dean
 - Mike Dalessio
 - Corey Innis
@@ -26,105 +22,111 @@ authors:
 - Vladimir Andrijevik
 - Adam Anderson
 - Keenan Brock
+- Desmond Bowe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-18 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: jeff@zilkey.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.md
 - active_hash.gemspec
 - lib/active_file/base.rb
+- lib/active_hash/base.rb
+- lib/active_hash/version.rb
+- lib/active_hash.rb
 - lib/active_yaml/base.rb
 - lib/associations/associations.rb
-- lib/active_hash.rb
 - lib/enum/enum.rb
-- lib/active_hash/version.rb
-- lib/active_hash/base.rb
 - Gemfile
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb
@@ -133,39 +135,34 @@ files:
 - spec/enum/enum_spec.rb
 - spec/lint_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/zilkey/active_hash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4063226138811375373
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
-test_files: 
+test_files:
 - Gemfile
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb