polymorphic_model 0.0.1 → 0.0.2

data/.gitignore

@@ -17,5 +17,5 @@ tmtags
 coverage
 rdoc
 pkg
-
+doc/*
 ## PROJECT::SPECIFIC

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/polymorphic_model.rb

@@ -15,21 +15,17 @@ module PolymorphicModel
         send(column) == t.to_s
       end
 
+      condition_hash = {column => t.to_s}
       if options[:singleton] == true
         validates_uniqueness_of column, :if => :"#{t}?"
         self.class.instance_eval do
           define_method t do
-            existing = find(:first, :conditions => {column => t.to_s})
-            if options[:autocreate]
-              existing || create!(column => t.to_s)
-            else
-              existing
-            end
+            scope = scoped(:conditions => condition_hash)
+            scope.first || (options[:autocreate] ? create!(condition_hash) : scope)
           end
-          
         end
       else
-        named_scope(t, :conditions => { column => "#{t.to_s}" })
+        named_scope(t, :conditions => condition_hash)
       end
     end
   end

data/polymorphic_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{polymorphic_model}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Artur Roszczyk"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-21}
   s.description = %q{Alternative for ActiveRecord's Single Table Inheritance}
   s.email = %q{artur.roszczyk@gmail.com}
   s.extra_rdoc_files = [
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
      "polymorphic_model.gemspec",
      "rails/init.rb",
      "spec/lib/database.rb",
-     "spec/lib/job_model.rb",
      "spec/polymorphic_model_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -40,7 +39,6 @@ Gem::Specification.new do |s|
   s.summary = %q{Alternative for ActiveRecord's Single Table Inheritance}
   s.test_files = [
     "spec/lib/database.rb",
-     "spec/lib/job_model.rb",
      "spec/polymorphic_model_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/lib/database.rb

@@ -6,20 +6,28 @@ DATABASE_CONFIG = {
   :adapter => 'sqlite3',
   :database => ':memory:'
 }.freeze
-def set_database
+
+def set_database(table_names)
   ActiveRecord::Base.establish_connection(DATABASE_CONFIG)
   #ActiveRecord::Base.logger = Logger.new(STDERR)
-  
-  ActiveRecord::Schema.define do
-    create_table :jobs do |t|
-      t.string :job_type
-  
-      t.string :title
-      t.string :url
-      t.text   :description
-  
-      t.timestamps
+  table_names.each do |table_name|
+    ActiveRecord::Schema.define do
+      suppress_messages do
+        create_table :"#{table_name.pluralize}" do |t|
+          t.string :"#{table_name}_type"
+
+          t.string :title
+          t.string :url
+          t.text   :description
+
+          t.timestamps
+        end
+      end
     end
+
+    eval %{
+      class #{table_name.capitalize} < ActiveRecord::Base
+      end
+    }
   end
 end
-require 'lib/job_model'

data/spec/polymorphic_model_spec.rb

@@ -1,8 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'lib/job_model'
 
 describe "PolymorphicModel" do
-  before(:all) do
+  before do
     Job.instance_eval do
       polymorphic_model :with_type_column => :job_type
     end
@@ -18,23 +17,28 @@ describe "PolymorphicModel" do
         define_type :some_type
       end
     end
-    
+
     it "should create check methods" do
       Job.instance_methods.should include("some_type?")
     end
+
+    it "should create named scope/accessor" do
+      Job.methods.should include("some_type")
+    end
   end
 end
 
 describe "When normal collection types are defined" do
   before do
     Job.instance_eval do
+      polymorphic_model :with_type_column => :job_type
       define_type :internal
       define_type :external
     end
     2.times { @external = Job.create(:job_type => "external") }
     3.times { @internal = Job.create(:job_type => "internal") }
   end
-  
+
   describe "check methods" do
     it "should return true if object is in kind of method" do
       @external.should be_external
@@ -43,46 +47,78 @@ describe "When normal collection types are defined" do
       @internal.should_not be_external          
     end
   end
-    
+
   describe "named scopes" do
     it "should return correct collections" do
       Job.external.count.should == 2
       Job.internal.count.should == 3
     end
   end
-  
-  after do
-    Job.destroy_all
-  end
 end
-    
+
 describe "When singleton type is defined" do
   describe "with autocreate" do
     before do
       Job.instance_eval do
+        polymorphic_model :with_type_column => :job_type
         define_type :basic, :singleton => true, :autocreate => true  
       end
     end
-    
-    describe "when object doesn't exist yet" do
+
+    describe "when object doesn't exist yet", "accessor" do
       before do
         Job.destroy_all
       end
-      
       it "should create object" do
         Job.basic.should be_basic
+        Job.basic.should_not be_new_record
       end
     end
-    
-    describe "when object exists" do
+
+    describe "when object exists", "accessor" do
       before do
-        Job.basic
+        Job.create!(:job_type => "basic")
+      end
+      it "should return object" do
+        Job.basic.should be_instance_of(Job)
       end
-      
       it "should not allow to create another instance of object" do
         Job.new(:job_type => "basic").should_not be_valid
       end
     end
   end
 
+  describe "without autocreate" do
+    before do
+      Job.instance_eval do
+        polymorphic_model :with_type_column => :job_type
+        define_type :basic, :singleton => true, :autocreate => false
+      end
+    end
+
+    describe "when object doesn't exist yet", "accessor" do
+      before do
+        Job.destroy_all
+      end
+      it "should not create object" do
+        Job.basic.should_not be_instance_of(Job)
+      end
+      it "should return empty scope" do
+        Job.basic.class.should == ActiveRecord::NamedScope::Scope
+      end
+    end
+
+    describe "when object exists", "accessor" do
+      before do
+        Job.create!(:job_type => "basic")
+      end
+      it "should return object" do
+        Job.basic.should be_instance_of(Job)
+      end
+      it "should not allow to create another instance of object" do
+        Job.new(:job_type => "basic").should_not be_valid
+      end
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -6,5 +6,5 @@ require 'spec/autorun'
 require 'lib/database'
 
 Spec::Runner.configure do |config|
-  set_database
+  config.before(:each) { set_database(["job", "offer"])  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polymorphic_model
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Artur Roszczyk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +01:00
+date: 2009-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,6 @@ files:
 - polymorphic_model.gemspec
 - rails/init.rb
 - spec/lib/database.rb
-- spec/lib/job_model.rb
 - spec/polymorphic_model_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -97,6 +96,5 @@ specification_version: 3
 summary: Alternative for ActiveRecord's Single Table Inheritance
 test_files: 
 - spec/lib/database.rb
-- spec/lib/job_model.rb
 - spec/polymorphic_model_spec.rb
 - spec/spec_helper.rb

data/spec/lib/job_model.rb

@@ -1,2 +0,0 @@
-class Job < ActiveRecord::Base
-end