active_mocker 1.7.3 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c73656be49d155784e88ad0bdef8cf2440cc22
-  data.tar.gz: 9a8c27c4c39255bb523bd30fe0ae377f2069143e
+  metadata.gz: 6d37886b706ee7f0b5c853537f5032c8c06c1020
+  data.tar.gz: 216a6de43827e700ed4da36cbb5a565fbf4923ee
 SHA512:
-  metadata.gz: 6991147d32ce7ed27729922506adaa0930b320ecd2c763bedcf096363e7cace498b38a5d91c1467593b18a6a97ec31fa692a33b1f790ab28e863c5a24519674e
-  data.tar.gz: 726e67dc6b993de80f1dd8fd34135f4c0ae61bc5933155887df8a1e2c9c758aaecb6e084ce004839cdad6480f53a82428fe2464131ae8626d1ab5323cd62332c
+  metadata.gz: 230736f97cc1d137031c30fe013e848e23a09f523d9c4110c54eb3448bdfa1da0cdb33468693b7a0571d0b59ea3fb0de7c405cf22e4b2e8cec10059784fde52e
+  data.tar.gz: 782b7f7577fdd3054c69239cce1e6e693eddd5e3f32267f934091d6a7379a1eb9a33b876b83eb8327fe79de8f15bf1c84b75616f7d3e8f7d5de8e97ad9f0e3c2

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+
+## 1.8 - 2015-02-17
+
+### Notes
+This release has minor speed improvements. You may find that some records where an attribute was nil it will now have an a value. Next release will most likely be 2.0 where I will focus on removing deprecated features and performance of the mocks runtime.
+
+### Enhancement
+- Improve accuracy and speed in some cases, for finding associations by not assigning them at creation time but finding them when called.
+- Hide the internals stack trace when calling method that will raising `NotImplementedError`.
+- Add spec documentation for method #new_relation
+
+### Added
+- Support for ruby 2.2.0 and rails 4.2
+- new method #none does what it does for ActiveRecord
+
 ## 1.7.3 - 2014-12-01
 
 ### Fix

data/README.md

@@ -312,6 +312,7 @@ See [Documentation](http://rdoc.info/github/zeisler/active_mocker/master/ActiveM
   * order(:field_name)
   * reverse_order
   * limit
+  * none
   
 **Relation Methods** - [docs](http://rdoc.info/github/zeisler/active_mocker/master/ActiveMocker/Mock/Collection)
   * concat

data/lib/active_mocker/mock.rb

@@ -1,3 +1,4 @@
+require 'active_support/deprecation'
 require 'active_support/dependencies/autoload'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/module/delegation'
@@ -22,7 +23,6 @@ require 'active_mocker/mock/mock_abilities'
 require 'active_mocker/mock/exceptions'
 require 'active_mocker/mock/template_methods'
 require 'active_mocker/mock/do_nothing_active_record_methods'
-require 'active_mocker/mock/next_id'
 require 'active_mocker/mock/records'
 require 'active_mocker/mock/object_inspect'
 require 'active_mocker/mock/base'

data/lib/active_mocker/mock/belongs_to.rb

@@ -5,11 +5,23 @@ module ActiveMocker
 
       attr_reader :item
 
-      def initialize(item, child_self:, foreign_key:, foreign_id:)
-        child_self.send(:write_attribute, foreign_key, foreign_id) if item.try(:persisted?)
+      def initialize(item, child_self:, foreign_key:)
+        save_item(item, child_self)
+        assign_foreign_key(child_self, foreign_key, item.try(:id))
         super
       end
 
+      private
+
+      def assign_foreign_key(child_self, foreign_key, foreign_id)
+        child_self.send(:write_attribute, foreign_key, foreign_id)
+      end
+
+      def save_item(item, child_self)
+        return if item.nil?
+        item.try(:save) if child_self.persisted?
+      end
+
     end
 
   end

data/lib/active_mocker/mock/collection.rb

@@ -6,6 +6,10 @@ module Mock
   class Collection
 
     include Enumerable
+    extend ::Forwardable
+    def_delegators :@collection, :[], :take, :push, :clear, :first, :last, :concat, :replace, :uniq, :count, :size, :length, :empty?, :any?, :many?, :include?, :delete
+    alias_method :distinct, :uniq
+
 
     def initialize(collection=[])
       @collection = [*collection]
@@ -15,23 +19,9 @@ module Mock
       collection.concat(records.flatten)
     end
 
-    extend ::Forwardable
-    def_delegators :@collection, :[], :take, :push, :clear, :first, :last, :concat, :replace, :uniq, :count, :size, :length, :empty?, :any?, :many?, :include?, :delete
-    alias_method :distinct, :uniq
-
-    def select(&block)
-      collection.select(&block)
-    end
-
     def each(&block)
       collection.each do |item|
-        block.call(item)
-      end
-    end
-
-    def map(&block)
-      collection.map do |item|
-        block.call(item)
+        yield(item)
       end
     end
 
@@ -51,7 +41,6 @@ module Mock
       @collection == val
     end
 
-    # Returns true if relation is blank.
     def blank?
       to_a.blank?
     end

data/lib/active_mocker/mock/has_one.rb

@@ -5,8 +5,8 @@ module ActiveMocker
 
       attr_reader :item
 
-      def initialize(item, child_self:, foreign_key:, foreign_id:)
-        item.send(:write_attribute, foreign_key, foreign_id) if item.respond_to?("#{foreign_key}=") && !foreign_id.nil?
+      def initialize(item, child_self:, foreign_key:)
+        item.send(:write_attribute, foreign_key, item.try(:id)) if !item.try(:id).nil?
         super
       end
 

data/lib/active_mocker/mock/mock_abilities.rb

@@ -26,8 +26,8 @@ module ActiveMocker
         self.class
       end
 
-      def is_implemented(val, method, type)
-        raise NotImplementedError, "#{type}#{method} for Class: #{class_name}. To continue stub the method." if val.nil?
+      def is_implemented(val, method, type, call_stack)
+        raise NotImplementedError, "#{type}#{method} for Class: #{class_name}. To continue stub the method.", call_stack  if val.nil?
       end
 
       def execute_block(method)
@@ -55,9 +55,9 @@ module ActiveMocker
 
       alias_method :stub_class_method, :mock_class_method
 
-      def call_mock_method(method, *arguments)
+      def call_mock_method(method, caller, *arguments)
         mock_method = mockable_class_methods[method.to_sym]
-        is_implemented(mock_method, method, '::')
+        is_implemented(mock_method, method, '::', caller)
         mock_method.arguments = arguments
         execute_block(mock_method)
       end
@@ -68,10 +68,10 @@ module ActiveMocker
 
     include InstanceAndClassMethods
 
-    def call_mock_method(method, *arguments)
+    def call_mock_method(method, caller, *arguments)
       mock_method = mockable_instance_methods[method.to_sym]
       mock_method = self.class.send(:mockable_instance_methods)[method.to_sym] if mock_method.nil?
-      is_implemented(mock_method, method, '#')
+      is_implemented(mock_method, method, '#', caller)
       mock_method.arguments = arguments
       execute_block mock_method
     end

data/lib/active_mocker/mock/queries.rb

@@ -11,11 +11,24 @@ module Mock
 
       def is_of(conditions={})
         conditions.all? do |col, match|
-          next match.any? { |m| @record.send(col) == m } if match.is_a? Enumerable
-          @record.send(col) == match
+          if match.is_a? Enumerable
+            any_match(col, match)
+          else
+            compare(col, match)
+          end
         end
       end
 
+      private
+
+      def any_match(col, match)
+        match.any? { |m| compare(col, m) }
+      end
+
+      def compare(col, match)
+        @record.send(col) == match
+      end
+
     end
 
     class WhereNotChain
@@ -145,8 +158,8 @@ module Mock
     #
     #   # Update all books that match conditions, but limit it to 5 ordered by date
     #   BookMock.where(title: 'Rails').order(:created_at).limit(5).update_all(author: 'David')
-    def update_all(conditions)
-      all.each { |i| i.update(conditions) }
+    def update_all(attributes)
+      all.each { |i| i.update(attributes) }
     end
 
     # Updates an object (or multiple objects) and saves it.
@@ -182,7 +195,9 @@ module Mock
     #
     #   Post.find_by name: 'Spartacus', rating: 4
     def find_by(conditions = {})
-      send(:where, conditions).first
+      to_a.detect do |record|
+        Find.new(record).is_of(conditions)
+      end
     end
 
     # Like <tt>find_by</tt>, except that if no record is found, raises
@@ -306,6 +321,34 @@ module Mock
       new_relation(to_a || [])
     end
 
+    # Returns a chainable relation with zero records.
+    #
+    # Any subsequent condition chained to the returned relation will continue
+    # generating an empty relation.
+    #
+    # Used in cases where a method or scope could return zero records but the
+    # result needs to be chainable.
+    #
+    # For example:
+    #
+    #   @posts = current_user.visible_posts.where(name: params[:name])
+    #   # => the visible_posts method is expected to return a chainable Relation
+    #
+    #   def visible_posts
+    #     case role
+    #     when 'Country Manager'
+    #       Post.where(country: country)
+    #     when 'Reviewer'
+    #       Post.published
+    #     when 'Bad User'
+    #       Post.none # It can't be chained if [] is returned.
+    #     end
+    #   end
+    #
+    def none
+      new_relation([])
+    end
+
     private
 
     def values_by_key(key)

data/lib/active_mocker/mock/records.rb

@@ -1,62 +1,62 @@
 module ActiveMocker
-module Mock
-class Records
+  module Mock
+    class Records
 
-  extend Forwardable
-  def_delegators :records, :<<, :count, :length, :to_a
+      extend Forwardable
+      def_delegators :records, :<<, :count, :length, :to_a
 
-  attr_reader :records, :record_index
-  private     :records, :record_index
-  def initialize(records = [])
-    @records      ||= records
-    @record_index ||= {}
-  end
+      attr_reader :records
+      private     :records
 
-  def insert(record)
-    record.attributes[:id] ||= next_id
-    validate_unique_id(record)
-    add_to_record_index(record)
-    records << record
-  end
+      def initialize(records = [])
+        @records = records
+      end
 
-  def delete(record)
-    raise RecordNotFound, 'Record has not been created.' if new_record?(record)
-    record_index.delete("#{record.id}")
-    index = records.index(record)
-    records.delete_at(index)
-  end
+      def insert(record)
+        records << validate_unique_id((record.id ||= next_id), record)
+      end
 
-  def exists?(record)
-    records.include?(record)
-  end
+      def delete(record)
+        raise RecordNotFound, 'Record has not been created.' unless records.delete(record)
+      end
 
-  def new_record?(record)
-    !exists?(record)
-  end
+      def exists?(record)
+        records.include?(record)
+      end
 
-  def persisted?(id)
-    records.map(&:id).include?(id)
-  end
+      def new_record?(record)
+        !exists?(record)
+      end
 
-  def reset
-    record_index.clear
-    records.clear
-  end
+      def persisted?(id)
+        ids.include?(id)
+      end
 
-  private
+      def reset
+        records.clear
+      end
 
-  def next_id
-    NextId.new(records).next
-  end
+      private
 
-  def add_to_record_index(record)
-    record_index.merge!({record.id.to_s => records.length})
-  end
+      def ids
+        records.map(&:id)
+      end
 
-  def validate_unique_id(record)
-    raise IdError, "Duplicate ID found for record #{record.inspect}" if record_index.has_key?(record.id.to_s)
-  end
+      def next_id
+        max_record.succ
+      rescue NoMethodError
+        1
+      end
 
-end
-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
+
+    end
+  end
 end

data/lib/active_mocker/mock/single_relation.rb

@@ -5,7 +5,7 @@ module ActiveMocker
 
       attr_reader :item
 
-      def initialize(item, child_self:, foreign_key:, foreign_id:)
+      def initialize(item, child_self:, foreign_key:)
         @item = item
         assign_associations(child_self, item) if item.class <= Base
       end

data/lib/active_mocker/mock_template.erb

@@ -63,12 +63,7 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
   end
 
   def <%= meth.name %>=(val)
-<% association = belongs_to_foreign_key(meth.name) -%>
     write_attribute(:<%= meth.name %>, val)
-<% if association -%>
-    association = classes('<%= association.class_name %>').try(:find_by, id: <%= meth.name %>)
-    write_association(:<%= association.name %>,association) unless association.nil?
-<% end -%>
   end
 <% end %>
   ##################################
@@ -78,12 +73,13 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
 <%= '# belongs_to' unless belongs_to.empty? -%>
 <% belongs_to.each do |meth| %>
   def <%= meth.name %>
-    read_association(:<%= meth.name %>)
+<% association = relation_find(:name, meth.name).first -%>
+    read_association(:<%= meth.name %>) || write_association(:<%= meth.name %>, classes('<%= association.class_name %>').try{ |k| k.find_by(id: <%= association.foreign_key %>)})
   end
 
   def <%= meth.name %>=(val)
     write_association(:<%= meth.name %>, val)
-    ActiveMocker::Mock::BelongsTo.new(val, child_self: self, foreign_key: :<%= meth.foreign_key %>, foreign_id: val.try(:id)).item
+    ActiveMocker::Mock::BelongsTo.new(val, child_self: self, foreign_key: :<%= meth.foreign_key %>).item
   end
 
   def build_<%= meth.name %>(attributes={}, &block)
@@ -111,7 +107,7 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
 
   def <%= meth.name %>=(val)
     write_association(:<%= meth.name %>, val)
-    ActiveMocker::Mock::HasOne.new(val, child_self: self, foreign_key: '<%= meth.foreign_key %>', foreign_id: self.id).item
+    ActiveMocker::Mock::HasOne.new(val, child_self: self, foreign_key: '<%= meth.foreign_key %>').item
   end
 
   def build_<%= meth.name %>(attributes={}, &block)
@@ -182,12 +178,12 @@ class <%= class_name + @mock_append_name %> < <%= parent_class %>
 
 <% instance_methods.each do |method| %>
   def <%= method.name %><%= "(#{method.arguments})" unless method.arguments.empty? %>
-    call_mock_method :<%= method.name %><%= ', ' unless method.arguments.empty? %><%= method.arguments.passable %>
+    call_mock_method :<%= method.name %>, Kernel.caller<%= ', ' unless method.arguments.empty? %><%= method.arguments.passable %>
   end
 <% end -%>
 <% class_methods.each do |method| %>
   def self.<%= method.name %><%= "(#{method.arguments})" unless method.arguments.empty? %>
-    call_mock_method :<%= method.name %><%= ', ' unless method.arguments.empty? %><%= method.arguments.passable %>
+    call_mock_method :<%= method.name %>, Kernel.caller<%= ', ' unless method.arguments.empty? %><%= method.arguments.passable %>
   end
 <% end -%>
 

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "1.7.3"
+  VERSION = "1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: '1.8'
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '10.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +237,6 @@ files:
 - 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/next_id.rb
 - lib/active_mocker/mock/object_inspect.rb
 - lib/active_mocker/mock/queries.rb
 - lib/active_mocker/mock/records.rb
@@ -283,7 +268,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.1.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -291,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Creates mocks from Active Record models. Allows your test suite to run very

data/lib/active_mocker/mock/next_id.rb

@@ -1,24 +0,0 @@
-module ActiveMocker
-module Mock
-# @api private
-class NextId
-
-  def initialize(records)
-    @records = records
-  end
-
-  def next
-    return 1 if max_record.nil?
-    return max_record.id.succ if max_record.id.is_a?(Numeric)
-    raise IdNotNumber
-  end
-
-  private
-
-  def max_record
-    @max_record ||= @records.max { |a, b| a.id <=> b.id }
-  end
-
-end
-end
-end