dm-types 0.10.2 → 1.0.0.rc1

data/.gitignore

@@ -0,0 +1,36 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## Rubinius
+*.rbc
+
+## PROJECT::GENERAL
+*.gem
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.local
+Gemfile.lock
+
+## PROJECT::SPECIFIC
+spec/db/

data/Gemfile

@@ -0,0 +1,147 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can use
+# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
+# worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by setting
+# an environment variable. This of course also works when using the Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
+# and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's recommended
+# that you first install all adapters that you are planning to use or work on
+# by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to bundler.
+# Once you have them installed you can easily switch between adapters for the
+# various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
+# when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by setting
+# an environment variable. This also works when using the Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
+# for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0.rc1'
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  if ENV['EXTLIB']
+    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
+  end
+
+  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'fastercsv',       '~> 1.5.0'
+  gem 'json_pure',       '~> 1.4.3'
+  gem 'uuidtools',       '~> 2.1.1'
+  gem 'stringex',        '~> 1.1.0'
+
+end
+
+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 'jeweler',        '~> 1.4'
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'metric_fu',      '~> 1.3'
+  gem 'rcov',           '~> 0.9.7'
+  gem 'reek',           '~> 1.2.7'
+  gem 'roodi',          '~> 2.1'
+  gem 'yard',           '~> 0.5'
+  gem 'yardstick',      '~> 0.1'
+
+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']
+
+  unless adapters.empty?
+
+    DO_VERSION     = '~> 0.10.2'
+    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+
+    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+
+    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
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+
+    adapters.each do |adapter|
+      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    end
+
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/Rakefile

@@ -15,15 +15,14 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'bcrypt-ruby', '~> 2.1.2'
-    gem.add_dependency 'dm-core',     '~> 0.10.2'
-    gem.add_dependency 'fastercsv',   '~> 1.5.0'
-    gem.add_dependency 'json_pure',   '~> 1.2.0'
-    gem.add_dependency 'uuidtools',   '~> 2.1.1'
-    gem.add_dependency 'stringex',    '~> 1.1.0'
+    gem.add_dependency 'dm-core',                     '~> 1.0.0.rc1'
+    gem.add_dependency 'fastercsv',                   '~> 1.5.0'
+    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.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.4.0'
+    gem.add_development_dependency 'rspec',           '~> 1.3'
+    gem.add_development_dependency 'dm-validations',  '~> 1.0.0.rc1'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.0.rc1

data/dm-types.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-types}
-  s.version = "0.10.2"
+  s.version = "1.0.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-12-11}
+  s.date = %q{2010-05-19}
   s.description = %q{DataMapper plugin providing extra data types}
   s.email = %q{dan.kubb [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -32,6 +34,9 @@ Gem::Specification.new do |s|
      "lib/dm-types/flag.rb",
      "lib/dm-types/ip_address.rb",
      "lib/dm-types/json.rb",
+     "lib/dm-types/paranoid/base.rb",
+     "lib/dm-types/paranoid_boolean.rb",
+     "lib/dm-types/paranoid_datetime.rb",
      "lib/dm-types/regexp.rb",
      "lib/dm-types/slug.rb",
      "lib/dm-types/uri.rb",
@@ -68,10 +73,13 @@ Gem::Specification.new do |s|
      "spec/unit/flag_spec.rb",
      "spec/unit/ip_address_spec.rb",
      "spec/unit/json_spec.rb",
+     "spec/unit/paranoid_boolean_spec.rb",
+     "spec/unit/paranoid_datetime_spec.rb",
      "spec/unit/regexp_spec.rb",
      "spec/unit/uri_spec.rb",
      "spec/unit/yaml_spec.rb",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
@@ -81,41 +89,74 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{DataMapper plugin providing extra data types}
+  s.test_files = [
+    "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",
+     "spec/integration/ip_address_spec.rb",
+     "spec/integration/json_spec.rb",
+     "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_helper.rb",
+     "spec/unit/bcrypt_hash_spec.rb",
+     "spec/unit/csv_spec.rb",
+     "spec/unit/enum_spec.rb",
+     "spec/unit/epoch_time_spec.rb",
+     "spec/unit/file_path_spec.rb",
+     "spec/unit/flag_spec.rb",
+     "spec/unit/ip_address_spec.rb",
+     "spec/unit/json_spec.rb",
+     "spec/unit/paranoid_boolean_spec.rb",
+     "spec/unit/paranoid_datetime_spec.rb",
+     "spec/unit/regexp_spec.rb",
+     "spec/unit/uri_spec.rb",
+     "spec/unit/yaml_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.0"])
-      s.add_runtime_dependency(%q<json_pure>, ["~> 1.2.0"])
+      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.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
     else
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.0"])
-      s.add_dependency(%q<json_pure>, ["~> 1.2.0"])
+      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.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
     end
   else
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.0"])
-    s.add_dependency(%q<json_pure>, ["~> 1.2.0"])
+    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.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc1"])
   end
 end
 

data/lib/dm-types.rb

@@ -1,23 +1,28 @@
-require 'pathname'
+require 'dm-core'
 
-module DataMapper
-  module Types
-    dir = (Pathname(__FILE__).dirname.expand_path / 'dm-types').to_s
+begin
+  require 'active_support/core_ext/date_time/conversions'
+rescue LoadError
+  require 'extlib/datetime'
+end
 
-    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'
+module DataMapper
+  class Property
+    autoload :CommaSeparatedList, 'dm-types/comma_separated_list'
+    autoload :Csv,                'dm-types/csv'
+    autoload :BCryptHash,         'dm-types/bcrypt_hash'
+    autoload :Enum,               'dm-types/enum'
+    autoload :EpochTime,          'dm-types/epoch_time'
+    autoload :FilePath,           'dm-types/file_path'
+    autoload :Flag,               'dm-types/flag'
+    autoload :IPAddress,          'dm-types/ip_address'
+    autoload :Json,               'dm-types/json'
+    autoload :Regexp,             'dm-types/regexp'
+    autoload :ParanoidBoolean,    'dm-types/paranoid_boolean'
+    autoload :ParanoidDateTime,   'dm-types/paranoid_datetime'
+    autoload :Slug,               'dm-types/slug'
+    autoload :UUID,               'dm-types/uuid'
+    autoload :URI,                'dm-types/uri'
+    autoload :Yaml,               'dm-types/yaml'
   end
 end

data/lib/dm-types/bcrypt_hash.rb

@@ -1,30 +1,34 @@
+require 'dm-core'
 require 'bcrypt'
 
 module DataMapper
-  module Types
-    class BCryptHash < DataMapper::Type
-      primitive String
-      length    60
+  class Property
+    class BCryptHash < String
+      length 60
 
-      def self.load(value, property)
-        typecast(value, property)
+      def primitive?(value)
+        value.kind_of?(BCrypt::Password)
       end
 
-      def self.dump(value, property)
-        typecast(value, property)
-      end
-
-      def self.typecast(value, property)
+      def load(value)
         if value.nil?
           nil
         else
           begin
-            value.is_a?(BCrypt::Password) ? value : BCrypt::Password.new(value)
+            primitive?(value) ? value : BCrypt::Password.new(value)
           rescue BCrypt::Errors::InvalidHash
             BCrypt::Password.create(value, :cost => BCrypt::Engine::DEFAULT_COST)
           end
         end
       end
+
+      def dump(value)
+        load(value)
+      end
+
+      def typecast_to_primitive(value)
+        load(value)
+      end
     end # class BCryptHash
-  end # module Types
+  end # class Property
 end # module DataMapper

data/lib/dm-types/comma_separated_list.rb

@@ -1,31 +1,26 @@
-module DataMapper
-  module Types
+require 'dm-core'
+require 'dm-types/yaml'
 
+module DataMapper
+  class Property
     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)
+      def dump(value)
         if value.nil?
           nil
-        elsif value.kind_of?(Array)
-          super(value, property)
-        elsif value.kind_of?(String)
+        elsif value.kind_of?(::Array)
+          super(value)
+        elsif value.kind_of?(::String)
           v = (value || "").split(",").
             compact.
             map { |i| i.downcase.strip }.
             reject { |i| i.blank? }.
             uniq
-          super(v, property)
+          super(v)
         else
           raise ArgumentError, "+value+ of CommaSeparatedList must be a string, an array or nil, but given #{value.inspect}"
         end
-      end # self.dump
+      end # dump
     end # CommaSeparatedList
 
-  end # Types
+  end # Property
 end # DataMapper