mongoid-indifferent-access 0.0.1 → 0.0.3

data/Gemfile.lock

@@ -1,30 +1,29 @@
 PATH
   remote: .
   specs:
-    mongoid-indifferent-access (0.0.1)
+    mongoid-indifferent-access (0.0.3)
       mongoid
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activesupport (3.2.2)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    bson (1.6.1)
-    bson (1.6.1-java)
     builder (3.0.0)
     diff-lcs (1.1.3)
     i18n (0.6.0)
-    mongo (1.6.1)
-      bson (~> 1.6.1)
-    mongoid (2.4.6)
+    mongoid (3.0.3)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    multi_json (1.1.0)
+    moped (1.2.0)
+    multi_json (1.3.6)
+    origin (1.0.6)
     rake (0.9.2.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -34,7 +33,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
 
 PLATFORMS
   java

data/lib/mongoid_indifferent_access.rb

@@ -2,39 +2,52 @@ module Mongoid
   module Extensions
     module Hash
       module IndifferentAccess
-        VERSION = "0.0.1"
+
+        VERSION = "0.0.3"
 
         def self.included(klass)
           klass.class_eval do
-            # @override Mongoid::Field
+
             def self.field(name, options={})
               field = super(name, options)
 
-              # why oh why does sometimes Hash != Hash? something with my environment maybe?
-              # tried ruby 1.9.2-p290 and jruby 1.6.6 (1.9 mode), so we also try checking the class name
-              if options[:type] == Hash || options[:type].name =~ /Hash/
-                getter_name = name.is_a?(Symbol) ? name : name.intern
-                setter_name = "#{getter_name}=".intern
-
-                define_method(getter_name) do
-                  val = super()
-                  unless val.nil? || val.is_a?(HashWithIndifferentAccess)
-                    wrapped_hash = val.with_indifferent_access
-                    self.send(setter_name, wrapped_hash)
-                    val = wrapped_hash
-                  end
-                  val
-                end
+              if options[:type].name == 'Hash'
+                getter_name = name.to_sym
+                setter_name = "#{getter_name}=".to_sym
+
+                hia_define_getter(getter_name, setter_name)
+                hia_define_setter(setter_name)
 
-                define_method(setter_name) do |hash|
-                  unless hash.nil? || hash.is_a?(HashWithIndifferentAccess)
-                    hash = hash.with_indifferent_access
-                  end
-                  super(hash)
+                descendants.each do |subclass|
+                  subclass.hia_define_getter(getter_name, setter_name)
+                  subclass.hia_define_setter(setter_name)
                 end
               end
+
               field
             end
+
+            def self.hia_define_getter(getter_name, setter_name)
+              define_method(getter_name) do
+                val = super()
+                unless val.nil? || val.is_a?(HashWithIndifferentAccess)
+                  wrapped_hash = val.with_indifferent_access
+                  self.send(setter_name, wrapped_hash)
+                  val = wrapped_hash
+                end
+                val
+              end
+            end
+
+            def self.hia_define_setter(setter_name)
+              define_method(setter_name) do |hash|
+                unless hash.nil? || hash.is_a?(HashWithIndifferentAccess)
+                  hash = hash.with_indifferent_access
+                end
+                super(hash)
+              end
+            end
+
           end
         end
       end

data/mongoid-indifferent-access.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'mongoid-indifferent-access'
-  s.version           = '0.0.1'
-  s.date              = '2012-03-13'
+  s.version           = '0.0.3'
+  s.date              = '2012-08-08'
   s.rubyforge_project = 'mongoid-indifferent-access'
 
   ## Make sure your summary is short. The description may be as long
@@ -62,6 +62,8 @@ Gem::Specification.new do |s|
     spec/mongoid-indifferent-access/indifferent_access_spec.rb
     spec/mongoid.yml
     spec/spec_helper.rb
+    spec/support/guitar.rb
+    spec/support/mandalin.rb
   ]
   # = MANIFEST =
 

data/spec/mongoid-indifferent-access/indifferent_access_spec.rb

@@ -1,43 +1,71 @@
 require 'spec_helper'
-require 'mongoid_indifferent_access'
-require 'mongoid'
-
-# mocking some of what Mongoid::Document would provide
-# so the spec doesn't require having MongoDB running
-class MockSuper
-  attr_accessor :config
-  def self.field(name, options={})
-    nil
-  end
-end
-
-class Guitar < MockSuper
-  include Mongoid::Extensions::Hash::IndifferentAccess
-
-  field :config, :type => Hash
-end
+require 'support/guitar'
+require 'support/mandalin'
 
 module Mongoid::Extensions::Hash
 
   describe IndifferentAccess do
-    subject {
-      g = Guitar.new
-      g.config = {:value => 123}
-      g
-    }
+
+    before :each do
+      @subject = Guitar.new
+      @subject.config = {:value => 123}
+    end
 
     it "returns a value given a String as the key" do
-      subject.config["value"].should eq(123)
+      @subject.config["value"].should eq(123)
     end
 
     it "returns a value given a Symbol as the key" do
-      subject.config[:value].should eq(123)
+      @subject.config[:value].should eq(123)
     end
 
     it "returns nil given a non-existing key" do
-      subject.config[:non_existant].should be_nil
+      @subject.config[:non_existant].should be_nil
+    end
+
+    describe 'subclasses' do
+
+      before :each do
+        @sub_subject = Mandalin.new
+        @sub_subject.config = {:value => 123}
+      end
+
+      it "returns a value given a String as the key" do
+        @sub_subject.config["value"].should eq(123)
+      end
+
+      it "returns a value given a Symbol as the key" do
+        @sub_subject.config[:value].should eq(123)
+      end
+
+      it "returns nil given a non-existing key" do
+        @sub_subject.config[:non_existant].should be_nil
+      end
+
+      describe 'reload superclass' do
+
+        before :each do
+          load 'support/guitar.rb'
+          @sub_subject = Mandalin.new
+          @sub_subject.config = {:value => 123}
+        end
+
+        it "returns a value given a String as the key" do
+          @sub_subject.config["value"].should eq(123)
+        end
+
+        it "returns a value given a Symbol as the key" do
+          @sub_subject.config[:value].should eq(123)
+        end
+
+        it "returns nil given a non-existing key" do
+          @sub_subject.config[:non_existant].should be_nil
+        end
+
+      end
+
     end
 
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -13,4 +13,4 @@
 require 'rspec/autorun'
 ROOT = File.expand_path('../..', __FILE__)
 Dir[File.join(ROOT, "spec/support/**/*.rb")].each {|f| require f}
-$LOAD_PATH.unshift(File.expand_path('lib', ROOT))
+$LOAD_PATH.unshift(File.expand_path('lib', ROOT))

data/spec/support/guitar.rb

@@ -0,0 +1,9 @@
+require 'mongoid'
+require 'mongoid_indifferent_access'
+
+class Guitar
+  include Mongoid::Document
+  include Mongoid::Extensions::Hash::IndifferentAccess
+
+  field :config, :type => Hash
+end

data/spec/support/mandalin.rb

@@ -0,0 +1,2 @@
+class Mandalin < Guitar
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-indifferent-access
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2176859440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2176859440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2176858660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2176858660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2176857780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2176857780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Mongoid Hash extension enabling 'indifferent access' so you can access
   keys using Strings or Symbols.
 email: craig@mindscratch.org
@@ -60,6 +75,8 @@ files:
 - spec/mongoid-indifferent-access/indifferent_access_spec.rb
 - spec/mongoid.yml
 - spec/spec_helper.rb
+- spec/support/guitar.rb
+- spec/support/mandalin.rb
 homepage: https://github.com/mindscratch/mongoid-indifferent-access
 licenses: []
 post_install_message: 
@@ -81,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid-indifferent-access
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: A Mongoid Hash extension enabling 'indifferent access' so you can access