dm-types 0.9.11 → 0.10.0

data/lib/dm-types/flag.rb

@@ -1,8 +1,10 @@
 module DataMapper
   module Types
-    class Flag < DataMapper::Type(Integer)
+    class Flag < Type
+      primitive Integer
+
       def self.inherited(target)
-        target.instance_variable_set("@primitive", self.primitive)
+        target.instance_variable_set('@primitive', self.primitive)
       end
 
       def self.flag_map
@@ -18,7 +20,7 @@ module DataMapper
         type.flag_map = {}
 
         flags.each_with_index do |flag, i|
-          type.flag_map[2 ** i] = flag
+          type.flag_map[i] = flag
         end
 
         type
@@ -29,13 +31,13 @@ module DataMapper
       end
 
       def self.load(value, property)
+        return [] if value.nil? || value <= 0
+
         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
+          0.upto(flag_map.size - 1) do |i|
+            matches << flag_map[i] if value[i] == 1
           end
 
           matches.compact
@@ -46,16 +48,15 @@ module DataMapper
 
       def self.dump(value, property)
         return if value.nil?
-        flags = value.is_a?(Array) ? value : [value]
-        flags.map!{ |f| f.to_sym }
-        flag_map.invert.values_at(*flags.flatten).compact.inject(0) { |sum, i| sum + i }
+        flags = Array(value).map { |flag| flag.to_sym }.flatten
+        flag_map.invert.values_at(*flags).compact.inject(0) { |sum, i| sum += 1 << i }
       end
 
       def self.typecast(value, property)
         case value
-        when nil   then nil
-        when Array then value.map {|v| v.to_sym}
-        else value.to_sym
+          when nil   then nil
+          when Array then value.map {|v| v.to_sym}
+          else value.to_sym
         end
       end
     end # class Flag

data/lib/dm-types/ip_address.rb

@@ -4,6 +4,7 @@ module DataMapper
   module Types
     class IPAddress < DataMapper::Type
       primitive String
+      length    16
 
       def self.load(value, property)
         if value.nil?

data/lib/dm-types/json.rb

@@ -1,17 +1,11 @@
-begin
-  gem "json"
-  require "json/ext"
-rescue LoadError
-  gem "json_pure"
-  require "json/pure"
-end
-
+require 'json'
 
 module DataMapper
   module Types
     class Json < DataMapper::Type
-      primitive Text
-      lazy true
+      primitive String
+      length    65535
+      lazy      true
 
       def self.load(value, property)
         if value.nil?
@@ -19,7 +13,7 @@ module DataMapper
         elsif value.is_a?(String)
           ::JSON.load(value)
         else
-          raise ArgumentError, '+value+ must be nil or a String'
+          raise ArgumentError.new("+value+ of a property of JSON type must be nil or a String")
         end
       end
 

data/lib/dm-types/regexp.rb

@@ -8,12 +8,11 @@ module DataMapper
       end
 
       def self.dump(value, property)
-        return nil if value.nil?
-        value.source
+        value.source unless value.nil?
       end
 
       def self.typecast(value, property)
-        value.kind_of?(::Regexp) ? value : load(value, property)
+        load(value, property)
       end
     end
   end

data/lib/dm-types/slug.rb

@@ -1,37 +1,28 @@
-require 'iconv'
+require 'stringex'
 
 module DataMapper
   module Types
     class Slug < DataMapper::Type
       primitive String
-      size 65535
+      length    65535
 
       def self.load(value, property)
         value
       end
 
       def self.dump(value, property)
-        if value.nil?
-          nil
-        elsif value.is_a?(String)
-          #Iconv.new('UTF-8//TRANSLIT//IGNORE', 'UTF-8').iconv(value.gsub(/[^\w\s\-\—]/,'').gsub(/[^\w]|[\_]/,' ').split.join('-').downcase).to_s
-          escape(value)
+        return if value.nil?
+
+        if value.respond_to?(:to_str)
+          escape(value.to_str)
         else
-          raise ArgumentError.new("+value+ must be nil or a String")
+          raise ArgumentError, '+value+ must be nil or respond to #to_str'
         end
       end
 
-      # Hugs and kisses to Rick Olsons permalink_fu for the escape method
       def self.escape(string)
-        result = Iconv.iconv('ascii//translit//IGNORE', 'utf-8', string).to_s
-        result.gsub!(/[^\x00-\x7F]+/, '')  # Remove anything non-ASCII entirely (e.g. diacritics).
-        result.gsub!(/[^\w_ \-]+/i,   '')  # Remove unwanted chars.
-        result.gsub!(/[ \-]+/i,      '-')  # No more than one of the separator in a row.
-        result.gsub!(/^\-|\-$/i,      '')  # Remove leading/trailing separator.
-        result.downcase!
-        result
+        string.to_url
       end
-
     end # class Slug
   end # module Types
 end # module DataMapper

data/lib/dm-types/uri.rb

@@ -1,31 +1,25 @@
-require 'rubygems'
-
-gem 'addressable', '~>2.0.2'
 require 'addressable/uri'
 
 module DataMapper
   module Types
     class URI < DataMapper::Type
       primitive String
+      length    2000
+
+      # Maximum length chosen based on recommendation:
+      # http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-an-url
 
       def self.load(value, property)
         Addressable::URI.parse(value)
       end
 
       def self.dump(value, property)
-        return nil if value.nil?
-        value.to_s
+        value.to_s unless value.nil?
       end
 
       def self.typecast(value, property)
-        if value.kind_of?(Addressable::URI)
-          value
-        elsif value.nil?
-          load(nil, property)
-        else
-          load(value.to_s, property)
-        end
+        load(value, property)
       end
     end # class URI
