active_mocker 2.0.0.beta1 → 2.0.0.pre1

data/lib/active_mocker/mock/belongs_to.rb

@@ -1,29 +1,23 @@
 module ActiveMocker
-  module Mock
+  class BelongsTo < SingleRelation
+    attr_reader :item
 
-    class BelongsTo < SingleRelation
-
-      attr_reader :item
-
-      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 initialize(item, child_self:, foreign_key:)
+      save_item(item, child_self)
+      assign_foreign_key(child_self, foreign_key, item.try(:id))
+      super
+    end
 
-      def save_item(item, child_self)
-        return if item.nil?
-        item.try(:save) if child_self.persisted?
-      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

@@ -1,10 +1,7 @@
 require 'forwardable'
 
 module ActiveMocker
-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
@@ -48,8 +45,5 @@ module Mock
     protected
 
     attr_accessor :collection
-
   end
-
-end
 end

data/lib/active_mocker/mock/do_nothing_active_record_methods.rb

@@ -1,61 +1,59 @@
 module ActiveMocker
-module Mock
-module DoNothingActiveRecordMethods
+  module DoNothingActiveRecordMethods
 
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      def transaction
+        yield
+      rescue LocalJumpError => err
+        raise err
+      rescue StandardError => e
+        raise e
+      end
 
-  module ClassMethods
+      def column_names
+        attribute_names
+      end
 
-    def transaction
-      yield
-    rescue LocalJumpError => err
-      raise err
-    rescue StandardError => e
-      raise e
     end
 
-    def column_names
-      attribute_names
+    def readonly?
+      false
     end
 
-  end
+    def errors
+      obj = Object.new
 
-  def readonly?
-    false
-  end
+      def obj.[](key)
+        []
+      end
 
-  def errors
-    obj = Object.new
+      def obj.full_messages()
+        []
+      end
 
-    def obj.[](key)
-      []
+      obj
     end
 
-    def obj.full_messages()
-      []
+    def valid?
+      true
     end
 
-    obj
-  end
-
-  def valid?
-    true
-  end
+    def marked_for_destruction?
+      false
+    end
 
-  def marked_for_destruction?
-    false
-  end
+    def destroyed?
+      false
+    end
 
-  def destroyed?
-    false
-  end
+    def reload
+      self
+    end
 
-  def reload
-    self
   end
-
-end
-end
 end

data/lib/active_mocker/mock/exceptions.rb

@@ -1,24 +1,22 @@
 module ActiveMocker
-module Mock
   class RecordNotFound < StandardError
   end
 
-  class ReservedFieldError < StandardError
+  module Mock
+    # @deprecated
+    RecordNotFound = ActiveMocker::RecordNotFound
   end
 
   class IdError < StandardError
   end
 
-  class FileTypeMismatchError < StandardError
-  end
-
   # Raised when unknown attributes are supplied via mass assignment.
   class UnknownAttributeError < NoMethodError
 
     attr_reader :record, :attribute
 
     def initialize(record, attribute)
-      @record = record
+      @record    = record
       @attribute = attribute.to_s
       super("unknown attribute: #{attribute}")
     end
@@ -36,11 +34,6 @@ module Mock
   class NotImplementedError < Exception
   end
 
-  class IdNotNumber < Exception
-  end
-
   class Error < Exception
   end
-
-end
 end

data/lib/active_mocker/mock/has_and_belongs_to_many.rb

@@ -1,6 +1,4 @@
 module ActiveMocker
-module Mock
   class HasAndBelongsToMany < HasMany
   end
-end
 end

data/lib/active_mocker/mock/has_many.rb

@@ -1,8 +1,5 @@
 module ActiveMocker
-module Mock
-
   class HasMany < Association
-
     include Queries
 
     def self.new(collection, options = {})
@@ -62,7 +59,9 @@ module Mock
     end
 
   end
-
-end
+  module Mock
+    # @deprecated
+    HasMany = ActiveMocker::HasMany
+  end
 end
 

