dm-types 0.9.9 → 0.9.10

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.9.10 / 2009-01-19
+
+* 1 bug fix:
+
+  * Return empty array for a flag type property when value is nil or <= 0
+
+* 2 minor enhancements:
+
+  * Updated Csv, Json, Yaml types to use a Text primitive rather than
+    a String
+  * Allow Flag property to be nullable
+
 === 0.9.9 / 2009-01-04
 
 * 1 bug fix:

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = 'Sam Smoot'
 EMAIL  = 'ssmoot [a] gmail [d] com'
 GEM_NAME = 'dm-types'
 GEM_VERSION = DataMapper::Types::VERSION
-GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"], ['addressable', '~>2.0.1']]
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"], ['addressable', '~>2.0.1'], ["bcrypt-ruby", "~>2.0"], ["json", "~>1.1.3"]]
 GEM_CLEAN = %w[ log pkg coverage ]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 

data/lib/dm-types.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.9'
+gem 'dm-core', '~>0.9.10'
 require 'dm-core'
 
 module DataMapper

data/lib/dm-types/csv.rb

@@ -1,13 +1,24 @@
+if RUBY_VERSION >= '1.9.0'
+ require 'csv'
+else
+  begin
+    gem 'fastercsv', '~>1.4.0'
+    require 'fastercsv'
+    CSV = FasterCSV
+  rescue LoadError
+    nil
+  end
+end
+
 module DataMapper
   module Types
     class Csv < DataMapper::Type
-      primitive String
-      size 65535
+      primitive Text
       lazy true
 
       def self.load(value, property)
         case value
-        when String then FasterCSV.parse(value)
+        when String then CSV.parse(value)
         when Array then value
         else nil
         end
@@ -16,7 +27,7 @@ module DataMapper
       def self.dump(value, property)
         case value
         when Array then
-          FasterCSV.generate do |csv|
+          CSV.generate do |csv|
             value.each { |row| csv << row }
           end
         when String then value

data/lib/dm-types/flag.rb

@@ -32,6 +32,7 @@ module DataMapper
         begin
           matches = []
 
+          return [] if value.nil? || (value <= 0)
           0.upto((Math.log(value) / Math.log(2)).ceil) do |i|
             pow = 2 ** i
             matches << flag_map[pow] if value & pow == pow
@@ -52,6 +53,7 @@ module DataMapper
 
       def self.typecast(value, property)
         case value
+        when nil   then nil
         when Array then value.map {|v| v.to_sym}
         else value.to_sym
         end

data/lib/dm-types/json.rb

@@ -1,10 +1,16 @@
-require 'json'
+begin
+  gem "json"
+  require "json/ext"
+rescue LoadError
+  gem "json_pure"
+  require "json/pure"
+end
+
 
 module DataMapper
   module Types
     class Json < DataMapper::Type
-      primitive String
-      size 65535
+      primitive Text
       lazy true
 
       def self.load(value, property)

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = '0.9.9'
+    VERSION = '0.9.10'
   end
 end

data/lib/dm-types/yaml.rb

@@ -3,8 +3,7 @@ require 'yaml'
 module DataMapper
   module Types
     class Yaml < DataMapper::Type
-      primitive String
-      size 65535
+      primitive Text
       lazy true
 
       def self.load(value, property)

data/spec/integration/enum_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::Enum do
   before(:all) do
-    class Bug
+    class ::Bug
       include DataMapper::Resource
 
       property :id, Integer, :serial => true

data/spec/integration/file_path_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::FilePath do
   before(:all) do
-    class FilePathTest
+    class ::FilePathTest
       include DataMapper::Resource
 
       property :id, Integer, :serial => true

data/spec/integration/flag_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::Flag do
   before(:all) do
-    class Shirt
+    class ::Shirt
       include DataMapper::Resource
       property :id, Serial
       property :sizes, DM::Flag[:xs, :small, :medium, :large, :xl, :xxl]

data/spec/integration/ip_address_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::IPAddress do
   before(:all) do
-    class IPAddressTest
+    class ::IPAddressTest
       include DataMapper::Resource
 
       property :id, Serial

data/spec/integration/json_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::Json do
   before(:all) do
-    class JsonTest
+    class ::JsonTest
       include DataMapper::Resource
 
       property :id, Serial

data/spec/integration/slug_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'pathname'
 require 'iconv'
 require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
@@ -5,7 +7,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 describe DataMapper::Types::Slug do
 
   before(:all) do
-    class SlugTest
+    class ::SlugTest
       include DataMapper::Resource
 
       property :id, Serial

data/spec/integration/uri_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::URI do
   before(:all) do
-    class URITest
+    class ::URITest
       include DataMapper::Resource
 
       property :id, Integer, :serial => true

data/spec/integration/yaml_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 describe DataMapper::Types::Enum do
   before(:all) do
-    class YamlTest
+    class ::YamlTest
       include DataMapper::Resource
 
       property :id, Serial
@@ -11,7 +11,7 @@ describe DataMapper::Types::Enum do
     end
     YamlTest.auto_migrate!
 
-    class SerializeMe
+    class ::SerializeMe
       attr_accessor :name
     end
   end

data/spec/unit/csv_spec.rb

@@ -1,16 +1,14 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
-require 'fastercsv'
-
 describe DataMapper::Types::Csv, ".load" do
   it 'should parse the value if a string is provided' do
-    FasterCSV.should_receive(:parse).with('csv_string').once
+    CSV.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)
+    CSV.should_not_receive(:parse)
     DataMapper::Types::Csv.load([], :property).should == []
   end
 
@@ -26,7 +24,7 @@ describe DataMapper::Types::Csv, ".dump" do
   end
 
   it 'should do nothing if the value is a string' do
-    FasterCSV.should_not_receive(:generate)
+    CSV.should_not_receive(:generate)
     DataMapper::Types::Csv.dump('string', :property).should == 'string'
   end
 

data/tasks/spec.rb

@@ -8,7 +8,7 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+    version: 
 description: DataMapper plugin providing extra data types
 email: 
 - ssmoot [a] gmail [d] com