dm-types 1.0.0 → 1.0.1

data/spec/integration/uri_spec.rb

@@ -4,12 +4,12 @@ try_spec do
 
   require './spec/fixtures/bookmark'
 
-  describe DataMapper::Types::Fixtures::Bookmark do
+  describe DataMapper::TypesFixtures::Bookmark do
     supported_by :all do
       describe 'without URI' do
         before :all do
           @uri = nil
-          @resource = DataMapper::Types::Fixtures::Bookmark.new(
+          @resource = DataMapper::TypesFixtures::Bookmark.new(
             :title  => 'Check this out',
             :uri    => @uri,
             :shared => false,
@@ -20,7 +20,7 @@ try_spec do
         end
 
         it 'can be found by uri' do
-          DataMapper::Types::Fixtures::Bookmark.first(:uri => @uri).should == @resource
+          DataMapper::TypesFixtures::Bookmark.first(:uri => @uri).should == @resource
         end
 
         describe 'when reloaded' do
@@ -37,8 +37,8 @@ try_spec do
       describe 'with a blank URI' do
         before :all do
           @uri = ''
-          DataMapper::Types::Fixtures::Bookmark.auto_migrate!
-          @resource = DataMapper::Types::Fixtures::Bookmark.new(
+          DataMapper::TypesFixtures::Bookmark.auto_migrate!
+          @resource = DataMapper::TypesFixtures::Bookmark.new(
             :title  => 'Check this out',
             :uri    => @uri,
             :shared => false,
@@ -49,7 +49,7 @@ try_spec do
         end
 
         it 'can be found by uri' do
-          DataMapper::Types::Fixtures::Bookmark.first(:uri => @uri).should == @resource
+          DataMapper::TypesFixtures::Bookmark.first(:uri => @uri).should == @resource
         end
 
         describe 'when reloaded' do
@@ -70,7 +70,7 @@ try_spec do
       describe 'with invalid URI' do
         before :all do
           @uri = 'this is def. not URI'
-          @resource = DataMapper::Types::Fixtures::Bookmark.new(
+          @resource = DataMapper::TypesFixtures::Bookmark.new(
             :title  => 'Check this out',
             :uri    => @uri,
             :shared => false,
@@ -109,7 +109,7 @@ try_spec do
       ].each do |uri|
         describe "with URI set to '#{uri}'" do
           before :all do
-            @resource = DataMapper::Types::Fixtures::Bookmark.new(
+            @resource = DataMapper::TypesFixtures::Bookmark.new(
               :title  => 'Check this out',
               :uri    => uri,
               :shared => false,
@@ -120,7 +120,7 @@ try_spec do
           end
 
           it 'can be found by uri' do
-            DataMapper::Types::Fixtures::Bookmark.first(:uri => uri).should_not be_blank
+            DataMapper::TypesFixtures::Bookmark.first(:uri => uri).should_not be_blank
           end
 
           describe 'when reloaded' do

data/spec/integration/uuid_spec.rb

@@ -4,13 +4,13 @@ try_spec do
 
   require './spec/fixtures/network_node'
 
-  describe DataMapper::Types::Fixtures::NetworkNode do
+  describe DataMapper::TypesFixtures::NetworkNode do
     supported_by :all do
       describe 'with UUID set as UUID object' do
         before :all do
           @uuid_string = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
           @uuid        = UUIDTools::UUID.parse(@uuid_string)
-          @resource    = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          @resource    = DataMapper::TypesFixtures::NetworkNode.new(:uuid => @uuid)
 
           @resource.save.should be(true)
         end
@@ -33,7 +33,7 @@ try_spec do
       describe 'with UUID set as a valid UUID string' do
         before :all do
           @uuid  = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
-          @resource = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          @resource = DataMapper::TypesFixtures::NetworkNode.new(:uuid => @uuid)
         end
 
         describe 'when reloaded' do
@@ -55,7 +55,7 @@ try_spec do
         before :all do
           @uuid  = 'meh'
           @operation = lambda do
-            DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+            DataMapper::TypesFixtures::NetworkNode.new(:uuid => @uuid)
           end
         end
 
@@ -70,7 +70,7 @@ try_spec do
         before :all do
           @uuid  = ''
           @operation = lambda do
-            DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+            DataMapper::TypesFixtures::NetworkNode.new(:uuid => @uuid)
           end
         end
 
@@ -84,7 +84,7 @@ try_spec do
       describe 'with missing UUID' do
         before :all do
           @uuid  = nil
-          @resource = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          @resource = DataMapper::TypesFixtures::NetworkNode.new(:uuid => @uuid)
         end
 
         describe 'when reloaded' do

data/spec/integration/yaml_spec.rb

@@ -5,10 +5,10 @@ try_spec do
   require './spec/fixtures/person'
   require './spec/fixtures/invention'
 
-  describe DataMapper::Types::Fixtures::Person do
+  describe DataMapper::TypesFixtures::Person do
     supported_by :all do
       before :all do
-        @resource = DataMapper::Types::Fixtures::Person.new(:name => '')
+        @resource = DataMapper::TypesFixtures::Person.new(:name => '')
       end
 
       describe 'with no inventions information' do
@@ -31,7 +31,7 @@ try_spec do
       describe 'with a few items on the inventions list' do
         before :all do
           @input = [ 'carbon telephone transmitter', 'light bulb', 'electric grid' ].map do |name|
-            DataMapper::Types::Fixtures::Invention.new(name)
+            DataMapper::TypesFixtures::Invention.new(name)
           end
           @resource.inventions = @input
         end

data/spec/shared/flags_shared_spec.rb

@@ -0,0 +1,37 @@
+share_examples_for "A property with flags" do
+  before :all do
+    %w[ @property_klass ].each do |ivar|
+      raise "+#{ivar}+ should be defined in before block" unless instance_variable_defined?(ivar)
+    end
+
+    @flags = [ :one, :two, :three ]
+
+    class ::User
+      include DataMapper::Resource
+    end
+
+    @property = User.property :item, @property_klass[@flags], :key => true
+  end
+
+  describe ".generated_classes" do
+    it "should cache the generated class" do
+      @property_klass.generated_classes[@flags].should_not be_nil
+    end
+  end
+
+  it "should include :flags in accepted_options" do
+    @property_klass.accepted_options.should include(:flags)
+  end
+
+  it "should respond to :generated_classes" do
+    @property_klass.should respond_to(:generated_classes)
+  end
+
+  it "should respond to :flag_map" do
+    @property.should respond_to(:flag_map)
+  end
+
+  it "should be custom" do
+    @property.custom?.should be(true)
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'dm-types'
 require 'dm-migrations'
 require 'dm-validations'
 
+Dir["#{Pathname(__FILE__).dirname.expand_path}/shared/*"].each { |file| require file }
+
 DataMapper::Spec.setup
 
 Spec::Runner.configure do |config|

data/spec/unit/bcrypt_hash_spec.rb

@@ -8,13 +8,13 @@ try_spec do
 
       @nonstandard_type = 1
 
-      class TestType
+      class ::TestType
         @a = 1
         @b = 'Hi There'
       end
       @nonstandard_type2 = TestType.new
 
-      class User
+      class ::User
         include DataMapper::Resource
         property :id, Serial
         property :password, BCryptHash

data/spec/unit/csv_spec.rb

@@ -4,7 +4,7 @@ try_spec do
   describe DataMapper::Property::Csv do
     supported_by :all do
       before :all do
-        class User
+        class ::User
           include DataMapper::Resource
           property :id, Serial
           property :things, Csv

data/spec/unit/enum_spec.rb

@@ -7,8 +7,12 @@ try_spec do
         include DataMapper::Resource
         property :id, Serial
       end
+
+      @property_klass = DataMapper::Property::Enum
     end
 
+    it_should_behave_like "A property with flags"
+
     describe '.dump' do
       before do
         @enum = User.property(:enum, DataMapper::Property::Enum[:first, :second, :third])

data/spec/unit/epoch_time_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 try_spec do
   describe DataMapper::Property::EpochTime do
     before :all do
-      class User
+      class ::User
         include DataMapper::Resource
         property :id, Serial
         property :bday, EpochTime

data/spec/unit/file_path_spec.rb

@@ -4,7 +4,7 @@ require './spec/fixtures/software_package'
 try_spec do
   describe DataMapper::Property::FilePath do
     before :all do
-      @property = DataMapper::Types::Fixtures::SoftwarePackage.properties[:source_path]
+      @property = DataMapper::TypesFixtures::SoftwarePackage.properties[:source_path]
     end
 
     before do

data/spec/unit/flag_spec.rb

@@ -6,10 +6,14 @@ try_spec do
   describe DataMapper::Property::Flag do
     describe '.dump' do
       before :all do
-        @flag = DataMapper::Types::Fixtures::TShirt.property(
+        @flag = DataMapper::TypesFixtures::TShirt.property(
           :stuff, DataMapper::Property::Flag[:first, :second, :third, :fourth, :fifth])
+
+        @property_klass = DataMapper::Property::Flag
       end
 
+    it_should_behave_like "A property with flags"
+
       describe 'when argument matches a value in the flag map' do
         before :all do
           @result = @flag.dump(:first)
@@ -63,7 +67,7 @@ try_spec do
 
     describe '.load' do
       before :all do
-        @flag = DataMapper::Types::Fixtures::TShirt.property(:stuff, DataMapper::Property::Flag, :flags => [:uno, :dos, :tres, :cuatro, :cinco])
+        @flag = DataMapper::TypesFixtures::TShirt.property(:stuff, DataMapper::Property::Flag, :flags => [:uno, :dos, :tres, :cuatro, :cinco])
       end
 
       describe 'when argument matches a key in the flag map' do

data/spec/unit/ip_address_spec.rb

@@ -7,7 +7,7 @@ try_spec do
     before :all do
       @stored = '81.20.130.1'
       @input  = IPAddr.new(@stored)
-      @property = DataMapper::Types::Fixtures::NetworkNode.properties[:ip_address]
+      @property = DataMapper::TypesFixtures::NetworkNode.properties[:ip_address]
     end
 
     describe '#valid?' do

data/spec/unit/json_spec.rb

@@ -7,7 +7,7 @@ try_spec do
 
   describe DataMapper::Property::Json do
     before :all do
-      @property = DataMapper::Types::Fixtures::Person.properties[:positions]
+      @property = DataMapper::TypesFixtures::Person.properties[:positions]
     end
 
     describe '#valid?' do
@@ -83,7 +83,7 @@ try_spec do
     end
 
     describe '.typecast' do
-      class SerializeMe
+      class ::SerializeMe
         attr_accessor :name
       end
 

data/spec/unit/regexp_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 try_spec do
   describe DataMapper::Property::Regexp  do
     before :all do
-      class User
+      class ::User
         include DataMapper::Resource
         property :id, Serial
         property :regexp, Regexp

data/spec/unit/uri_spec.rb

@@ -8,7 +8,7 @@ try_spec do
       @uri_str = 'http://example.com/path/to/resource/'
       @uri     = Addressable::URI.parse(@uri_str)
 
-      @property = DataMapper::Types::Fixtures::Bookmark.properties[:uri]
+      @property = DataMapper::TypesFixtures::Bookmark.properties[:uri]
     end
 
     describe '.dump' do

data/spec/unit/uuid_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+try_spec do
+  require './spec/fixtures/network_node'
+
+  describe DataMapper::Property::UUID do
+    before :all do
+      @property = DataMapper::TypesFixtures::NetworkNode.properties[:node_uuid]
+      @input    = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+      @uuid     = UUIDTools::UUID.random_create
+    end
+
+    describe '#valid?' do
+      describe "with a String" do
+        subject { @property.valid?(@input) }
+        it { subject.should be(true) }
+      end
+
+      describe "with a UUIDTools::UUID" do
+        subject { @property.valid?(@uuid) }
+        it { subject.should be(true) }
+      end
+    end
+  end
+end

data/spec/unit/yaml_spec.rb

@@ -7,7 +7,7 @@ try_spec do
 
   describe DataMapper::Property::Yaml do
     before :all do
-      @property = DataMapper::Types::Fixtures::Person.properties[:inventions]
+      @property = DataMapper::TypesFixtures::Person.properties[:inventions]
     end
 
     describe '.load' do
@@ -65,7 +65,7 @@ try_spec do
     end
 
     describe '.typecast' do
-      class SerializeMe
+      class ::SerializeMe
         attr_accessor :name
       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-types
 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: 
 - Dan Kubb
@@ -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: 5
         segments: 
         - 1
         - 5
@@ -58,12 +55,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 4
-        - 3
-        version: 1.4.3
+        version: "1.4"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,7 +69,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 1
@@ -90,7 +84,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -106,7 +99,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -121,12 +113,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: *id007
 description: DataMapper plugin providing extra data types
@@ -161,6 +152,7 @@ files:
 - lib/dm-types/paranoid_datetime.rb
 - lib/dm-types/regexp.rb
 - lib/dm-types/slug.rb
+- lib/dm-types/support/flags.rb
 - lib/dm-types/uri.rb
 - lib/dm-types/uuid.rb
 - lib/dm-types/yaml.rb
@@ -184,6 +176,7 @@ files:
 - 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
@@ -199,6 +192,7 @@ files:
 - 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/ci.rake
 - tasks/local_gemfile.rake
@@ -220,7 +214,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -229,7 +222,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -260,6 +252,7 @@ test_files:
 - spec/integration/uri_spec.rb
 - spec/integration/uuid_spec.rb
 - spec/integration/yaml_spec.rb
+- spec/shared/flags_shared_spec.rb
 - spec/shared/identity_function_group.rb
 - spec/spec_helper.rb
 - spec/unit/bcrypt_hash_spec.rb
@@ -274,4 +267,5 @@ test_files:
 - 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