active_hash 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+2011-06-07
+  - fixed bug where .find would not work if you defined your ids as strings
+
 2011-06-05
   - fixed deprecation warnings for class_inheritable_accessor (thanks scudco!)
   - added basic compatibility with the `where` method from Arel (thanks rgarver!)

data/Gemfile

@@ -3,8 +3,20 @@ source :gemcutter
 gemspec
 
 group :development do
-  gem "activerecord"
-  gem "rake"
+  activerecord_version = ENV['ACTIVE_HASH_ACTIVERECORD_VERSION']
+
+  if activerecord_version == "edge"
+    git "git://github.com/rails/rails.git" do
+      gem "activerecord"
+      gem "activesupport"
+    end
+  elsif activerecord_version && activerecord_version.strip != ""
+    gem "activerecord", activerecord_version
+  else
+    gem "activerecord"
+  end
+
+  gem "rake", "0.8.7"
   gem "rspec", "2.2.0"
   gem "sqlite3-ruby", ">= 1.3.2"
 end

data/README.md

@@ -325,6 +325,55 @@ Constants are formed by first stripping all non-word characters and then upcasin
 
 The field specified as the _enum_accessor_ must contain unique data values.
 
+## Contributing
+
+If you'd like to become an ActiveHash contributor, the easiest way it to fork this repo, make your changes, run the specs and submit a pull request once they pass.
+
+To run specs, run:
+
+    bundle install
+    bundle exec rspec spec
+
+If your changes seem reasonable and the specs pass I'll give you commit rights to this repo and add you to the list of people who can push the gem.
+
+## Releasing a new version
+
+To make users' lives easier, please maintain support for:
+
+  * Ruby 1.8.7
+  * Ruby Enterprise 1.8.7
+  * Ruby 1.92
+  * ActiveRecord/ActiveSupport from 2.3.2 through edge
+
+To that end, there is a prerelease script that will run the tests against those 3 rubies, and against multiple versions of ActiveRecord/ActiveSupport.
+Before releasing a new version of ActiveHash, please run the prelease shell script like so:
+
+  ./prerelease
+
+It requires you to have rvm installed, and it requires the latest patch-versions of 1.8.7, ree and 1.9.2.  The prerelease script will:
+
+  * switch to rvm's ruby-1.8.7
+  * check for an active_hash gemset, and create one if it's not there
+  * check for bundler and install it if it's not there
+  * run `bundle exec rspec spec` against AR versions 2.3.2, 2.3.5, 2.3.11, the currently released version and edge
+  * switch to ree-1.8.7 and do the same
+  * switch to ruby-1.9.2 and do the same
+
+Needless to say, this script takes some time to run.  If you have to update your rubies, the first time you run this might take 45 minutes,
+but it will save users lots of headaches, and save me from dealing with the bug reports :)
+
+Once `prerelease` passes, follow these steps to release a new version of active_hash:
+
+  * update the changelog with a brief summary of the changes that are included in the release
+  * bump the gem version by editing the `version.rb` file
+  * if there are new contributors, add them to the list of authors in the Rakefile
+  * run `rake build`
+  * commit those changes
+  * run `rake install` and verify that the gem loads correctly from an irb session
+  * run `rake release`, which will rebuild the gem, tag it, push the tags (and your latest commit) to github, then push the gem to rubygems.org
+
+If you have any questions about how to maintain backwards compatibility, please email me and we can figure it out.
+
 ## Copyright
 
 Copyright (c) 2010 Jeff Dean. See LICENSE for details.

data/active_hash.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
     "Tom Stuart",
     "Joel Chippindale",
     "Kevin Olsen",
-    "Vladimir Andrijevik"
+    "Vladimir Andrijevik",
+    "Adam Anderson"
   ]
   s.date = %q{2011-01-22}
   s.email = %q{jeff@zilkey.com}

data/lib/active_hash/base.rb

@@ -91,7 +91,7 @@ module ActiveHash
 
       def where(options)
         (@records || []).select do |record|
