dm-types 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,9 +1,10 @@
-=== 0.9.11 / 2009-03-29
+=== 0.10.0 / 2009-10-15
 
-* 2 bug fixes:
+* Updated to work with dm-core 0.10.0
+
+=== 0.9.11 / 2009-03-29
 
-  * Remove dependency on bcrypt
-  * Remove dependency on json
+* No changes this version
 
 === 0.9.10 / 2009-01-19
 

data/LICENSE

@@ -1,20 +1,22 @@
-Copyright (c) 2007 Sam Smoot
+Copyright (c) 2007, 2008, 2009 Sam Smoot, Dan Kubb
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
 
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -1,11 +1,12 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 lib/dm-types.rb
 lib/dm-types/bcrypt_hash.rb
+lib/dm-types/comma_separated_list.rb
 lib/dm-types/csv.rb
 lib/dm-types/enum.rb
 lib/dm-types/epoch_time.rb
@@ -14,13 +15,21 @@ lib/dm-types/flag.rb
 lib/dm-types/ip_address.rb
 lib/dm-types/json.rb
 lib/dm-types/regexp.rb
-lib/dm-types/serial.rb
 lib/dm-types/slug.rb
 lib/dm-types/uri.rb
 lib/dm-types/uuid.rb
 lib/dm-types/version.rb
 lib/dm-types/yaml.rb
+spec/fixtures/article.rb
+spec/fixtures/bookmark.rb
+spec/fixtures/invention.rb
+spec/fixtures/network_node.rb
+spec/fixtures/person.rb
+spec/fixtures/software_package.rb
+spec/fixtures/ticket.rb
+spec/fixtures/tshirt.rb
 spec/integration/bcrypt_hash_spec.rb
+spec/integration/comma_separated_list_spec.rb
 spec/integration/enum_spec.rb
 spec/integration/file_path_spec.rb
 spec/integration/flag_spec.rb
@@ -30,6 +39,7 @@ spec/integration/slug_spec.rb
 spec/integration/uri_spec.rb
 spec/integration/uuid_spec.rb
 spec/integration/yaml_spec.rb
+spec/shared/identity_function_group.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/unit/bcrypt_hash_spec.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -12,12 +11,12 @@ 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.2']]
+GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin providing extra data types'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/TODO

@@ -0,0 +1,74 @@
+### -*- mode:org -*-
+
+* Spec suite improvement
+** integration
+*** DONE bcrypt_hash_spec.rb
+*** DONE enum_spec.rb
+*** DONE file_path_spec.rb
+*** DONE flag_spec.rb
+*** DONE ip_address_spec.rb
+*** DONE json_spec.rb
+*** DONE slug_spec.rb
+*** DONE uri_spec.rb
+*** DONE uuid_spec.rb
+*** DONE yaml_spec.rb
+
+    MK reworked spec suite to the point we actually
+    can trust it
+
+** fixtures
+
+   It should be perfectly possible to combine fixture
+   models from dm-validations and dm-types, and publish
+   a little gem that all DM plugins developers can use
+   as a basis
+
+*** TODO Investigate if sharing of models across DM plugins makes sense
+
+* Ideas/prototypes of New types
+** SHA1 hash
+
+   Case: when you want to compute SHA1 of another property
+   and store it. Useful for file stores, caching and other things.
+
+   Would be a good example of how types can interact with models
+   via property binding
+
+** LowercaseString
+
+   A string type subclass that downcases the input
+
+   Case: CASES WHERE YOU WOULD HATE TO SEE UPPERCASE!
+
+** EmbeddedValue
+
+   An experiment of type/model interaction: takes a class
+   and uses YAML/JSON for serialization
+
+   To complete the picture we would need to add validation
+   delegation (so embedded object can add errors to
+   the parent if it makes sense), but it would be helpful
+   to shape up Property/Type refactoring, and should take
+   as little time as one evening
+
+** ZIP
+
+   Input: a string, output: a ZIP object that is smart enough
+   to provide predicates
+
+   Need to find a library for zips that would fit
+
+** Address
+
+   Same as ZIP but for actuall address. Again, stored
+   in YAML I suppose
+
+** Coordinate
+
+   Input: two floats or two strings can be cast to floats,
+   output: object that knows how to render a map for itself
+
+** DNA
+
+   Mostly for fun, to see how far we can push current types API
+   with little help from BioRuby

data/lib/dm-types.rb

@@ -1,26 +1,23 @@
 require 'pathname'
-require 'rubygems'
-
-gem 'dm-core', '0.9.11'
-require 'dm-core'
 
 module DataMapper
   module Types
     dir = (Pathname(__FILE__).dirname.expand_path / 'dm-types').to_s
 
-    autoload :BCryptHash, dir / 'bcrypt_hash'
-    autoload :Csv,        dir / 'csv'
-    autoload :Enum,       dir / 'enum'
-    autoload :EpochTime,  dir / 'epoch_time'
-    autoload :FilePath,   dir / 'file_path'
-    autoload :Flag,       dir / 'flag'
-    autoload :IPAddress,  dir / 'ip_address'
-    autoload :Json,       dir / 'json'
-    autoload :Regexp,     dir / 'regexp'
-    autoload :Serial,     dir / 'serial'
-    autoload :Slug,       dir / 'slug'
-    autoload :URI,        dir / 'uri'
-    autoload :UUID,       dir / 'uuid'
-    autoload :Yaml,       dir / 'yaml'
+    autoload :BCryptHash,         dir / 'bcrypt_hash'
+    autoload :CommaSeparatedList, dir / 'comma_separated_list'
+    autoload :Csv,                dir / 'csv'
+    autoload :Enum,               dir / 'enum'
+    autoload :EpochTime,          dir / 'epoch_time'
+    autoload :FilePath,           dir / 'file_path'
+    autoload :Flag,               dir / 'flag'
+    autoload :IPAddress,          dir / 'ip_address'
+    autoload :Json,               dir / 'json'
+    autoload :Regexp,             dir / 'regexp'
+    autoload :Serial,             dir / 'serial'
+    autoload :Slug,               dir / 'slug'
+    autoload :URI,                dir / 'uri'
+    autoload :UUID,               dir / 'uuid'
+    autoload :Yaml,               dir / 'yaml'
   end
 end

data/lib/dm-types/bcrypt_hash.rb

@@ -1,13 +1,10 @@
-require 'rubygems'
-
-gem 'bcrypt-ruby', '~>2.0.5'
 require 'bcrypt'
 
 module DataMapper
   module Types
     class BCryptHash < DataMapper::Type
       primitive String
-      size 60
+      length    60
 
       def self.load(value, property)
         typecast(value, property)

data/lib/dm-types/comma_separated_list.rb

@@ -0,0 +1,31 @@
+module DataMapper
+  module Types
+
+    class CommaSeparatedList < Yaml
+      # this must be set even though Yaml already
+      # uses String primitive
+      #
+      # current DM::Type behavior probably needs to
+      # be improved for cases like this
+      primitive String
+
+      def self.dump(value, property)
+        if value.nil?
+          nil
+        elsif value.kind_of?(Array)
+          super(value, property)
+        elsif value.kind_of?(String)
+          v = (value || "").split(",").
+            compact.
+            map { |i| i.downcase.strip }.
+            reject { |i| i.blank? }.
+            uniq
+          super(v, property)
+        else
+          raise ArgumentError, "+value+ of CommaSeparatedList must be a string, an array or nil, but given #{value.inspect}"
+        end
+      end # self.dump
+    end # CommaSeparatedList
+
+  end # Types
+end # DataMapper

data/lib/dm-types/csv.rb

@@ -1,37 +1,31 @@
 if RUBY_VERSION >= '1.9.0'
- require 'csv'
+  require 'csv'
 else
-  begin
-    gem 'fastercsv', '~>1.4.0'
-    require 'fastercsv'
-    CSV = FasterCSV
-  rescue LoadError
-    nil
-  end
+  require 'fastercsv'  # must be ~>1.5
+  CSV = FasterCSV unless defined?(CSV)
 end
 
 module DataMapper
   module Types
     class Csv < DataMapper::Type
       primitive Text
-      lazy true
+      lazy      true
 
       def self.load(value, property)
         case value
-        when String then CSV.parse(value)
-        when Array then value
-        else nil
+          when String then CSV.parse(value)
+          when Array  then value
+          else
+            nil
         end
       end
 
       def self.dump(value, property)
         case value
-        when Array then
-          CSV.generate do |csv|
-            value.each { |row| csv << row }
-          end
-        when String then value
-        else nil
+          when Array  then CSV.generate { |csv| value.each { |row| csv << row } }
+          when String then value
+          else
+            nil
         end
       end
     end # class Csv

data/lib/dm-types/enum.rb

@@ -1,6 +1,8 @@
 module DataMapper
   module Types
-    class Enum < DataMapper::Type(Integer)
+    class Enum < Type
+      primitive Integer
+
       def self.inherited(target)
         target.instance_variable_set("@primitive", self.primitive)
       end
@@ -49,22 +51,23 @@ module DataMapper
           else             value
         end
       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]
+      def self.bind(property)
+        if defined?(::DataMapper::Validate)
+          model = property.model
 
-          if property.type.ancestors.include?(Types::Enum)
-            validates_within property.name, options_with_message({:set => property.type.flag_map.values}, property, :within)
+          unless model.skip_auto_validation_for?(property)
+            if property.type.ancestors.include?(Types::Enum)
+              model.class_eval do
+                flag_map = property.type.flag_map
+                allowed  = flag_map.values_at(*flag_map.keys.sort)
+
+                validates_within property.name, options_with_message({ :set => allowed }, property, :within)
+              end
+            end
           end
         end
       end
-    end
-  end
-end # module DataMapper
+    end # class Enum
+  end # module Types
+end # module DataMapper

data/lib/dm-types/epoch_time.rb

@@ -4,8 +4,7 @@ module DataMapper
       primitive Integer
 
       def self.load(value, property)
-        case value
-        when Integer
+        if value.kind_of?(Integer)
           Time.at(value)
         else
           value
@@ -14,14 +13,10 @@ module DataMapper
 
       def self.dump(value, property)
         case value
-        when Integer
-          value
-        when Time
-          value.to_i
-        when DateTime
-          Time.parse(value.to_s).to_i
+          when Integer, Time then value.to_i
+          when DateTime      then value.to_time.to_i
         end
       end
-    end # class EpochTime
-  end # module Types
-end # module DataMapper
+    end # class EpochTime
+  end # module Types
+end # module DataMapper

data/lib/dm-types/file_path.rb

@@ -4,9 +4,10 @@ module DataMapper
   module Types
     class FilePath < DataMapper::Type
       primitive String
+      length    255
 
       def self.load(value, property)
-        if value.nil?
+        if value.blank?
           nil
         else
           Pathname.new(value)
@@ -14,7 +15,7 @@ module DataMapper
       end
 
       def self.dump(value, property)
-        return nil if value.nil?
+        return nil if value.blank?
         value.to_s
       end
 
@@ -23,5 +24,5 @@ module DataMapper
         value.kind_of?(Pathname) ? value : load(value, property)
       end
     end # class FilePath
-  end # module Types
-end # module DataMapper
+  end # module Types
+end # module DataMapper