jm81-dm-address 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/dm-address.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-address}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2009-07-18}
+  s.date = %q{2009-07-22}
   s.email = %q{jmorgan@morgancreative.net}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
      "lib/dm-address/zip_code.rb",
      "lib/dm-types/phone_number.rb",
      "lib/dm-types/zip_code.rb",
+     "lib/dm-validations/formats/phone_number.rb",
+     "lib/dm-validations/formats/zip_code.rb",
      "spec/dm-address/phone_number_spec.rb",
      "spec/dm-address/us_spec.rb",
      "spec/dm-address/zip_code_spec.rb",

data/lib/dm-address.rb

@@ -35,3 +35,7 @@ end
   require File.dirname(__FILE__) + '/dm-types/' + file
 end
 
+# Require dm-validations/formats files
+%w{ phone_number zip_code }.each do |file|
+  require File.dirname(__FILE__) + '/dm-validations/formats/' + file
+end

data/lib/dm-address/us.rb

@@ -32,13 +32,9 @@ module DataMapper
             [:street_2, String],
             [:city, String, {:length => 100}],
             [:state, String, {:length => 2}],
-            [:postal_code, DataMapper::Types::ZipCode, {
-                :format => Proc.new { |zc| zc.blank? || zc.length == 5 || zc.length == 9 },
-                :messages => { :format => "Postal code should be 5 digits or 9 digits (ZIP+4)" }}],
+            [:postal_code, DataMapper::Types::ZipCode, {:format => :zip_code}],
             [:country, String, {:nullable => false, :length => 50, :default => 'USA'}],
-            [:phone, DataMapper::Types::PhoneNumber, {
-                 :format => Proc.new { |ph| ph.blank? || ph.length == 10 },
-                 :messages => { :format => "Phone number should be 10 digits (include area code)" }}],
+            [:phone, DataMapper::Types::PhoneNumber, {:format => :phone_number}],
             [:created_at, DateTime],
             [:updated_at, DateTime]
           ].each do |args|

data/lib/dm-address/zip_code.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Address
     class ZipCode < String     
-      # Remove all non-digits from given phone number
+      # Remove all non-digits from given zip code
       def initialize(s)
         super((s || '').gsub(/\D+/, ''))
       end

data/lib/dm-validations/formats/phone_number.rb

@@ -0,0 +1,19 @@
+module DataMapper
+  module Validate
+    module Format
+      module PhoneNumber
+ 
+        def self.included(base)
+          DataMapper::Validate::FormatValidator::FORMATS.merge!(
+            :phone_number => [
+                Proc.new { |ph| ph.blank? || ph.length == 10 },
+                lambda { |field, value| '%s should be 10 digits (include area code)'.t(value) }
+            ]
+          )
+        end
+      end # module PhoneNumber
+    end # module Format
+  end # module Validate
+end # module DataMapper
+
+DataMapper::Validate::FormatValidator.__send__(:include, DataMapper::Validate::Format::PhoneNumber)

data/lib/dm-validations/formats/zip_code.rb

@@ -0,0 +1,19 @@
+module DataMapper
+  module Validate
+    module Format
+      module ZipCode
+ 
+        def self.included(base)
+          DataMapper::Validate::FormatValidator::FORMATS.merge!(
+            :zip_code => [
+                Proc.new { |zc| zc.blank? || zc.length == 5 || zc.length == 9 },
+                lambda { |field, value| '%s should be 5 digits or 9 digits (ZIP+4)'.t(value) }
+            ]
+          )
+        end
+      end # module ZipCode
+    end # module Format
+  end # module Validate
+end # module DataMapper
+
+DataMapper::Validate::FormatValidator.__send__(:include, DataMapper::Validate::Format::ZipCode)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jm81-dm-address
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-18 00:00:00 -07:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,8 @@ files:
 - lib/dm-address/zip_code.rb
 - lib/dm-types/phone_number.rb
 - lib/dm-types/zip_code.rb
+- lib/dm-validations/formats/phone_number.rb
+- lib/dm-validations/formats/zip_code.rb
 - spec/dm-address/phone_number_spec.rb
 - spec/dm-address/us_spec.rb
 - spec/dm-address/zip_code_spec.rb