active_mocker 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d68198a21ac2738734c94c5565127480b8772d8
-  data.tar.gz: 55577fbc878b514b20b2c6a4ed8169e273fd610d
+  metadata.gz: 5fb5d2c18e0123bbfcd1e6e34e9ce6f323a29324
+  data.tar.gz: dbe134929a21a543e9f72ea5ff773bcbb1601f97
 SHA512:
-  metadata.gz: d3d812eeae5501c118b19293b99f405bcdf6683c692b4a6aadebda619d5a9d0eaf13351db8787058f1a84ff5b0da46aa78077ca18e0d9238f9a8aaa8d71f14d2
-  data.tar.gz: cebef904a1a20c104b27bf005ea1bd263354bd4215536da28930fb6c3fee6a202ced8354350b511242d93159ddcce0cfe737526d961e28c242c2f6dab7350f97
+  metadata.gz: 1edf9a047d35d844d8382192dce7e368afe325a86adaa825196a4d30082d9171998bb3dcc37e9e97aea70e3fde04a89e95dee15f77a88154367b75d51060382c
+  data.tar.gz: 20bc1b6439aacc5de848ea444463d9477cbf567a4b67f860f5618a2a7726e1800a8717feda70fe0074b7ecb30a5497778158bdb41f0492209f1f11c5c968560d

data/README.md

@@ -3,7 +3,6 @@
 
 Create mocks from active record models without loading rails or running a database.
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -51,7 +50,7 @@ Or install it yourself as:
 
     require 'active_mocker'
 
-    ActiveMocker::Base.configure do |config|
+    ActiveMocker.configure do |config|
     # Required Options
       config.schema_file = "#{APP_ROOT}/db/schema.rb"
       config.model_dir   = "#{APP_ROOT}/app/models"
@@ -65,13 +64,13 @@ Or install it yourself as:
       config.log_level = Logger::WARN    #default
     end
 
-    ActiveMocker::Base.mock('Person')
+    ActiveMocker.mock('Person')
         => PersonMock
 
     PersonMock.column_names
         => ["account_id", "first_name", "last_name", "address", "city"]
 
-    person_mock = PersonMock.new(first_name: "Dustin", last_name: "Zeisler", account: mocker.mock('Account').new)
+    person_mock = PersonMock.new(first_name: "Dustin", last_name: "Zeisler", account: ActiveMocker.mock('Account').new)
         => #<PersonMock @first_name="Dustin", @last_name="Zeisler">
 
      person_mock.first_name
@@ -106,14 +105,14 @@ Or install it yourself as:
         => RuntimeError: #bar is not Implemented for Class: PersonMock
 
 
-     mock_class.mock_instance_method(:bar) do  |name, type=nil|
+     person_mock.mock_instance_method(:bar) do  |name, type=nil|
         "Now implemented with #{name} and #{type}"
      end
 
-     mock_class.new.bar('foo', 'type')
+     person_mock.new.bar('foo', 'type')
         => "Now implemented with foo and type"
 
-     mock_class.mock_class_method(:baz) do
+     person_mock.mock_class_method(:baz) do
        "Now implemented"
      end
 
@@ -130,7 +129,7 @@ Or install it yourself as:
 
     end
 
-    mock_class.new.bar('foo', 'type')
+    person_mock.new.bar('foo', 'type')
       => ArgumentError: wrong number of arguments (2 for 1)
 
 
@@ -145,7 +144,7 @@ Or install it yourself as:
 
     end
 
-    mock_class.mock_instance_method(:bar) do  |name, type=nil|
+    person_mock.mock_instance_method(:bar) do  |name, type=nil|
       "Now implemented with #{name} and #{type}"
     end
       => NameError: undefined method `bar' for class `PersonMock'
