machinist-mongoid 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117eaff98c32d0739aa64484647c3087cd099cb3
-  data.tar.gz: 580c778ede35414aa8fb41b2d0f80a7c2d895f3f
+  metadata.gz: b7b118d41d219b8e5ac787858076b92fc30ba860
+  data.tar.gz: 54d2f7a098497791a68b7b93fcc6ab53159637d4
 SHA512:
-  metadata.gz: 7372767b1b655ed9c0ef467a4a4aae7872f6831cd3822e7dcc1751da060a78edba6aef7affefa1bcebea3308b0ffbf2aa46d01b97c68be442ce6d30267d4b289
-  data.tar.gz: e3be69d29bfec9e521c2dcbf6b8d45d2f4cb30bf067947a87c85822ee0d050b0be8da0f512de68ac8f20a8fddecc855bf0b1b4cb93f6f80be0c11ee0c36c69ed
+  metadata.gz: df504caaf2ad49fdf0a261cdd2ff204271ef5131529787e84a441b5c6f21977237923164b166b1634aef98284c27204036bad73bcbb68a0946e14bbbe7042924
+  data.tar.gz: 9a852bf152ebaa432f2a39d73f1c9c7d9ce20d3a0bcaae8992438649566abacd8e5d0d0d2b0efeb07aa3781db52748a102f8672d5fdd288be8a2e70ba65a0e94

data/.gitignore

@@ -16,4 +16,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp
+gemfiles

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "mongoid-3x" do
+  gem "mongoid", "~> 3.0"
+end
+
+appraise "mongoid-4x" do
+  gem "mongoid", "=> 4.0"
+end

data/Gemfile

@@ -1,7 +1,12 @@
 source "https://rubygems.org"
 
-group :test do 
-  gem 'mongoid',      "~> 3.0"
+group :development, :test do
+  gem "bundler", "~> 1.3"
+  gem "rake"
+  gem "appraisal"
+end
+
+group :test do
   gem 'machinist',    "~> 2.0"
   gem 'rspec',        "~> 2.13"
 end

data/README.md

@@ -1,8 +1,7 @@
 # Machinist::Mongoid
 
-This library is intended to support machinist 2.0 factories within Mongoid 3.x 
-codebases.  It's inspired by the existing [machinist_mongo][mm] gem that doesn't 
-support mongoid 3.x.
+This library is intended to support machinist 2.0 factories within Mongoid 3.x
+and 4.x versions.  It's originally inspired by the existing [machinist_mongo][mm] gem.
 
 ## Installation
 
@@ -18,9 +17,16 @@ Or install it yourself as:
 
     $ gem install machinist-mongoid
 
-## Usage
+## Testing
+
+    # once
+    bundle install
+    appraisal install
+
+    # each test run.
+    appraisal mongoid-3x rake spec
+    appraisal mongoid-4x rake spec
 
-TODO: Write usage instructions here
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,7 @@
+require "rubygems"
+require "bundler/setup"
+
 require "bundler/gem_tasks"
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)

data/lib/machinist/mongoid.rb

@@ -10,12 +10,12 @@ rescue LoadError
 end
 
 module Machinist
-  
+
   module Mongoid
-    
+
     module Machinable
       extend ActiveSupport::Concern
-      
+
       module ClassMethods
         include Machinist::Machinable
         def blueprint_class
@@ -23,23 +23,23 @@ module Machinist
         end
       end
     end
-    
+
     class Blueprint < Machinist::Blueprint
-      
+
       def make!(attributes = {})
         object = make(attributes)
         object.save!
         object.reload
       end
-      
+
       def lathe_class #:nodoc:
         Machinist::Mongoid::Lathe
       end
-      
+
       def outside_transaction
         yield
       end
-      
+
       def box(object)
         object.id
       end
@@ -49,7 +49,7 @@ module Machinist
         @klass.find(id)
       end
     end
-    
+
     class Lathe < Machinist::Lathe
       def make_one_value(attribute, args) #:nodoc:
         if block_given?
@@ -59,16 +59,16 @@ module Machinist
           make_association(attribute, args)
         end
       end
-      
+
       def make_association(attribute, args) #:nodoc:
-        association = @klass.associations[attribute.to_s]
-        if association
-          association.klass.make(*args)
+        relation = relations_for(@klass)[attribute.to_s]
+        if relation
+          relation.klass.make(*args)
         else
           raise_argument_error(attribute)
         end
       end
-      
+
       def assign_attribute(key, value)
         @assigned_attributes[key.to_sym] = value
         if @object.respond_to?("#{key}=")
@@ -77,6 +77,17 @@ module Machinist
           @object[key] = value
         end
       end
+
+    private
+
+    def relations_for(obj)
+      if ::Mongoid::VERSION =~ /^4\./
+        obj.relations
+      else
+        obj.associations
+      end
+    end
+
     end
   end
 end

data/lib/machinist/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Machinist
   module Mongoid
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/machinist-mongoid.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Machinist::Mongoid::VERSION
   spec.authors       = ["Blake Chambers"]
   spec.email         = ["chambb1@gmail.com"]
