polymorphic_model 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/polymorphic_model.rb

@@ -16,8 +16,12 @@ module PolymorphicModel
 
     def validates_type
       validates_each @_polymorphic_column, {:on => :save} do |record, attr_name, value|
-        unless self.types.include?(value.to_sym)
-          record.errors.add_to_base("is undefined type (#{value.to_s}), correct types are: [#{self.types.map(&:to_s).join(', ')}]")
+        unless value.nil? || value == ""
+          unless self.types.include?(value.to_sym)
+            record.errors.add_to_base("is undefined type (#{value.to_s}), correct types are: [#{self.types.map(&:to_s).join(', ')}]")
+          end
+        else
+          record.errors.add_to_base("is not any type, correct types are: [#{self.types.map(&:to_s).join(', ')}]")
         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.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Artur Roszczyk"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-11-24}
   s.description = %q{Alternative for ActiveRecord's Single Table Inheritance}
   s.email = %q{artur.roszczyk@gmail.com}
   s.extra_rdoc_files = [

data/spec/polymorphic_model_spec.rb

@@ -35,8 +35,8 @@ describe "When normal collection types are defined" do
       define_type :internal
       define_type :external
     end
-    2.times { @external = Job.create(:job_type => "external") }
-    3.times { @internal = Job.create(:job_type => "internal") }
+    2.times { @external = Job.create!(:job_type => "external") }
+    3.times { @internal = Job.create!(:job_type => "internal") }
   end
 
   describe "check methods" do
@@ -56,9 +56,17 @@ describe "When normal collection types are defined" do
   end
 
   it "should allow only defined types" do
-    Job.new(:job_type => "other").should_not be_valid
+    @job = Job.new(:job_type => "other")
+    @job.should_not be_valid
   end
-  
+
+  it "should require any type" do
+    @job = Job.new
+    @job.should_not be_valid
+    @job.job_type = ""
+    @job.should_not be_valid
+  end
+
   it "should provide list of defined types" do
     Job.types.should include(:internal, :external)
   end
@@ -108,11 +116,10 @@ describe "When singleton type is defined" 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
+        Job.basic.should be_empty
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polymorphic_model
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Artur Roszczyk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +01:00
+date: 2009-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency