active_mocker 1.2.4 → 1.3

data/sample_app_rails_4/spec/mocks/micropost_mock.rb

@@ -6,19 +6,19 @@ class MicropostMock < ::ActiveHash::Base
   include ActiveMocker::MockInstanceMethods
   extend  ActiveMocker::MockClassMethods
 
-  def initialize(attributes = {})
-    @attributes = HashWithIndifferentAccess.new({"id"=>nil, "content"=>nil, "user_id"=>nil, "created_at"=>nil, "updated_at"=>nil})
+  def initialize(attributes={}, &block)
+    @attributes = HashWithIndifferentAccess.new({"id"=>nil, "content"=>nil, "user_id"=>nil, "up_votes"=>nil, "created_at"=>nil, "updated_at"=>nil})
     @associations = HashWithIndifferentAccess.new({:user=>nil})
-    super(attributes)
+    super(attributes, &block)
   end
 
 
   def self.column_names
-    ["id", "content", "user_id", "created_at", "updated_at"]
+    ["id", "content", "user_id", "up_votes", "created_at", "updated_at"]
   end
 
   def self.attribute_names
-    @attribute_names = [:id, :content, :user_id, :created_at, :updated_at]
+    @attribute_names = ["id", "content", "user_id", "up_votes", "created_at", "updated_at"]
   end
 
   ##################################
@@ -26,7 +26,7 @@ class MicropostMock < ::ActiveHash::Base
   ##################################
 
   def id
-  @attributes['id']
+    @attributes['id']
   end
 
   def id=(val)
@@ -35,7 +35,7 @@ class MicropostMock < ::ActiveHash::Base
   end
 
   def content
-  @attributes['content']
+    @attributes['content']
   end
 
   def content=(val)
@@ -44,7 +44,7 @@ class MicropostMock < ::ActiveHash::Base
   end
 
   def user_id
-  @attributes['user_id']
+    @attributes['user_id']
   end
 
   def user_id=(val)
@@ -52,8 +52,17 @@ class MicropostMock < ::ActiveHash::Base
     @attributes['user_id'] = type.coerce(val)
   end
 
+  def up_votes
+    @attributes['up_votes']
+  end
+
+  def up_votes=(val)
+    type = (types[:up_votes] ||= Virtus::Attribute.build(Fixnum))
+    @attributes['up_votes'] = type.coerce(val)
+  end
+
   def created_at
-  @attributes['created_at']
+    @attributes['created_at']
   end
 
   def created_at=(val)
@@ -62,7 +71,7 @@ class MicropostMock < ::ActiveHash::Base
   end
 
   def updated_at
-  @attributes['updated_at']
+    @attributes['updated_at']
   end
 
   def updated_at=(val)

data/sample_app_rails_4/spec/mocks/relationship_mock.rb

@@ -6,10 +6,10 @@ class RelationshipMock < ::ActiveHash::Base
   include ActiveMocker::MockInstanceMethods
   extend  ActiveMocker::MockClassMethods
 
-  def initialize(attributes = {})
+  def initialize(attributes={}, &block)
     @attributes = HashWithIndifferentAccess.new({"id"=>nil, "follower_id"=>nil, "followed_id"=>nil, "created_at"=>nil, "updated_at"=>nil})
     @associations = HashWithIndifferentAccess.new({:follower=>nil, :followed=>nil})
-    super(attributes)
+    super(attributes, &block)
   end
 
 
@@ -18,7 +18,7 @@ class RelationshipMock < ::ActiveHash::Base
   end
 
   def self.attribute_names
-    @attribute_names = [:id, :follower_id, :followed_id, :created_at, :updated_at]
+    @attribute_names = ["id", "follower_id", "followed_id", "created_at", "updated_at"]
   end
 
   ##################################
@@ -26,7 +26,7 @@ class RelationshipMock < ::ActiveHash::Base
   ##################################
 
   def id
