active_mocker 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39450a85ddf3388cbecfa4aa0fdb0fcc88fd2c50
-  data.tar.gz: 8360812d1b7dacd4175bd7fd353e793e0ca9e26d
+  metadata.gz: ee07a0c316a8e30d793536c32edcb6ffc1ff0d3a
+  data.tar.gz: 2c7938f5ea726a3ddb388e6b65547df17bc5ce2f
 SHA512:
-  metadata.gz: bf6d0277dac3ea3dcdff50ab09e3959f9009f97263996f3f79d9835d04f8481028603f2a9798d84162b2301fead4075f87a9f4b249779ac2499652ba5da0b4c3
-  data.tar.gz: fdcbc2e172d15da3b9ed57208c394e2390c46b87bc60ffe34ee0916d4ee65a06d0621b8e899d0958c2458f812834c0aa7538439a85a2a3cd1d0ce5081616ffff
+  metadata.gz: 2909eac242da2763b902c05af8e462e49ee256640cc791716a76bde87d56dc7c2d3e2fb750996d77de865ec4bc0eb2d20d34bdd1c2e0cf343ebdb1f6d9231d71
+  data.tar.gz: 59177e2d5513705962e95ba9c0784c5436299b38736cb3a660bd58d8e265a03d77a5d84e792d78a285d44d229cebdb3c91ad5f052bf755fbae58989450ba6f16

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2.5.4 - 2017-11-17
+### Fix
+- has_and_belongs_to_many association did not contain scoped methods.
+
+### Enhancement
+- Error message when calling stubbed methods show safe_methods syntax along with RSpec syntax.
+
 ## 2.5.3 - 2017-10-01
 ### Fix
 - Update gem dependency to fix Macro `ActiveMocker.safe_methods` when marking class_methods.

data/lib/active_mocker/mock/mockable_method.rb

@@ -5,13 +5,15 @@ module ActiveMocker
     private
 
     def __am_raise_not_mocked_error(method:, caller:, type:)
-      variable_name = if is_a?(Relation)
-                        "#{self.class.name.underscore.split("/").first}_relation"
-                      elsif type == "#"
-                        "#{self.class.name.underscore}_record"
-                      else
-                        name
-                      end
+      variable_name, klass, method_type = if is_a?(Relation)
+                                            klass = self.class.name.underscore.split("/").first
+                                            ["#{klass}_relation", klass.camelize, :scopes]
+                                          elsif type == "#"
+                                            klass = self.class.name
+                                            ["#{klass.underscore}_record", klass, :instance_methods]
+                                          else
+                                            [name, name, :class_methods]
+                                          end
 
       message = <<-ERROR.strip_heredoc
         Unknown implementation for mock method: #{variable_name}.#{method}
@@ -21,6 +23,11 @@ module ActiveMocker
           allow(
             #{variable_name}
           ).to receive(:#{method}).and_return(:some_expected_result)
+
+        OR Whitelist the method as safe to copy/run in the context of ActiveMocker (requires mock rebuild)
+        # ActiveMocker.safe_methods #{method_type}: [:#{method}]
+        class #{klass.gsub("Mock", "")} < ActiveRecord::Base
+        end
       ERROR
 
       raise NotImplementedError, message, caller

data/lib/active_mocker/mock_template/_associations.erb

@@ -71,10 +71,10 @@ end
 
 <% has_and_belongs_to_many.each do |meth| -%>
   def <%= meth.name %>
-    read_association(:<%= meth.name %>, ->{ ActiveMocker::HasAndBelongsToMany.new([]) })
+    read_association(:<%= meth.name %>, -> { ActiveMocker::HasAndBelongsToMany.new([],foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>') })
   end
 
   def <%= meth.name %>=(val)
-    write_association(:<%= meth.name %>, ActiveMocker::HasAndBelongsToMany.new(val))
+    write_association(:<%= meth.name %>, ActiveMocker::HasAndBelongsToMany.new(val, foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>'))
   end
 <% end -%>

data/lib/active_mocker/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ActiveMocker
-  VERSION = "2.5.3"
+  VERSION = "2.5.4"
   module Mock
     VERSION = "2" # This increments when breaking changes happen in the generated mocks
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport