dm-validations 1.0.0.rc3 → 1.0.0

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc3'
+DM_VERSION = '~> 1.0.0'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/Rakefile

@@ -15,10 +15,10 @@ begin
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-core', '~> 1.0.0'
 
     gem.add_development_dependency 'rspec',    '~> 1.3'
-    gem.add_development_dependency 'dm-types', '~> 1.0.0.rc3'
+    gem.add_development_dependency 'dm-types', '~> 1.0.0'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.0.rc3
+1.0.0

data/dm-validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-validations}
-  s.version = "1.0.0.rc3"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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-05-27}
+  s.date = %q{2010-06-08}
   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 = [
@@ -56,7 +56,6 @@ Gem::Specification.new do |s|
      "spec/fixtures/company.rb",
      "spec/fixtures/corporate_world.rb",
      "spec/fixtures/country.rb",
-     "spec/fixtures/currency.rb",
      "spec/fixtures/ethernet_frame.rb",
      "spec/fixtures/event.rb",
      "spec/fixtures/g3_concert.rb",
@@ -67,6 +66,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/memory_object.rb",
      "spec/fixtures/mittelschnauzer.rb",
      "spec/fixtures/motor_launch.rb",
+     "spec/fixtures/multibyte.rb",
      "spec/fixtures/page.rb",
      "spec/fixtures/phone_number.rb",
      "spec/fixtures/pirogue.rb",
@@ -180,7 +180,6 @@ Gem::Specification.new do |s|
      "spec/fixtures/company.rb",
      "spec/fixtures/corporate_world.rb",
      "spec/fixtures/country.rb",
-     "spec/fixtures/currency.rb",
      "spec/fixtures/ethernet_frame.rb",
      "spec/fixtures/event.rb",
      "spec/fixtures/g3_concert.rb",
@@ -191,6 +190,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/memory_object.rb",
      "spec/fixtures/mittelschnauzer.rb",
      "spec/fixtures/motor_launch.rb",
+     "spec/fixtures/multibyte.rb",
      "spec/fixtures/page.rb",
      "spec/fixtures/phone_number.rb",
      "spec/fixtures/pirogue.rb",
@@ -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.rc3"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_development_dependency(%q<dm-types>, ["~> 1.0.0.rc3"])
+      s.add_development_dependency(%q<dm-types>, ["~> 1.0.0"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-types>, ["~> 1.0.0"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-types>, ["~> 1.0.0"])
   end
 end
 

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

@@ -94,7 +94,7 @@ module DataMapper
       #
       # @api private
       def value_length(value)
-        value.to_str.split(//).size
+        value.to_str.split(//u).size
       end
 
       # Validate the value length is equal to the expected length

data/spec/fixtures/multibyte.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+module DataMapper
+  module Validations
+    module Fixtures
+      class Multibyte
+        include DataMapper::Resource
+
+        property :id,   Serial
+        property :name, String
+
+        validates_length_of :name, :is => 20
+      end
+    end
+  end
+end

data/spec/integration/length_validator/equality_spec.rb

@@ -68,12 +68,18 @@ describe 'DataMapper::Validations::Fixtures::EthernetFrame' do
 
   describe "with multibyte characters" do
     before :all do
-      @model = DataMapper::Validations::Fixtures::Currency.valid_instance(
-        :name   => 'Euro',
-        :code   => 'EUR',
-        :symbol => '€'
-      )
-      @model.valid?
+      begin
+        # force normal encoding in this block
+        original, $KCODE = $KCODE, 'N' if RUBY_VERSION <= '1.8.6'
+
+        # example from: http://intertwingly.net/stories/2004/04/14/i18n.html
+        @model = DataMapper::Validations::Fixtures::Multibyte.new(
+          :name => 'Iñtërnâtiônàlizætiøn'
+        )
+        @model.should be_valid
+      ensure
+        $KCODE = original if RUBY_VERSION <= '1.8.6'
+      end
     end
 
     it_should_behave_like "valid model"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  hash: 977940572
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - rc3
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940572
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc3
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,13 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940572
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc3
-        version: 1.0.0.rc3
+        version: 1.0.0
   type: :development
   version_requirements: *id003
 description: Library for performing validations on DM models and pure Ruby object
@@ -117,7 +114,6 @@ files:
 - spec/fixtures/company.rb
 - spec/fixtures/corporate_world.rb
 - spec/fixtures/country.rb
-- spec/fixtures/currency.rb
 - spec/fixtures/ethernet_frame.rb
 - spec/fixtures/event.rb
 - spec/fixtures/g3_concert.rb
@@ -128,6 +124,7 @@ files:
 - spec/fixtures/memory_object.rb
 - spec/fixtures/mittelschnauzer.rb
 - spec/fixtures/motor_launch.rb
+- spec/fixtures/multibyte.rb
 - spec/fixtures/page.rb
 - spec/fixtures/phone_number.rb
 - spec/fixtures/pirogue.rb
@@ -244,14 +241,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: datamapper
@@ -270,7 +265,6 @@ test_files:
 - spec/fixtures/company.rb
 - spec/fixtures/corporate_world.rb
 - spec/fixtures/country.rb
-- spec/fixtures/currency.rb
 - spec/fixtures/ethernet_frame.rb
 - spec/fixtures/event.rb
 - spec/fixtures/g3_concert.rb
@@ -281,6 +275,7 @@ test_files:
 - spec/fixtures/memory_object.rb
 - spec/fixtures/mittelschnauzer.rb
 - spec/fixtures/motor_launch.rb
+- spec/fixtures/multibyte.rb
 - spec/fixtures/page.rb
 - spec/fixtures/phone_number.rb
 - spec/fixtures/pirogue.rb

data/spec/fixtures/currency.rb

@@ -1,42 +0,0 @@
-module DataMapper
-  module Validations
-    module Fixtures
-      class Currency
-
-        #
-        # Behaviors
-        #
-
-        include DataMapper::Resource
-
-        #
-        # Properties
-        #
-
-        without_auto_validations do
-          property :name,   String, :length => 1..50, :key => true
-          property :code,   String, :length => 3,     :unique_index => true
-          property :symbol, String, :length => 1
-        end
-
-        #
-        # Validations
-        #
-
-        validates_length_of :name,   :within => 1..50
-        validates_length_of :code,   :is => 3
-        validates_length_of :symbol, :is => 1
-
-        def self.valid_instance(overrides = {})
-          defaults = {
-            :name   => 'United States Dollar',
-            :code   => 'USD',
-            :symbol => '$'
-          }
-
-          new(defaults.merge(overrides))
-        end
-      end # Barcode
-    end
-  end
-end