-  @attributes['id']
+    @attributes['id']
   end
 
   def id=(val)
@@ -35,7 +35,7 @@ class RelationshipMock < ::ActiveHash::Base
   end
 
   def follower_id
-  @attributes['follower_id']
+    @attributes['follower_id']
   end
 
   def follower_id=(val)
@@ -44,7 +44,7 @@ class RelationshipMock < ::ActiveHash::Base
   end
 
   def followed_id
-  @attributes['followed_id']
+    @attributes['followed_id']
   end
 
   def followed_id=(val)
@@ -53,7 +53,7 @@ class RelationshipMock < ::ActiveHash::Base
   end
 
   def created_at
-  @attributes['created_at']
+    @attributes['created_at']
   end
 
   def created_at=(val)
@@ -62,7 +62,7 @@ class RelationshipMock < ::ActiveHash::Base
   end
 
   def updated_at
-  @attributes['updated_at']
+    @attributes['updated_at']
   end
 
   def updated_at=(val)

data/sample_app_rails_4/spec/mocks/user_mock.rb

@@ -6,10 +6,10 @@ class UserMock < ::ActiveHash::Base
   include ActiveMocker::MockInstanceMethods
   extend  ActiveMocker::MockClassMethods
 
-  def initialize(attributes = {})
+  def initialize(attributes={}, &block)
     @attributes = HashWithIndifferentAccess.new({"id"=>nil, "name"=>nil, "email"=>"", "credits"=>nil, "created_at"=>nil, "updated_at"=>nil, "password_digest"=>nil, "remember_token"=>true, "admin"=>false})
     @associations = HashWithIndifferentAccess.new({:microposts=>nil, :relationships=>nil, :followed_users=>nil, :reverse_relationships=>nil, :followers=>nil})
-    super(attributes)
+    super(attributes, &block)
   end
 
 
@@ -18,7 +18,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def self.attribute_names
-    @attribute_names = [:id, :name, :email, :credits, :created_at, :updated_at, :password_digest, :remember_token, :admin]
+    @attribute_names = ["id", "name", "email", "credits", "created_at", "updated_at", "password_digest", "remember_token", "admin"]
   end
 
   ##################################
@@ -26,7 +26,7 @@ class UserMock < ::ActiveHash::Base
   ##################################
 
   def id
-  @attributes['id']
+    @attributes['id']
   end
 
   def id=(val)
@@ -35,7 +35,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def name
-  @attributes['name']
+    @attributes['name']
   end
 
   def name=(val)
@@ -44,7 +44,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def email
-  @attributes['email']
+    @attributes['email']
   end
 
   def email=(val)
@@ -53,7 +53,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def credits
-  @attributes['credits']
+    @attributes['credits']
   end
 
   def credits=(val)
@@ -62,7 +62,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def created_at
-  @attributes['created_at']
+    @attributes['created_at']
   end
 
   def created_at=(val)
@@ -71,7 +71,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def updated_at
-  @attributes['updated_at']
+    @attributes['updated_at']
   end
 
   def updated_at=(val)
@@ -80,7 +80,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def password_digest
-  @attributes['password_digest']
+    @attributes['password_digest']
   end
 
   def password_digest=(val)
@@ -89,7 +89,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def remember_token
-  @attributes['remember_token']
+    @attributes['remember_token']
   end
 
   def remember_token=(val)
@@ -98,7 +98,7 @@ class UserMock < ::ActiveHash::Base
   end
 
   def admin
-  @attributes['admin']
+    @attributes['admin']
   end
 
   def admin=(val)
@@ -115,43 +115,43 @@ class UserMock < ::ActiveHash::Base
   end
 
   def microposts
-    associations['microposts'] ||= ActiveMocker::CollectionAssociation.new
+    associations['microposts'] ||= ActiveMocker::Collection::Association.new
   end
 
   def microposts=(val)
