dm-types 0.9.3 → 0.9.4

data/lib/dm-types.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.3'
+gem 'dm-core', '=0.9.4'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-types'

data/lib/dm-types/enum.rb

@@ -33,7 +33,10 @@ module DataMapper
       end
 
       def self.dump(value, property)
-        self.flag_map.invert[value]
+        case value
+        when Array then value.collect { |v| self.dump(v, property) }
+        else            self.flag_map.invert[value]
+        end
       end
 
       def self.typecast(value, property)
@@ -48,4 +51,20 @@ module DataMapper
       end
     end # class Enum
   end # module Types
+
+  if defined?(Validate)
+    module Validate
+      module AutoValidate
+        alias :orig_auto_generate_validations :auto_generate_validations
+        def auto_generate_validations(property)
+          orig_auto_generate_validations(property)
+          return unless property.options[:auto_validation]
+
+          if property.type.ancestors.include?(Types::Enum)
+           validates_within property.name, options_with_message({:set => property.type.flag_map.values}, property, :within)
+          end
+        end
+      end
+    end
+  end
 end # module DataMapper

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
-end
+end

data/spec/integration/enum_spec.rb

@@ -14,8 +14,8 @@ describe DataMapper::Types::Enum do
 
   it "should work" do
     repository(:default) do
-      Bug.create!(:status => :crit)
-      Bug.create!(:status => :warn)
+      Bug.create(:status => :crit)
+      Bug.create(:status => :warn)
     end
 
     bugs = Bug.all
@@ -26,4 +26,33 @@ describe DataMapper::Types::Enum do
   it 'should immediately typecast supplied values' do
     Bug.new(:status => :crit).status.should == :crit
   end
+
+  describe "with finders" do
+    before(:all) do
+      @info = Bug.create(:status => :info)
+    end
+    it "should work with equality opeand" do
+      Bug.all(:status => [:info, :unknown]).entries.should == [@info]
+    end
+    it "should work with inequality operand" do
+      Bug.all(:status.not => [:crit, :warn]).entries.should == [@info]
+    end
+  end
+
+  if defined?(Validate)
+    describe 'with validation' do
+      it "should accept crit status" do
+        bug = Bug.new
+        bug.status = :crit
+        bug.should be_valid
+      end
+
+      it "should not accept blah status" do
+        bug = Bug.new
+        bug.status = :blah
+        bug.should_not be_valid
+        bug.errors.on(:status).should_not be_empty
+      end
+    end
+  end
 end

data/spec/integration/file_path_spec.rb

@@ -16,7 +16,7 @@ describe DataMapper::Types::FilePath do
     repository(:default) do
       FilePathTest.create!(:path => '/usr')
     end
-    
+
     FilePathTest.first.path.should == Pathname.new('/usr')
   end
 

data/spec/unit/csv_spec.rb

@@ -8,15 +8,15 @@ describe DataMapper::Types::Csv, ".load" do
     FasterCSV.should_receive(:parse).with('csv_string').once
     DataMapper::Types::Csv.load('csv_string', :property)
   end
-  
+
   it 'should do nothing if the value is a string' do
     FasterCSV.should_not_receive(:parse)
     DataMapper::Types::Csv.load([], :property).should == []
   end
-  
+
   it 'should return nil otherwise' do
     DataMapper::Types::Csv.load({},  :property).should == nil
-    DataMapper::Types::Csv.load(nil, :property).should == nil    
+    DataMapper::Types::Csv.load(nil, :property).should == nil
   end
 end
 
@@ -24,14 +24,14 @@ describe DataMapper::Types::Csv, ".dump" do
   it 'should dump to CSV' do
     DataMapper::Types::Csv.dump([[1, 2, 3]], :property).should == "1,2,3\n"
   end
-  
+
   it 'should do nothing if the value is a string' do
     FasterCSV.should_not_receive(:generate)
     DataMapper::Types::Csv.dump('string', :property).should == 'string'
   end
-  
+
   it 'should return nil otherwise' do
     DataMapper::Types::Csv.dump({},  :property).should == nil
-    DataMapper::Types::Csv.dump(nil, :property).should == nil    
+    DataMapper::Types::Csv.dump(nil, :property).should == nil
   end
 end

data/spec/unit/json_spec.rb

@@ -5,12 +5,12 @@ describe DataMapper::Types::Json, ".load" do
   it 'should return nil if nil is provided' do
     DataMapper::Types::Json.load(nil, :property).should be_nil
   end
-  
+
   it 'should parse the value if a string is provided' do
     JSON.should_receive(:load).with('json_string').once
     DataMapper::Types::Json.load('json_string', :property)
   end
-  
+
   it 'should raise an ArgumentError if something else is given' do
     lambda {
       DataMapper::Types::Json.load(:sym, :property)
@@ -22,12 +22,12 @@ describe DataMapper::Types::Json, ".dump" do
   it 'should return nil if the value is nil' do
     DataMapper::Types::Json.dump(nil, :property).should be_nil
   end
-  
+
   it 'should do nothing if the value is a string' do
     JSON.should_not_receive(:dump)
     DataMapper::Types::Json.dump('', :property).should be_kind_of(String)
   end
-  
+
   it 'should dump to a JSON string otherwise' do
     JSON.should_receive(:dump).with([]).once
     DataMapper::Types::Json.dump([], :property)

data/spec/unit/yaml_spec.rb

@@ -5,12 +5,12 @@ describe DataMapper::Types::Yaml, ".load" do
   it 'should return nil if nil is provided' do
     DataMapper::Types::Yaml.load(nil, :property).should be_nil
   end
-  
+
   it 'should parse the value if a string is provided' do
     YAML.should_receive(:load).with('yaml_string').once
     DataMapper::Types::Yaml.load('yaml_string', :property)
   end
-  
+
   it 'should raise an ArgumentError if something else is given' do
     lambda {
       DataMapper::Types::Yaml.load(:sym, :property)
@@ -22,17 +22,17 @@ describe DataMapper::Types::Yaml, ".dump" do
   it 'should return nil if the value is nil' do
     DataMapper::Types::Yaml.dump(nil, :property).should be_nil
   end
-  
+
   it 'should do nothing if the value is a string which begins with ---' do
     YAML.should_not_receive(:dump)
     DataMapper::Types::Yaml.dump('--- str', :property).should be_kind_of(String)
   end
-  
+
   it 'should dump to a YAML string if the value is a normal string' do
     YAML.should_receive(:dump).with('string').once
     DataMapper::Types::Yaml.dump('string', :property)
   end
-  
+
   it 'should dump to a YAML string otherwise' do
     YAML.should_receive(:dump).with([]).once
     DataMapper::Types::Yaml.dump([], :property)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -05:00
+date: 2008-08-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe