active_mocker 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b2d6d3b9db64dae42eea2223e30608abae1b26
-  data.tar.gz: 8b08a6fbe431e368a3316edbc5897e0f0a9509ee
+  metadata.gz: 7cb66180d5ec42fc5a0971815560364088008ced
+  data.tar.gz: 61b57337f4569854453c417d84323816995fc841
 SHA512:
-  metadata.gz: 35604d9a34529d65362c204c108064508bd6bcff699fafa35a9696dd54dc74f11949b28d7f365f6fde7e066a37f981e9ad10f663a13381492e3be9dabc9845f7
-  data.tar.gz: 34e6858458951b9b17b408da9e89459ddff3207845b19832206805ff6644cda465c4dd60d1a9eacc8d494d176a5238fbaf62661fe5213772bd2437582a7bcbbb
+  metadata.gz: ee31dab1abe47dff3fd80b11fa28b5767008d04b1c3eb266feae2ecc486a7b4bd62eaf093d97cc6b85a6c09e2b25f59ebb706982146f69a6681f2f88c7f397ed
+  data.tar.gz: 30ac184f5e8b5f42bc79ace88aaca7475a8cdd9a6c696d3aa11a51232a0b389365c0b1396eacc475fba916f87d5f29d09d6a044cb4cf841f71cc00346ad24269

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2.1.0 - 2106-02-05
+### Enhancement
+- Support for module nested models.
+- Adding support for ruby 2.3
+
 ## 2.0.0 - 2015-12-22
 ### Enhancement
 - The mock append name is now changeable using `ActiveMocker::Config.mock_append_name=`. The default still being `Mock`.
@@ -18,9 +23,9 @@ All notable changes to this project will be documented in this file.
 - Reduce restriction on Virtus gem to 1.0.any
 - When id is not a fixnum and make it match ActiveRecord behavior of calling `#to_i`.
 
-### Depracated
-- Moved `ActiveMocker::MockAbilities` into "active_mocker/deprecated_components/mock_abilities" if a project is still dependent on it this file it can be required and used at least until version 2.1. The alternative is to use `RSpec` verified doubles.
-- `#mock_class("Mock")` method has been moved to "active_mocker/deprecated_components/rspec_helper" if a project is still dependent on it this file it can be required and used at least until version 2.1. The alternative is to use the new api that is accessible by `instead active_mocker.mocks.find('ClassName')`.
+### Deprecated
+- Moved `ActiveMocker::MockAbilities` into "active_mocker/deprecated_components/mock_abilities" if a project is still dependent on it this file it can be required and used at least until version 3.0. The alternative is to use `RSpec` verified doubles.
+- `#mock_class("Mock")` method has been moved to "active_mocker/deprecated_components/rspec_helper" if a project is still dependent on it this file it can be required and used at least until version 3.0. The alternative is to use the new api that is accessible by instead `active_mocker.mocks.find('ClassName')`.
 
 ### Removed
 - `log/active_mocker.log` is replaced env `ERROR_VERBOSITY=[0,1,2,3] rake active_mocker:build` or in Ruby `ActiveMocker::Config.error_verbosity=`

data/README.md

@@ -267,9 +267,15 @@ PersonMock::CONSTANT_VALUE
 
 ### Managing Mocks  
 
-Deletes All Records for Loaded Mocks - (Useful in after(:each) to clean up state between examples)
 ```ruby    
-ActiveMocker::LoadedMocks.delete_all
+require "active_mocker/rspec_helper"
+
+active_mocker.delete_all # Delete all records from loaded mocks
+
+active_mocker.find("User") # Find a mock by model name. Useful in before(:all)/after(:all) where automatic constant stubbing is unavailable.
+
+active_mocker.mocks.except("User").delete_all # Delete all loaded mock expect the User mock.
+
 ```
 ### ActiveRecord supported methods
 
@@ -356,7 +362,7 @@ See [Documentation](http://rdoc.info/github/zeisler/active_mocker/master/ActiveM
 * 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.
-* This is not a full replacement for ActiveRecord. It's simplified, with only the most essential parts. There are many tests to verify that is works the same as ActiveRecord, but's yours responsibility to know how ActiveRecord works.
+* 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. 
 
 ## Inspiration

data/lib/active_mocker.rb

@@ -10,7 +10,6 @@
 require "rubygems"
 require 'active_mocker/version'
 require 'active_mocker/railtie' if defined?(Rails)
-require 'ruby-progressbar'
 require 'forwardable'
 require 'active_support/all'
 require 'active_mocker/public_methods'
@@ -18,7 +17,7 @@ require 'active_mocker/config'
 require "reverse_parameters"
 require "active_record_schema_scrapper"
 require "dissociated_introspection"
-require "colorize"
+require "active_mocker/file_path_to_ruby_class"
 require "active_mocker/hash_new_style"
 require "active_mocker/null_progress"
 require "active_mocker/progress"

data/lib/active_mocker/display_errors.rb

@@ -67,3 +67,12 @@ module ActiveMocker
     end
   end
 end
+
+class String
+  def colorize(*args)
+    require "colorize"
+    super(*args)
+  rescue LoadError
+    self
+  end
+end

data/lib/active_mocker/file_path_to_ruby_class.rb

@@ -0,0 +1,16 @@
+module ActiveMocker
+  class FilePathToRubyClass
+
+    attr_reader :class_path, :base_path
+
+    def initialize(base_path:, class_path:)
+      @base_path  = base_path
+      @class_path = class_path
+    end
+
+    def to_s
+      File.basename((class_path.gsub(base_path + "/", "")).split("/").map(&:camelize).join("::"), '.rb')
+    end
+
+  end
+end

data/lib/active_mocker/generate.rb

@@ -16,6 +16,7 @@ module ActiveMocker
         model           = get_model_const(model_name)
         mock_file_name  = "#{model_name.underscore}_#{config.mock_append_name.underscore}.rb"
         mock_file_path  = File.join(Config.mock_dir, mock_file_name)
+        assure_dir_path_exists(mock_file_path)
         schema_scrapper = ActiveRecordSchemaScrapper.new(model: model)
         File.open(mock_file_path, 'w') do |file_out|
           begin
@@ -34,7 +35,7 @@ module ActiveMocker
 
     def get_model_const(model_name)
       model_name.constantize
-    rescue => e
+    rescue StandardError, LoadError => e
       display_errors.wrap_an_exception(e, model_name)
     end
 
@@ -73,7 +74,7 @@ module ActiveMocker
     end
 
     def model_name(file)
-      File.basename(file, '.rb').camelize
+      FilePathToRubyClass.new(base_path: config.model_dir, class_path: file).to_s
     end
 
     def model_names
@@ -85,11 +86,17 @@ module ActiveMocker
     end
 
     def progress_init
-      @progress = config.progress_class.new(models_paths.count)
+      @progress = config.progress_class.create(models_paths.count)
     end
 
     def models_paths
-      @models_paths ||= Dir.glob(config.single_model_path || File.join(config.model_dir, "*.rb"))
+      @models_paths ||= Dir.glob(config.single_model_path || File.join(config.model_dir, "**/*.rb"))
+    end
+
+    def assure_dir_path_exists(file)
+      unless File.exists?(File.dirname(file))
+        FileUtils::mkdir_p(File.dirname(file))
+      end
     end
 
     def config

data/lib/active_mocker/mock/base.rb

@@ -161,13 +161,12 @@ module ActiveMocker
     # @private
     attr_accessor :_create_caller_locations
     # New objects can be instantiated as either empty (pass no construction parameter) or pre-set with
-    # attributes but not yet saved (pass a hash with key names matching the associated table column names).
-    # In both instances, valid attribute keys are determined by the column names of the associated table --
-    # hence you can't have attributes that aren't part of the table columns.
+    # attributes.
     #
     # ==== Example:
     #   # Instantiates a single new object
     #   UserMock.new(first_name: 'Jamie')
+
     def initialize(attributes = {}, &block)
       if self.class.abstract_class?
         raise NotImplementedError, "#{self.class.name} is an abstract class and cannot be instantiated."
@@ -336,4 +335,4 @@ module ActiveMocker
     module Scopes
     end
   end
-end
+end

data/lib/active_mocker/mock/queries.rb

@@ -199,7 +199,7 @@ module ActiveMocker
     end
 
     # Like <tt>find_by</tt>, except that if no record is found, raises
-    # an <tt>ActiveRecord::RecordNotFound</tt> error.
+    # an <tt>ActiveMocker::RecordNotFound</tt> error.
     def find_by!(conditions={})
       result = find_by(conditions)
       if result.nil?
@@ -360,4 +360,4 @@ module ActiveMocker
     end
 
   end
-end
+end

data/lib/active_mocker/mock_creator.rb

@@ -62,7 +62,13 @@ module ActiveMocker
     def template_creator_default(file_out)
       TemplateCreator.new(file_out:     file_out,
                           erb_template: File.new(File.join(File.dirname(__FILE__), "mock_template.erb"), 'r'),
-                          binding:      binding)
+                          binding:      binding,
+                          post_process: -> (str) {
+                            ruby_code = DissociatedIntrospection::RubyCode.build_from_source(str, parse_with_comments: true)
+                            DissociatedIntrospection::WrapInModules.new(ruby_code: ruby_code)
+                              .call(modules: nested_modules)
+                              .source_from_ast.gsub(/end\n/, "end\n\n")
+                          })
     end
 
     def class_introspector_default
@@ -104,7 +110,13 @@ module ActiveMocker
     end
 
     def class_name
-      class_introspector.parsed_source.class_name
+      @class_name ||= class_introspector.parsed_source.class_name.split("::").last
+    end
+
+    def nested_modules
+      @nested_modules ||= begin
+        class_introspector.parsed_source.module_nesting.join("::")
+      end
     end
 
     def parent_class
@@ -216,6 +228,7 @@ module ActiveMocker
         class_introspector
           .get_class
           .public_instance_methods(false)
+          .sort
           .map { |m| create_method(m, :instance_method) }
       end
 
@@ -223,6 +236,7 @@ module ActiveMocker
         class_introspector
           .get_class
           .methods(false)
+          .sort
           .map { |m| create_method(m, :method) }
       end
 

data/lib/active_mocker/null_progress.rb

@@ -1,9 +1,14 @@
 module ActiveMocker
   class NullProgress
-    def initialize(*)
 
+    def self.create(*)
+      self.new
     end
+
+    def initialize(*)
+    end
+
     def increment
     end
   end
-end
+end

data/lib/active_mocker/progress.rb

@@ -1,13 +1,25 @@
 module ActiveMocker
   class Progress
+
+    def self.create(count)
+      require 'ruby-progressbar'
+      self.new(count)
+    rescue LoadError
+      NullProgress.new
+    end
+
     def initialize(count)
-      @progress = ProgressBar.create(title:  'Generating Mocks',
-                                     total:  count,
-                                     format: '%t |%b>>%i| %p%%')
+      @count = count
     end
 
     def increment
-      @progress.increment
+      progress.increment
+    end
+
+    def progress
+      @progress ||= ProgressBar.create(title:  'Generating Mocks',
+                                       total:  @count,
+                                       format: '%t |%b>>%i| %p%%')
     end
   end
-end
+end

data/lib/active_mocker/task.rake

@@ -3,9 +3,11 @@ namespace :active_mocker do
   desc('Rebuild mocks.')
   task :build => :environment do
     ActiveMocker.configure do |c|
-      c.single_model_path = ENV["MODEL"] if ENV["MODEL"]
-      c.progress_bar     = false if ENV["MUTE_PROGRESS_BAR"]
-      c.error_verbosity  = ENV["ERROR_VERBOSITY"].to_i if ENV["ERROR_VERBOSITY"]
+      c.single_model_path             = ENV["MODEL"] if ENV["MODEL"]
+      c.model_dir                     = ENV["MODEL_DIR"] if ENV["MODEL_DIR"]
+      c.mock_dir                      = ENV["MOCK_DIR"] if ENV["MOCK_DIR"]
+      c.progress_bar                  = false if ENV["MUTE_PROGRESS_BAR"]
+      c.error_verbosity               = ENV["ERROR_VERBOSITY"].to_i if ENV["ERROR_VERBOSITY"]
       c.disable_modules_and_constants = false
     end.create_mocks
   end

data/lib/active_mocker/template_creator.rb

@@ -3,20 +3,21 @@ require 'forwardable'
 module ActiveMocker
   class TemplateCreator
 
-    def initialize(erb_template:, file_out: nil, binding:)
+    def initialize(erb_template:, file_out: nil, binding:, post_process: -> (str){str})
       @erb_template = erb_template
       @binding      = binding
       @file_out     = file_out || Tempfile.new('TemplateModel')
+      @post_process = post_process
     end
 
     def render
       template = ERB.new(erb_template.read, nil, '>')
-      file_out.write template.result(binding).gsub(/\n{2,5}/, "\n\n")
+      file_out.write post_process.call(template.result(binding))
       file_out
     end
 
     private
 
-    attr_reader :erb_template, :binding, :file_out
+    attr_reader :erb_template, :binding, :file_out, :post_process
   end
-end
+end

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,7 @@ files:
 - lib/active_mocker/deprecated_components/rspec.rb
 - lib/active_mocker/display_errors.rb
 - lib/active_mocker/error_object.rb
+- lib/active_mocker/file_path_to_ruby_class.rb
 - lib/active_mocker/generate.rb
 - lib/active_mocker/hash_new_style.rb
 - lib/active_mocker/loaded_mocks.rb