-  end # module Types
-end # module DataMapper
+  end # module Types
+end # module DataMapper

data/lib/dm-types/uuid.rb

@@ -1,7 +1,4 @@
-require 'rubygems'
-
-gem 'uuidtools', '~>1.0.7'
-require 'uuidtools'
+require 'uuidtools'  # must be ~>2.0
 
 module DataMapper
   module Types
@@ -42,26 +39,23 @@ module DataMapper
     #
     class UUID < DataMapper::Type
       primitive String
-      size 36
+      length    36
 
       def self.load(value, property)
-        return nil if value.nil?
-        ::UUID.parse(value)
+        UUIDTools::UUID.parse(value) unless value.nil?
       end
 
       def self.dump(value, property)
-        return nil if value.nil?
-        value.to_s
+        value.to_s unless value.nil?
       end
 
       def self.typecast(value, property)
-        value.kind_of?(::UUID) ? value : load(value, property)
+        if value.kind_of?(UUIDTools::UUID)
+          value
+        else
+          load(value, property)
+        end
       end
-
-      #::DataMapper::Property::TYPES << self
-      #if defined? DataMapper::Adapters::PostgresAdapter
-      #  DataMapper::Adapters::PostgresAdapter.type_map.map(self).to('UUID').with(:size => nil)
-      #end
     end
   end
 end

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = '0.9.11'
+    VERSION = '0.10.0'.freeze
   end
 end

data/lib/dm-types/yaml.rb

@@ -3,8 +3,9 @@ require 'yaml'
 module DataMapper
   module Types
     class Yaml < DataMapper::Type
-      primitive Text
-      lazy true
+      primitive String
+      length    65535
+      lazy      true
 
       def self.load(value, property)
         if value.nil?
@@ -12,7 +13,7 @@ module DataMapper
         elsif value.is_a?(String)
           ::YAML.load(value)
         else
-          raise ArgumentError.new("+value+ must be nil or a String")
+          raise ArgumentError.new("+value+ of a property of YAML type must be nil or a String")
         end
       end
 

data/spec/fixtures/article.rb

@@ -0,0 +1,39 @@
+module DataMapper
+  module Types
+    module Fixtures
+
+      class Article
+        #
+        # Behaviors
+        #
+
+        include ::DataMapper::Resource
+
+        #
+        # Properties
+        #
+
+        property :id,         Serial
+
+        property :title,      String, :length => 255
+        property :body,       Text
+
+        property :created_at,   DateTime
+        property :updated_at,   DateTime
+        property :published_at, DateTime
+
+        property :slug, Slug
+
+        #
+        # Hooks
+        #
+
+        before :valid? do
+          self.slug = self.title
+        end
+
+        auto_migrate!
+      end # Article
+    end
+  end
+end

data/spec/fixtures/bookmark.rb

@@ -0,0 +1,27 @@
+module DataMapper
+  module Types
+    module Fixtures
+
+      class Bookmark
+        #
+        # Behaviors
+        #
+
+        include ::DataMapper::Resource
+
+        #
+        # Properties
+        #
+
+        property :id, Serial
+
+        property :title,  String, :length => 255
+        property :shared, Boolean
+        property :uri,    URI
+        property :tags,   Yaml
+
+        auto_migrate!
+      end # Bookmark
+    end
+  end
+end

data/spec/fixtures/invention.rb

@@ -0,0 +1,9 @@
+module DataMapper
+  module Types
+    module Fixtures
+
+      Invention = Struct.new(:name)
+
+    end
+  end
+end

data/spec/fixtures/network_node.rb

@@ -0,0 +1,40 @@
+module DataMapper
+  module Types
+    module Fixtures
+
+      class NetworkNode
+        #
+        # Behaviors
+        #
+
+        include ::DataMapper::Resource
+
+        #
+        # Properties
+        #
+
+        property :id,               Serial
+        property :ip_address,       IPAddress
+        property :cidr_subnet_bits, Integer
+        property :node_uuid,        UUID
+
+        #
+        # API
+        #
+
+        alias uuid  node_uuid
+        alias uuid= node_uuid=
+
+        def runs_ipv6?
+          self.ip_address.ipv6?
+        end
+
+        def runs_ipv4?
+          self.ip_address.ipv4?
+        end
+
+        auto_migrate!
+      end # NetworkNode
+    end # Fixtures
+  end # Types
+end # DataMapper

data/spec/fixtures/person.rb

@@ -0,0 +1,29 @@
+module DataMapper
+  module Types
+    module Fixtures
+
+      class Person
+        #
+        # Behaviors
+        #
+
+        include DataMapper::Resource
+
+        #
+        # Properties
+        #
+
+        property :id,         Serial
+        property :name,       String
+        property :positions,  Json
+        property :inventions, Yaml
+
+        property :interests, CommaSeparatedList
+
+        property :password, BCryptHash
+
+        auto_migrate!
+      end
+    end
+  end
+end

data/spec/fixtures/software_package.rb

@@ -0,0 +1,37 @@
+module DataMapper
+  module Types
+    module Fixtures
+
+      class SoftwarePackage
+        #
+        # Behaviors
+        #
+
+        include ::DataMapper::Resource
+
+        #
+        # Properties
+        #
+
+        property :id, Serial
+        without_auto_validations do
+          property :node_number, Integer, :index => true
+
+          property :source_path,      FilePath
+          property :destination_path, FilePath
+
+          property :product,     String
+          property :version,     String
+          property :released_at, DateTime
+
+          property :security_update,  Boolean
+
+          property :installed_at,     DateTime
+          property :installed_by,     String
+        end
+
+        auto_migrate!
+      end # SoftwarePackage
+    end # Fixtures
+  end # Types
+end # DataMapper