active_mocker 2.6.1.beta2 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 380a7a869f713e299aeb753431527628534128bb
-  data.tar.gz: 0e2253e679969d16ad94ff1dbdaf07a1905b83de
+SHA256:
+  metadata.gz: a128fbb6ea0d9e4ed9755109736a1d03f9d689576e9c1207ebe9fffdda1de082
+  data.tar.gz: 3ea03e73c5187e86c30c78537a5033fc7f7c7c4bd5f7b289d62b9dd9564eaaa3
 SHA512:
-  metadata.gz: 4472cbac55a5d82a7e84ac94a7f4cc50dc8a3cfd6c700fb173056e320af90e1a2f1bc2249b8c3073cc18480f7fd05c2157272a44e403ebf5506fd41035fcf14e
-  data.tar.gz: 861f0d27e1d2ed921ef4730dfa13525f4d03beb95c7de6286f28dbdc9bbd50bd8e5b4ab681ee96057c7bbb3139a74a90ed46cbed97a01f39bfd44d4d05366126
+  metadata.gz: b62c4e6d9e3c0e504ccdfb8d5be12bcd350d49b24c860821342564b420a382f6cf4d519ad9c17496f4d0373b11c91d8bc22d06b020096c77622616b5f5ee8ee0
+  data.tar.gz: 2be8c7a163260adb490656dfdb138db6c8127d3f4d5661677f4ea5debfae3e30dbc86c41f097a2bb768c61c6518c5f6401787bba70b768db27ea2fd6708fc716

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## Current
-### Enhancement
-- Locally defined modules are imported and included.
+## 2.6.1 - 2018-10-30
+### Feature
+* Actively support Rails 5.2
+* Add tested support for Ruby 2.4 and 2.5
+* When using Rails 5.2 now supports `ActiveMocker::Mock.limit(10).delete_all` while previous version raised an error, in accordance with it's Rails version.
+
+### Removed
+* Remove tested support for Rails 5.0 (Currently supported 4.2, 5.1, 5.2)
+* Remove support for Ruby 2.1 and 2.2
 
 ## 2.6.0 - 2017-12-01
 ### Feature

data/README.md

