active_hash 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8402bf0998ccf7ae1e02e14a7f8d751d223fb2f
-  data.tar.gz: cebb5ad579c8330dd32de73c0c3e30b2ab9bb7a5
+  metadata.gz: 10ab92fe5ae0453d087ce9f904ade8c1664db5c3
+  data.tar.gz: '0964a0f76b8d9321f0c7bcbe136e2dde6a91ed2f'
 SHA512:
-  metadata.gz: d4d6a5528d93310bb3d84ba38e92074df4a9717fd22b36ccf6133b6bd038ccd8a47b111d5e6c89255c64bbfb6cc86e000fc184a9d92880a41621a44ccb5d4218
-  data.tar.gz: 294a765759e4310f83de96efcc43d670c099196e070a470483fd1123b9b52bca01fbf76b87a9a93fec746993e0470a4c00c54950f48d1576e68b735dc734b8f8
+  metadata.gz: c00058af1e0cc646f6f7e6b3e2b9a3f06e129c1297cd8d59dff7a9b7aff411beb91237bd4999976f8adfecce2244e85da9131332edee3b11eba665402380e40a
+  data.tar.gz: b41cd527f634cb8f57eea675ef2a732e97c808b9409086191b0b28391340d650d980d6b94aded02041856668c8dc5b9f2ae25d72f9b56c32720af599da9e0be0

data/CHANGELOG

@@ -1,3 +1,6 @@
+2017-04-20 (v1.5.1)
+  - Fix a bug on `.where` [#147](https://github.com/zilkey/active_hash/pull/147)
+
 2017-03-24 (v1.5.0)
   - add support for `.find_by!`(@syguer)
 

data/lib/active_hash/base.rb

@@ -90,7 +90,7 @@ module ActiveHash
 
       def insert(record)
         @records ||= []
-        record.attributes[:id] ||= next_id
+        record[:id] ||= next_id
         validate_unique_id(record) if dirty
         mark_dirty
 
@@ -158,7 +158,8 @@ module ActiveHash
         return @records if options.blank?
 
         # use index if searching by id
-        if (ids = (options.delete(:id) || options.delete("id")))
+        if options.key?(:id) || options.key?("id")
+          ids = (options.delete(:id) || options.delete("id"))
           candidates = Array.wrap(ids).map { |id| find_by_id(id) }
         end
         return candidates if options.blank?
@@ -319,7 +320,7 @@ module ActiveHash
         method_name = :"#{field}="
         unless instance_methods.include?(method_name)
           define_method(method_name) do |new_val|
-            attributes[field] = new_val
+            @attributes[field] = new_val
           end
         end
       end
@@ -423,7 +424,7 @@ module ActiveHash
 
     def attributes
       if self.class.default_attributes
-        self.class.default_attributes.merge @attributes
+        (self.class.default_attributes.merge @attributes).freeze
       else
         @attributes
       end
@@ -439,7 +440,7 @@ module ActiveHash
     alias_method :read_attribute, :_read_attribute
 
     def []=(key, val)
-      attributes[key] = val
+      @attributes[key] = val
     end
 
     def id
@@ -447,7 +448,7 @@ module ActiveHash
     end
 
     def id=(id)
-      attributes[:id] = id
+      @attributes[:id] = id
     end
 
     alias quoted_id id

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jeff Dean
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,8 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
 test_files: []
+has_rdoc: