dm-types 1.2.1 → 1.2.2

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.*
+
+## PROJECT::SPECIFIC
+spec/db/

data/Gemfile

@@ -10,20 +10,20 @@ DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
-gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'bcrypt-ruby', '~> 3.0'
+gem 'fastercsv',   '~> 1.5'
+gem 'multi_json',  '~> 1.0'
+gem 'json',        '~> 1.6', :platforms => [ :ruby_18 ]
+gem 'stringex',    '~> 1.3'
+gem 'uuidtools',   '~> 2.1'
+
 gem 'dm-core',     DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
-gem 'fastercsv',   '~> 1.5.4'
-gem 'multi_json',  '~> 1.0.3'
-gem 'json',        '~> 1.6.1', :platforms => [ :ruby_18 ]
-gem 'stringex',    '~> 1.3.0'
-gem 'uuidtools',   '~> 2.1.2'
 
 group :development do
 
   gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
-  gem 'jeweler',        '~> 1.6.4'
-  gem 'rake',           '~> 0.9.2'
-  gem 'rspec',          '~> 1.3.2'
+  gem 'rake',           '~> 0.9'
+  gem 'rspec',          '~> 1.3'
 
 end
 

data/Rakefile

@@ -1,25 +1,4 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  gem 'jeweler', '~> 1.6.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'dm-types'
-    gem.summary     = 'DataMapper plugin providing extra data types'
-    gem.description = gem.summary
-    gem.email       = 'dan.kubb [a] gmail [d] com'
-    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
-    gem.authors     = [ 'Dan Kubb' ]
-    gem.has_rdoc    = 'yard'
-
-    gem.rubyforge_project = 'datamapper'
-  end
-
-  Jeweler::GemcutterTasks.new
-
-  FileList['tasks/**/*.rake'].each { |task| import task }
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4'
-end
+FileList['tasks/**/*.rake'].each { |task| import task }

data/dm-types.gemspec

@@ -1,141 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "dm-types"
-  s.version = "1.2.1"
+Gem::Specification.new do |gem|
+  gem.authors     = [ 'Dan Kubb' ]
+  gem.email       = [ "dan.kubb@gmail.com" ]
+  gem.summary     = "DataMapper plugin providing extra data types"
+  gem.description = gem.summary
+  gem.homepage    = "http://datamapper.org"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dan Kubb"]
-  s.date = "2011-10-24"
-  s.description = "DataMapper plugin providing extra data types"
-  s.email = "dan.kubb [a] gmail [d] com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "dm-types.gemspec",
-    "lib/dm-types.rb",
-    "lib/dm-types/api_key.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",
-    "lib/dm-types/file_path.rb",
-    "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/support/dirty_minder.rb",
-    "lib/dm-types/support/flags.rb",
-    "lib/dm-types/uri.rb",
-    "lib/dm-types/uuid.rb",
-    "lib/dm-types/yaml.rb",
-    "spec/fixtures/api_user.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/api_key_spec.rb",
-    "spec/integration/bcrypt_hash_spec.rb",
-    "spec/integration/comma_separated_list_spec.rb",
-    "spec/integration/dirty_minder_spec.rb",
-    "spec/integration/enum_spec.rb",
-    "spec/integration/epoch_time_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/rcov.opts",
-    "spec/shared/flags_shared_spec.rb",
-    "spec/shared/identity_function_group.rb",
-    "spec/spec.opts",
-    "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/uuid_spec.rb",
-    "spec/unit/yaml_spec.rb",
-    "tasks/spec.rake",
-    "tasks/yard.rake",
-    "tasks/yardstick.rake"
-  ]
-  s.homepage = "http://github.com/datamapper/dm-types"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "datamapper"
-  s.rubygems_version = "1.8.11"
-  s.summary = "DataMapper plugin providing extra data types"
+  gem.files            = `git ls-files`.split("\n")
+  gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
+  gem.extra_rdoc_files = %w[LICENSE README.rdoc]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.name          = "dm-types"
+  gem.require_paths = [ "lib" ]
+  gem.version       = '1.2.2'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.4"])
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_runtime_dependency(%q<json>, ["~> 1.6.1"])
-      s.add_runtime_dependency(%q<stringex>, ["~> 1.3.0"])
-      s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1.2"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
-    else
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
-      s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
-      s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-      s.add_dependency(%q<json>, ["~> 1.6.1"])
-      s.add_dependency(%q<stringex>, ["~> 1.3.0"])
-      s.add_dependency(%q<uuidtools>, ["~> 2.1.2"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rake>, ["~> 0.9.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
-    end
-  else
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-    s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
-    s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
-    s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
-    s.add_dependency(%q<json>, ["~> 1.6.1"])
-    s.add_dependency(%q<stringex>, ["~> 1.3.0"])
-    s.add_dependency(%q<uuidtools>, ["~> 2.1.2"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.2.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rake>, ["~> 0.9.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
-  end
-end
+  gem.add_runtime_dependency('bcrypt-ruby', '~> 3.0')
+  gem.add_runtime_dependency('fastercsv',   '~> 1.5')
+  gem.add_runtime_dependency('multi_json',  '~> 1.0')
+  gem.add_runtime_dependency('json',        '~> 1.6')
+  gem.add_runtime_dependency('stringex',    '~> 1.4')
+  gem.add_runtime_dependency('uuidtools',   '~> 2.1')
+  gem.add_runtime_dependency('dm-core',     '~> 1.2.0')
 
+  gem.add_development_dependency('rake',  '~> 0.9')
+  gem.add_development_dependency('rspec', '~> 1.3')
+end

data/lib/dm-types/enum.rb

@@ -4,6 +4,7 @@ require 'dm-types/support/flags'
 module DataMapper
   class Property
     class Enum < Integer
+      min 1
 
       include Flags
 
@@ -12,13 +13,15 @@ module DataMapper
 
         flags = options.fetch(:flags, self.class.flags)
         flags.each_with_index do |flag, i|
-          @flag_map[i + 1] = flag
+          @flag_map[i.succ] = flag
         end
 
         if self.class.accepted_options.include?(:set) && !options.include?(:set)
           options[:set] = @flag_map.values_at(*@flag_map.keys.sort)
         end
 
+        options[:max] = @flag_map.size
+
         super
       end
 

metadata

@@ -1,213 +1,129 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-types
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70240922907680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70240922907680
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70240922904360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 5
-        - 4
-        version: 1.5.4
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70240922904360
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70240922899540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
-        version: 1.0.3
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70240922899540
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70240922895560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: stringex
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70240922895560
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: &70240922893660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70240922893660
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70240922890680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70240922890680
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: &70240922889520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: jeweler
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70240922889520
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70240922888240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70240922888240
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70240922886840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *70240922886840
 description: DataMapper plugin providing extra data types
-email: dan.kubb [a] gmail [d] com
+email:
+- dan.kubb@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
+- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - dm-types.gemspec
 - lib/dm-types.rb
 - lib/dm-types/api_key.rb
@@ -275,38 +191,28 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-homepage: http://github.com/datamapper/dm-types
+homepage: http://datamapper.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: datamapper
-rubygems_version: 1.8.11
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin providing extra data types
 test_files: []
-

data/VERSION

@@ -1 +0,0 @@
-1.2.1