with_model 0.1.4 → 0.1.5

data/.rspec

@@ -0,0 +1 @@
+--colour

data/CHANGELOG

@@ -1,3 +1,8 @@
+### 0.1.5
+
+WithModel::Base is now marked as an abstract_class, which makes polymorphic
+belongs_to work properly.
+
 ### 0.1.4
 
 Add ability to pass arguments to create_table.

data/lib/with_model/base.rb

@@ -5,6 +5,7 @@ end
 
 module WithModel
   class Base < ActiveRecord::Base
+    self.abstract_class = true
     class << self
       def with_model?
         true

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/active_record_behaviors_spec.rb

@@ -1,60 +1,103 @@
 require 'spec_helper'
 
 describe "ActiveRecord behaviors" do
-  describe "a temporary ActiveRecord model created with with_model that has a named_scope" do
-    before do
-      class RegularModel < ActiveRecord::Base
-        scope_method =
-          if respond_to?(:scope) && !protected_methods.include?('scope')
-            :scope # ActiveRecord 3.x
-          else
-            :named_scope # ActiveRecord 2.x
-          end
-
-        send scope_method, :title_is_foo, :conditions => {:title => 'foo'}
-      end
-      RegularModel.connection.drop_table(RegularModel.table_name) rescue nil
-      RegularModel.connection.create_table(RegularModel.table_name) do |t|
-        t.string 'title'
-        t.text 'content'
-        t.timestamps
+  describe "a temporary ActiveRecord model created with with_model" do
+    context "that has a named_scope" do
+      before do
+        class RegularModel < ActiveRecord::Base
+          scope_method =
+            if respond_to?(:scope) && !protected_methods.include?('scope')
+              :scope # ActiveRecord 3.x
+            else
+              :named_scope # ActiveRecord 2.x
+            end
+
+          send scope_method, :title_is_foo, :conditions => {:title => 'foo'}
+        end
+        RegularModel.connection.drop_table(RegularModel.table_name) rescue nil
+        RegularModel.connection.create_table(RegularModel.table_name) do |t|
+          t.string 'title'
+          t.text 'content'
+          t.timestamps
+        end
       end
-    end
 
-    after do
-      RegularModel.connection.drop_table(@model.table_name) rescue nil
-    end
+      after do
+        RegularModel.connection.drop_table(@model.table_name) rescue nil
+      end
 
-    with_model :blog_post do
-      table do |t|
-        t.string 'title'
-        t.text 'content'
-        t.timestamps
+      with_model :blog_post do
+        table do |t|
+          t.string 'title'
+          t.text 'content'
+          t.timestamps
+        end
+
+        model do
+          scope_method =
+            if respond_to?(:scope) && !protected_methods.include?('scope')
+              :scope # ActiveRecord 3.x
+            else
+              :named_scope # ActiveRecord 2.x
+            end
+
+          send scope_method, :title_is_foo, :conditions => {:title => 'foo'}
+        end
       end
 
-      model do
-        scope_method =
-          if respond_to?(:scope) && !protected_methods.include?('scope')
-            :scope # ActiveRecord 3.x
-          else
-            :named_scope # ActiveRecord 2.x
-          end
+      describe "the named scope" do
+        it "should work like a regular named scope" do
+          included = RegularModel.create!(:title => 'foo', :content => "Include me!")
+          excluded = RegularModel.create!(:title => 'bar', :content => "Include me!")
+
+          RegularModel.title_is_foo.should == [included]
 
-        send scope_method, :title_is_foo, :conditions => {:title => 'foo'}
+          included = BlogPost.create!(:title => 'foo', :content => "Include me!")
+          excluded = BlogPost.create!(:title => 'bar', :content => "Include me!")
+
+          BlogPost.title_is_foo.should == [included]
+        end
       end
     end
 
-    describe "the named scope" do
-      it "should work like a regular named scope" do
-        included = RegularModel.create!(:title => 'foo', :content => "Include me!")
-        excluded = RegularModel.create!(:title => 'bar', :content => "Include me!")
+    context "that has a polymorphic belongs_to" do
+      before do
+        class Animal < ActiveRecord::Base
+          has_many :tea_cups, :as => :pet
+        end
+      end
+
+      with_model :tea_cup do
+        table do |t|
+          t.belongs_to :pet, :polymorphic => true
+        end
+        model do
+          belongs_to :pet, :polymorphic => true
+        end
+      end
+
+      with_table :animals
+
+      with_model :stuffed_animal do
+        table
+        model do
+          has_many :tea_cups, :as => :pet
+        end
+      end
 
-        RegularModel.title_is_foo.should == [included]
+      describe "the polymorphic belongs_to" do
+        it "should work like a regular polymorphic belongs_to" do
+          animal = Animal.create!
+          stuffed_animal = StuffedAnimal.create!
 
-        included = BlogPost.create!(:title => 'foo', :content => "Include me!")
-        excluded = BlogPost.create!(:title => 'bar', :content => "Include me!")
+          tea_cup_for_animal = TeaCup.create!(:pet => animal)
+          tea_cup_for_animal.pet_type.should == "Animal"
+          animal.tea_cups.should include(tea_cup_for_animal)
 
-        BlogPost.title_is_foo.should == [included]
+          tea_cup_for_stuffed_animal = TeaCup.create!(:pet => stuffed_animal)
+          tea_cup_for_stuffed_animal.pet_type.should == "StuffedAnimal"
+          stuffed_animal.tea_cups.should include(tea_cup_for_stuffed_animal)
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -18,4 +18,26 @@ end
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
 
 # For readme_spec.rb
-module SomeModule; end
+module SomeModule; end
+
+if defined?(ActiveModel)
+  shared_examples_for "ActiveModel" do
+    require 'test/unit/assertions'
+    require 'active_model/lint'
+    include Test::Unit::Assertions
+    include ActiveModel::Lint::Tests
+
+    # to_s is to support ruby-1.9
+    ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+      example m.gsub('_',' ') do
+        begin
+          send m
+        rescue
+          puts $!.message
+        end
+      end
+    end
+
+    before { @model = subject }
+  end
+end

data/spec/with_model_spec.rb

@@ -38,6 +38,13 @@ describe "a temporary ActiveRecord model created with with_model" do
       }.should raise_error(ActiveRecord::RecordNotFound)
     end
 
+    if defined?(ActiveModel)
+      describe "the class" do
+        subject { BlogPost.new }
+        it_should_behave_like "ActiveModel"
+      end
+    end
+
     it "should have methods defined in its model block" do
       blog_post.new(:title => 'New blog post').fancy_title.should == "Title: New blog post"
     end
@@ -51,6 +58,10 @@ describe "a temporary ActiveRecord model created with with_model" do
         BlogPost.with_model?.should be_true
       end
     end
+
+    it "should have a base_class of itself" do
+      BlogPost.base_class.should == BlogPost
+    end
   end
 
   context "after an example which uses with_model without shadowing an existing constant" do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: with_model
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.4
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +26,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
     - - <
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 4
+        - 0
+        - 0
         version: 4.0.0
   type: :runtime
   version_requirements: *id001
@@ -39,6 +54,7 @@ extra_rdoc_files: []
 files: 
 - .autotest
 - .gitignore
+- .rspec
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -70,17 +86,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Dynamically build a model within an Rspec context