-          options.all? {|col, match| record[col] == match}
+          options.all? { |col, match| record[col] == match }
         end
       end
 
@@ -118,7 +118,7 @@ module ActiveHash
           when :all
             all
           when Array
-            all.select { |record| id.map(& :to_i).include?(record.id) }
+            all.select { |record| id.to_s.include?(record.id.to_s) }
           else
             find_by_id(id) || begin
               raise RecordNotFound.new("Couldn't find #{name} with ID=#{id}")
@@ -127,7 +127,7 @@ module ActiveHash
       end
 
       def find_by_id(id)
-        all.detect { |record| record.id == id.to_i }
+        all.detect { |record| record.id.to_s == id.to_s }
       end
 
       delegate :first, :last, :to => :all
@@ -180,7 +180,7 @@ module ActiveHash
         else
           result = matches.first
           if config[:bang?]
-            result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attribute_pairs.collect {|pair| "#{pair[0]} = #{pair[1]}"}.join(', ')}")
+            result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attribute_pairs.collect { |pair| "#{pair[0]} = #{pair[1]}" }.join(', ')}")
           else
             result
           end
@@ -190,8 +190,8 @@ module ActiveHash
       def configuration_for_custom_finder(finder_name)
         if finder_name.to_s.match(/^find_(all_)?by_(.*?)(!)?$/) && !($1 && $3)
           {
-            :all?   => !!$1,
-            :bang?  => !!$3,
+            :all? => !!$1,
+            :bang? => !!$3,
             :fields => $2.split('_and_')
           }
         end
@@ -304,13 +304,13 @@ module ActiveHash
       private :mark_clean
 
       def has_instance_method?(name)
-        instance_methods.map{|method| method.to_sym}.include?(name)
+        instance_methods.map { |method| method.to_sym }.include?(name)
       end
 
       private :has_instance_method?
 
       def has_singleton_method?(name)
-        singleton_methods.map{|method| method.to_sym}.include?(name)
+        singleton_methods.map { |method| method.to_sym }.include?(name)
       end
 
       private :has_singleton_method?
@@ -373,12 +373,12 @@ module ActiveHash
 
     def cache_key
       case
-      when new_record?
-        "#{self.class.model_name.cache_key}/new"
-      when timestamp = self[:updated_at]
-        "#{self.class.model_name.cache_key}/#{id}-#{timestamp.to_s(:number)}"
-      else
-        "#{self.class.model_name.cache_key}/#{id}"
+        when new_record?
+          "#{self.class.model_name.cache_key}/new"
+        when timestamp = self[:updated_at]
+          "#{self.class.model_name.cache_key}/#{id}-#{timestamp.to_s(:number)}"
+        else
+          "#{self.class.model_name.cache_key}/#{id}"
       end
     end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

data/spec/active_hash/base_spec.rb

@@ -341,6 +341,23 @@ describe ActiveHash, "Base" do
       it "finds the record with the specified id" do
         Country.find_by_id(2).id.should == 2
       end
+
+      it "finds the record with the specified id as a string" do
+        Country.find_by_id("2").id.should == 2
+      end
+    end
+
+    context "with string ids" do
+      before do
+        Country.data = [
+          {:id => "abc", :name => "US"},
+          {:id => "def", :name => "Canada"}
+        ]
+      end
+
+      it "finds the record with the specified id" do
+        Country.find_by_id("abc").id.should == "abc"
+      end
     end
 
     context "with nil" do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: 
-  version: 0.9.4
+  segments: 
+  - 0
+  - 9
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Jeff Dean
@@ -20,6 +25,7 @@ authors:
 - Joel Chippindale
 - Kevin Olsen
 - Vladimir Andrijevik
+- Adam Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -28,16 +34,21 @@ date: 2011-01-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
+  requirement: *id001
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: activesupport
 description: 
 email: jeff@zilkey.com
 executables: []
@@ -81,12 +92,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []