active_mocker 1.7.beta2 → 1.7.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0975aed9ead531daac453611e42d222199073bd
-  data.tar.gz: abffc672d856ccfde039f23bd118695a3448961f
+  metadata.gz: 568d05ab028a0dd5e561ec9933bd905922671944
+  data.tar.gz: 432288a414d9024b74e16631f3727544431dc2c0
 SHA512:
-  metadata.gz: e488d0a90b6058678ba60d1e94c8212ac7c5723c1fa218e6c2a333107020842e975027b7314d3eb46deec41e0a533787e87ae119fced6da38e73e6bca6ddb453
-  data.tar.gz: 2eb69e280988d909e648c1a18a22017205a57b97b172b3c28a8e98ae0c762bc8c6ad6121bb5e9e8b470c9d158e65171de37c1de9cccbb99ef89941ba78e55460
+  metadata.gz: 1b5b5f4833d9d294e872c8c3087eb1d2752ecc5fad1cf98a25a9b380e546f68ecd9e46100fc87b16048783913b4eb63d727aa3a1a992b2808033f68693a3a2c7
+  data.tar.gz: 6d47573531aa806f71e1cc37cb2886ede715aafdb6f3c4b1f0614711bcb8ad0bbbec533b46ffb22867357466ce4a9e8cef589828c557ea81ae3ce910e63c227e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## 1.7.beta3 - 2-14-09-25
+
+### Fix
+- Last beta introduced a breaking regression where after assigning some associations they could not be read. Solution was to never access @associations directly inside mock. 
+
 ## 1.7.beta2 - 2-14-09-18
 
 ### Fix 

data/lib/active_mocker/mock/base.rb

@@ -282,8 +282,8 @@ class Base
     end
 
     # @api private
-    def read_association(attr)
-      @associations[attr.to_sym]
+    def read_association(attr, assign_if_value_nil=nil)
+      @associations[attr.to_sym] ||= assign_if_value_nil
     end
 
     # @api private

data/lib/active_mocker/mock_template.erb

@@ -54,10 +54,10 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
   end
 
   def <%= meth.name %>=(val)
-<% association = belongs_to_foreign_key(meth.name)  -%>
+<% association = belongs_to_foreign_key(meth.name) -%>
     write_attribute(:<%= meth.name %>, val)
 <% if association -%>
-    association = classes('<%= association.class_name %>').try(:find_by, id: <%= meth.name  %>)
+    association = classes('<%= association.class_name %>').try(:find_by, id: <%= meth.name %>)
     write_association(:<%= association.name %>,association) unless association.nil?
 <% end -%>
   end
@@ -69,11 +69,11 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
 <%= '# belongs_to' unless belongs_to.empty? -%>
 <% belongs_to.each do |meth| %>
   def <%= meth.name %>
-    @associations[:<%= meth.name %>]
+    read_association(:<%= meth.name %>)
   end
 
   def <%= meth.name %>=(val)
-    @associations[:<%= meth.name %>] = val
+    write_association(:<%= meth.name %>, val)
     ActiveMocker::Mock::BelongsTo.new(val, child_self: self, foreign_key: :<%= meth.foreign_key %>, foreign_id: val.try(:id)).item
   end
 
@@ -101,8 +101,8 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
   end
 
   def <%= meth.name %>=(val)
-    @associations[:<%= meth.name %>] = val
-    ActiveMocker::Mock::HasOne.new(val, child_self: self, foreign_key: '<%= meth.foreign_key %>', foreign_id: @attributes['id']).item
+    write_association(:<%= meth.name %>, val)
+    ActiveMocker::Mock::HasOne.new(val, child_self: self, foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id).item
   end
 
   def build_<%= meth.name %>(attributes={}, &block)
@@ -124,21 +124,21 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
 <%= '# has_many' unless has_many.empty? -%>
 <% has_many.each do |meth| %>
   def <%= meth.name %>
-    @associations[:<%= meth.name %>] ||= ActiveMocker::Mock::HasMany.new([],foreign_key: '<%= meth.foreign_key %>', foreign_id: @attributes['id'], relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>')
+    read_association(:<%= meth.name %>, ActiveMocker::Mock::HasMany.new([],foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>'))
   end
 
   def <%= meth.name %>=(val)
-    @associations[:<%= meth.name %>] ||= ActiveMocker::Mock::HasMany.new(val, foreign_key: '<%= meth.foreign_key %>', foreign_id: @attributes['id'], relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>')
+    write_association(:<%= meth.name %>, ActiveMocker::Mock::HasMany.new(val, foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>'))
   end
 <% end -%>
 <%= '# has_and_belongs_to_many' unless has_and_belongs_to_many.empty? -%>
 <% has_and_belongs_to_many.each do |meth| %>
   def <%= meth.name %>
-    @associations[:<%= meth.name %>] ||= ActiveMocker::Mock::HasAndBelongsToMany.new([])
+    read_association(:<%= meth.name %>, ActiveMocker::Mock::HasAndBelongsToMany.new([]))
   end
 
   def <%= meth.name %>=(val)
-    @associations[:<%= meth.name %>] = ActiveMocker::Mock::HasAndBelongsToMany.new(val)
+    write_association(:<%= meth.name %>, ActiveMocker::Mock::HasAndBelongsToMany.new(val))
   end
 <% end -%>
 

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "1.7.beta2"
+  VERSION = "1.7.beta3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.7.beta2
+  version: 1.7.beta3
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport