dm-types 1.0.0.rc3 → 1.0.0

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc3'
+DM_VERSION = '~> 1.0.0'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/Rakefile

@@ -15,14 +15,14 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',   '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-core',   '~> 1.0.0'
     gem.add_dependency 'fastercsv', '~> 1.5.3'
     gem.add_dependency 'json_pure', '~> 1.4.3'
     gem.add_dependency 'uuidtools', '~> 2.1.1'
     gem.add_dependency 'stringex',  '~> 1.1.0'
 
     gem.add_development_dependency 'rspec',          '~> 1.3'
-    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc3'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.0'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.0.rc3
+1.0.0

data/dm-types.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-types}
-  s.version = "1.0.0.rc3"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-06-08}
   s.description = %q{DataMapper plugin providing extra data types}
   s.email = %q{dan.kubb [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -133,30 +133,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.3"])
       s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.3"])
       s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1.1"])
       s.add_runtime_dependency(%q<stringex>, ["~> 1.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
       s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
       s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
       s.add_dependency(%q<stringex>, ["~> 1.1.0"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
     s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
     s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
     s.add_dependency(%q<stringex>, ["~> 1.1.0"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
   end
 end
 

data/lib/dm-types/csv.rb

@@ -10,6 +10,10 @@ end
 module DataMapper
   class Property
     class Csv < Text
+      def primitive?(value)
+        super || value.kind_of?(::Array)
+      end
+
       def load(value)
         case value
           when ::String then CSV.parse(value)

data/lib/dm-types/flag.rb

@@ -53,8 +53,8 @@ module DataMapper
       def typecast(value)
         case value
           when nil   then nil
-          when Array then value.map {|v| v.to_sym}
-          else value.to_sym
+          when ::Array then value.map {|v| v.to_sym}
+          else [value.to_sym]
         end
       end
     end # class Flag

data/spec/fixtures/tshirt.rb

@@ -19,7 +19,7 @@ module DataMapper
         property :picture,     Enum[:octocat, :fork_you, :git_down]
 
         property :color, Enum[:white, :black, :red, :orange, :yellow, :green, :cyan, :blue, :purple]
-        property :size,  Flag[:xs, :small, :medium, :large, :xl, :xxl]
+        property :size,  Flag[:xs, :small, :medium, :large, :xl, :xxl], :default => :xs
       end # Shirt
     end # Fixtures
   end # Types

data/spec/integration/flag_spec.rb

@@ -11,14 +11,20 @@ try_spec do
           :writing     => 'Fork you',
           :has_picture => true,
           :picture     => :octocat,
-          :color       => :white,
-          :size        => [ :xs, :medium ]
+          :color       => :white
         )
       end
 
+      describe 'with the default value' do
+        it 'returns it as an array' do
+          @resource.size.should eql([DataMapper::Types::Fixtures::TShirt.properties[:size].default])
+        end
+      end
+
       describe 'with multiple sizes' do
         describe 'dumped and loaded' do
           before do
+            @resource.size = [ :xs, :medium ]
             @resource.save.should be(true)
             @resource.reload
           end

data/spec/unit/csv_spec.rb

@@ -79,6 +79,17 @@ try_spec do
             @result.should be_nil
           end
         end
+
+        describe 'when argument is an array' do
+          before :all do
+            @input  = [ 1, 2, 3 ]
+            @result = @property.load(@input)
+          end
+
+          it 'returns input as is' do
+            @result.should eql(@input)
+          end
+        end
       end
 
       describe '.dump' do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  hash: 977940572
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - rc3
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Dan Kubb
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940572
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc3
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -123,13 +121,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940572
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc3
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :development
   version_requirements: *id007
 description: DataMapper plugin providing extra data types
@@ -230,14 +227,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: datamapper