toystore 0.6.4 → 0.6.5

data/.gitignore

@@ -4,4 +4,5 @@ testing/
 log
 tmp
 pkg
-.bundle
+.bundle
+Gemfile.lock

data/lib/toy.rb

@@ -10,7 +10,6 @@ require 'simple_uuid'
 require 'active_model'
 require 'active_support/json'
 require 'active_support/core_ext/object'
-require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/string/conversions'

data/lib/toy/attribute.rb

@@ -5,11 +5,11 @@ module Toy
     def initialize(model, name, type, options={})
       options.assert_valid_keys(:default, :embedded_list, :virtual, :abbr)
 
-      @model, @name, @type, @options = model, name.to_sym, type, options
+      @model, @name, @type, @options = model, name.to_s, type, options
       @virtual = options.fetch(:virtual, false)
 
       if abbr?
-        options[:abbr] = abbr.to_sym
+        options[:abbr] = abbr.to_s
         model.alias_attribute(abbr, name)
       end
 
@@ -55,7 +55,7 @@ module Toy
     end
 
     def store_key
-      (abbr? ? abbr : name).to_s
+      abbr? ? abbr : name
     end
 
     # Stores reference to related embedded list

data/lib/toy/attributes.rb

@@ -99,11 +99,11 @@ module Toy
 
       private
         def read_attribute(key)
-          @attributes[key]
+          @attributes[key.to_s]
         end
 
         def write_attribute(key, value)
-          @attributes[key] = attribute_definition(key).try(:from_store, value)
+          @attributes[key.to_s] = attribute_definition(key).try(:from_store, value)
         end
 
         def attribute_definition(key)
@@ -127,9 +127,9 @@ module Toy
         end
 
         def initialize_attributes_with_defaults
-          @attributes = {}.with_indifferent_access
+          @attributes = {}
           self.class.defaulted_attributes.each do |attribute|
-            @attributes[attribute.name] = attribute.default
+            @attributes[attribute.name.to_s] = attribute.default
           end
         end
     end

data/lib/toy/dolly.rb

@@ -5,7 +5,7 @@ module Toy
     def initialize_copy(other)
       @_new_record = true
       @_destroyed  = false
-      @attributes = {}.with_indifferent_access
+      @attributes = {}
 
       self.class.embedded_lists.each do |name, list|
         instance_variable_set(list.instance_variable, nil)

data/lib/toy/extensions/hash.rb

@@ -2,11 +2,11 @@ module Toy
   module Extensions
     module Hash
       def store_default
-        {}.with_indifferent_access
+        {}
       end
 
       def from_store(value, *)
-        value.nil? ? store_default : value.with_indifferent_access
+        value.nil? ? store_default : value
       end
     end
   end

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/toy/attribute_spec.rb

@@ -14,7 +14,7 @@ describe Toy::Attribute do
   end
 
   it "has name" do
-    attribute.name.should == :age
+    attribute.name.should == 'age'
   end
 
   it "has type" do
@@ -152,11 +152,11 @@ describe Toy::Attribute do
 
   describe "#abbr" do
     it "returns abbr if present" do
-      Toy::Attribute.new(User, :twitter_access_token, String, :abbr => :tat).abbr.should == :tat
+      Toy::Attribute.new(User, :twitter_access_token, String, :abbr => :tat).abbr.should == 'tat'
     end
 
     it "returns abbr as symbol if present as string" do
-      Toy::Attribute.new(User, :twitter_access_token, String, :abbr => 'tat').abbr.should == :tat
+      Toy::Attribute.new(User, :twitter_access_token, String, :abbr => 'tat').abbr.should == 'tat'
     end
 
     it "returns nil if not present" do

data/spec/toy/extensions/hash_spec.rb

@@ -1,21 +1,19 @@
 require 'helper'
 
 describe "Hash.from_store" do
-  it "should convert hash to hash with indifferent access" do
-    hash = Hash.from_store(:foo => 'bar')
-    hash[:foo].should  == 'bar'
-    hash['foo'].should == 'bar'
+  it "should return hash" do
+    Hash.from_store(:foo => 'bar')[:foo].should  == 'bar'
+    Hash.from_store('foo' => 'bar')['foo'].should  == 'bar'
   end
 
   it "should be hash if nil" do
     hash = Hash.from_store(nil)
     hash.should == {}
-    hash.is_a?(HashWithIndifferentAccess).should be_true
   end
 end
 
 describe "Hash.store_default" do
-  it "returns emtpy hash with indifferent access" do
-    Hash.store_default.should == {}.with_indifferent_access
+  it "returns emtpy hash" do
+    Hash.store_default.should == {}
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toystore
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Geoffrey Dagley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 -05:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,6 @@ files:
 - .autotest
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - LOGGING.rdoc
 - README.rdoc

data/Gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: .
-  specs:
-    toystore (0.6.3)
-      activemodel (~> 3.0.3)
-      activesupport (~> 3.0.3)
-      adapter (~> 0.5.1)
-      simple_uuid (~> 0.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    adapter (0.5.1)
-    bson (1.2.0)
-    bson_ext (1.2.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    log_buddy (0.5.0)
-    rack (1.2.1)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    simple_uuid (0.1.1)
-    timecop (0.3.5)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (~> 3.0.3)
-  activesupport (~> 3.0.3)
-  adapter (~> 0.5.1)
-  bson
-  bson_ext
-  log_buddy (~> 0.5.0)
-  rack-test
-  rake (~> 0.8.7)
-  rspec (~> 2.3)
-  simple_uuid (~> 0.1.1)
-  timecop (~> 0.3.5)
-  toystore!
-  tzinfo (~> 0.3.23)