dm-validations 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"
@@ -90,7 +90,7 @@ group(:development) do # Development dependencies (as in the gemspec)
   gem 'dm-types',       DM_VERSION, :git => "#{DATAMAPPER}/dm-types.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
@@ -109,32 +109,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,10 +15,10 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 1.0.0'
+    gem.add_dependency 'dm-core', '~> 1.0.1'
 
     gem.add_development_dependency 'rspec',    '~> 1.3'
-    gem.add_development_dependency 'dm-types', '~> 1.0.0'
+    gem.add_development_dependency 'dm-types', '~> 1.0.1'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

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

data/dm-validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-validations}
-  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 = ["Guy van den Berg"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-09-07}
   s.description = %q{Library for performing validations on DM models and pure Ruby object}
   s.email = %q{vandenberg.guy [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -285,18 +285,18 @@ 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_development_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_development_dependency(%q<dm-types>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<dm-types>, ["~> 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<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<dm-types>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-types>, ["~> 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<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<dm-types>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-types>, ["~> 1.0.1"])
   end
 end
 

data/lib/dm-validations/validation_errors.rb

@@ -40,7 +40,7 @@ module DataMapper
       end
 
       def self.default_error_message(key, field, *values)
-        field = ActiveSupport::Inflector.humanize(field)
+        field = DataMapper::Inflector.humanize(field)
         @@default_error_messages[key] % [field, *values].flatten
       end
 

data/lib/dm-validations/validators/generic_validator.rb

@@ -33,7 +33,7 @@ module DataMapper
         @options              = options.except(:if, :unless)
         @if_clause            = options[:if]
         @unless_clause        = options[:unless]
-        @humanized_field_name = ActiveSupport::Inflector.humanize(@field_name)
+        @humanized_field_name = DataMapper::Inflector.humanize(@field_name)
       end
 
       # Add an error message to a target resource. If the error corresponds to a

data/spec/fixtures/reservation.rb

@@ -30,7 +30,7 @@ module DataMapper
 
         validates_confirmation_of :person_name,     :allow_nil => false, :allow_blank => false
         validates_confirmation_of :number_of_seats, :confirm => :seats_confirmation, :message => Proc.new { |resource, property|
-          '%s requires confirmation for %s' % [ActiveSupport::Inflector.demodulize(resource.model.name), property.name]
+          '%s requires confirmation for %s' % [DataMapper::Inflector.demodulize(resource.model.name), property.name]
         }
       end # Reservation
     end # Fixtures

data/spec/integration/automatic_validation/custom_messages_for_inferred_validation_spec.rb

@@ -5,8 +5,8 @@ describe 'Inferred validations' do
   it "allow overriding a single error message" do
     custom_boat = Class.new do
       include DataMapper::Resource
-      property :id,   DataMapper::Types::Serial
-      property :name, String,  :required => true, :message => "This boat must have name"
+      property :id,   DataMapper::Property::Serial
+      property :name, String, :required => true, :message => "This boat must have name"
     end
     boat = custom_boat.new
     boat.should_not be_valid
@@ -16,8 +16,8 @@ describe 'Inferred validations' do
   it "should have correct error messages" do
     custom_boat = Class.new do
       include DataMapper::Resource
-      property :id,   DataMapper::Types::Serial
-      property :name, String,  :required => true, :length => 5..20, :format => /^[a-z]+$/,
+      property :id,   DataMapper::Property::Serial
+      property :name, String, :required => true, :length => 5..20, :format => /^[a-z]+$/,
                :messages => {
                  :presence => "This boat must have name",
                  :length => "Name must have at least 4 and at most 20 chars",

data/spec/integration/automatic_validation/disabling_inferred_validation_spec.rb

@@ -6,9 +6,9 @@ describe "A class with inferred validations disabled for all properties with an
     @klass = Class.new do
       include DataMapper::Resource
 
-      property :id,   DataMapper::Types::Serial,                      :auto_validation => false
-      property :name, String,                     :required => true, :auto_validation => false
-      property :bool, DataMapper::Types::Boolean, :required => true, :auto_validation => false
+      property :id,   DataMapper::Property::Serial,                     :auto_validation => false
+      property :name, String,                        :required => true, :auto_validation => false
+      property :bool, DataMapper::Property::Boolean, :required => true, :auto_validation => false
     end
 
     @model = @klass.new
@@ -26,9 +26,9 @@ describe "A class with inferred validations disabled for all properties with a b
       include DataMapper::Resource
 
       without_auto_validations do
-        property :id,   DataMapper::Types::Serial
-        property :name, String,                     :required => true
-        property :bool, DataMapper::Types::Boolean, :required => true
+        property :id,   DataMapper::Property::Serial
+        property :name, String,                        :required => true
+        property :bool, DataMapper::Property::Boolean, :required => true
       end
     end
 

data/spec/integration/automatic_validation/inferred_within_validation_spec.rb

@@ -5,8 +5,8 @@ describe 'A model with a :set & :default options on a property' do
   before :all do
     class ::LimitedBoat
       include DataMapper::Resource
-      property :id,       DataMapper::Types::Serial
-      property :limited,  String,   :set => %w[ foo bar bang ], :default => 'foo'
+      property :id,      DataMapper::Property::Serial
+      property :limited, String, :set => %w[ foo bar bang ], :default => 'foo'
     end
   end
 

data/tasks/local_gemfile.rake

@@ -1,16 +1,14 @@
 desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
 task :local_gemfile do |t|
 
-  root              = Pathname(__FILE__).dirname.parent
-  datamapper        = root.parent
-
-  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
-  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+  root       = Pathname(__FILE__).dirname.parent
+  datamapper = root.parent
 
   root.join('Gemfile.local').open('w') do |f|
     root.join('Gemfile').open.each do |line|
-      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
-      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
+      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
       f.puts line
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -57,12 +54,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :development
   version_requirements: *id003
 description: Library for performing validations on DM models and pure Ruby object
@@ -234,7 +230,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -243,7 +238,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"