-    associations['microposts'] = ActiveMocker::CollectionAssociation.new(val)
+    associations['microposts'] = ActiveMocker::Collection::Association.new(val)
   end
 
   def relationships
-    associations['relationships'] ||= ActiveMocker::CollectionAssociation.new
+    associations['relationships'] ||= ActiveMocker::Collection::Association.new
   end
 
   def relationships=(val)
-    associations['relationships'] = ActiveMocker::CollectionAssociation.new(val)
+    associations['relationships'] = ActiveMocker::Collection::Association.new(val)
   end
 
   def followed_users
-    associations['followed_users'] ||= ActiveMocker::CollectionAssociation.new
+    associations['followed_users'] ||= ActiveMocker::Collection::Association.new
   end
 
   def followed_users=(val)
-    associations['followed_users'] = ActiveMocker::CollectionAssociation.new(val)
+    associations['followed_users'] = ActiveMocker::Collection::Association.new(val)
   end
 
   def reverse_relationships
-    associations['reverse_relationships'] ||= ActiveMocker::CollectionAssociation.new
+    associations['reverse_relationships'] ||= ActiveMocker::Collection::Association.new
   end
 
   def reverse_relationships=(val)
-    associations['reverse_relationships'] = ActiveMocker::CollectionAssociation.new(val)
+    associations['reverse_relationships'] = ActiveMocker::Collection::Association.new(val)
   end
 
   def followers
-    associations['followers'] ||= ActiveMocker::CollectionAssociation.new
+    associations['followers'] ||= ActiveMocker::Collection::Association.new
   end
 
   def followers=(val)
-    associations['followers'] = ActiveMocker::CollectionAssociation.new(val)
+    associations['followers'] = ActiveMocker::Collection::Association.new(val)
   end
 
   ##################################

data/sample_app_rails_4/spec/user_mock_spec.rb

@@ -42,7 +42,6 @@ describe UserMock do
     end
 
     it 'add has_many relationship' do
-      expect(UserMock.new.microposts.class).to eq ActiveMocker::CollectionAssociation
       expect(UserMock.new.microposts.count).to eq 0
       mock_inst = UserMock.new
       mock_inst.microposts << 1

data/spec/lib/active_mocker/{collection_association_spec.rb → collection.rb}

@@ -1,21 +1,20 @@
 require 'rspec'
 $:.unshift File.expand_path('../../', __FILE__)
 require 'active_support/all'
-require 'active_mocker/collection_association'
+require 'active_mocker/collection/base'
+require 'active_mocker/collection/queries'
+require 'active_mocker/collection/relation'
 require 'ostruct'
 
-describe ActiveMocker::CollectionAssociation do
+describe ActiveMocker::Collection::Relation do
 
   subject{described_class.new}
 
   describe '#sum' do
 
-
     it 'sum values by attribute name' do
-
       subject << [OpenStruct.new(value: 1), OpenStruct.new(value: 1)]
       expect(subject.sum(:value)).to eq 2
-
     end
 
   end

data/spec/lib/active_mocker/generate_spec.rb

@@ -1,51 +1,40 @@
 require 'rspec'
 $:.unshift File.expand_path('../../', __FILE__)
-require 'singleton'
-require 'logger'
-require 'forwardable'
-require 'active_mocker/logger'
-require 'string_reader'
-require 'active_mocker/public_methods'
-require 'file_reader'
-require 'active_mocker/collection_association'
-require 'active_mocker/table'
-require 'active_mocker/config'
-require 'active_mocker/reparameterize'
-require 'active_mocker/field'
-require 'active_mocker/active_record'
-require 'active_mocker/model_reader'
-require 'active_mocker/schema_reader'
-require 'active_mocker/active_record/schema'
-require 'active_support/all'
-require 'active_hash/ar_api'
-require 'active_mocker/generate'
-require 'erb'
-require 'virtus'
+require 'active_mocker'
 require_relative '../../unit_logger'
 
 describe ActiveMocker::Generate do
 