@@ -1,9 +1,7 @@
 # ActiveMocker
 [![Gem Version](https://badge.fury.io/rb/active_mocker.svg)](http://badge.fury.io/rb/active_mocker)
-[![Build Status](https://travis-ci.org/zeisler/active_mocker.png?branch=master)](https://travis-ci.org/zeisler/active_mocker)
-[![Dependency Status](https://gemnasium.com/zeisler/active_mocker.svg)](https://gemnasium.com/zeisler/active_mocker)
-[![Gitter chat](https://badges.gitter.im/zeisler/active_mocker.png)](https://gitter.im/zeisler/active_mocker)
-[![Gittip](http://img.shields.io/gittip/zeisler.svg)](https://www.gittip.com/zeisler/)
+[![Build Status](https://travis-ci.org/zeisler/active_mocker.svg?branch=master)](https://travis-ci.org/zeisler/active_mocker)
+[![Gitter chat](https://badges.gitter.im/zeisler/active_mocker.svg)](https://gitter.im/zeisler/active_mocker)
 
 ## Description
 Creates stub classes from any ActiveRecord model. 
@@ -14,17 +12,17 @@ ActiveMocker analyzes the methods and database columns to generate a Ruby class
 
 The stub file can be run standalone and comes included with many useful parts of ActiveRecord.
 
-Stubbed out methods contain their original argument signatures or ActiveMocker friendly code can be brought over in its entirety.
+Stubbed out methods contain their original argument signatures or ActiveMocker's friendly code can be brought over in its entirety.
 
 Mocks are regenerated when the schema is modified so your mocks won't go stale, preventing the case where your unit tests pass but production code fails.
 
-*Examples from a real apps*
+*Examples from a real app*
 
 		Finished in 1 seconds
 		374 examples, 0 failures
 
 ## Around the web
-["Mocking ActiveRecord with ActiveMocker" by Envy](http://madewithenvy.com/ecosystem/articles/2015/mocking-activerecord-with-activemocker/)
+["Mocking ActiveRecord with ActiveMocker" by Envy](https://web.archive.org/web/20150511052653/http://madewithenvy.com/ecosystem/articles/2015/mocking-activerecord-with-activemocker/)
 
 ------------------------------------------
 
@@ -67,8 +65,8 @@ group :development, :test do
   gem 'active_mocker'
 end
 ```
-It needs to be in development as well as test because development is where mocks will be generated.
-And then execute:
+It needs to be in development as well as test groups, as the development environment is where mocks will be generated.
+Then execute:
 
     $ bundle
 
@@ -77,9 +75,8 @@ Or install it yourself as:
     $ gem install active_mocker
 
 ## Dependencies
-* Tested with Rails 4.1, 4.2, 5.0
-* Requires Ruby MRI >= 2.1.x
-
+* Tested with Rails 4.x, 5.x, 6.x
+* Requires Ruby MRI >= 2.4.x
 
 ## Setup
 
@@ -89,7 +86,7 @@ Or install it yourself as:
 
 ### Generate Mocks
 
-Running this rake task builds/rebuilds the mocks. It will be ran automatically after every schema modification. If the model changes this rake task needs to be called manually. You could add a file watcher for when your models change and have it run the rake task.
+Running this rake task builds/rebuilds the mocks. It will be ran automatically after every schema modification. If the model changes, this rake task needs to be called manually. You could add a file watcher for when your models change and have it run the rake task.
 
     rake active_mocker:build
 
@@ -144,7 +141,7 @@ end
 
 * Assigning the tag `active_mocker:true` will stub any ActiveRecord model Constants for Mock classes in an `it` or a `before/after(:each)`. This removes any need for dependency injection. Write tests and code like you would normally.
 * To stub any Constants in `before(:all)`, `after(:all)` use `active_mocker.find('ClassName')`.
-* Mock state will be cleaned up for you in an `after(:all)`. To clean state your self use `active_mocker.delete_all`.
+* Mock state will be cleaned up for you in an `after(:all)`. To clean state by yourself, use `active_mocker.delete_all`.
 
 ---------
     
@@ -188,15 +185,15 @@ Person.new(first_name: "Dustin", last_name: "Zeisler")
 
 ### Creating Custom collections
 
-If you want to create custom set of record that is not part of the global collection for model. (ie. for stubbing in a test)
+If you want to create a custom set of records that is not part of the global collection for model. (ie. for stubbing in a test)
 
 ```ruby
 User::ScopeRelation.new([User.new, User.new])
 ```
 
-This give the full query API (ie. find_by, where, etc). 
+This gives the full query API (ie. `find_by`, `where`, etc). 
 
-This is not feature available in ActiveRecord as such do not include this where you intend to swap in ActiveRecord.
+This is not a feature available in ActiveRecord, so do not include this where you intend to swap for ActiveRecord.
 
 
 ## Optional Features
@@ -211,15 +208,15 @@ ActiveMocker::LoadedMocks.features.enable(:stub_active_record_exceptions)
 
 ### timestamps
 
-  Enables created_at and updated_at to be update on save and create
+  Enables `created_at` and `updated_at` to be updated on save and create
 
 ### delete_all_before_example
 
-  When using "active_mocker/rspec_helper" it delete all records from all mocks before each example.
+  When using "active_mocker/rspec_helper", it deletes all records from all mocks before each example.
 
 ### stub_active_record_exceptions
 
-  When requiring "active_mocker/rspec_helper", and adding `active_mocker: true` to the describe metadata, these errors will be auto stubbed:
+  When requiring "active_mocker/rspec_helper", and adding `active_mocker: true` to the `describe` metadata, these errors will be auto stubbed:
   
   * ActiveRecord::RecordNotFound
   * ActiveRecord::RecordNotUnique
@@ -228,7 +225,7 @@ ActiveMocker::LoadedMocks.features.enable(:stub_active_record_exceptions)
 ### Copy over Mock safe methods into the generated mock
   
   Adding the comment `ActiveMocker.safe_methods` at the top of a class marks it as safe to copy to the mock.
-  Be careful that it does not contain anything that ActiveMocker cannot run.
+  Be careful. It should not contain anything that ActiveMocker cannot run.
   
   ```ruby
   # ActiveMocker.safe_methods(scopes: [], instance_methods: [:full_name], class_methods: [])
@@ -242,8 +239,8 @@ ActiveMocker::LoadedMocks.features.enable(:stub_active_record_exceptions)
 ## Mocking Methods
 
 #### Rspec 3 Mocks - verify double
-Verifying doubles are a stricter alternative to normal doubles that provide guarantees about
-what is being verified. When using verifying doubles, RSpec will check that the methods
+Verifying doubles is a stricter alternative to normal doubles that provides guarantees about
+what is being verified. When using verifying doubles, RSpec will check if the methods
 being stubbed are actually present on the underlying object if it is available.
 [rspec-mocks/docs/verifying-doubles](https://relishapp.com/rspec/rspec-mocks/docs/verifying-doubles)
 ```ruby
@@ -326,7 +323,7 @@ PersonMock::CONSTANT_VALUE
 ```
 
 ### Scoped Methods 
-* Any chained scoped methods will be available when the mock file that defines it is required. When called it raises a `NotImplementedError`, stub the method with a value to continue.
+* Any chained scoped methods will be available when the mock file that defines it is required. When called, it raises a `NotImplementedError`. Stub the method with a value to continue.
 
 ### Managing Mocks  
 
@@ -420,7 +417,7 @@ See [Documentation](http://rdoc.info/github/zeisler/active_mocker/master/ActiveM
 
 ### Schema/Migration Option Support
 * A db/schema.rb is not required.
-* All schema types are supported and coerced by [Virtus](https://github.com/solnic/virtus). If coercion fails the passed value will be retained.
+* All schema types are supported and coerced by [Virtus](https://github.com/solnic/virtus). If coercion fails, the passed value will be retained.
 * Default value is supported.
 * Scale and Precision are not supported.
 
@@ -429,15 +426,15 @@ See [Documentation](http://rdoc.info/github/zeisler/active_mocker/master/ActiveM
 * When an association is set in one object it may not always be reflective in other objects, especially when it is a non standard/custom association. See [test_rails_4_app/spec/active_record_compatible_api.rb](https://github.com/zeisler/active_mocker/blob/master/test_rails_4_app/spec/active_record_compatible_api.rb) for a complete list of supported associations. 
 * Validation/Callbacks are not supported.
 * Sql queries, joins, etc will never be supported.
-* A record that has been created and then is modified will persist changes without calling `#save`, beware of this difference.
+* A record that has been created and then is modified will persist changes without calling `#save`. Beware of this difference.
 * This is not a full replacement for ActiveRecord.
-* Primary key will always default to `id`. If this is an causes a problem open an issue. 
+* Primary key will always default to `id`. If this is causing a problem, feel free to open an issue (or even better, a PR =)). 
 
 ## Inspiration
 Thanks to Jeff Olfert for being my original inspiration for this project.
 
 ## Contributing
-Your contribution are welcome!
+Your contributions are welcome!
 
 1. Fork it ( http://github.com/zeisler/active_mocker/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/lib/active_mocker.rb

@@ -39,3 +39,4 @@ require "active_mocker/generate"
 require "active_mocker/attribute_types/register"
 require "active_mocker/attribute_types/enum"
 require "active_mocker/attribute"
+require "active_mocker/late_inclusion"

data/lib/active_mocker/late_inclusion.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ActiveMocker
+  module LateInclusion
+    module Extension
+      def prepended(const)
+        if const.respond_to?(:__extended_onto__)
+          const.__extended_onto__.each do |ex|
+            ex.extend self
+          end
+        end
+
+        if const.respond_to?(:__included_onto__)
+          const.__included_onto__.each do |ex|
+            ex.prepend self
+          end
+        end
+      end
+    end
+
+    def extended(const)
+      __extended_onto__ << const
+    end
+
+    def __extended_onto__
+      @__extended_onto__ ||= []
+    end
+
+    def included(const)
+      __included_onto__ << const
+    end
+
+    def __included_onto__
+      @__included_onto__ ||= []
+    end
+  end
+end

data/lib/active_mocker/loaded_mocks.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+
+require "forwardable"
 require_relative "loaded_mocks/features"
 
 module ActiveMocker

data/lib/active_mocker/mock/base.rb

@@ -155,6 +155,11 @@ module ActiveMocker
           require "active_mocker/mock/compatibility/base/ar51"
           extend AR51
         end
+
+        if __active_record_build_version__ >= Gem::Version.create("5.2")
+          require "active_mocker/mock/compatibility/queries/ar52"
+          Queries.prepend(Queries::AR52)
+        end
         raise UpdateMocksError.new(name, version, ActiveMocker::Mock::VERSION) if version != ActiveMocker::Mock::VERSION
       end
     end

data/lib/active_mocker/mock/compatibility/base/ar51.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: tru
-
 module ActiveMocker
   class Base
     module AR51

data/lib/active_mocker/mock/compatibility/queries/ar52.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ActiveMocker
+  module Queries
+    module AR52
+      extend LateInclusion::Extension
+
+      private
+
+      def check_for_limit_scope!
+        # noop
+      end
+    end
+  end
+end

data/lib/active_mocker/mock/queries.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module ActiveMocker
   module Queries
+    extend LateInclusion
+
     class Find
       def initialize(record)
         @record = record

data/lib/active_mocker/mock_creator/attributes.rb

@@ -24,7 +24,7 @@ module ActiveMocker
             attribute:     attr.name,
             db_value_type: attr.type,
           )
-          if ActiveRecord::VERSION::MAJOR == 5
+          if ActiveRecord::VERSION::MAJOR >= 5
             enum_type.ignore_value = true
             attr.type              = enum_type
             if attr.default

data/lib/active_mocker/mock_creator/modules_constants.rb

@@ -20,19 +20,16 @@ module ActiveMocker
       end
 
       def constants
-        class_introspector.get_class.constants.each_with_object({}) do |v, const|
+        class_introspector.get_class.constants.map do |v|
           c = class_introspector.get_class.const_get(v)
           next if [Module, Class].include?(c.class)
-          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)
+          const = if /\A#</ =~ c.inspect
+                    Inspectable.new("ActiveMocker::UNREPRESENTABLE_CONST_VALUE")
+                  else
+                    c
+                  end
+          [v, const]
+        end.compact.sort
       end
 
       private
@@ -51,7 +48,7 @@ module ActiveMocker
       end
 
       def get_module_by_reference(type)
-        isolated_module_names = class_introspector.public_send(type).map(&:referenced_name)
+        isolated_module_names = reject_local_const(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|
@@ -60,7 +57,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_creator/scopes.rb

@@ -32,7 +32,7 @@ module ActiveMocker
       def ast_scopes
         @ast_scopes ||= class_introspector
                           .parsed_source
-                          .send(:class_begin)
+                          .class_begin
                           .children
                           .select { |n| n.try(:type) == :send && n.try { children[1] == :scope } }
       end

data/lib/active_mocker/mock_template/_modules_constants.erb

@@ -1,9 +1,6 @@
 # _modules_constants.erb
-<% constants.each do |constant| -%>
-  <%= constant.first %> = <%= constant.last.inspect %>
-<% end -%>
-<% defined_nested_modules.each do |m| -%>
-  <%= m %>
+<% constants.each do |constant, value| -%>
+  <%= constant %> = <%= value.inspect %>
 <% end -%>
 <% modules[:included].each do |constant| -%>
   prepend <%= constant %>

data/lib/active_mocker/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ActiveMocker
-  VERSION = "2.6.1.beta2"
+  VERSION = "2.6.2"
   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.1.beta2
+  version: 2.6.2
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -56,20 +56,20 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
@@ -112,40 +112,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: dissociated_introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +218,7 @@ files:
 - lib/active_mocker/inspectable/pathname.rb
 - lib/active_mocker/inspectable/struct.rb
 - lib/active_mocker/inspectable/time.rb
+- lib/active_mocker/late_inclusion.rb
 - lib/active_mocker/loaded_mocks.rb
 - lib/active_mocker/loaded_mocks/features.rb
 - lib/active_mocker/mock.rb
@@ -233,6 +228,7 @@ files:
 - lib/active_mocker/mock/belongs_to.rb
 - lib/active_mocker/mock/collection.rb
 - lib/active_mocker/mock/compatibility/base/ar51.rb
+- lib/active_mocker/mock/compatibility/queries/ar52.rb
 - lib/active_mocker/mock/do_nothing_active_record_methods.rb
 - lib/active_mocker/mock/exceptions.rb
 - lib/active_mocker/mock/has_and_belongs_to_many.rb
@@ -289,15 +285,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Creates stub classes from any ActiveRecord model