-  spec.description   = %q{Machinist for Mongoid 3.x}
-  spec.summary       = %q{Machinist for Mongoid 3.x}
+  spec.description   = %q{Machinist for Mongoid 3 and 4}
+  spec.summary       = %q{Machinist for Mongoid 3 and 4}
   spec.homepage      = "http://github.com/blakechambers/machinist-mongoid"
   spec.license       = "MIT"
 
@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_dependency "machinist", "~> 2.0"
 end

data/spec/mongoid_spec.rb

@@ -5,7 +5,7 @@ MachinistTestHelper.configure!
 
 class Address
   include Mongoid::Document
-  
+
   field :street
   field :zip
   field :country
@@ -14,7 +14,7 @@ end
 
 class Person
   include Mongoid::Document
-  
+
   field :name
   field :password
   field :admin, :type => Boolean, :default => false
@@ -24,26 +24,26 @@ end
 
 class Post
   include Mongoid::Document
-  
+
   field :title
   field :body
   field :published, :type => Boolean, :default => true
-  
+
   has_many :comments
 end
 
 class Comment
   include Mongoid::Document
-  
+
   field :body
   field :post_id
   field :author_id
-  
+
   belongs_to :post
   belongs_to :author, :class_name => "Person"
 end
 
-describe Machinist, "Mongoid::Document adapter" do 
+describe Machinist, "Mongoid::Document adapter" do
 
   before(:each) do
     Person.clear_blueprints!
@@ -57,19 +57,19 @@ describe Machinist, "Mongoid::Document adapter" do
       person = Person.make!
       person.should_not be_new_record
     end
-    
+
     it "should create an object through embedded_in association" do
       Post.blueprint { }
       Comment.blueprint { post }
       Comment.make.post.should be_instance_of(Post)
     end
-      
+
     it "should create an object through embedded_in association with a class_name attribute" do
       Person.blueprint { }
       Comment.blueprint { author }
       Comment.make.author.should be_instance_of(Person)
     end
-    
+
     it "should create an object through embedded_in association using a named blueprint" do
       Post.blueprint { }
       Post.blueprint(:dummy) do
@@ -79,30 +79,33 @@ describe Machinist, "Mongoid::Document adapter" do
       Comment.make.post.title.should == 'Dummy Post'
     end
   end
-  
+
   describe "plan method" do
-    context "attribute assignment" do 
+    context "attribute assignment" do
       it "should allow assigning a value to an attribute" do
         Post.blueprint { title {"1234"} }
         post = Post.make!
         post.title.should == "1234"
       end
 
-      it "should allow arbitrary attributes on the base model in its blueprint" do
-        Post.blueprint { foo {"bar"} }
-        post = Post.make!
-        post.foo.should == "bar"
+      # see: https://github.com/mongoid/mongoid/issues/3035#issuecomment-17858040
+      unless ::Mongoid::VERSION =~ /^4\./
+        it "should allow arbitrary attributes on the base model in its blueprint" do
+          Post.blueprint { foo {"bar"} }
+          post = Post.make!
+          post.foo.should == "bar"
+        end
       end
     end
   end
-  
+
   describe "make_unsaved method" do
     it "should not save the constructed object" do
       Person.blueprint { }
       person = Person.make
       person.should be_new_record
     end
-    
+
     it "should not save associated objects" do
       Post.blueprint { }
       Comment.blueprint { post }
@@ -110,7 +113,7 @@ describe Machinist, "Mongoid::Document adapter" do
       comment.post.should be_new_record
     end
   end
-  
+
   describe "make method with embedded documents" do
     it "should construct object" do
       Address.blueprint { }
@@ -126,11 +129,14 @@ describe Machinist, "Mongoid::Document adapter" do
       Person.make.address.should be_instance_of(Address)
     end
 
-    it "should allow arbitrary attributes on the base model in its blueprint" do
-      Address.blueprint { foo {"bar"} }
-      addr = Address.make
-      addr.foo.should == "bar"
+    # see: https://github.com/mongoid/mongoid/issues/3035#issuecomment-17858040
+    unless ::Mongoid::VERSION =~ /^4\./
+      it "should allow arbitrary attributes on the base model in its blueprint" do
+        Address.blueprint { foo {"bar"} }
+        addr = Address.make
+        addr.foo.should == "bar"
+      end
     end
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 require "rubygems"
-require "rspec"
-#require "sham"
-
 require 'bundler/setup'
 
+require "rspec"
+
 module MachinistTestHelper
   def self.configure!
     ::Mongoid.load!(File.join([File.dirname(__FILE__), "support/mongoid.yml"]), :test)

data/spec/support/mongoid.yml

@@ -1,8 +1,6 @@
 test:
   sessions:
     default:
-      database: mongoid
+      database: machinist_mongoid
       hosts:
-        - localhost:27017
-      options:
-          allow_dynamic_fields: true
+        - localhost:27017

metadata

@@ -1,44 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: machinist-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Blake Chambers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: machinist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Machinist for Mongoid 3.x
+        version: '2.0'
+description: Machinist for Mongoid 3 and 4
 email:
 - chambb1@gmail.com
 executables: []
@@ -47,6 +33,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,10 +64,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Machinist for Mongoid 3.x
+summary: Machinist for Mongoid 3 and 4
 test_files:
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb