jm81-dm-address 0.4.0 → 0.5.0

data/Gemfile

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'dm-core',           '~> 1.0.2'
+gem 'dm-migrations',     '~> 1.0.2'
+gem 'dm-timestamps',     '~> 1.0.2'
+gem 'dm-types',          '~> 1.0.2'
+gem 'dm-validations',    '~> 1.0.2'

data/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.0)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-timestamps (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-types (1.0.2)
+      dm-core (~> 1.0.2)
+      fastercsv (~> 1.5.3)
+      json_pure (~> 1.4)
+      stringex (~> 1.1.0)
+      uuidtools (~> 2.1.1)
+    dm-validations (1.0.2)
+      dm-core (~> 1.0.2)
+    extlib (0.9.15)
+    fastercsv (1.5.3)
+    json_pure (1.4.6)
+    stringex (1.1.0)
+    uuidtools (2.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  dm-core (~> 1.0.2)
+  dm-migrations (~> 1.0.2)
+  dm-timestamps (~> 1.0.2)
+  dm-types (~> 1.0.2)
+  dm-validations (~> 1.0.2)

data/Rakefile

@@ -1,10 +1,12 @@
 require 'rubygems'
 require 'rake'
+require File.join(File.dirname(__FILE__), 'lib', 'dm-address', 'version')
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "jm81-dm-address"
+    gem.version = DataMapper::Address::VERSION.dup
     gem.summary = %Q{Add address related fields to a DataMapper model}
     gem.description = <<EOF
 Add address fields to a DataMapper model. This includes optional validations,
@@ -13,9 +15,11 @@ EOF
     gem.email = "jmorgan@morgancreative.net"
     gem.homepage = "http://github.com/jm81/dm-address"
     gem.authors = ["Jared Morgan"]
-    gem.add_dependency('dm-core', '>= 0.10.0')
-    gem.add_dependency('dm-types', '>= 0.10.0')
-    gem.add_dependency('dm-validations', '>= 0.10.0')
+    gem.add_dependency('dm-core', '~> 1.0.0')
+    gem.add_dependency('dm-timestamps', '~> 1.0.0')
+    gem.add_dependency('dm-types', '~> 1.0.0')
+    gem.add_dependency('dm-validations', '~> 1.0.0')
+    gem.add_development_dependency('dm-migrations', '~> 1.0.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/TODO

@@ -0,0 +1,3 @@
+Add :except option to address_properties
+(Usually a property can be ignored, but if this model belongs_to a model named, 
+e.g. Company, problems ensue. See http://datamapper.lighthouseapp.com/projects/20609/tickets/1057)

data/jm81-dm-address.gemspec

@@ -5,32 +5,36 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jm81-dm-address}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2009-11-29}
+  s.date = %q{2010-09-09}
   s.description = %q{Add address fields to a DataMapper model. This includes optional validations,
 and additional DM types for ZipCode and PhoneNumber.
 }
   s.email = %q{jmorgan@morgancreative.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.rdoc",
+     "TODO"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
+     "TODO",
      "jm81-dm-address.gemspec",
      "lib/dm-address.rb",
      "lib/dm-address/phone_number.rb",
      "lib/dm-address/polymorphic.rb",
      "lib/dm-address/preferred.rb",
      "lib/dm-address/us.rb",
+     "lib/dm-address/version.rb",
      "lib/dm-address/zip_code.rb",
      "lib/dm-types/phone_number.rb",
      "lib/dm-types/zip_code.rb",
@@ -45,18 +49,20 @@ and additional DM types for ZipCode and PhoneNumber.
      "spec/dm-address_spec.rb",
      "spec/dm-types/phone_number_spec.rb",
      "spec/dm-types/zip_code_spec.rb",
+     "spec/fixtures/types-fixture.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/jm81/dm-address}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Add address related fields to a DataMapper model}
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/dm-address_spec.rb",
      "spec/dm-types/phone_number_spec.rb",
      "spec/dm-types/zip_code_spec.rb",
+     "spec/fixtures/types-fixture.rb",
      "spec/dm-address/us_spec.rb",
      "spec/dm-address/preferred_spec.rb",
      "spec/dm-address/polymorphic_spec.rb",
@@ -69,19 +75,25 @@ and additional DM types for ZipCode and PhoneNumber.
     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<dm-core>, [">= 0.10.0"])
-      s.add_runtime_dependency(%q<dm-types>, [">= 0.10.0"])
-      s.add_runtime_dependency(%q<dm-validations>, [">= 0.10.0"])
+    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-timestamps>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<dm-types>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<dm-validations>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.0.0"])
     else
-      s.add_dependency(%q<dm-core>, [">= 0.10.0"])
-      s.add_dependency(%q<dm-types>, [">= 0.10.0"])
-      s.add_dependency(%q<dm-validations>, [">= 0.10.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-types>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
     end
   else
-    s.add_dependency(%q<dm-core>, [">= 0.10.0"])
-    s.add_dependency(%q<dm-types>, [">= 0.10.0"])
-    s.add_dependency(%q<dm-validations>, [">= 0.10.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-timestamps>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-types>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
   end
 end
 

data/lib/dm-address.rb

@@ -1,16 +1,15 @@
 require 'dm-core'
+require 'dm-timestamps'
 require 'dm-types'
 require 'dm-validations'
 
 # Require dm-address files
-%w{ phone_number zip_code polymorphic preferred us }.each do |file|
+%w{ phone_number zip_code polymorphic preferred us version }.each do |file|
   require 'dm-address/' + file
 end
 
 module DataMapper
   module Address
-    VERSION = '0.4.0'
-    
     DEFAULTS = {
       :phone_format => PhoneNumber::DEFAULT_FORMAT.dup,
       :include_country => false,

data/lib/dm-address/phone_number.rb

@@ -5,21 +5,19 @@ module DataMapper
       
       # Remove all non-digits from given phone number
       def initialize(s)
-        super((s || '').gsub(/\D+/, ''))
+        super((s || '').to_str.gsub(/\D+/, ''))
       end
       
-      alias base to_s
-      
       # %A is area code, %P is prefix, %S is last 4 digits (suffix)
       # Default is "(%A) %P-%S" -> (###) ###-####
       def to_s(format = nil)
         unless format
           format = DataMapper::Address.config[:phone_format] || DEFAULT_FORMAT
         end
-        return '' if base.nil? || base.empty?
-        format.gsub(/\%A/, base[0..2]).
-               gsub(/\%P/, base[3..5]).
-               gsub(/\%S/, base[6..9])
+        return '' if to_str.empty?
+        format.gsub(/\%A/, to_str[0..2]).
+               gsub(/\%P/, to_str[3..5]).
+               gsub(/\%S/, to_str[6..9])
       end
     end # class PhoneNumber
   end # module Address

data/lib/dm-address/us.rb

@@ -25,23 +25,23 @@ module DataMapper
                  DEFAULT_REQUIRED_FIELDS
           
           [
-            [:id, DataMapper::Types::Serial],
+            [:id, DataMapper::Property::Serial],
             [:name, String, {:length => 100}],
             [:company, String, {:length => 100}],
             [:street, String, {:length => 100}],
             [:street_2, String],
             [:city, String, {:length => 100}],
             [:state, String, {:length => 2}],
-            [:postal_code, DataMapper::Types::ZipCode, {:format => :zip_code}],
-            [:country, String, {:nullable => false, :length => 50, :default => 'USA'}],
-            [:phone, DataMapper::Types::PhoneNumber, {:format => :phone_number}],
+            [:postal_code, DataMapper::Property::ZipCode, {:format => :zip_code}],
+            [:country, String, {:required => false, :length => 50, :default => 'USA'}],
+            [:phone, DataMapper::Property::PhoneNumber, {:format => :phone_number}],
             [:created_at, DateTime],
             [:updated_at, DateTime]
           ].each do |args|
             unless self.properties.named?(args[0])
               args[0] = "#{options[:prefix]}#{args[0]}" if options[:prefix]
               args[2] ||= {}
-              args[2][:nullable] = !reqs.include?(args[0])
+              args[2][:required] = reqs.include?(args[0])
               self.property(*args)
             end
           end
@@ -62,9 +62,9 @@ module DataMapper
           value = attribute_get(fld)
           fields << value unless value.blank?
         end
-        fields << "#{self.city}, #{self.state} #{self.postal_code.to_s}"
+        fields << "#{self.city}, #{self.state} #{ZipCode.new(self.postal_code).to_s}"
         fields << self.country if include_country
-        fields << self.phone.to_s if include_phone && !self.phone.blank?
+        fields << PhoneNumber.new(self.phone).to_s if include_phone && !self.phone.blank?
         fields.join(newline)
       end
       

data/lib/dm-address/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module Address
+    VERSION = '0.5.0'.freeze
+  end
+end

data/lib/dm-address/zip_code.rb

@@ -1,18 +1,16 @@
 module DataMapper
   module Address
-    class ZipCode < String     
+    class ZipCode < String
       # Remove all non-digits from given zip code
       def initialize(s)
-        super((s || '').gsub(/\D+/, ''))
+        super((s || '').to_str.gsub(/\D+/, ''))
       end
-      
-      alias base to_s
-      
+
       # ZipCode formatted as #####-#### or #####
       def to_s(format = nil)
-        return '' if base.nil? || base.empty?
-        return base if base.length == 5
-        "#{base[0..4]}-#{base[5..8]}"
+        return '' if to_str.empty?
+        return to_str if to_str.length == 5
+        "#{to_str[0..4]}-#{to_str[5..8]}"
       end
     end # class ZipCode
   end # module Address

data/lib/dm-types/phone_number.rb

@@ -1,28 +1,27 @@
 module DataMapper
-  module Types
-    class PhoneNumber < DataMapper::Type
-      primitive String
- 
-      def self.load(value, property)
-        if value.nil?
-          nil
-        elsif value.is_a?(String)
-          DataMapper::Address::PhoneNumber.new(value)
-        else
-          raise ArgumentError.new("+value+ must be nil or a String")
-        end
+  class Property
+    class PhoneNumber < String
+      def primitive?(value)
+        super || value.kind_of?(::DataMapper::Address::PhoneNumber)
       end
- 
-      def self.dump(value, property)
-        return nil if value.nil?
-        value.base
+
+      def load(value)
+        case value
+          when ::DataMapper::Address::PhoneNumber then value
+          when ::String then DataMapper::Address::PhoneNumber.new(value)
+          else
+            nil
+        end
       end
  
-      def self.typecast(value, property)
-        value.kind_of?(DataMapper::Address::PhoneNumber) ?
-            value :
-            load(value, property)
+      def dump(value)
+        case value
+          when ::DataMapper::Address::PhoneNumber then value.to_str
+          when ::String then value
+          else
+            nil
+        end
       end
     end # class PhoneNumber
-  end # module Types
+  end # module Property
 end # module DataMapper

data/lib/dm-types/zip_code.rb

@@ -1,28 +1,27 @@
 module DataMapper
-  module Types
-    class ZipCode < DataMapper::Type
-      primitive String
- 
-      def self.load(value, property)
-        if value.nil?
-          nil
-        elsif value.is_a?(String)
-          DataMapper::Address::ZipCode.new(value)
-        else
-          raise ArgumentError.new("+value+ must be nil or a String")
-        end
+  class Property
+    class ZipCode < String
+      def primitive?(value)
+        super || value.kind_of?(::DataMapper::Address::ZipCode)
       end
- 
-      def self.dump(value, property)
-        return nil if value.nil?
-        value.base
+
+      def load(value)
+        case value
+          when ::DataMapper::Address::ZipCode then value
+          when ::String then DataMapper::Address::ZipCode.new(value)
+          else
+            nil
+        end
       end
- 
-      def self.typecast(value, property)
-        value.kind_of?(DataMapper::Address::ZipCode) ?
-            value :
-            load(value, property)
+
+      def dump(value)
+        case value
+          when ::DataMapper::Address::ZipCode then value.to_str
+          when ::String then value
+          else
+            nil
+        end
       end
     end # class ZipCode
-  end # module Types
+  end # module Property
 end # module DataMapper

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

@@ -6,7 +6,7 @@ module DataMapper
         def self.included(base)
           DataMapper::Validate::FormatValidator::FORMATS.merge!(
             :phone_number => [
-                Proc.new { |ph| ph.blank? || ph.length == 10 },
+                Proc.new { |ph| ph.blank? || ph.gsub(/\D+/, '').length == 10 },
                 lambda { |field, value| '%s should be 10 digits (include area code)'.t(value) }
             ]
           )

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

@@ -6,7 +6,7 @@ module DataMapper
         def self.included(base)
           DataMapper::Validate::FormatValidator::FORMATS.merge!(
             :zip_code => [
-                Proc.new { |zc| zc.blank? || zc.length == 5 || zc.length == 9 },
+                Proc.new { |zc| zc.blank? || zc.gsub(/\D+/, '').length == 5 || zc.gsub(/\D+/, '').length == 9 },
                 lambda { |field, value| '%s should be 5 digits or 9 digits (ZIP+4)'.t(value) }
             ]
           )

data/spec/dm-address/phone_number_spec.rb

@@ -12,10 +12,10 @@ describe DataMapper::Address::PhoneNumber do
     end
   end
   
-  describe '#base' do
+  describe '#to_str' do
     it 'should not be formatted (digits only)' do
-      @klass.new('405-555-5555').base.should == '4055555555'
-      @klass.new('(405) 555.5556').base.should == '4055555556'
+      @klass.new('405-555-5555').to_str.should == '4055555555'
+      @klass.new('(405) 555.5556').to_str.should == '4055555556'
     end
   end
   

data/spec/dm-address/samples.rb

@@ -1,5 +1,5 @@
 DataMapper.setup(:default, 'sqlite3::memory:')
-require 'dm-timestamps' # Only needed to make #created_at and #updated_at auto-update
+require 'dm-migrations'
 
 module DataMapper::Address::Spec
   class US

data/spec/dm-address/us_spec.rb

@@ -75,27 +75,37 @@ describe DataMapper::Address::US do
   end
   
   describe '#postal_code=' do
+    before(:each) { @address.save }
+    
     it 'should strip out non-digits' do
-      @address.postal_code = '12345-6789'
+      @address.update(:postal_code => '12345-6789')
+      @address.reload
       @address.postal_code.should == '123456789'
-      @address.postal_code = '(12345 -67s80z'
+
+      @address.update(:postal_code => '(12345 -67s80z')
+      @address.reload
       @address.postal_code.should == '123456780'
     end
   end
   
   describe '#postal_code.to_s' do
+    before(:each) { @address.save }
+    
     it 'should return empty String if #postal_code is blank' do
-      @address.postal_code = ''
+      @address.update!(:postal_code => '')
+      @address.reload
       @address.postal_code.to_s.should == ''
     end
     
     it 'should format 5-digit code as #####' do
-      @address.postal_code = '12345'
+      @address.update(:postal_code => '12345')
+      @address.reload
       @address.postal_code.to_s.should == '12345'
     end
     
     it 'should format 9-digit code as #####-####' do
-      @address.postal_code = '123456789'
+      @address.update(:postal_code => '123456789')
+      @address.reload
       @address.postal_code.to_s.should == '12345-6789'
     end
   end
@@ -123,22 +133,31 @@ describe DataMapper::Address::US do
   end
   
   describe '#phone=' do
+    before(:each) { @address.save }
+    
     it 'should strip out non-digits' do
-      @address.phone = '405-555-5555'
-      @address.phone.should == '4055555555'
-      @address.phone = '(405) 555.5556'
-      @address.phone.should == '4055555556'
+      @address.update(:phone => '405-555-5555')
+      @address.reload
+      @address.phone.to_str.should == '4055555555'
+
+      @address.update(:phone => '(405) 555.5556')
+      @address.reload
+      @address.phone.to_str.should == '4055555556'
     end
   end
   
   describe '#phone.to_s' do
+    before(:each) { @address.save }
+    
     it 'should return empty String if #phone is blank' do
-      @address.phone = ''
+      @address.update(:phone => '')
+      @address.reload
       @address.phone.to_s.should == ''
     end
     
     it 'should format as (###) ###-####' do
-      @address.phone = '1234567899'
+      @address.update(:phone => '1234567899')
+      @address.reload
       @address.phone.to_s.should == '(123) 456-7899'
     end
   end

data/spec/dm-address/zip_code_spec.rb

@@ -12,10 +12,10 @@ describe DataMapper::Address::ZipCode do
     end
   end
   
-  describe '#base' do
+  describe '#to_str' do
     it 'should not be formatted (digits only)' do
-      @klass.new('12345-6789').base.should == '123456789'
-      @klass.new('(12345 -67s80z').base.should == '123456780'
+      @klass.new('12345-6789').to_str.should == '123456789'
+      @klass.new('(12345 -67s80z').to_str.should == '123456780'
     end
   end
   

data/spec/dm-types/phone_number_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
+require 'fixtures/types-fixture'
 
-describe DataMapper::Types::PhoneNumber do
-
+describe DataMapper::Property::PhoneNumber do
+  subject { TypesFixture.properties[:phone] }
+  
   before(:each) do
-    @klass = DataMapper::Types::PhoneNumber
     @phone_str  = "(405) 555-1234"
     @phone_dump = "4055551234"
     @phone = DataMapper::Address::PhoneNumber.new(@phone_str)
@@ -11,46 +12,33 @@ describe DataMapper::Types::PhoneNumber do
  
   describe ".dump" do
     it "should return the Phone Number as a digits-only string" do
-      @klass.dump(@phone, :property).should == @phone_dump
+      subject.dump(@phone).should == @phone_dump
     end
  
     it "should return nil if the string is nil" do
-      @klass.dump(nil, :property).should be_nil
+      subject.dump(nil).should be_nil
     end
  
     it "should return an empty String if the Phone Number is empty" do
-      @klass.dump(DataMapper::Address::PhoneNumber.new(''), :property).should == ""
+      subject.dump(DataMapper::Address::PhoneNumber.new('')).should == ""
     end
   end
  
   describe ".load" do
     it "should return the string as PhoneNumber" do
-      @klass.load(@phone_str, :property).should == @phone
+      subject.load(@phone_str).should == @phone
     end
  
     it "should return nil if given nil" do
-      @klass.load(nil, :property).should be_nil
+      subject.load(nil).should be_nil
     end
  
     it "should return an empty Phone Number if given an empty string" do
-      @klass.load("", :property).should == DataMapper::Address::PhoneNumber.new('')
-    end
- 
-    it 'should raise an ArgumentError if given something else' do
-      lambda {
-        @klass.load([], :property)
-      }.should raise_error(ArgumentError, '+value+ must be nil or a String')
-    end
-  end
- 
-  describe '.typecast' do
-    it 'should do nothing if an PhoneNumber is provided' do
-      @klass.typecast(@phone, :property).should == @phone
+      subject.load('').should == DataMapper::Address::PhoneNumber.new('')
     end
  
-    it 'should defer to .load if a string is provided' do
-      @klass.should_receive(:load).with(@phone_str, :property)
-      @klass.typecast(@phone_str, :property)
+    it 'should return nil if given something else' do
+      subject.load([]).should be(nil)
     end
   end
 end

data/spec/dm-types/zip_code_spec.rb

@@ -1,56 +1,44 @@
 require 'spec_helper'
+require 'fixtures/types-fixture'
 
-describe DataMapper::Types::ZipCode do
+describe DataMapper::Property::ZipCode do
+  subject { TypesFixture.properties[:zip] }
 
   before(:each) do
-    @klass = DataMapper::Types::ZipCode
     @zip_str  = "12345-6789"
     @zip_dump = "123456789"
     @zip = DataMapper::Address::ZipCode.new(@zip_str)
   end
- 
+
   describe ".dump" do
     it "should return the Zip Number as a digits-only string" do
-      @klass.dump(@zip, :property).should == @zip_dump
+      subject.dump(@zip).should == @zip_dump
     end
- 
+
     it "should return nil if the string is nil" do
-      @klass.dump(nil, :property).should be_nil
+      subject.dump(nil).should be_nil
     end
- 
+
     it "should return an empty String if the Zip Number is empty" do
-      @klass.dump(DataMapper::Address::ZipCode.new(''), :property).should == ""
+      subject.dump(DataMapper::Address::ZipCode.new('')).should == ""
     end
   end
- 
+
   describe ".load" do
     it "should return the string as ZipCode" do
-      @klass.load(@zip_str, :property).should == @zip
+      subject.load(@zip_str).should == @zip
     end
- 
+
     it "should return nil if given nil" do
-      @klass.load(nil, :property).should be_nil
+      subject.load(nil).should be_nil
     end
- 
+
     it "should return an empty Zip Code if given an empty string" do
-      @klass.load("", :property).should == DataMapper::Address::ZipCode.new('')
-    end
- 
-    it 'should raise an ArgumentError if given something else' do
-      lambda {
-        @klass.load([], :property)
-      }.should raise_error(ArgumentError, '+value+ must be nil or a String')
+      subject.load("").should == DataMapper::Address::ZipCode.new('')
     end
-  end
- 
-  describe '.typecast' do
-    it 'should do nothing if an ZipCode is provided' do
-      @klass.typecast(@zip, :property).should == @zip
-    end
- 
-    it 'should defer to .load if a string is provided' do
-      @klass.should_receive(:load).with(@zip_str, :property)
-      @klass.typecast(@zip_str, :property)
+
+    it 'should return nil if given something else' do
+      subject.load([]).should be(nil)
     end
   end
 end

data/spec/fixtures/types-fixture.rb

@@ -0,0 +1,7 @@
+class TypesFixture
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :phone, PhoneNumber
+  property :zip, ZipCode
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jm81-dm-address
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,39 +15,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 -06:00
+date: 2010-09-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: dm-timestamps
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dm-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-validations
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id005
 description: |
   Add address fields to a DataMapper model. This includes optional validations,
   and additional DM types for ZipCode and PhoneNumber.
@@ -54,19 +110,23 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
+- TODO
 - jm81-dm-address.gemspec
 - lib/dm-address.rb
 - lib/dm-address/phone_number.rb
 - lib/dm-address/polymorphic.rb
 - lib/dm-address/preferred.rb
 - lib/dm-address/us.rb
+- lib/dm-address/version.rb
 - lib/dm-address/zip_code.rb
 - lib/dm-types/phone_number.rb
 - lib/dm-types/zip_code.rb
@@ -81,6 +141,7 @@ files:
 - spec/dm-address_spec.rb
 - spec/dm-types/phone_number_spec.rb
 - spec/dm-types/zip_code_spec.rb
+- spec/fixtures/types-fixture.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jm81/dm-address
@@ -92,21 +153,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Add address related fields to a DataMapper model
@@ -115,6 +182,7 @@ test_files:
 - spec/dm-address_spec.rb
 - spec/dm-types/phone_number_spec.rb
 - spec/dm-types/zip_code_spec.rb
+- spec/fixtures/types-fixture.rb
 - spec/dm-address/us_spec.rb
 - spec/dm-address/preferred_spec.rb
 - spec/dm-address/polymorphic_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.4.0