@@ -155,11 +154,11 @@ ActiveHash is a simple base class that allows you to use a ruby hash as a readon
   [zilkey/active_hash](https://github.com/zilkey/active_hash)
 
 
-    ActiveMocker::Base.configure do |config|
+    ActiveMocker.configure do |config|
       config.active_hash_as_base = true
     end
 
-    ActiveMocker::Base.mock('Person').superclass
+    ActiveMocker.mock('Person').superclass
       => ActiveHash::Base
 
     dustin = PersonMock.create(first_name: 'Dustin')
@@ -174,7 +173,7 @@ ActiveHash is a simple base class that allows you to use a ruby hash as a readon
      dustin.save
        => true
 
-### Additional ActiveHash extentions for matching ActiveRecord
+### Additional ActiveHash extensions for matching ActiveRecord
 
 
 #### #update method
@@ -209,6 +208,9 @@ ActiveHash is a simple base class that allows you to use a ruby hash as a readon
 * **::mock** model names and table names must follow the default ActiveRecord naming pattern.
 * Included/extended module methods will not be included on the mock.
 
+## Inspiration
+Thanks to Jeff Olfert for being my original inspiration for this project.
+
 ## Contributing
 
 1. Fork it ( http://github.com/zeisler/active_mocker/fork )

data/lib/active_hash/ar_api.rb

@@ -1,12 +1,14 @@
 require_relative 'destroy_all'
 require_relative 'update'
 require_relative 'find_by'
+require_relative 'init'
 
 module ActiveHash
 
   module ARApi
 
     include ARApi::Update
+    include ARApi::Init
 
     def self.included(base)
       base.extend(ClassMethods)

data/lib/active_hash/init.rb

@@ -0,0 +1,33 @@
+require 'active_support/core_ext/hash/indifferent_access'
+module ActiveHash
+
+  module ARApi
+
+    module Init
+
+      attr_reader :associations
+
+      def initialize(attributes = {})
+        filter_associations(HashWithIndifferentAccess.new(attributes))
+        @attributes.dup.merge(@associations.dup).each do |key, value|
+          send "#{key}=", value
+        end
+      end
+
+      private
+
+      def filter_associations(attributes)
+        @attributes = attributes.select do |k, v|
+          self.class.send(:attribute_names).include? k.to_sym
+        end
+        @attributes = self.class.send(:attribute_template).merge(@attributes)
+        @associations = attributes.select do |k, v|
+          self.class.send(:association_names).include? k.to_sym
+        end
+        @associations = self.class.send(:association_template).merge(associations)
+      end
+
+    end
+  end
+
+end

data/lib/active_mocker.rb

@@ -1,11 +1,13 @@
 require "active_mocker/version"
 $:.unshift File.expand_path('../../', __FILE__)
+require 'singleton'
 require 'logger'
 require 'active_mocker/logger'
 require 'active_support/all'
 require 'active_mocker/table'
 require 'active_mocker/field'
 require 'file_reader'
+require 'active_mocker/public_methods'
 require 'active_mocker/config'
 require 'active_mocker/reparameterize'
 require 'active_mocker/active_record'
@@ -17,6 +19,5 @@ require 'active_mocker/active_record'
 require 'active_mocker/model_reader'
 require 'active_mocker/reparameterize'
 require 'active_hash/ar_api'
-module ActiveMocker
 
-end
+

data/lib/active_mocker/base.rb

@@ -14,7 +14,6 @@ module ActiveMocker
                    :model_file_reader,
                    :schema_file_reader
 
-
     attr_reader :model_name, :klass
 
     def initialize(model_name)
@@ -28,7 +27,7 @@ module ActiveMocker
     end
 
     def self.mock(model_name)
-      self.new(model_name).klass
+      self.send(:new, model_name).klass
     end
 
     def model_definition
@@ -48,56 +47,76 @@ module ActiveMocker
     end
 
     def active_hash_mock_class
-
-      add_column_names_method
+      fill_templates
       klass  = create_klass
-      fields = table_definition.column_names + model_definition.relationships
+      fields = table_definition.column_names
       klass.class_eval do
         klass.fields(*fields)
       end
 
+      add_relationships_methods
+      add_column_names_method
       add_method_mock_of
       if model_methods
         add_class_methods
         add_instance_methods
       end
-
     end
 
     def plain_mock_class
+      fill_templates
       add_method_mock_of
       if model_methods
         add_class_methods
         add_instance_methods
       end
-      add_relationships        if model_relationships
-      add_column_names_method  if schema_attributes
       add_table_attributes     if schema_attributes
+      add_relationships_methods        if model_relationships
+      add_column_names_method  if schema_attributes
       create_initializer       if mass_assignment
     end
 
     def create_initializer
       klass = create_klass
-      klass.instance_eval do
-        define_method('initialize') do |options={}|
-          options.each {|method, value| send("#{method}=", value)}
+      klass.class_eval <<-'eos', __FILE__, __LINE__+1
+        def initialize(options={})
+          options.each {|method, value| write_attribute(method, value) }
         end
-      end
+      eos
+    end
+
+    def fill_templates
+      klass = create_klass
+      klass.send(:association_names=, model_definition.relationships)
+      klass.send(:attribute_names=, table_definition.column_names)
     end
 
     def add_relationships
       klass = create_klass
       model_definition.relationships.each do |m|
-        klass.instance_variable_set("@#{m}", nil)
-        klass.class_eval { attr_accessor m }
+        klass.send(:schema_attributes_template)[m] = nil
+        begin
+          klass.class_eval <<-eos, __FILE__, __LINE__+1
+            def #{m}
+              read_attribute(#{m.inspect})
+            end
+
+            def #{m}=(value)
+              write_attribute(#{m.inspect}, value)
+            end
+          eos
+        rescue SyntaxError
+          Logger_.debug "ActiveMocker :: Can't create accessor methods for #{m}.\n #{caller}"
+        end
       end
     end
 
     def add_method_mock_of
       klass = create_klass
-      klass.class_variable_set(:@@model_name, model_name)
+      m_name = model_name
+      klass.instance_variable_set(:@model_class, model_definition.klass)
       klass.instance_eval do
-        define_method(:mock_of) {klass.class_variable_get :@@model_name}
+        define_method(:mock_of) {m_name}
       end
     end
 
@@ -106,19 +125,43 @@ module ActiveMocker
       table_definition.column_names.each do |m|
 
         klass.send(:schema_attributes_template)[m] = nil
+        begin
+          klass.class_eval <<-eos, __FILE__, __LINE__+1
+            def #{m}
+              read_attribute(#{m.inspect})
+            end
+
+            def #{m}=(value)
+              write_attribute(#{m.inspect}, value)
+            end
+          eos
+        rescue SyntaxError
+          Logger_.debug "ActiveMocker :: Can't create accessor methods for #{m}.\n #{caller}"
+        end
+      end
+    end
 
-        klass.class_eval <<-eos, __FILE__, __LINE__+1 unless m =~ /^\d/
-          def #{m}
-            read_attribute(#{m.inspect})
-          end
-
-          def #{m}=(value)
-            write_attribute(#{m.inspect}, value)
-          end
-        eos
+    def add_relationships_methods
+      klass = create_klass
+      model_definition.relationships.each do |m|
+        klass.send(:schema_attributes_template)[m] = nil
+        begin
+          klass.class_eval <<-eos, __FILE__, __LINE__+1
+            def #{m}
+              read_attribute(#{m.inspect})
+            end
+
+            def #{m}=(value)
+              write_attribute(#{m.inspect}, value)
+            end
+          eos
+        rescue SyntaxError
+          Logger_.debug "ActiveMocker :: Can't create accessor methods for #{m}.\n #{caller}"
+        end
       end
     end
 
+
     def add_instance_methods
       klass = create_klass
       model_definition.instance_methods_with_arguments.each do |method|
@@ -130,7 +173,8 @@ module ActiveMocker
 
         klass.class_eval <<-eos, __FILE__, __LINE__+1
           def #{m}(#{params})
-            model_instance_methods[#{m.inspect}].call(#{params_pass})
+            block =  model_instance_methods[#{m.inspect}].to_proc
+            instance_exec(*[#{params_pass}], &block)
           end
         eos
       end
@@ -142,19 +186,18 @@ module ActiveMocker
         m = method.keys.first
         params = Reparameterize.call(method.values.first)
         params_pass = Reparameterize.call(method.values.first, true)
-
         klass.send(:model_class_methods)[m] = eval_lambda(params, %Q[raise "::#{m} is not Implemented for Class: #{klass.name}"])
-
         klass.class_eval <<-eos, __FILE__, __LINE__+1
           def self.#{m}(#{params})
-            model_class_methods[#{m.inspect}].call(#{params_pass})
+            block =  model_class_methods[#{m.inspect}].to_proc
+            instance_exec(*[#{params_pass}], &block)
           end
         eos
       end
     end
 
     def eval_lambda(arguments, block)
-      eval(%Q[ ->(#{arguments}){ #{block} }])
+      eval(%Q[ ->(#{arguments}){ #{block} }],binding, __FILE__, __LINE__)
     end
 
     def add_column_names_method
@@ -214,13 +257,22 @@ module ActiveMocker
 
     private
 
+    def delegate_to_model_instance(method, *args)
+      self.class.send(:delegate_to_model_instance, method, *args)
+    end
+
+    def delegate_to_model_class(method, *args)
+      self.class.send(:delegate_to_model_class, method, *args)
+    end
+
     def model_instance_methods
       @model_instance_methods ||= self.class.send(:model_methods_template).dup
     end
 
     def schema_attributes
-      @schema_attributes ||= self.class.send(:schema_attributes_template).dup
+      @schema_attributes ||= self.class.send(:attribute_template).dup
     end
+
   end
 
   module ModelClassMethods
@@ -239,6 +291,14 @@ module ActiveMocker
 
     private
 
+    def delegate_to_model_instance(method, *args)
+      model_class_instance.send(method, *args)
+    end
+
+    def delegate_to_model_class(method, *args)
+      model_class.send(method, *args)
+    end
+
     def model_class_methods
       @model_class_methods ||= HashWithIndifferentAccess.new
     end
@@ -251,6 +311,44 @@ module ActiveMocker
       @schema_attributes_template ||= HashWithIndifferentAccess.new
     end
 
+    def model_class
+      @model_class
+    end
+
+    def model_class_instance
+      @model_class_instance ||= model_class.new
+    end
+
+    def attribute_names
+      @attribute_names
+    end
+
+    def attribute_names=(attributes)
+      @attribute_names = attributes.map{|a| a.to_sym}
+    end
+
+    def attribute_template
+      return @attribute_template unless @attribute_template.nil?
+      @attribute_template = HashWithIndifferentAccess.new
+      attribute_names.each {|a| @attribute_template[a] = nil}
+      return @attribute_template
+    end
+
+    def association_names
+      @association_names
+    end
+
+    def association_names=(associations)
+      @association_names = associations.map{|a| a.to_sym}
+    end
+
+    def association_template
+      return @association_template unless @association_template.nil?
+      @association_template = HashWithIndifferentAccess.new
+      association_names.each {|a| @association_template[a] = nil}
+      return @association_template
+    end
+
   end
 
 end

data/lib/active_mocker/public_methods.rb

@@ -0,0 +1,11 @@
+module ActiveMocker
+
+  def self.mock(model_name)
+    Base.mock(model_name)
+  end
+
+  def self.configure(&block)
+    Base.configure(&block)
+  end
+
+end

data/lib/active_mocker/schema_reader.rb

@@ -12,6 +12,8 @@ module ActiveMocker
     def search(model_name)
       @model_name = model_name
       @table = search_schema_file
+      @table.fields.unshift Field.new('id', :integer, {})
+      @table
     end
 
     private

data/lib/active_mocker/version.rb

@@ -1,3 +1,3 @@
 module ActiveMocker
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/lib/active_mocker/base_spec.rb

@@ -1,8 +1,10 @@
 require 'rspec'
 $:.unshift File.expand_path('../../', __FILE__)
+require 'singleton'
 require 'logger'
 require 'active_mocker/logger'
 require 'string_reader'
+require 'active_mocker/public_methods'
 require 'active_mocker/table'
 require 'active_mocker/config'
 require 'active_mocker/reparameterize'
@@ -18,7 +20,7 @@ require 'active_hash/ar_api'
 describe ActiveMocker::Base do
 
   before(:each) do
-    ActiveMocker::Base.configure do |config|
+    ActiveMocker.configure do |config|
       # Required Options
       config.schema_file = 'file is being inject as string'
       config.model_dir   = 'file is being inject as string'
@@ -38,7 +40,7 @@ describe ActiveMocker::Base do
   end
 
   let(:mock_class){
-    described_class.mock('Person')
+    ActiveMocker.mock('Person')
   }
 
   after(:each) do
@@ -72,7 +74,7 @@ describe ActiveMocker::Base do
   describe '::column_names' do
 
     it 'returns an array of column names found from the schema.rb file' do
-      expect(mock_class.column_names).to eq(["account_id", "first_name", "last_name", "address", "city", "800_number"])
+      expect(mock_class.column_names).to eq(["id", "account_id", "first_name", "last_name", "address", "city", "800_number"])
     end
 
   end
@@ -104,18 +106,6 @@ describe ActiveMocker::Base do
 
     end
 
-    context 'set to false' do
-
-      it 'will fail' do
-        described_class.mass_assignment = false
-        person = described_class.mock("Person")
-        expect{
-          person.new(first_name: "Sam", last_name: 'Walton')
-        }.to raise_error ArgumentError
-      end
-
-    end
-
   end
 
   describe '#mock_class' do
@@ -208,6 +198,9 @@ describe ActiveMocker::Base do
         class Person < ActiveRecord::Base
           def bar(name, type=nil)
           end
+
+          def baz
+          end
         end
         eos
       }
@@ -230,6 +223,65 @@ describe ActiveMocker::Base do
 
       end
 
+      it 'can reference another mock' do
+
+        mock_class.mock_instance_method(:bar) do  |name, type=nil|
+          "Now implemented with #{name} and #{type}"
+        end
+
+        mock_class.mock_instance_method(:baz) do
+          bar("name", 'type')
+        end
+
+        expect(mock_class.new.bar("name", 'type')).to eq "Now implemented with name and type"
+        expect(mock_class.new.baz).to eq "Now implemented with name and type"
+      end
+
+      context 'can call real code by delegating to model' do
+
+        let(:model_file){
+          StringReader.new <<-eos
+        class Person < ActiveRecord::Base
+          def bar(name, type=nil)
+            name + ' bar' + foo + ' ' +type
+          end
+
+          def foo
+            'foo'
+          end
+
+          def baz
+          end
+
+          def self.foobar
+            'foobar'
+          end
+        end
+          eos
+        }
+
+        it 'can delegate instance method to models instance method' do
+
+          mock_class.mock_instance_method(:bar) do  |name, type=nil|
+            delegate_to_model_instance(:bar, name, type)
+          end
+
+          expect(mock_class.new.bar('name','type')).to eq  "name barfoo type"
+
+        end
+
+        it 'can delegate class method to models class method' do
+
+          mock_class.mock_class_method(:foobar) do
+            delegate_to_model_class(:foobar)
+          end
+
+          expect(mock_class.foobar).to eq  "foobar"
+
+        end
+
+      end
+
     end
 
     describe 'class methods' do
@@ -311,7 +363,7 @@ describe ActiveMocker::Base do
       end
 
       it '::column_names' do
-        expect(mock_class.column_names).to eq(["account_id", "first_name", "last_name", "address", "city","800_number"])
+        expect(mock_class.column_names).to eq(["id", "account_id", "first_name", "last_name", "address", "city","800_number"])
       end
 
       it '#mock_of' do

data/spec/lib/active_mocker/model_reader_spec.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 $:.unshift File.expand_path('../../', __FILE__)
+require 'singleton'
 require 'logger'
 require 'active_mocker/logger'
 require 'string_reader'

data/spec/lib/active_mocker/schema_reader_spec.rb

@@ -64,7 +64,7 @@ describe ActiveMocker::SchemaReader do
     it 'let not read a file but return a string instead to be evaluated' do
       people = subject.search('people')
       expect(people.name).to eq 'people'
-      expect(people.fields[1].to_h).to eq({:name=>"first_name", :type=>:string, :options=>[{:limit=>128}]})
+      expect(people.fields[2].to_h).to eq({:name=>"first_name", :type=>:string, :options=>[{:limit=>128}]})
       expect(subject.search('zip_codes').name).to eq 'zip_codes'
     end
 
@@ -89,7 +89,7 @@ describe ActiveMocker::SchemaReader do
 
       it 'returns an array of columns from the schema.rb' do
         expect(people_search.name).to eq 'people'
-        expect(people_search.column_names).to eq ["company_id", "first_name", "middle_name", "last_name", "address_1", "address_2", "city", "state_id", "zip_code_id", "title", "department", "person_email", "work_phone", "cell_phone", "home_phone", "fax", "user_id_assistant", "birth_date", "needs_review", "created_at", "updated_at"]
+        expect(people_search.column_names).to eq ["id", "company_id", "first_name", "middle_name", "last_name", "address_1", "address_2", "city", "state_id", "zip_code_id", "title", "department", "person_email", "work_phone", "cell_phone", "home_phone", "fax", "user_id_assistant", "birth_date", "needs_review", "created_at", "updated_at"]
       end
 
     end
@@ -97,7 +97,7 @@ describe ActiveMocker::SchemaReader do
     describe '#fields' do
 
       it 'returns all fields from schema' do
-        expect(people_search.fields.first.to_h).to eq({:name=>"company_id", :type=>:integer, :options=>[]})
+        expect(people_search.fields[1].to_h).to eq({:name=>"company_id", :type=>:integer, :options=>[]})
       end
 
     end

data/spec/lib/compare_mocker_and_record_spec.rb

@@ -7,20 +7,12 @@ describe 'Comparing ActiveMocker Api to ActiveRecord Api' do
 
   before(:each) do
     ActiveMocker::Base.configure do |config|
-      # Required Options
       config.schema_file = project_root + '/lib/active_record/db/schema.rb'
       config.model_dir   = project_root + '/lib/active_record/app/models'
-      # Additional Options
-      # Dependency injection
-      config.schema_file_reader = nil
-      config.model_file_reader  = nil
-      config.active_hash_as_base = true #default
-      #config.schema_attributes   = true  #default
-      #config.model_relationships = true  #default
-      #config.model_methods       = true  #default
-      #config.mass_assignment     = true  #default
-      # Logging
-      config.log_level = Logger::WARN       #default
+      config.schema_file_reader  = nil
+      config.model_file_reader   = nil
+      config.active_hash_as_base = true
+      config.log_level = Logger::WARN
     end
     ActiveMocker::Base.mock('Person')
   end
@@ -63,30 +55,10 @@ describe 'Comparing ActiveMocker Api to ActiveRecord Api' do
     let(:person_ar){Person.new(attributes)}
     let(:person_mock){PersonMock.new(attributes)}
 
-    # DO NOT depend on the fact that attributes to be the same as AR
-    # Work Around: seed all unused values with nil
-    # Implementation Fix: On init give all values nil
-
-    it 'the mock will exclude any attributes with nil and have a symbol and string version' do
-      expect(person_mock.attributes).to eq({:first_name=>"Dustin", :last_name=>"Zeisler", "first_name"=>"Dustin", "last_name"=>"Zeisler"})
-    end
-
-    it 'can still ask for attribute that is nil on mock' do
-      expect(person_mock[:middle_name]).to eq(nil)
+    it 'they are the same' do
+      expect(person_mock.attributes).to eq person_ar.attributes
     end
 
-    it 'ar will include values with nil' do
-      expect(person_ar.attributes).to eq({"id"=>nil, "company_id"=>nil, "first_name"=>"Dustin", "middle_name"=>nil, "last_name"=>"Zeisler", "address_1"=>nil, "address_2"=>nil, "city"=>nil, "state_id"=>nil, "zip_code_id"=>nil, "title"=>nil, "department"=>nil, "person_email"=>nil, "work_phone"=>nil, "cell_phone"=>nil, "home_phone"=>nil, "fax"=>nil, "user_id_assistant"=>nil, "birth_date"=>nil, "needs_review"=>nil, "created_at"=>nil, "updated_at"=>nil})
-    end
-
-    it 'compare access to attribute' do
-      expect(person_mock.first_name).to eq person_ar.first_name
-      expect(person_mock[:first_name]).to eq person_ar.first_name
-      expect(person_mock['first_name']).to eq person_ar.first_name
-      expect(person_ar[:first_name]).to eq person_mock.first_name
-    end
-
-
   end
 
   describe 'associations' do
@@ -97,12 +69,9 @@ describe 'Comparing ActiveMocker Api to ActiveRecord Api' do
     let(:person_ar){Person.new(create_attributes)}
     let(:person_mock){PersonMock.new(create_attributes)}
 
-    # DO NOT Depend on this or your code will break in production
-    # Work Around: To access associations call method
-    # Implementation Fix: remove association from fields and make getter and setter method
-
-    it 'The Mock will include associations in attributes' do
-      expect(person_mock.attributes).to eq({:first_name=>"Dustin", :last_name=>"Zeisler", zip_code: zip_code, "first_name"=>"Dustin", "last_name"=>"Zeisler"})
+    it 'the Mock when adding an association will not set the _id attribute, do it manually' do
+      expect(person_mock.attributes).to eq({"id"=>nil, "company_id"=>nil, "first_name"=>"Dustin", "middle_name"=>nil, "last_name"=>"Zeisler", "address_1"=>nil, "address_2"=>nil, "city"=>nil, "state_id"=>nil, "zip_code_id"=>nil, "title"=>nil, "department"=>nil, "person_email"=>nil, "work_phone"=>nil, "cell_phone"=>nil, "home_phone"=>nil, "fax"=>nil, "user_id_assistant"=>nil, "birth_date"=>nil, "needs_review"=>nil, "created_at"=>nil, "updated_at"=>nil})
+      expect(person_mock.zip_code).to eq zip_code
     end
 
     it 'Ar will not include associations in attributes' do
@@ -115,12 +84,8 @@ describe 'Comparing ActiveMocker Api to ActiveRecord Api' do
 
     let(:column_names){["company_id", "first_name", "middle_name", "last_name", "address_1", "address_2", "city", "state_id", "zip_code_id", "title", "department", "person_email", "work_phone", "cell_phone", "home_phone", "fax", "user_id_assistant", "birth_date", "needs_review", "created_at", "updated_at"]}
 
-    it 'mock does not include id column' do
-      expect(PersonMock.column_names).to eq column_names
-    end
-
-    it 'AR does include id column' do
-      expect(Person.column_names).to eq column_names.unshift('id')
+    it 'they are the same' do
+      expect(PersonMock.column_names).to eq Person.column_names
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,6 +160,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -169,6 +170,7 @@ files:
 - lib/active_hash/ar_api.rb
 - lib/active_hash/destroy_all.rb
 - lib/active_hash/find_by.rb
+- lib/active_hash/init.rb
 - lib/active_hash/update.rb
 - lib/active_mocker.rb
 - lib/active_mocker/active_record.rb
@@ -184,6 +186,7 @@ files:
 - lib/active_mocker/field.rb
 - lib/active_mocker/logger.rb
 - lib/active_mocker/model_reader.rb
+- lib/active_mocker/public_methods.rb
 - lib/active_mocker/reparameterize.rb
 - lib/active_mocker/schema_reader.rb
 - lib/active_mocker/table.rb
@@ -236,3 +239,4 @@ test_files:
 - spec/lib/model.rb
 - spec/lib/person.rb
 - spec/lib/schema.rb
+has_rdoc: