active_hash 0.9.11 → 0.9.12

data/CHANGELOG

@@ -1,3 +1,6 @@
+2012-07-25
+  - Make find_by_id lookups faster by indexing records by id (desmondmonster)
+
 2012-07-16
   - Validate IDs are unique by caching them in a set (desmondmonster)
 

data/README.md

@@ -339,7 +339,7 @@ Records can be accessed by looking up the field constant:
     >> Country::CANADA
     => #<Country:0x10229fb28 @attributes={:name=>"Canada", :id=>2}
     
-Constants are formed by first stripping all non-word characters and then upcasing the result. This means strings like "Blazing Saddles", "ReBar", "Mike & Ike" and "Ho! Ho! Ho!" become BLAZINGSADDLES, REBAR, MIKEIKE and HOHOHO.
+Constants are formed by first stripping all non-word characters and then upcasing the result. This means strings like "Blazing Saddles", "ReBar", "Mike & Ike" and "Ho! Ho! Ho!" become BLAZING_SADDLES, REBAR, MIKE_IKE and HO_HO_HO.
 
 The field specified as the _enum_accessor_ must contain unique data values.
 

data/lib/active_hash/base.rb

@@ -11,8 +11,6 @@ module ActiveHash
 
   class Base
 
-    require 'set'
-
     if respond_to?(:class_attribute)
       class_attribute :_data, :dirty
     else
@@ -59,7 +57,7 @@ module ActiveHash
       def data=(array_of_hashes)
         mark_dirty
         @records = nil
-        reset_ids
+        reset_record_index
         self._data = array_of_hashes
         if array_of_hashes
           auto_assign_fields(array_of_hashes)
@@ -75,7 +73,7 @@ module ActiveHash
         validate_unique_id(record) if dirty
         mark_dirty
 
-        ids << record.id
+        add_to_record_index({ record.id.to_s => @records.length })
         @records << record
       end
 
@@ -88,20 +86,26 @@ module ActiveHash
         end
       end
 
-      def ids
-        @ids ||= Set.new
+      def record_index
+        @record_index ||= {}
+      end
+
+      private :record_index
+
+      def reset_record_index
+        record_index.clear
       end
 
-      private :ids
+      private :reset_record_index
 
-      def reset_ids
-        ids.clear
+      def add_to_record_index(entry)
+        record_index.merge!(entry)
       end
 
-      private :reset_ids
+      private :add_to_record_index
 
       def validate_unique_id(record)
-        raise IdError.new("Duplicate Id found for record #{record.attributes}") if ids.include?(record.id)
+        raise IdError.new("Duplicate Id found for record #{record.attributes}") if record_index.has_key?(record.id.to_s)
       end
 
       private :validate_unique_id
@@ -148,7 +152,7 @@ module ActiveHash
 
       def delete_all
         mark_dirty
-        reset_ids
+        reset_record_index
         @records = []
       end
 
@@ -168,7 +172,8 @@ module ActiveHash
       end
 
       def find_by_id(id)
-        all.detect { |record| record.id.to_s == id.to_s }
+        index = record_index[id.to_s]
+        index and @records[index]
       end
 
       delegate :first, :last, :to => :all
@@ -326,7 +331,7 @@ module ActiveHash
       end
 
       def reload
-        reset_ids
+        reset_record_index
         self.data = _data
         mark_clean
       end

data/lib/active_hash/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
   prerelease: 
 platform: ruby
 authors:
@@ -26,11 +26,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70291036455660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +38,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+  version_requirements: *70291036455660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70291036454000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,15 +49,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+  version_requirements: *70291036454000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70291036451580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +60,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70291036451580
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70291036450320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +71,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+  version_requirements: *70291036450320
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70291036449280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,12 +82,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70291036449280
 description: 
 email: jeff@zilkey.com
 executables: []
@@ -147,9 +122,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4063226138811375373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource