active_mocker 2.0.0.beta1 → 2.0.0.pre1

data/lib/active_mocker/mock/records.rb

@@ -1,62 +1,64 @@
 module ActiveMocker
-  module Mock
-    class Records
+  class Records
 
-      extend Forwardable
-      def_delegators :records, :<<, :count, :length, :to_a
+    extend Forwardable
+    def_delegators :records, :<<, :count, :length, :to_a
 
-      attr_reader :records
-      private     :records
+    attr_reader :records
+    private :records
 
-      def initialize(records = [])
-        @records = records
-      end
+    def initialize(records = [])
+      @records = records
+    end
 
-      def insert(record)
-        records << validate_unique_id((record.id ||= next_id), record)
-      end
+    def insert(record)
+      records << validate_id((record.id ||= next_id), record)
+    end
 
-      def delete(record)
-        raise RecordNotFound, 'Record has not been created.' unless records.delete(record)
-      end
+    def delete(record)
+      raise RecordNotFound, 'Record has not been created.' unless records.delete(record)
+    end
 
-      def exists?(record)
-        records.include?(record)
-      end
+    def exists?(record)
+      records.include?(record)
+    end
 
-      def new_record?(record)
-        !exists?(record)
-      end
+    def new_record?(record)
+      !exists?(record)
+    end
 
-      def persisted?(id)
-        ids.include?(id)
-      end
+    def persisted?(id)
+      ids.include?(id)
+    end
 
-      def reset
-        records.clear
-      end
+    def reset
+      records.clear
+    end
 
-      private
+    private
 
-      def ids
-        records.map(&:id)
-      end
+    def ids
+      records.map(&:id)
+    end
 
-      def next_id
-        max_record.succ
-      rescue NoMethodError
-        1
-      end
+    def next_id
+      max_record.succ
+    rescue NoMethodError
+      1
+    end
 
-      def max_record
-        ids.max
-      end
+    def max_record
+      ids.max
+    end
 
-      def validate_unique_id(id, record)
-        raise IdError, "Duplicate ID found for record #{record.inspect}" if persisted?(id)
-        record
-      end
+    def validate_id(id, record)
+      record.id = id.to_i
+      validate_unique_id(id, record)
+    end
 
+    def validate_unique_id(id, record)
+      raise IdError, "Duplicate ID found for record #{record.inspect}" if persisted?(id)
+      record
     end
   end
 end

data/lib/active_mocker/mock/relation.rb

@@ -1,7 +1,5 @@
 module ActiveMocker
-module Mock
   class Relation < Collection
-
     include Queries
 
     def initialize(collection=[])
@@ -10,7 +8,7 @@ module Mock
     end
 
     def inspect
-      entries = to_a.take(11).map!(&:inspect)
+      entries     = to_a.take(11).map!(&:inspect)
       entries[10] = '...' if entries.size == 11
       "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
@@ -26,5 +24,4 @@ module Mock
     end
 
   end
-end
 end

data/lib/active_mocker/mock/single_relation.rb

@@ -1,27 +1,23 @@
 module ActiveMocker
-  module Mock
+  class SingleRelation
 
-    class SingleRelation
+    attr_reader :item
 
-      attr_reader :item
-
-      def initialize(item, child_self:, foreign_key:)
-        @item = item
-        assign_associations(child_self, item) if item.class <= Base
-      end
+    def initialize(item, child_self:, foreign_key:)
+      @item = item
+      assign_associations(child_self, item) if item.class <= Base
+    end
 
-      def assign_associations(child_self, item)
-        [*item.class._find_associations_by_class(child_self.class.send('mocked_class'))].each do |type, relations|
-          relations.each do |relation|
-            if item.send(relation).class <= Collection
-              item.send(relation) << child_self
-            else
-              item.send(:write_association, relation, child_self)
-            end
+    def assign_associations(child_self, item)
+      [*item.class._find_associations_by_class(child_self.class.send('mocked_class'))].each do |type, relations|
+        relations.each do |relation|
+          if item.send(relation).class <= Collection
+            item.send(relation) << child_self
+          else
+            item.send(:write_association, relation, child_self)
           end
         end
       end
-
     end
 
   end

data/lib/active_mocker/mock/template_methods.rb

@@ -1,5 +1,4 @@
 module ActiveMocker
-module Mock
   module TemplateMethods
 
     def self.included(base)
@@ -13,7 +12,7 @@ module Mock
       end
 
       def types
-        ActiveMocker::Mock::HashProcess.new({}, method(:build_type))
+        HashProcess.new({}, method(:build_type))
       end
 
       def associations
@@ -37,7 +36,5 @@ module Mock
       end
 
     end
-
   end
 end
-end

data/lib/active_mocker/mock_creator.rb

@@ -7,6 +7,7 @@ module ActiveMocker
                    class_introspector: nil,
                    enabled_partials: nil,
                    klasses_to_be_mocked:,
+                   mock_append_name:,
                    active_record_base_klass: ActiveRecord::Base)
       @file                     = file
       @file_out                 = file_out
@@ -16,6 +17,7 @@ module ActiveMocker
       @enabled_partials         = enabled_partials || self.class.enabled_partials_default
       @klasses_to_be_mocked     = klasses_to_be_mocked
       @active_record_base_klass = active_record_base_klass
+      @mock_append_name         = mock_append_name
       @errors                   = []
       @completed                = false
     end
@@ -45,7 +47,8 @@ module ActiveMocker
                 :class_introspector,
                 :enabled_partials,
                 :klasses_to_be_mocked,
-                :active_record_base_klass
+                :active_record_base_klass,
+                :mock_append_name
 
     # -- Defaults -- #
     private
@@ -96,10 +99,6 @@ module ActiveMocker
       class_introspector.parsed_source.class_name
     end
 
-    def mock_append_name
-      'Mock'
-    end
-
     def parent_class
       @parent_class
     end

data/lib/active_mocker/mock_template/_associations.erb

@@ -9,7 +9,7 @@ read_association(:<%= meth.name %>) || write_association(:<%= meth.name %>, clas
   end
   def <%= meth.name %>=(val)
     write_association(:<%= meth.name %>, val)
-    ActiveMocker::Mock::BelongsTo.new(val, child_self: self, foreign_key: :<%= meth.foreign_key %>).item
+    ActiveMocker::BelongsTo.new(val, child_self: self, foreign_key: :<%= meth.foreign_key %>).item
   end
 
   def build_<%= meth.name %>(attributes={}, &block)
@@ -39,7 +39,7 @@ end
 
   def <%= meth.name %>=(val)
     write_association(:<%= meth.name %>, val)
-    ActiveMocker::Mock::HasOne.new(val, child_self: self, foreign_key: '<%= meth.foreign_key %>').item
+    ActiveMocker::HasOne.new(val, child_self: self, foreign_key: '<%= meth.foreign_key %>').item
   end
 
   def build_<%= meth.name %>(attributes={}, &block)
@@ -62,21 +62,21 @@ end
 
 <% has_many.each do |meth| -%>
   def <%= meth.name %>
-    read_association(:<%= meth.name %>, -> { ActiveMocker::Mock::HasMany.new([],foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>') })
+    read_association(:<%= meth.name %>, -> { ActiveMocker::HasMany.new([],foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>') })
   end
 
   def <%= meth.name %>=(val)
-    write_association(:<%= meth.name %>, ActiveMocker::Mock::HasMany.new(val, foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>'))
+    write_association(:<%= meth.name %>, ActiveMocker::HasMany.new(val, foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id, relation_class: classes('<%= meth.class_name %>'), source: '<%= meth.source %>'))
   end
 <% end -%>
 <%= '# has_and_belongs_to_many' unless has_and_belongs_to_many.empty? -%>
 
 <% has_and_belongs_to_many.each do |meth| -%>
   def <%= meth.name %>
-    read_association(:<%= meth.name %>, ->{ ActiveMocker::Mock::HasAndBelongsToMany.new([]) })
+    read_association(:<%= meth.name %>, ->{ ActiveMocker::HasAndBelongsToMany.new([]) })
   end
 
   def <%= meth.name %>=(val)
-    write_association(:<%= meth.name %>, ActiveMocker::Mock::HasAndBelongsToMany.new(val))
+    write_association(:<%= meth.name %>, ActiveMocker::HasAndBelongsToMany.new(val))
   end
 <% end -%>

data/lib/active_mocker/mock_template/_class_methods.erb

@@ -5,7 +5,7 @@
     end
 
     def types
-      @types ||= ActiveMocker::Mock::HashProcess.new(<%= types_hash %>, method(:build_type)).merge(super)
+      @types ||= ActiveMocker::HashProcess.new(<%= types_hash %>, method(:build_type)).merge(super)
     end
 
     def associations

data/lib/active_mocker/mock_template/_scopes.erb

@@ -12,12 +12,12 @@ end
 
   extend Scopes
 
-  class ScopeRelation < ActiveMocker::Mock::Association
+  class ScopeRelation < ActiveMocker::Association
     include <%= class_name + mock_append_name %>::Scopes
   end
 
-  def self.new_relation(collection)
+  def self.__new_relation__(collection)
     <%= class_name + mock_append_name %>::ScopeRelation.new(collection)
   end
 
-  private_class_method :new_relation
+  private_class_method :__new_relation__

data/lib/active_mocker/parent_class.rb

@@ -22,7 +22,7 @@ module ActiveMocker
       if @parent_mock_name
         "#{@parent_mock_name}#{mock_append_name}"
       else
-        'ActiveMocker::Mock::Base'
+        'ActiveMocker::Base'
       end
     end
 

data/lib/active_mocker/public_methods.rb

@@ -8,13 +8,16 @@ module ActiveMocker
     #    c.single_model_path=  # Path to generate a single mock
     #    c.progress_bar=       # False disables progress bar from sending to STDOUT
     #                            or pass a class that takes a count in the initializer and responds to #increment.
-    #    c.error_verbosity=    # 0 = none, 1 = One line per error, 2 = More details
+    #    c.error_verbosity=    # 0 = none
+    #                          # 1 = Summary of failures
+    #                          # 2 = One line per error
+    #                          # 3 = Errors with exception backtrace
     #    c.disable_modules_and_constants= # Modules are include/extend along with constant declarations.
     #                                     # Default is false, to disable set to true.
     #  end
     #
-    # @param [block]
     # @returns self
+    # @yield [Config]
     def configure(&block)
       Config.set(&block)
       self

data/lib/active_mocker/rspec.rb

@@ -1,16 +1,8 @@
 module ActiveMocker
   module Rspec
-
     # @return ActiveMocker::LoadedMocks
     def active_mocker
       ActiveMocker::LoadedMocks
     end
-
-    # @deprecated method, will be removed in version 2.1
-    # Use +active_mocker.mocks.find('ClassName')+ instead
-    def mock_class(*args)
-      active_mocker.mocks.find(*args)
-    end
-
   end
 end

data/lib/active_mocker/rspec_helper.rb

@@ -2,7 +2,6 @@ require 'active_mocker/loaded_mocks'
 require 'active_mocker/rspec'
 
 RSpec.configure do |config|
-
   config.include ActiveMocker::Rspec
 
   config.before(:each, active_mocker: true) do
@@ -18,5 +17,4 @@ RSpec.configure do |config|
   config.before(:all, active_mocker: true) do
     ActiveMocker::LoadedMocks.delete_all
   end
-
 end

data/lib/active_mocker/task.rake

@@ -27,5 +27,3 @@ end
     Rake::Task['active_mocker:build'].invoke
   end
 end
-
-

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "2.0.0.beta1"
+  VERSION = "2.0.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,17 +150,18 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: ActiveMocker creates mocks classes from ActiveRecord models. Allowing
-  your test suite to run very fast by not loading Rails or a database. It parses the
-  schema.rb and the defined methods on a model then generates a ruby file that can
-  be included within a test. The mock file can be run by themselves and come with
-  a partial implementation of ActiveRecord. Attributes and associations can be used
-  just the same as in ActiveRecord. Methods will have the correct arguments but raise
-  an NotImplementedError when called. Mocks are regenerated when the schema is modified
-  so your mocks will not go stale; preventing the case where your units tests pass
-  but production code fails.
+description: ActiveMocker creates mock classes from ActiveRecord models, allowing
+  your test suite to run at breakneck speed. This can be done by not loading Rails
+  or hitting a database. The models are read dynamically and statically so that ActiveMocker
+  can generate a Ruby file to require within a test. The mock file can be run by itself
+  and comes with a partial implementation of ActiveRecord. Attributes and associations
+  can be used the same as in ActiveRecord. Methods have the same argument signature
+  but raise a NotImplementedError when called, allowing you to stub it with a mocking
+  framework, like RSpec. Mocks are regenerated when the schema is modified so your
+  mocks won't go stale, preventing the case where your units tests pass but production
+  code fails.
 email:
-- dustin@zive.me
+- dustin@zeisler.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -156,9 +171,12 @@ files:
 - README.md
 - lib/active_mocker.rb
 - lib/active_mocker/config.rb
+- lib/active_mocker/deprecated_components/mock_abilities.rb
+- lib/active_mocker/deprecated_components/rspec.rb
+- lib/active_mocker/display_errors.rb
+- lib/active_mocker/error_object.rb
 - lib/active_mocker/generate.rb
 - lib/active_mocker/loaded_mocks.rb
-- lib/active_mocker/logger.rb
 - lib/active_mocker/mock.rb
 - lib/active_mocker/mock/association.rb
 - lib/active_mocker/mock/base.rb
@@ -170,7 +188,7 @@ files:
 - lib/active_mocker/mock/has_many.rb
 - lib/active_mocker/mock/has_one.rb
 - lib/active_mocker/mock/hash_process.rb
-- lib/active_mocker/mock/mock_abilities.rb
+- lib/active_mocker/mock/mock_relation.rb
 - lib/active_mocker/mock/object_inspect.rb
 - lib/active_mocker/mock/queries.rb
 - lib/active_mocker/mock/records.rb
@@ -186,7 +204,6 @@ files:
 - lib/active_mocker/mock_template/_modules_constants.erb
 - lib/active_mocker/mock_template/_scopes.erb
 - lib/active_mocker/null_progress.rb
-- lib/active_mocker/output_capture.rb
 - lib/active_mocker/parent_class.rb
 - lib/active_mocker/progress.rb
 - lib/active_mocker/public_methods.rb