active_mocker 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23446ffbd114cb1cc70afd86eb8e1f359abc760
-  data.tar.gz: 68cc169cc6eacf73b16f96932d7bf25786b8be0f
+  metadata.gz: 9471f85889f657625b27471d107dacf1f2a1e356
+  data.tar.gz: 36ca7ce095b75166f8148a11a39ab8f0ce502dd1
 SHA512:
-  metadata.gz: efff2e22e9b36d613afebff85f06b14878553c102d12f89e40c81a5ccfb57730f57c030b65a3506d63b4166292187b5e498ace9f2cfd36835ef0120f5b99227d
-  data.tar.gz: 332b954724a2f12ef89684f7f503d0e68ef56fbe4593ce88a4a58f88a545191e0f71f4c22580e2bc32e8f04cac455900e217f16b6135120e04d4e2f6ad54e167
+  metadata.gz: 7cf121a9c56ed305c01c1b5445cb855f95e807f8475f1993e6f6e664da8b1cbfa9c648c553476aa1cca7bcc2ae6bd7e9277d13d6388ceec4379e21f8aed3f09a
+  data.tar.gz: f9d5c52020ae381bab78685780d0eeefa784de91348643196e5f5053539b0e7d59679e1c786372e1e6d0058b275dcb83f7d652c48f29adf97805692fc210dae2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+
+## 2.5.0 - 2017-03-17
+### Feature
+- In comment Macro `ActiveMocker.safe_methods(*instance_methods, scopes: [], instance_methods: [])` Now accepts scope methods
+
 ## 2.4.4 - 2017-03-10
 ### Fix
 - Really fix: scope methods returned `undefined method `call_mock_method' for nil:NilClass` for Mocks nested in modules. 

data/README.md

@@ -221,10 +221,10 @@ ActiveMocker::LoadedMocks.features.enable(:stub_active_record_exceptions)
   Be careful that it does not contain anything that ActiveMocker cannot run.
   
   ```ruby
-  # ActiveMocker.safe_methods :full_name
+  # ActiveMocker.safe_methods(scopes: [], instance_methods: [:full_name])
   class User
     def full_name
-      "#{first_name} + #{last_name}
+      "#{first_name} + #{last_name}"
     end
   end
   ```

data/lib/active_mocker/mock_creator/defined_methods.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
+require_relative "safe_methods"
 module ActiveMocker
   class MockCreator
     module DefinedMethods
+      include SafeMethods
       Method = Struct.new(:name, :arguments, :body)
 
       def instance_methods
         meths = class_introspector.get_class.public_instance_methods(false).sort
-        if safe_methods.include?(:initialize)
-          meths << :initialize
-        end
+        meths << :initialize if safe_methods[:instance_methods].include?(:initialize)
         meths.map { |m| create_method(m, :instance_method) }
       end
 
@@ -22,22 +22,10 @@ module ActiveMocker
 
       private
 
-      def safe_methods
-        @safe_methods ||= class_introspector.parsed_source.comments.flat_map do |comment|
-          if comment.text.include?("ActiveMocker.safe_methods")
-            ActiveMocker.module_eval(comment.text.delete("#"))
-          end
-        end
-      end
-
-      module ActiveMocker
-        def self.safe_methods(*methods)
-          methods
-        end
-      end
-
       def create_method(m, type)
-        if safe_methods.include?(m)
+        plural_type = (type.to_s + "s").to_sym
+        if safe_methods[plural_type].include?(m)
+          raise "ActiveMocker.safe_methods(class_methods: []) is currently unsupported." if type == :method
           def_method = class_introspector.parsed_source.defs.detect { |meth| meth.name == m }
           Method.new(
             m,

data/lib/active_mocker/mock_creator/safe_methods.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module ActiveMocker
+  class MockCreator
+    module SafeMethods
+      BASE = { instance_methods: [], scopes: [], methods: [] }.freeze
+
+      def safe_methods
+        @safe_methods ||= class_introspector.parsed_source.comments.each_with_object(BASE.dup) do |comment, hash|
+          if comment.text.include?("ActiveMocker.safe_methods")
+            hash.merge!(ActiveMocker.module_eval(comment.text.delete("#")))
+          else
+            hash
+          end
+        end
+      end
+
+      module ActiveMocker
+        def self.safe_methods(*arg_methods, scopes: [], instance_methods: [], class_methods: [])
+          { instance_methods: arg_methods.concat(instance_methods), scopes: scopes, methods: class_methods }
+        end
+      end
+    end
+  end
+end

data/lib/active_mocker/mock_creator/scopes.rb

@@ -1,15 +1,43 @@
 # frozen_string_literal: true
+require_relative "safe_methods"
 module ActiveMocker
   class MockCreator
     module Scopes
       Method = Struct.new(:name, :arguments, :body)
+      include SafeMethods
 
       def scope_methods
         class_introspector.class_macros.select { |h| h.keys.first == :scope }.map do |h|
-          a = h.values.first.first
-          Method.new(a[0], ReverseParameters.new(a[1], blocks_as_values: true), nil)
+          name, args = h.values.first.first
+          arguments  = ReverseParameters.new(args, blocks_as_values: true)
+          body       = scope_body(arguments, name)
+          Method.new(name, arguments, body)
         end
       end
+
+      def scope_body(arguments, name)
+        if safe_methods[:scopes].include?(name)
+          find_scope_body_from_ast(name)
+        else
+          "#{class_name}.send(:call_mock_method, " \
+                           "method: '#{name}', " \
+                           "caller: Kernel.caller, " \
+                           "arguments: [#{arguments.arguments}])"
+        end
+      end
+
+      def ast_scopes
+        @ast_scopes ||= class_introspector
+                          .parsed_source
+                          .class_begin
+                          .children
+                          .select { |n| n.try(:type) == :send && n.try { children[1] == :scope } }
+      end
+
+      def find_scope_body_from_ast(name)
+        scope = ast_scopes.detect { |n| n.children[2].children.first == name }
+        DissociatedIntrospection::RubyCode.build_from_ast(scope.children[3].children[2]).source
+      end
     end
   end
 end

data/lib/active_mocker/mock_template/_scopes.erb

@@ -4,7 +4,7 @@ include <%= parent_class_inspector.parent_mock_name %>::Scopes
 
   <% scope_methods.each do |method| -%>
   def <%= method.name %><%= "(#{method.arguments.parameters})" unless method.arguments.parameters.to_a.empty? %>
-    <%= class_name %>.send(:call_mock_method, method: '<%= method.name %>', caller: Kernel.caller, arguments: [<%= method.arguments.arguments %>])
+    <%= method.body %>
     end
 
   <% end -%>

data/lib/active_mocker/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ActiveMocker
-  VERSION = "2.4.4"
+  VERSION = "2.5.0"
   module Mock
     VERSION = "1" # 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.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -233,6 +233,7 @@ files:
 - lib/active_mocker/mock_creator/defined_methods.rb
 - lib/active_mocker/mock_creator/modules_constants.rb
 - lib/active_mocker/mock_creator/recreate_class_method_calls.rb
+- lib/active_mocker/mock_creator/safe_methods.rb
 - lib/active_mocker/mock_creator/scopes.rb
 - lib/active_mocker/mock_template.erb
 - lib/active_mocker/mock_template/_associations.erb