+  let(:app_root){ File.expand_path('../../../../', __FILE__)}
+  let(:mock_dir){ File.join(app_root, 'sample_app_rails_4/spec/mocks')}
+
   before(:each) do
-    app_root = File.expand_path('../../../../', __FILE__)
     ActiveMocker.config do |config|
-      # Required Options
       config.schema_file = File.join(app_root, 'sample_app_rails_4/db/schema.rb')
       config.model_dir   = File.join(app_root, 'sample_app_rails_4/app/models')
-      config.mock_dir    = File.join(app_root, 'sample_app_rails_4/spec/mocks')
-      config.logger = UnitLogger
-
+      config.mock_dir    = mock_dir
+      config.logger      = UnitLogger
     end
 
+    FileUtils.rm_rf mock_dir
+
   end
 
-  describe 'new' do
+  subject{described_class.new}
 
-    it 'generates all mocks' do
+  describe 'new' do
 
-      described_class.new
+    before(:each) do
+      subject
+    end
 
+    it 'generates all mocks files' do
+      expect(File.exist? File.join(mock_dir, 'user_mock.rb')        ).to eq true
+      expect(File.exist? File.join(mock_dir, 'micropost_mock.rb')   ).to eq true
+      expect(File.exist? File.join(mock_dir, 'relationship_mock.rb')).to eq true
     end
 
   end
 
-end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: '1.3'
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,10 +152,10 @@ dependencies:
         version: '1.3'
 description: Creates mocks from Active Record models. Allows your test suite to run
   very fast by not loading Rails or hooking to a database. It parse the schema definition
-  and the definded methods on a model then saves a ruby file that can be included
-  with a test. Mocks are regenerated when the schema is modified so your mocks will
-  not go stale. This prevents the case where your units tests pass but production
-  code is failing.
+  and the defined methods on a model then saves a ruby file that can be included with
+  a test. Mocks are regenerated when the schema is modified so your mocks will not
+  go stale. This prevents the case where your units tests pass but production code
+  is failing.
 email:
 - dustin@zive.me
 executables: []
@@ -171,9 +171,7 @@ files:
 - Rakefile
 - active_mocker.gemspec
 - lib/active_hash/ar_api.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
 - lib/active_mocker/active_record/const_missing.rb
@@ -183,7 +181,10 @@ files:
 - lib/active_mocker/active_record/unknown_class_method.rb
 - lib/active_mocker/active_record/unknown_module.rb
 - lib/active_mocker/class_exists.rb
-- lib/active_mocker/collection_association.rb
+- lib/active_mocker/collection/association.rb
+- lib/active_mocker/collection/base.rb
+- lib/active_mocker/collection/queries.rb
+- lib/active_mocker/collection/relation.rb
 - lib/active_mocker/config.rb
 - lib/active_mocker/const_sets.rb
 - lib/active_mocker/field.rb
@@ -353,7 +354,7 @@ files:
 - sample_app_rails_4/spec/user_mock_spec.rb
 - sample_app_rails_4/vendor/assets/javascripts/.keep
 - sample_app_rails_4/vendor/assets/stylesheets/.keep
-- spec/lib/active_mocker/collection_association_spec.rb
+- spec/lib/active_mocker/collection.rb
 - spec/lib/active_mocker/generate_spec.rb
 - spec/lib/active_mocker/model_reader_spec.rb
 - spec/lib/active_mocker/schema_reader_spec.rb
@@ -388,7 +389,7 @@ specification_version: 4
 summary: Creates mocks from Active Record models. Allows your test suite to run very
   fast by not loading Rails or hooking to a database.
 test_files:
-- spec/lib/active_mocker/collection_association_spec.rb
+- spec/lib/active_mocker/collection.rb
 - spec/lib/active_mocker/generate_spec.rb
 - spec/lib/active_mocker/model_reader_spec.rb
 - spec/lib/active_mocker/schema_reader_spec.rb