dm-types 1.0.0 → 1.0.1

data/.gitignore

@@ -31,6 +31,7 @@ measurements
 .bundle
 Gemfile.local
 Gemfile.lock
+Gemfile.local.lock
 
 ## PROJECT::SPECIFIC
 spec/db/

data/Gemfile

@@ -71,14 +71,14 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0'
+DM_VERSION = '~> 1.0.1'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
   else
-    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
   end
 
   gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
@@ -94,7 +94,7 @@ group(:development) do # Development dependencies (as in the gemspec)
   gem 'dm-validations', DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
 
   gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3'
+  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
   gem 'jeweler',        '~> 1.4'
 
 end
@@ -113,32 +113,31 @@ end
 group :datamapper do # We need this because we want to pin these dependencies to their git master sources
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
-  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
 
-  unless adapters.empty?
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-    DO_VERSION     = '~> 0.10.3'
-    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+    gem 'data_objects',  DO_VERSION, options.dup
 
-    adapters.each do |adapter|
-      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
-        adapter = 'sqlite3' if adapter == 'sqlite'
-        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
-      end
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
     end
 
     gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+  end
 
-    adapters.each do |adapter|
-      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
-    end
-
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
-  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
     gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"

data/Rakefile

@@ -15,14 +15,14 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',   '~> 1.0.0'
+    gem.add_dependency 'dm-core',   '~> 1.0.1'
     gem.add_dependency 'fastercsv', '~> 1.5.3'
-    gem.add_dependency 'json_pure', '~> 1.4.3'
+    gem.add_dependency 'json_pure', '~> 1.4'
     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'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.1'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/dm-types.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-types}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-09-07}
   s.description = %q{DataMapper plugin providing extra data types}
   s.email = %q{dan.kubb [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/dm-types/paranoid_datetime.rb",
      "lib/dm-types/regexp.rb",
      "lib/dm-types/slug.rb",
+     "lib/dm-types/support/flags.rb",
      "lib/dm-types/uri.rb",
      "lib/dm-types/uuid.rb",
      "lib/dm-types/yaml.rb",
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
      "spec/integration/uuid_spec.rb",
      "spec/integration/yaml_spec.rb",
      "spec/rcov.opts",
+     "spec/shared/flags_shared_spec.rb",
      "spec/shared/identity_function_group.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -77,6 +79,7 @@ Gem::Specification.new do |s|
      "spec/unit/paranoid_datetime_spec.rb",
      "spec/unit/regexp_spec.rb",
      "spec/unit/uri_spec.rb",
+     "spec/unit/uuid_spec.rb",
      "spec/unit/yaml_spec.rb",
      "tasks/ci.rake",
      "tasks/local_gemfile.rake",
@@ -111,6 +114,7 @@ Gem::Specification.new do |s|
      "spec/integration/uri_spec.rb",
      "spec/integration/uuid_spec.rb",
      "spec/integration/yaml_spec.rb",
+     "spec/shared/flags_shared_spec.rb",
      "spec/shared/identity_function_group.rb",
      "spec/spec_helper.rb",
      "spec/unit/bcrypt_hash_spec.rb",
@@ -125,6 +129,7 @@ Gem::Specification.new do |s|
      "spec/unit/paranoid_datetime_spec.rb",
      "spec/unit/regexp_spec.rb",
      "spec/unit/uri_spec.rb",
+     "spec/unit/uuid_spec.rb",
      "spec/unit/yaml_spec.rb"
   ]
 
@@ -133,30 +138,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"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.1"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.3"])
-      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.3"])
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4"])
       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"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.1"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
-      s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
+      s.add_dependency(%q<json_pure>, ["~> 1.4"])
       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"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.1"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.3"])
-    s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
+    s.add_dependency(%q<json_pure>, ["~> 1.4"])
     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"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.1"])
   end
 end
 

data/lib/dm-types/enum.rb

@@ -1,17 +1,10 @@
 require 'dm-core'
+require 'dm-types/support/flags'
 
 module DataMapper
   class Property
     class Enum < Integer
-      accept_options :flags
-
-      attr_reader :flag_map
-
-      def self.[](*values)
-        klass = ::Class.new(self)
-        klass.flags(values)
-        klass
-      end
+      include Flags
 
       def initialize(model, name, options = {}, type = nil)
         super
@@ -33,10 +26,6 @@ module DataMapper
         end
       end
 
-      def custom?
-        true
-      end
-
       def load(value)
         flag_map[value]
       end

data/lib/dm-types/flag.rb

@@ -1,17 +1,10 @@
 require 'dm-core'
+require 'dm-types/support/flags'
 
 module DataMapper
   class Property
     class Flag < Integer
-      accept_options :flags
-
-      attr_reader :flag_map
-
-      def self.[](*values)
-        klass = ::Class.new(self)
-        klass.flags(values)
-        klass
-      end
+      include Flags
 
       def initialize(model, name, options = {}, type = nil)
         super
@@ -24,10 +17,6 @@ module DataMapper
         end
       end
 
-      def custom?
-        true
-      end
-
       def load(value)
         return [] if value.nil? || value <= 0
 

data/lib/dm-types/json.rb

@@ -1,5 +1,5 @@
 require 'dm-core'
-require 'json'
+require 'json/pure'
 
 module DataMapper
   class Property

data/lib/dm-types/paranoid_boolean.rb

@@ -11,7 +11,7 @@ module DataMapper
         property_name = name.inspect
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          include Paranoid::Base
+          include DataMapper::Types::Paranoid::Base
 
           set_paranoid_property(#{property_name}) { true }
 

data/lib/dm-types/paranoid_datetime.rb

@@ -10,7 +10,7 @@ module DataMapper
         property_name = name.inspect
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          include Paranoid::Base
+          include DataMapper::Types::Paranoid::Base
 
           set_paranoid_property(#{property_name}) { ::DateTime.now }
 

data/lib/dm-types/support/flags.rb

@@ -0,0 +1,41 @@
+module DataMapper
+  class Property
+    module Flags
+      def self.included(base)
+        base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          extend DataMapper::Property::Flags::ClassMethods
+
+          accept_options :flags
+          attr_reader :flag_map
+
+          class << self
+            attr_accessor :generated_classes
+          end
+
+          self.generated_classes = {}
+        RUBY
+      end
+
+      def custom?
+        true
+      end
+
+      module ClassMethods
+        # TODO: document
+        # @api public
+        def [](*values)
+          if klass = generated_classes[values.flatten]
+            klass
+          else
+            klass = ::Class.new(self)
+            klass.flags(values)
+
+            generated_classes[values.flatten] = klass
+
+            klass
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dm-types/uri.rb

@@ -4,6 +4,8 @@ require 'dm-core'
 module DataMapper
   class Property
     class URI < String
+      # Maximum length chosen based on recommendation:
+      # http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-an-url
       length 2000
 
       def custom?
@@ -18,9 +20,6 @@ module DataMapper
         super || primitive?(value) || value.kind_of?(::String)
       end
 
-      # Maximum length chosen based on recommendation:
-      # http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-an-url
-
       def load(value)
         Addressable::URI.parse(value)
       end

data/lib/dm-types/uuid.rb

@@ -48,6 +48,10 @@ module DataMapper
         value.kind_of?(UUIDTools::UUID)
       end
 
+      def valid?(value, negated = false)
+        super || dump(value).kind_of?(::String)
+      end
+
       def dump(value)
         value.to_s unless value.nil?
       end

data/spec/fixtures/article.rb

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

data/spec/fixtures/bookmark.rb

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