data/lib/active_mocker/mock/has_one.rb

@@ -1,17 +1,11 @@
 module ActiveMocker
-  module Mock
-
-    class HasOne < SingleRelation
-
-      attr_reader :item
-
-      def initialize(item, child_self:, foreign_key:)
-        item.send(:write_attribute, foreign_key, item.try(:id)) if !item.try(:id).nil?
-        super
-      end
+  class HasOne < SingleRelation
+    attr_reader :item
 
+    def initialize(item, child_self:, foreign_key:)
+      item.send(:write_attribute, foreign_key, item.try(:id)) if !item.try(:id).nil?
+      super
     end
 
   end
 end
-

data/lib/active_mocker/mock/hash_process.rb

@@ -1,25 +1,22 @@
 module ActiveMocker
-  module Mock
-    # @api private
-    class HashProcess
+  # @api private
+  class HashProcess
 
-      attr_accessor :hash, :processor
+    attr_accessor :hash, :processor
 
-      def initialize(hash, processor)
-        @hash         = hash
-        @processor    = processor
-        @hash_process = {}
-      end
-
-      def [](val)
-        @hash_process[val] ||= processor.call(hash[val])
-      end
+    def initialize(hash, processor)
+      @hash         = hash
+      @processor    = processor
+      @hash_process = {}
+    end
 
-      def merge(merge_hash)
-        self.hash = hash.merge(merge_hash.hash)
-        self
-      end
+    def [](val)
+      @hash_process[val] ||= processor.call(hash[val])
+    end
 
+    def merge(merge_hash)
+      self.hash = hash.merge(merge_hash.hash)
+      self
     end
   end
 end

data/lib/active_mocker/mock/mock_relation.rb

@@ -0,0 +1,10 @@
+module ActiveMocker
+  class MockRelation
+    # @param [ActiveMocker::Base] mock, a generated mock class
+    # @param [Array<ActiveMocker::Base>] collection, an array of mock instances
+    # @return [ScopeRelation] for the given mock
+    def self.new(mock, collection)
+      mock.send(:__new_relation__, collection)
+    end
+  end
+end

data/lib/active_mocker/mock/object_inspect.rb

@@ -1,43 +1,40 @@
 module ActiveMocker
-module Mock
-class ObjectInspect
+  class ObjectInspect
 
-  def initialize(class_name, attributes)
-    @class_name = class_name
-    @attributes = attributes
-    @string     = create_inspections
-  end
+    def initialize(class_name, attributes)
+      @class_name = class_name
+      @attributes = attributes
+      @string     = create_inspections
+    end
 
-  def to_s
-    @string
-  end
+    def to_s
+      @string
+    end
 
-  def to_str
-    @string
-  end
+    def to_str
+      @string
+    end
 
-  private
+    private
 
-  def create_inspections
-    inspection = @attributes.map do |name ,value|
-      "#{name}: #{object_for_inspect(value)}"
+    def create_inspections
+      inspection = @attributes.map do |name, value|
+        "#{name}: #{object_for_inspect(value)}"
+      end
+      "#<#{@class_name} #{inspection.compact.join(", ")}>"
     end
-    "#<#{@class_name} #{inspection.compact.join(", ")}>"
-  end
 
-  def object_for_inspect(value)
-    if value.is_a?(String) && value.length > 50
-      "#{value[0, 50]}...".inspect
-    elsif value.is_a?(Date) || value.is_a?(Time)
-      %("#{value.to_s(:db)}")
-    elsif value.is_a?(Array) && value.size > 10
-      inspected = value.first(10).inspect
-      %(#{inspected[0...-1]}, ...])
-    else
-      value.inspect
+    def object_for_inspect(value)
+      if value.is_a?(String) && value.length > 50
+        "#{value[0, 50]}...".inspect
+      elsif value.is_a?(Date) || value.is_a?(Time)
+        %("#{value.to_s(:db)}")
+      elsif value.is_a?(Array) && value.size > 10
+        inspected = value.first(10).inspect
+        %(#{inspected[0...-1]}, ...])
+      else
+        value.inspect
+      end
     end
   end
-
-end
-end
 end

data/lib/active_mocker/mock/queries.rb

@@ -1,6 +1,4 @@
 module ActiveMocker
-module Mock
-
   module Queries
 
     class Find
@@ -61,9 +59,9 @@ module Mock
     # If a limit scope is supplied, +delete_all+ raises an ActiveMocker error:
     #
     #   Post.limit(100).delete_all
-    #   # => ActiveMocker::Mock::Error: delete_all doesn't support limit scope
+    #   # => ActiveMocker::Error: delete_all doesn't support limit scope
     def delete_all(conditions=nil)
-      raise ActiveMocker::Mock::Error.new("delete_all doesn't support limit scope") if from_limit?
+      raise ActiveMocker::Error.new("delete_all doesn't support limit scope") if from_limit?
       if conditions.nil?
         to_a.map(&:delete)
         return to_a.clear
@@ -116,8 +114,8 @@ module Mock
     #
     # See WhereChain for more details on #not.
     def where(conditions=nil)
-      return WhereNotChain.new(all, method(:new_relation)) if conditions.nil?
-      new_relation(to_a.select do |record|
+      return WhereNotChain.new(all, method(:__new_relation__)) if conditions.nil?
+      __new_relation__(to_a.select do |record|
         Find.new(record).is_of(conditions)
       end)
     end
@@ -131,13 +129,13 @@ module Mock
     #   Person.find([7, 17])    # returns an array for objects with IDs in (7, 17)
     #   Person.find([1])        # returns an array for the object with ID = 1
     #
-    # <tt>ActiveMocker::Mock::RecordNotFound</tt> will be raised if one or more ids are not found.
+    # <tt>ActiveMocker::RecordNotFound</tt> will be raised if one or more ids are not found.
     def find(ids)
       raise RecordNotFound.new("Couldn't find #{self.name} without an ID") if ids.nil?
       results = [*ids].map do |id|
         find_by!(id: id.to_i)
       end
-      return new_relation(results) if ids.class == Array
+      return __new_relation__(results) if ids.class == Array
       results.first
     end
 
@@ -259,7 +257,7 @@ module Mock
     #
     #   User.limit(10)
     def limit(num)
-      relation = new_relation(all.take(num))
+      relation = __new_relation__(all.take(num))
       relation.send(:set_from_limit)
       relation
     end
@@ -281,7 +279,7 @@ module Mock
     #   PersonMock.average(:age) # => 35.8
     def average(key)
       values = values_by_key(key)
-      total = values.inject { |sum, n| sum + n }
+      total  = values.inject { |sum, n| sum + n }
       BigDecimal.new(total) / BigDecimal.new(values.count)
     end
 
@@ -307,18 +305,18 @@ module Mock
     #
     #   User.order(:name)
     def order(key)
-      new_relation(all.sort_by { |item| item.send(key) })
+      __new_relation__(all.sort_by { |item| item.send(key) })
     end
 
     # Reverse the existing order clause on the relation.
     #
     #   User.order('name').reverse_order
     def reverse_order
-      new_relation(to_a.reverse)
+      __new_relation__(to_a.reverse)
     end
 
     def all
-      new_relation(to_a || [])
+      __new_relation__(to_a || [])
     end
 
     # Returns a chainable relation with zero records.
@@ -346,7 +344,7 @@ module Mock
     #   end
     #
     def none
-      new_relation([])
+      __new_relation__([])
     end
 
     private
@@ -355,13 +353,11 @@ module Mock
       all.map { |obj| obj.send(key) }
     end
 
-    def new_relation(collection)
-      duped = self.dup
+    def __new_relation__(collection)
+      duped            = self.dup
       duped.collection = collection
       duped
     end
 
   end
-
-end
 end