active_mocker 2.6.0 → 2.6.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9486fcafe8737ffaf943ef442d155de53152ac51
-  data.tar.gz: 1b70a0a54a57e9b093b9a010580403baa015ff0f
+  metadata.gz: bef80549ecc7fff2879bd261103cbde42ed7939f
+  data.tar.gz: 5965d36b46ae431e93b70507911dfcdf56f52f12
 SHA512:
-  metadata.gz: b5fee7877de2d5f3c1fa342430a0607ea27d7fcb7936b74d2db2a5e9b6f6958f99c901477648968c3cebfc372cf4370fb6c266b68e8f748e790da114676ce745
-  data.tar.gz: 4dd3a0f9b59357d078e603457c34a3379f8b9548edb98e22b2dda6644742b848129e2bcb0a447f82223df4d54d13ea416979ab6cb250edba8a5382d144941112
+  metadata.gz: c05810f552eed2f24c4dee009aa393ab0c006af900c87474925b113d47f2246c81bca29290c566b3eb21803dda45f46f4bcc7408750e63424492f6e94037917b
+  data.tar.gz: 6802f02bbc7b88bbcb7d89963a1d361ee46ddd9a7e4161383653a87aef4f598a35b1a69a45226d1b6bbda520e6a0194de576787d0509653a6aa01eb5111991da

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Current
+### Enhancement
+- Locally defined modules are imported and included.
+
 ## 2.6.0 - 2017-12-01
 ### Feature
 - Relation#order now accepts all non-SQL arguments

data/lib/active_mocker/mock_creator/modules_constants.rb

@@ -23,14 +23,18 @@ module ActiveMocker
         class_introspector.get_class.constants.each_with_object({}) do |v, const|
           c = class_introspector.get_class.const_get(v)
           next if [Module, Class].include?(c.class)
-          if /\A#</ =~ c.inspect
-            const[v] = Inspectable.new("ActiveMocker::UNREPRESENTABLE_CONST_VALUE")
-          else
-            const[v] = c
-          end
+          const[v] = if /\A#</ =~ c.inspect
+                       Inspectable.new("ActiveMocker::UNREPRESENTABLE_CONST_VALUE")
+                     else
+                       c
+                     end
         end
       end
 
+      def defined_nested_modules
+        class_introspector.parsed_source.defined_nested_modules.map(&:source)
+      end
+
       private
       def reject_local_const(source)
         source.reject do |n|
@@ -47,7 +51,7 @@ module ActiveMocker
       end
 
       def get_module_by_reference(type)
-        isolated_module_names = reject_local_const(class_introspector.public_send(type)).map(&:referenced_name)
+        isolated_module_names = class_introspector.public_send(type).map(&:referenced_name)
         real_module_names     = get_real_module(type).map(&:name).compact
         isolated_module_names.map do |isolated_name|
           real_name = real_module_names.detect do |rmn|
@@ -56,7 +60,7 @@ module ActiveMocker
             [
               real_parts.include?(active_record_model.name),
               real_parts.include?(isolated_name),
-              (total_parts_count == real_parts.count)
+              (total_parts_count == real_parts.count),
             ].all?
           end
           real_name ? real_name : isolated_name

data/lib/active_mocker/mock_template/_modules_constants.erb

@@ -2,9 +2,12 @@
 <% constants.each do |constant| -%>
   <%= constant.first %> = <%= constant.last.inspect %>
 <% end -%>
+<% defined_nested_modules.each do |m| -%>
+  <%= m %>
+<% end -%>
 <% modules[:included].each do |constant| -%>
   prepend <%= constant %>
 <% end -%>
 <% modules[:extended].each do |constant| -%>
   extend <%= constant %>
-<% end -%>
+<% end -%>

data/lib/active_mocker/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ActiveMocker
-  VERSION = "2.6.0"
+  VERSION = "2.6.1.beta"
   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.6.0
+  version: 2.6.1.beta
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,20 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -292,9 +286,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1