active_mocker 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6857ef7a6d6e842ef53b64fc87f08f8b7e36c11
-  data.tar.gz: 81e5e8273ee2302efae6bf5d2610a77ae9d6704e
+  metadata.gz: b786f26685352ec1315bf5b715c7b2ffdcd37df6
+  data.tar.gz: f70eee54d0a03d5f4fe13a1a5aa077dd11de19da
 SHA512:
-  metadata.gz: 441d757202f71f10019f96d4710143d872d97a8a58341e884448e398313a0085de4202745dd535312c0946643a67ef2bf2ffc1b545a0cd532e35f388bd431bdd
-  data.tar.gz: efc1a21ff7fb7641c7635196efd4a9e325a919d87b26c6f16695512d7915897a7949b7bd9f58c1dc6ee76ff1997519a3db6ccf4bc5053fc6abbd01a3799a187e
+  metadata.gz: b1566d93d8b03eb55856f62e03275da366218a40929d04be9c95140ea7791c6f71fe2bc83fd8bfbed2bfdbf6e19d34f96898c5e9be7567d965c3739b7265ef9f
+  data.tar.gz: ca35c36eed333a2f64777241a968bfd19c937b6914154ee8d6743f1640c40344992afdcaa2dbea67bb26a165ceee976b41400a679773fcfc96288ad6a925949d

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2.3.1 - 2016-09-26
+### Fix
+- `create_<association>` failed to set the foreign key.
+
+### Enhancement
+- Specific ActiveMocker exceptions now all inherit from `ActiveMocker::BaseError`
+
 ## 2.3.0 - 2016-08-29
 ### Feature
 - Added `#first_or_create`, `#first_or_create!`, and `#first_or_initialize`

data/lib/active_mocker/mock/base.rb

@@ -105,8 +105,11 @@ module ActiveMocker
         @@built_types[type] ||= Virtus::Attribute.build(type)
       end
 
-      def classes(klass)
-        ActiveMocker::LoadedMocks.find(klass)
+      def classes(klass, fail_hard=false)
+        ActiveMocker::LoadedMocks.find(klass).tap do |found_class|
+          raise MockNotLoaded, "The ActiveMocker version of #{klass} is not required." if fail_hard && !found_class
+          found_class
+        end
       end
 
       # @param [Array<ActiveMocker::Base>] collection, an array of mock instances
@@ -152,8 +155,8 @@ module ActiveMocker
 
     private :call_mock_method
 
-    def classes(klass)
-      self.class.send(:classes, klass)
+    def classes(klass, fail_hard = false)
+      self.class.send(:classes, klass, fail_hard)
     end
 
     private :classes

data/lib/active_mocker/mock/exceptions.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module ActiveMocker
-  class RecordNotFound < StandardError
+  class BaseError < StandardError
+  end
+  class RecordNotFound < BaseError
   end
 
   module Mock
@@ -8,7 +10,7 @@ module ActiveMocker
     RecordNotFound = ActiveMocker::RecordNotFound
   end
 
-  class IdError < StandardError
+  class IdError < BaseError
   end
 
   # Raised when unknown attributes are supplied via mass assignment.
@@ -22,15 +24,18 @@ module ActiveMocker
     end
   end
 
-  class UpdateMocksError < Exception
+  class UpdateMocksError < BaseError
     def initialize(name, mock_version, gem_version)
       super("#{name} was built with #{mock_version} but the gem version is #{gem_version}. Run `rake active_mocker:build` to update.")
     end
   end
 
-  class NotImplementedError < Exception
+  class NotImplementedError < BaseError
+  end
+
+  class Error < BaseError
   end
 
-  class Error < Exception
+  class MockNotLoaded < BaseError
   end
 end

data/lib/active_mocker/mock_template/_associations.erb

@@ -15,16 +15,14 @@ read_association(:<%= meth.name %>) || write_association(:<%= meth.name %>, clas
   def build_<%= meth.name %>(attributes={}, &block)
   <% association = relation_find(:name, meth.name).first -%>
   <% if association -%>
-association = classes('<%= association.class_name %>').try(:new, attributes, &block)
-    write_association(:<%= meth.name %>, association) unless association.nil?
+self.<%= meth.name %> = classes('<%= association.class_name %>', true).new(attributes, &block)
   <% end -%>
 end
 
   def create_<%= meth.name %>(attributes={}, &block)
   <% association = relation_find(:name, meth.name).first -%>
   <% if association -%>
-association = classes('<%= association.class_name %>').try(:create,attributes, &block)
-    write_association(:<%= meth.name %>, association) unless association.nil?
+self.<%= meth.name %> = classes('<%= association.class_name %>', true).create(attributes, &block)
   <% end -%>
 end
   alias_method :create_<%= meth.name %>!, :create_<%= meth.name %>
@@ -45,14 +43,14 @@ end
   def build_<%= meth.name %>(attributes={}, &block)
   <% association = relation_find(:name, meth.name).first -%>
   <% if association -%>
-write_association(:<%= meth.name %>, classes('<%= association.class_name %>').new(attributes, &block)) if classes('<%= association.class_name %>')
+self.<%= meth.name %>= classes('<%= association.class_name %>', true).new(attributes, &block)
 <% end -%>
   end
 
   def create_<%= meth.name %>(attributes={}, &block)
   <% association = relation_find(:name, meth.name).first -%>
   <% if association -%>
-write_association(:<%= meth.name %>, classes('<%= association.class_name %>').new(attributes, &block)) if classes('<%= association.class_name %>')
+        self.<%= meth.name %>= classes('<%= association.class_name %>', true).new(attributes, &block)
   <% end -%>
 end
   alias_method :create_<%= meth.name %>!, :create_<%= meth.name %>
@@ -79,4 +77,4 @@ end
   def <%= meth.name %>=(val)
     write_association(:<%= meth.name %>, ActiveMocker::HasAndBelongsToMany.new(val))
   end
-<% end -%>
+<% end -%>

data/lib/active_mocker/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveMocker
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport