active_hash 0.9.2 → 0.9.3

data/CHANGELOG

@@ -1,5 +1,8 @@
+2011-04-19
+  - better dependency management and compatibility with ActiveSupport 2.x (thanks vandrijevik!)
+
 2011-01-22
-  - improved method_missing errors for dynamic finders (
+  - improved method_missing errors for dynamic finders
   - prevent users from trying to overwrite :attributes (https://github.com/zilkey/active_hash/issues/#issue/33)
 
 2010-12-08

data/Gemfile

@@ -1,8 +1,10 @@
 source :gemcutter
 
-gem "activerecord", "3.0.3"
-gem "activesupport", "3.0.3"
-gem "fixjour", "0.5.3"
-gem "rspec", "2.2.0"
-gem "sqlite3-ruby", ">= 1.3.2"
-gem 'rake'
+gemspec
+
+group :development do
+  gem "activerecord"
+  gem "rake"
+  gem "rspec", "2.2.0"
+  gem "sqlite3-ruby", ">= 1.3.2"
+end

data/active_hash.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
     "Ryan Garver",
     "Tom Stuart",
     "Joel Chippindale",
-    "Kevin Olsen"
+    "Kevin Olsen",
+    "Vladimir Andrijevik"
   ]
   s.date = %q{2011-01-22}
   s.email = %q{jeff@zilkey.com}
@@ -43,7 +44,6 @@ Gem::Specification.new do |s|
   s.summary = %q{An ActiveRecord-like model that uses a hash or file as a datasource}
   s.test_files = [
     "Gemfile",
-    "Gemfile.lock",
     "spec/active_file/base_spec.rb",
     "spec/active_hash/base_spec.rb",
     "spec/active_yaml/base_spec.rb",

data/lib/active_hash.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 
 begin
-  require 'active_support/all'
+  require 'active_support/core_ext'
 rescue MissingSourceFile
 end
 

data/lib/active_hash/base.rb

@@ -88,8 +88,9 @@ module ActiveHash
 
       def transaction
         yield
+      rescue LocalJumpError => err
+        raise err
       rescue ActiveRecord::Rollback
-
       end
 
       def delete_all

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

data/lib/enum/enum.rb

@@ -43,7 +43,7 @@ module ActiveHash
       private :set_constant
 
       def constant_for(field_value)
-        if constant = field_value.try(:dup)
+        if constant = !field_value.nil? && field_value.dup
           constant.gsub!(/\W+/, "_")
           constant.gsub!(/^_|_$/, '')
           constant.upcase!

data/spec/active_hash/base_spec.rb

@@ -11,6 +11,15 @@ describe ActiveHash, "Base" do
     Object.send :remove_const, :Country
   end
 
+  it "passes LocalJumpError through in .transaction when no block is given" do
+    expect { Country.transaction }.to raise_error(LocalJumpError)
+  end
+
+  # This require must be after the above example so that ActiveRecord
+  # is available in its full glory for the test classes that use it,
+  # but doesn't create a false positive for the above example.
+  require "active_record"
+
   describe ".fields" do
     before do
       Country.fields :name, :iso_name
@@ -944,34 +953,4 @@ describe ActiveHash, "Base" do
 
   end
 
-  describe "using with Fixjour" do
-
-    before do
-      Country.field :name
-      Fixjour :allow_redundancy => true do
-        define_builder(Country) do |klass, overrides|
-          klass.new(:name => 'Pat')
-        end
-      end
-    end
-
-    it "should verify" do
-      Fixjour.verify!
-    end
-
-    it "should work with the create builder" do
-      proc do
-        create_country
-      end.should change(Country, :count).by(1)
-    end
-
-    it "should work with the new builder" do
-      proc do
-        country = new_country :name => "foo"
-        country.name.should == "foo"
-      end.should_not change(Country, :count)
-    end
-
-  end
-
 end

data/spec/spec_helper.rb

@@ -1,12 +1,6 @@
 require 'rspec'
 require 'rspec/autorun'
-require 'active_record'
-require 'fixjour'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'active_hash'
-
-RSpec.configure do |config|
-  config.include Fixjour
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Jeff Dean
@@ -24,6 +24,7 @@ authors:
 - Tom Stuart
 - Joel Chippindale
 - Kevin Olsen
+- Vladimir Andrijevik
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -69,7 +70,6 @@ files:
 - lib/associations/associations.rb
 - lib/enum/enum.rb
 - Gemfile
-- Gemfile.lock
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb
 - spec/active_yaml/base_spec.rb
@@ -107,13 +107,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
 test_files: 
 - Gemfile
-- Gemfile.lock
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb
 - spec/active_yaml/base_spec.rb

data/Gemfile.lock

@@ -1,41 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    fixjour (0.5.3)
-      activerecord
-    i18n (0.5.0)
-    rake (0.8.7)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
-    sqlite3-ruby (1.3.2)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.0.3)
-  activesupport (= 3.0.3)
-  fixjour (= 0.5.3)
-  rake
-  rspec (= 2.2.0)
-  sqlite3-ruby (>= 1.3.2)