ninja-model 0.8.1 → 0.9.0

data/spec/support/dummy_adapter/adapter.rb

@@ -0,0 +1,48 @@
+module DummyAdapter
+  class Adapter < NinjaModel::Adapters::AbstractAdapter
+    extend ActiveSupport::Autoload
+
+    def initilalize(config, logger = nil)
+      super
+      @active = false
+    end
+
+    def reconnect!
+      disconnect!
+      connect
+    end
+
+    def disconnect!
+      nil
+    end
+
+    def connect
+    end
+
+    def create(model)
+      execute :create, model
+    end
+
+    def read(query)
+      execute :read, query
+    end
+
+    def update(model)
+      execute :update, model
+    end
+
+    def destroy(model)
+      execute :destroy, model
+    end
+
+    def reload(model)
+      execute :reload, model
+    end
+
+    private
+
+    def execute(method, object)
+      raise NotImplementedError, "I should have been stubbed!"
+    end
+  end
+end

data/spec/support/factories/bio.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :bio do
+    association :user
+    sequence(:name) { |n| "Name #{n}" }
+    to_create { |model|
+      model.write_attribute(:id, 1)
+      model.stubs(:persisted?).returns(true)
+      model.stubs(:new_record?).returns(false)
+    }
+  end
+end

data/spec/support/factories/body.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :body do
+    association :post
+    sequence(:text) { |n| "Body #{n}" }
+    to_create { |model|
+      model.write_attribute(:id, 1)
+      model.stubs(:persisted?).returns(true)
+      model.stubs(:new_record?).returns(false)
+    }
+  end
+end
+

data/spec/support/factories/email_address.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :email_address do
+    sequence(:email) { |n| "user#{n}@example.com" }
+  end
+end

data/spec/support/factories/post.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :post do
+    association :user
+    sequence(:title) { |n| "Title #{n}" }
+    published false
+    to_create { |model|
+      model.write_attribute(:id, 1)
+      model.stubs(:persisted?).returns(true)
+      model.stubs(:new_record?).returns(false)
+    }
+  end
+end

data/spec/support/factories/tag.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :tag do
+    sequence(:name) { |n| "Tag #{n}" }
+  end
+end

data/spec/support/factories/user.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :user do
+    sequence(:username) { |n| "User#{n}" }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja-model
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &9388120 !ruby/object:Gem::Requirement
+  requirement: &13989660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9388120
+  version_requirements: *13989660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9387240 !ruby/object:Gem::Requirement
+  requirement: &13988620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *9387240
+  version_requirements: *13988620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9386660 !ruby/object:Gem::Requirement
+  requirement: &13987680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9386660
+  version_requirements: *13987680
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &9383260 !ruby/object:Gem::Requirement
+  requirement: &13986480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *9383260
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &9382620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *9382620
+  version_requirements: *13986480
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &9381940 !ruby/object:Gem::Requirement
+  requirement: &13985720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 0.5.10
   type: :development
   prerelease: false
-  version_requirements: *9381940
+  version_requirements: *13985720
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &9381280 !ruby/object:Gem::Requirement
+  requirement: &13984420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *9381280
+  version_requirements: *13984420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &9380660 !ruby/object:Gem::Requirement
+  requirement: &13983440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +87,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *9380660
+  version_requirements: *13983440
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &9379980 !ruby/object:Gem::Requirement
+  requirement: &13982400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +98,29 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *9379980
+  version_requirements: *13982400
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &13981760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :development
+  prerelease: false
+  version_requirements: *13981760
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &13981220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *13981220
 description: Pseudo-ORM for Ruby/Rails with an ActiveRecord-like interface
 email: theprime@codingprime.com
 executables: []
@@ -135,10 +146,21 @@ files:
 - lib/ninja_model/adapters/adapter_pool.rb
 - lib/ninja_model/adapters/adapter_specification.rb
 - lib/ninja_model/associations.rb
+- lib/ninja_model/associations/association.rb
 - lib/ninja_model/associations/association_proxy.rb
+- lib/ninja_model/associations/association_scope.rb
 - lib/ninja_model/associations/belongs_to_association.rb
+- lib/ninja_model/associations/builder/association.rb
+- lib/ninja_model/associations/builder/belongs_to.rb
+- lib/ninja_model/associations/builder/collection_association.rb
+- lib/ninja_model/associations/builder/has_many.rb
+- lib/ninja_model/associations/builder/has_one.rb
+- lib/ninja_model/associations/builder/singular_association.rb
+- lib/ninja_model/associations/collection_association.rb
+- lib/ninja_model/associations/collection_proxy.rb
 - lib/ninja_model/associations/has_many_association.rb
 - lib/ninja_model/associations/has_one_association.rb
+- lib/ninja_model/associations/singular_association.rb
 - lib/ninja_model/attribute.rb
 - lib/ninja_model/attribute_methods.rb
 - lib/ninja_model/base.rb
@@ -157,24 +179,42 @@ files:
 - lib/ninja_model/validation.rb
 - lib/ninja_model/version.rb
 - ninja-model.gemspec
-- spec/ninja_model/adapters/abstract_adapter_spec.rb
-- spec/ninja_model/adapters/adapter_manager_spec.rb
-- spec/ninja_model/adapters/adapter_pool_spec.rb
-- spec/ninja_model/adapters_spec.rb
-- spec/ninja_model/attribute_methods_spec.rb
-- spec/ninja_model/attribute_spec.rb
-- spec/ninja_model/base_spec.rb
-- spec/ninja_model/identity_spec.rb
-- spec/ninja_model/persistence_spec.rb
-- spec/ninja_model/predicate_spec.rb
-- spec/ninja_model/query_methods_spec.rb
-- spec/ninja_model/reflection_spec.rb
-- spec/ninja_model/relation_spec.rb
-- spec/ninja_model/symbol_spec.rb
-- spec/ninja_model/validation_spec.rb
-- spec/ninja_model_spec.rb
+- spec/db/schema.rb
+- spec/lib/ninja_model/adapters/abstract_adapter_spec.rb
+- spec/lib/ninja_model/adapters/adapter_manager_spec.rb
+- spec/lib/ninja_model/adapters/adapter_pool_spec.rb
+- spec/lib/ninja_model/adapters_spec.rb
+- spec/lib/ninja_model/associations/belongs_to_association_spec.rb
+- spec/lib/ninja_model/associations/has_many_association_spec.rb
+- spec/lib/ninja_model/associations/has_one_association_spec.rb
+- spec/lib/ninja_model/attribute_methods_spec.rb
+- spec/lib/ninja_model/attribute_spec.rb
+- spec/lib/ninja_model/base_spec.rb
+- spec/lib/ninja_model/identity_spec.rb
+- spec/lib/ninja_model/persistence_spec.rb
+- spec/lib/ninja_model/predicate_spec.rb
+- spec/lib/ninja_model/query_methods_spec.rb
+- spec/lib/ninja_model/reflection_spec.rb
+- spec/lib/ninja_model/relation_spec.rb
+- spec/lib/ninja_model/symbol_spec.rb
+- spec/lib/ninja_model/validation_spec.rb
+- spec/lib/ninja_model_spec.rb
+- spec/models/bio.rb
+- spec/models/body.rb
+- spec/models/category.rb
+- spec/models/email_address.rb
+- spec/models/post.rb
+- spec/models/tag.rb
+- spec/models/user.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
+- spec/support/dummy_adapter/adapter.rb
+- spec/support/factories/bio.rb
+- spec/support/factories/body.rb
+- spec/support/factories/email_address.rb
+- spec/support/factories/post.rb
+- spec/support/factories/tag.rb
+- spec/support/factories/user.rb
 - spec/support/matchers/convert.rb
 homepage: http://github.com/t3hpr1m3/ninja-model.git
 licenses: []
@@ -190,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2496958608719154652
+      hash: -4215966564310549894
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2496958608719154652
+      hash: -4215966564310549894
 requirements: []
 rubyforge_project: ninja-model
 rubygems_version: 1.8.10
@@ -207,23 +247,41 @@ signing_key:
 specification_version: 3
 summary: Pseudo-ORM for Ruby
 test_files:
-- spec/ninja_model/adapters/abstract_adapter_spec.rb
-- spec/ninja_model/adapters/adapter_manager_spec.rb
-- spec/ninja_model/adapters/adapter_pool_spec.rb
-- spec/ninja_model/adapters_spec.rb
-- spec/ninja_model/attribute_methods_spec.rb
-- spec/ninja_model/attribute_spec.rb
-- spec/ninja_model/base_spec.rb
-- spec/ninja_model/identity_spec.rb
-- spec/ninja_model/persistence_spec.rb
-- spec/ninja_model/predicate_spec.rb
-- spec/ninja_model/query_methods_spec.rb
-- spec/ninja_model/reflection_spec.rb
-- spec/ninja_model/relation_spec.rb
-- spec/ninja_model/symbol_spec.rb
-- spec/ninja_model/validation_spec.rb
-- spec/ninja_model_spec.rb
+- spec/db/schema.rb
+- spec/lib/ninja_model/adapters/abstract_adapter_spec.rb
+- spec/lib/ninja_model/adapters/adapter_manager_spec.rb
+- spec/lib/ninja_model/adapters/adapter_pool_spec.rb
+- spec/lib/ninja_model/adapters_spec.rb
+- spec/lib/ninja_model/associations/belongs_to_association_spec.rb
+- spec/lib/ninja_model/associations/has_many_association_spec.rb
+- spec/lib/ninja_model/associations/has_one_association_spec.rb
+- spec/lib/ninja_model/attribute_methods_spec.rb
+- spec/lib/ninja_model/attribute_spec.rb
+- spec/lib/ninja_model/base_spec.rb
+- spec/lib/ninja_model/identity_spec.rb
+- spec/lib/ninja_model/persistence_spec.rb
+- spec/lib/ninja_model/predicate_spec.rb
+- spec/lib/ninja_model/query_methods_spec.rb
+- spec/lib/ninja_model/reflection_spec.rb
+- spec/lib/ninja_model/relation_spec.rb
+- spec/lib/ninja_model/symbol_spec.rb
+- spec/lib/ninja_model/validation_spec.rb
+- spec/lib/ninja_model_spec.rb
+- spec/models/bio.rb
+- spec/models/body.rb
+- spec/models/category.rb
+- spec/models/email_address.rb
+- spec/models/post.rb
+- spec/models/tag.rb
+- spec/models/user.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
+- spec/support/dummy_adapter/adapter.rb
+- spec/support/factories/bio.rb
+- spec/support/factories/body.rb
+- spec/support/factories/email_address.rb
+- spec/support/factories/post.rb
+- spec/support/factories/tag.rb
+- spec/support/factories/user.rb
 - spec/support/matchers/convert.rb
 has_rdoc: 

data/spec/ninja_model/adapters/adapter_manager_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe NinjaModel::Adapters::AdapterManager do
-  class DummyAdapter < NinjaModel::Adapters::AbstractAdapter; end
-  class TestModel < NinjaModel::Base; end
-  class ChildModel < TestModel; end
-
-  before {
-    @manager = NinjaModel::Adapters::AdapterManager.new
-    @manager.class.register_adapter_class(:dummy, DummyAdapter)
-  }
-  subject { @manager }
-
-  it 'should remember registered adapters' do
-    subject.class.registered?(:dummy).should be_true
-  end
-
-  describe 'creating an adapter' do
-    before { @manager.create_adapter('TestModel', NinjaModel::Adapters::AdapterSpecification.new({}, :dummy)) }
-    it 'should add the adapter to the pool' do
-      @manager.retrieve_adapter_pool(TestModel).spec.name.should eql(:dummy)
-    end
-    it 'should return the adapter for descendent classes' do
-      @manager.retrieve_adapter_pool(ChildModel).spec.name.should eql(:dummy)
-    end
-  end
-
-  describe 'removing an adapter' do
-    before {
-      @spec = NinjaModel::Adapters::AdapterSpecification.new({:foo => 'bar'}, :dummy)
-      @manager.create_adapter('TestModel', @spec)
-    }
-    it 'should remove the adapter from the pool' do
-      @manager.remove_adapter(TestModel)
-      @manager.retrieve_adapter_pool(TestModel).should be_nil
-    end
-    it 'should cause retrieve_adapter to raise an error' do
-      @manager.remove_adapter(TestModel)
-      lambda { @manager.retrieve_adapter(TestModel) }.should raise_error(StandardError)
-    end
-    it 'should return the spec that created it' do
-      @manager.remove_adapter(TestModel).should eql({:foo => 'bar'})
-    end
-  end
-
-  describe 'release_active_adapters!' do
-    before {
-      @spec = NinjaModel::Adapters::AdapterSpecification.new({:foo => 'bar'}, :dummy)
-      @manager.create_adapter('TestModel', @spec)
-    }
-    it 'should call release_instance on all pools' do
-      @pool = @manager.adapter_pools['TestModel']
-      @pool.expects(:release_instance)
-      @manager.release_active_adapters!
-    end
-  end
-
-  describe 'release_all_adapters!' do
-    before {
-      @spec = NinjaModel::Adapters::AdapterSpecification.new({:foo => 'bar'}, :dummy)
-      @manager.create_adapter('TestModel', @spec)
-    }
-    it 'should call shutdown! on all pools' do
-      @pool = @manager.adapter_pools['TestModel']
-      @pool.expects(:shutdown!)
-      @manager.release_all_adapters!
-    end
-  end
-end