active_mocker 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fffbadcc8ae119c4d21f143ffd15bb0a39da50
-  data.tar.gz: a571362fc14c543977695632341ee8bf998ca4ca
+  metadata.gz: 2b9ffc902e6ec65a43aced40034136b32162c83d
+  data.tar.gz: 05f4e7753af31a25d6df189bd345c8f4b966b832
 SHA512:
-  metadata.gz: 7e997a86936372d4f9d9fe150c2ad0b6b844bbb962b36dd2db87260b48d3ed3d12e572b6710c3354225d60a2671741d0b200bbf097f7d7a076fc402706d5339d
-  data.tar.gz: e09743ecb6b2df4f4fa40354b5e3131f8731ab21bfbaa1f24e02ef8ffa81437f1cd0c5b585e42be7c792ad24143e4c0da0b082006e5d1484696b4b3628ee6903
+  metadata.gz: 85bf777384443284ad2a40a38749d3c910145abc8590962a0b4f6b2682bfaf81b1a390eb29d9ff531c21052cfdb1481fd0284ed9c5e20d9b415f390d057211bf
+  data.tar.gz: 8d17e5205fda5b47b2f2eec67378aab8528eee1450106288c049732395b221c7fed13701159661a6e896c6e932b2413525b53368932947463970d032504c8cb3

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## 1.6.3 - 2014-08-14
+
+### Fix
+- Remove check for object is defined and then deleting, it is no longer needed there are better ways to manage clearing state.
+- `rake active_mock:build` failed parsing when an ActiveRecord Model had no table, example where `self.abstract_class = true` was set.
+- `rake active_mock:build` failed for STI models.
+
+###Enhancement
+- Removing methods `#hash` and `==` and using Ruby defaults gives modest performance improvements.
+- Cache build_types object for small performance improvements. 
+
 ## 1.6.2 - 2014-07-31
 
 ## Fix 

data/README.md

@@ -37,7 +37,7 @@ Examples from a real apps
 
 ---------------------------
 
-## Documentation
+## Documentation [![Inline docs](http://inch-ci.org/github/zeisler/active_mocker.png?branch=master)](http://inch-ci.org/github/zeisler/active_mocker)
 
 [rdoc](http://rdoc.info/github/zeisler/active_mocker/master/ActiveMocker)
 
@@ -71,11 +71,15 @@ Or install it yourself as:
 
 ## Setup
 
+
+  See [example_rails_app](https://github.com/zeisler/active_mocker/tree/master/example_rails_app) for complete setup.
+
+
 ### 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.
 
-    rake active_mocker::build
+    rake active_mocker:build
 
 ## Usage
 
@@ -254,7 +258,7 @@ Running this rake task builds/rebuilds the mocks. It will be ran automatically a
 
 
 ### Scoped Methods 
-* As long the mock file that holds the scope method is required it will be available but implemented.
+* As long the mock file that holds the scope method is required it will be available but raise an `unimplemented error` when called.
 
 ### Managing Mocks  
 
@@ -341,9 +345,9 @@ See [Documentation](http://rdoc.info/github/zeisler/active_mocker/master/ActiveM
 ### Known Limitations
 * Model names and table names must follow the default ActiveRecord naming pattern.
 * Whatever associations are setup in one mock object will not be reflected in any other objects. 
-    * There partial support for this feature coming in v1.6 when `ActiveMocker::Mock.config.experimental = true` is set. 
+    * There's partial support for it to work more like ActiveRecord in v1.6 when `ActiveMocker::Mock.config.experimental = true` is set. When v1.7 comes out these features will be moved out of experimantal.
 
-* Validation are not present in mocks.
+* Validation/Callbacks are not present in mocks. A Work around is putting the method into a module with required ActiveSupport/ActiveModel dependencies and make sure the code is supported by the mock. 
 * Sql queries, joins, etc will never be supported.
 
 ## Inspiration

data/lib/active_mocker.rb

@@ -24,4 +24,7 @@ require 'active_mocker/reparameterize'
 require 'active_mocker/db_to_ruby_type'
 require 'active_mocker/model_schema'
 require 'active_mocker/model_schema/generate'
+require 'parser/current'
+require 'unparser'
+require 'active_mocker/ruby_parse'
 require 'virtus'

data/lib/active_mocker/active_record.rb

@@ -33,6 +33,7 @@ module ActiveMocker
       class ConstMissing
 
         def self.const_missing(name)
+          Logger.debug "ActiveMocker :: Debug :: const_missing #{name} from class #{self.name}.\n\t\t\t\t\t\t\t\t#{caller}\n"
           self.const_set name, Class.new(ConstMissing)
         end
 

data/lib/active_mocker/mock.rb

@@ -1,3 +1,4 @@
+require 'active_support/dependencies/autoload'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/inflector'

data/lib/active_mocker/mock/base.rb

@@ -99,7 +99,8 @@ class Base
     end
 
     def build_type(type)
-      Virtus::Attribute.build(type)
+      @@built_types ||= {}
+      @@built_types[type] ||= Virtus::Attribute.build(type)
     end
 
     def classes(klass)
@@ -256,16 +257,6 @@ class Base
     ObjectInspect.new(self.class.name, attributes).to_s
   end
 
-  def hash
-    attributes.hash
-  end
-
-  def ==(obj)
-    return false if obj.nil?
-    return hash == obj.attributes.hash if obj.respond_to?(:attributes)
-    hash == obj.hash if obj.respond_to?(:hash)
-  end
-
   module PropertiesGetterAndSetter
 
     # Returns the value of the attribute identified by <tt>attr_name</tt> after

data/lib/active_mocker/mock_template.erb

@@ -1,5 +1,4 @@
 require 'active_mocker/mock'
-Object.send(:remove_const, "<%= class_name + @mock_append_name %>") if Object.const_defined?("<%= class_name + @mock_append_name %>")
 
 class <%= class_name + @mock_append_name %> < ActiveMocker::Mock::Base
 <% constants.each do |constant| -%>

data/lib/active_mocker/model_reader.rb

@@ -1,5 +1,7 @@
+
 module ActiveMocker
   # @api private
+
   class ModelReader
 
     attr_reader :model_name, :model_dir, :file_reader
@@ -12,44 +14,68 @@ module ActiveMocker
     def parse(model_name)
       @model_name = model_name
       klass
-      return self unless @klass == false
+      return self if @klass
       return false
     end
 
     def klass
-      @klass ||= eval_file
+      @klass ||= eval_file(sandbox_model, file_path)
+    end
+
+    def sandbox_model
+      source = ActiveMocker::RubyParse.new(read_file)
+      if source.has_parent_class? && source.parent_class_name == 'ActiveRecord::Base'
+        source.modify_parent_class('ActiveMocker::ActiveRecord::Base')
+      else
+        load_parent_class(source.parent_class_name)
+        read_file
+      end
+    end
+
+    def load_parent_class(class_name)
+      file_name = class_name.tableize.singularize
+      source = ActiveMocker::RubyParse.new(read_file(file_name)).modify_parent_class('ActiveMocker::ActiveRecord::Base')
+      eval_file(source, file_path(file_name))
     end
 
-    def eval_file
+    def module_namespace
+      @module ||= Module.new
+    end
+
+    def eval_file(string, file_path)
       failure = false
-        begin
-          m = Module.new
-          m.module_eval(read_file, file_path)
-        rescue SyntaxError => e
-          Logger.error "ActiveMocker :: Error loading Model: #{model_name} \n \t\t\t\t\t\t\t\t`#{e}` \n"
-          puts "ActiveMocker :: Error loading Model: #{model_name} \n \t\t\t\t\t\t\t\t`#{e}` \n"
-          Logger.error "\t\t\t\t\t\t\t\t #{file_path}\n"
-          puts "\t\t\t\t\t\t\t\t #{file_path}\n"
-          failure = true
-        rescue Exception => e
-          Logger.error "ActiveMocker :: Error loading Model: #{model_name} \n \t\t\t\t\t\t\t\t`#{e}` \n"
-          Logger.error "\t\t\t\t\t\t\t\t #{file_path}\n"
-          failure = true
-        end
-      return m.const_get m.constants.first unless failure
-      return false
+      begin
+
+        module_namespace.module_eval(string, file_path)
+        _klass = module_namespace.const_get(module_namespace.constants.last)
+      rescue SyntaxError => e
+        log_loading_error(e, true)
+        failure = true
+      rescue Exception => e
+        log_loading_error(e, false)
+        failure = true
+      end
+      return false if failure
+      _klass
+    end
+
+    def log_loading_error(msg, print_to_stdout=false)
+      main = "ActiveMocker :: Error loading Model: #{model_name} \n\t#{msg}\n"
+      file = "\t#{file_path}\n"
+      Logger.error main + file
+      print main + file if print_to_stdout
     end
 
     def real
       model_name.classify.constantize
     end
 
-    def read_file
-      file_reader.read(file_path)
+    def read_file(m_name=model_name)
+      file_reader.read(file_path(m_name))
     end
 
-    def file_path
-      "#{model_dir}/#{model_name}.rb"
+    def file_path(m_name=model_name)
+      "#{model_dir}/#{m_name}.rb"
     end
 
     def class_methods
@@ -74,12 +100,14 @@ module ActiveMocker
 
     def instance_methods_with_arguments
       instance_methods.map do |m|
-        {m => klass.new.method(m).parameters }
+        {m => klass.instance_method(m).parameters }
       end
     end
 
     def instance_methods
-      klass.public_instance_methods(false)
+      methods = klass.public_instance_methods(false)
+      methods << klass.superclass.public_instance_methods(false) if klass.superclass != ActiveRecord::Base
+      methods.flatten
     end
 
     def relationships_types

data/lib/active_mocker/model_schema/generate.rb

@@ -35,20 +35,22 @@ module ActiveMocker
       def run
         model_schemas = models.map do |model_name|
 
-          model      = get_model(model_name)
+          model = get_model(model_name)
           next if model == false
-          table      = get_table(model, model_name)
-          attributes = build_attributes(table.fields, primary_key(table.fields, model))
+          table = get_table(model, model_name)
+          table_name = model_name
+          attributes = []
+          attributes = build_attributes(table.fields, primary_key(table.fields, model)) unless table.nil?
 
           increment_progress
 
-          ModelSchema.new(class_name:    model_name.camelize,
-                          table_name:    table.name,
-                          attributes:    attributes,
-                          methods:       build_methods(model),
+          ModelSchema.new(class_name: model_name.camelize,
+                          table_name: table_name,
+                          attributes: attributes,
+                          methods: build_methods(model),
                           relationships: build_relationships(model),
-                          constants:     model.constants,
-                          modules:       model.modules)
+                          constants: model.constants,
+                          modules: model.modules)
 
         end
 

data/lib/active_mocker/rspec_helper.rb

@@ -7,8 +7,8 @@ RSpec.configure do |config|
     ActiveMocker::LoadedMocks.class_name_to_mock.select { |name, mock| name == class_name }.values.first
   end
 
-  config.before(:each) do
-    if self.class.metadata[:active_mocker]
+  config.before(:each, active_mocker: true) do
+    unless  ENV['RUN_WITH_RAILS'] && self.class.metadata[:rails_compatible]
       ActiveMocker::LoadedMocks.class_name_to_mock.each { |class_name, mock| stub_const(class_name, mock) }
     end
   end

data/lib/active_mocker/ruby_parse.rb

@@ -0,0 +1,68 @@
+module ActiveMocker
+
+  class RubyParse
+
+    attr_reader :source
+
+    def initialize(source)
+      @source = source
+    end
+
+    def is_class?
+      ast.type == :class
+    end
+
+    def class_name
+      Unparser.unparse(find_class.to_a[0])
+    end
+
+    def parent_class_name
+      Unparser.unparse(find_class.to_a[1])
+    end
+
+    def has_parent_class?
+      return false if find_class.nil?
+      find_class.to_a[1].try(:type) == :const
+    end
+
+    def change_class_name(class_name)
+      reset_nodes
+      nodes[0] = Parser::CurrentRuby.parse(class_name)
+      new_ast = ast.updated(nil, nodes, nil)
+      Unparser.unparse(new_ast)
+    end
+
+    def modify_parent_class(parent_class)
+      reset_nodes
+      if has_parent_class?
+        class_node = find_class.to_a.dup
+        class_node[1] = Parser::CurrentRuby.parse(parent_class)
+        new_ast = find_class.updated(nil, class_node, nil)
+      else
+        nodes[1] = nodes[0].updated(:const, [nil, parent_class.to_sym])
+        new_ast = ast.updated(nil, nodes, nil)
+      end
+      Unparser.unparse(new_ast)
+    end
+
+    def find_class
+      return ast if ast.try(:type) == :class
+      ast.to_a.select {|n| n.try(:type) == :class}.first
+    end
+
+    def ast
+      @ast ||= Parser::CurrentRuby.parse(source)
+    end
+
+    def nodes
+      @nodes ||= ast.to_a.dup
+    end
+
+    def reset_nodes
+      @nodes = nil
+    end
+
+  end
+
+end
+

data/lib/active_mocker/task.rake

@@ -1,9 +1,20 @@
 namespace :active_mocker do
+
   desc('Rebuild mocks.')
   task :build => :environment do
     ActiveMocker::Generate.new
   end
 
+  desc('Run all tests tagged   active_mocker')
+  task :test do
+    sh 'rspec --tag active_mocker'
+  end
+
+  desc('Run all tests tagged active_mocker and rails_compatible and will disable model stubbing')
+  task :rails_compatible do
+    sh 'RUN_WITH_RAILS=1 rspec --tag rails_compatible'
+  end
+
 end
 
 ['db:migrate'].each do |task|

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,61 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '2.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
 description: ActiveMocker creates mocks classes from ActiveRecord models. Allowing
   your test suite to run very fast by not loading Rails or hooking to a database.
   It parses the schema.rb and the defined methods on a model then generates a ruby
@@ -262,6 +262,7 @@ files:
 - lib/active_mocker/railtie.rb
 - lib/active_mocker/reparameterize.rb
 - lib/active_mocker/rspec_helper.rb
+- lib/active_mocker/ruby_parse.rb
 - lib/active_mocker/schema_reader.rb
 - lib/active_mocker/string_reader.rb
 - lib/active_mocker/table.rb