dm-types 0.10.2 → 1.0.0.rc1

data/spec/integration/ip_address_spec.rb

@@ -15,139 +15,141 @@ try_spec do
   require './spec/fixtures/network_node'
 
   describe DataMapper::Types::Fixtures::NetworkNode do
-    before :all do
-      @resource = DataMapper::Types::Fixtures::NetworkNode.new(
-        :node_uuid        => '25a44800-21c9-11de-8c30-0800200c9a66',
-        :ip_address       => nil,
-        :cidr_subnet_bits => nil
-      )
-    end
-
-    include IPAddressMatchers
-
-    describe 'with IP address fe80::ab8:e8ff:fed7:f8c9' do
+    supported_by :all do
       before :all do
-        @resource.ip_address = 'fe80::ab8:e8ff:fed7:f8c9'
+        @resource = DataMapper::Types::Fixtures::NetworkNode.new(
+          :node_uuid        => '25a44800-21c9-11de-8c30-0800200c9a66',
+          :ip_address       => nil,
+          :cidr_subnet_bits => nil
+        )
       end
 
-      describe 'when dumped and loaded' do
+      include IPAddressMatchers
+
+      describe 'with IP address fe80::ab8:e8ff:fed7:f8c9' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = 'fe80::ab8:e8ff:fed7:f8c9'
         end
 
-        it 'is an IPv6 node' do
-          @resource.should run_ipv6
-        end
-      end
-    end
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with IP address 127.0.0.1' do
-      before :all do
-        @resource.ip_address = '127.0.0.1'
+          it 'is an IPv6 node' do
+            @resource.should run_ipv6
+          end
+        end
       end
 
-      describe 'when dumped and loaded' do
+      describe 'with IP address 127.0.0.1' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = '127.0.0.1'
         end
 
-        it 'is an IPv4 node' do
-          @resource.should run_ipv4
-        end
-      end
-    end
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with IP address 218.43.243.136' do
-      before :all do
-        @resource.ip_address = '218.43.243.136'
+          it 'is an IPv4 node' do
+            @resource.should run_ipv4
+          end
+        end
       end
 
-      describe 'when dumped and loaded' do
+      describe 'with IP address 218.43.243.136' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = '218.43.243.136'
         end
 
-        it 'is an IPv4 node' do
-          @resource.should run_ipv4
-        end
-      end
-    end
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with IP address 221.186.184.68' do
-      before :all do
-        @resource.ip_address = '221.186.184.68'
+          it 'is an IPv4 node' do
+            @resource.should run_ipv4
+          end
+        end
       end
 
-      describe 'when dumped and loaded' do
+      describe 'with IP address 221.186.184.68' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = '221.186.184.68'
         end
 
-        it 'is an IPv4 node' do
-          @resource.should run_ipv4
-        end
-      end
-    end
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with IP address given as CIDR' do
-      before :all do
-        @resource.ip_address = '218.43.243.0/24'
+          it 'is an IPv4 node' do
+            @resource.should run_ipv4
+          end
+        end
       end
 
-      describe 'when dumped and loaded' do
+      describe 'with IP address given as CIDR' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = '218.43.243.0/24'
         end
 
-        it 'is an IPv4 node' do
-          @resource.should run_ipv4
-        end
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-        it 'includes IP address 218.43.243.2 in subnet hosts' do
-          @resource.ip_address.include?('218.43.243.2')
-        end
-      end
-    end
+          it 'is an IPv4 node' do
+            @resource.should run_ipv4
+          end
 
-    describe 'with a blank string used as IP address' do
-      before :all do
-        @resource.ip_address = ''
+          it 'includes IP address 218.43.243.2 in subnet hosts' do
+            @resource.ip_address.include?('218.43.243.2')
+          end
+        end
       end
 
-      describe 'when dumped and loaded' do
+      describe 'with a blank string used as IP address' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = ''
         end
 
-        it 'is an IPv4 node' do
-          @resource.should run_ipv4
-        end
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-        it 'should be the expected value' do
-          @resource.ip_address.should == IPAddr.new('0.0.0.0')
-        end
-      end
-    end
+          it 'is an IPv4 node' do
+            @resource.should run_ipv4
+          end
 
-    describe 'with NO IP address' do
-      before :all do
-        @resource.ip_address = nil
+          it 'should be the expected value' do
+            @resource.ip_address.should == IPAddr.new('0.0.0.0')
+          end
+        end
       end
 
-      describe 'when dumped and loaded' do
+      describe 'with NO IP address' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.ip_address = nil
         end
 
-        it 'has no IP address assigned' do
-          @resource.ip_address.should be_nil
+        describe 'when dumped and loaded' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
+
+          it 'has no IP address assigned' do
+            @resource.ip_address.should be_nil
+          end
         end
       end
     end

data/spec/integration/json_spec.rb

@@ -5,63 +5,65 @@ try_spec do
   require './spec/fixtures/person'
 
   describe DataMapper::Types::Fixtures::Person do
-    before :all do
-      @resource = DataMapper::Types::Fixtures::Person.new(:name => 'Thomas Edison')
-    end
-
-    describe 'with no positions information' do
+    supported_by :all do
       before :all do
-        @resource.positions = nil
+        @resource = DataMapper::Types::Fixtures::Person.new(:name => 'Thomas Edison')
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with no positions information' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.positions = nil
         end
 
-        it 'has nil positions list' do
-          @resource.positions.should be_nil
-        end
-      end
-    end
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with a few items on the positions list' do
-      before :all do
-        @resource.positions = [
-          { :company => 'The Death Star, Inc', :title => 'Light sabre engineer'    },
-          { :company => 'Sane Little Company', :title => 'Chief Curiosity Officer' },
-        ]
+          it 'has nil positions list' do
+            @resource.positions.should be_nil
+          end
+        end
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with a few items on the positions list' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
-        end
-
-        it 'loads positions list to the state when it was dumped/persisted with keys being strings' do
-          @resource.positions.should == [
-            { 'company' => 'The Death Star, Inc',  'title' => 'Light sabre engineer'    },
-            { 'company'  => 'Sane Little Company', 'title' => 'Chief Curiosity Officer' },
+          @resource.positions = [
+            { :company => 'The Death Star, Inc', :title => 'Light sabre engineer'    },
+            { :company => 'Sane Little Company', :title => 'Chief Curiosity Officer' },
           ]
         end
-      end
-    end
 
-    describe 'with positions information given as empty list' do
-      before :all do
-        @resource.positions = []
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
+
+          it 'loads positions list to the state when it was dumped/persisted with keys being strings' do
+            @resource.positions.should == [
+              { 'company' => 'The Death Star, Inc',  'title' => 'Light sabre engineer'    },
+              { 'company'  => 'Sane Little Company', 'title' => 'Chief Curiosity Officer' },
+            ]
+          end
+        end
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with positions information given as empty list' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.positions = []
         end
 
-        it 'has empty positions list' do
-          @resource.positions.should == []
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
+
+          it 'has empty positions list' do
+            @resource.positions.should == []
+          end
         end
       end
     end

data/spec/integration/slug_spec.rb

@@ -7,47 +7,49 @@ try_spec do
   require './spec/fixtures/article'
 
   describe DataMapper::Types::Fixtures::Article do
-    describe "persisted with title and slug set to 'New DataMapper Type'" do
-      before :all do
-        @input    = 'New DataMapper Type'
-        @resource = DataMapper::Types::Fixtures::Article.create(:title => @input, :slug => @input)
-
-        @resource.reload
-      end
-
-      it 'has slug equal to "new-datamapper-type"' do
-        @resource.slug.should == 'new-datamapper-type'
-      end
-
-      it 'can be found by slug' do
-        DataMapper::Types::Fixtures::Article.first(:slug => 'new-datamapper-type').should == @resource
-      end
-    end
-
-    [
-     ['Iñtërnâtiônàlizætiøn',      'internationalizaetion' ],
-     ["This is Dan's Blog",        'this-is-dans-blog'],
-     ['This is My Site, and Blog', 'this-is-my-site-and-blog'],
-     ['Google searches for holy grail of Python performance', 'google-searches-for-holy-grail-of-python-performance'],
-     ['iPhone dev: Creating length-controlled data sources', 'iphone-dev-creating-length-controlled-data-sources'],
-     ["Review: Nintendo's New DSi -- A Quantum Leap Forward", 'review-nintendos-new-dsi-a-quantum-leap-forward'],
-     ["Arriva BraiVe, è l'auto-robot che si 'guida' da sola'", 'arriva-braive-e-lauto-robot-che-si-guida-da-sola'],
-     ["La ley antipiratería reduce un 33% el tráfico online en Suecia", 'la-ley-antipirateria-reduce-un-33-percent-el-trafico-online-en-suecia'],
-     ["L'Etat américain du Texas s'apprête à interdire Windows Vista", 'letat-americain-du-texas-sapprete-a-interdire-windows-vista']
-    ].each do |title, slug|
-      describe "persisted with title '#{title}'" do
+    supported_by :all do
+      describe "persisted with title and slug set to 'New DataMapper Type'" do
         before :all do
-          @resource = DataMapper::Types::Fixtures::Article.new(:title => title)
-          @resource.save.should be_true
+          @input    = 'New DataMapper Type'
+          @resource = DataMapper::Types::Fixtures::Article.create(:title => @input, :slug => @input)
+
           @resource.reload
         end
 
-        it "has slug equal to '#{slug}'" do
-          @resource.slug.should == slug
+        it 'has slug equal to "new-datamapper-type"' do
+          @resource.slug.should == 'new-datamapper-type'
         end
 
         it 'can be found by slug' do
-          DataMapper::Types::Fixtures::Article.first(:slug => slug).should == @resource
+          DataMapper::Types::Fixtures::Article.first(:slug => 'new-datamapper-type').should == @resource
+        end
+      end
+
+      [
+       ['Iñtërnâtiônàlizætiøn',      'internationalizaetion' ],
+       ["This is Dan's Blog",        'this-is-dans-blog'],
+       ['This is My Site, and Blog', 'this-is-my-site-and-blog'],
+       ['Google searches for holy grail of Python performance', 'google-searches-for-holy-grail-of-python-performance'],
+       ['iPhone dev: Creating length-controlled data sources', 'iphone-dev-creating-length-controlled-data-sources'],
+       ["Review: Nintendo's New DSi -- A Quantum Leap Forward", 'review-nintendos-new-dsi-a-quantum-leap-forward'],
+       ["Arriva BraiVe, è l'auto-robot che si 'guida' da sola'", 'arriva-braive-e-lauto-robot-che-si-guida-da-sola'],
+       ["La ley antipiratería reduce un 33% el tráfico online en Suecia", 'la-ley-antipirateria-reduce-un-33-percent-el-trafico-online-en-suecia'],
+       ["L'Etat américain du Texas s'apprête à interdire Windows Vista", 'letat-americain-du-texas-sapprete-a-interdire-windows-vista']
+      ].each do |title, slug|
+        describe "persisted with title '#{title}'" do
+          before :all do
+            @resource = DataMapper::Types::Fixtures::Article.new(:title => title)
+            @resource.save.should be_true
+            @resource.reload
+          end
+
+          it "has slug equal to '#{slug}'" do
+            @resource.slug.should == slug
+          end
+
+          it 'can be found by slug' do
+            DataMapper::Types::Fixtures::Article.first(:slug => slug).should == @resource
+          end
         end
       end
     end

data/spec/integration/uri_spec.rb

@@ -5,83 +5,85 @@ try_spec do
   require './spec/fixtures/bookmark'
 
   describe DataMapper::Types::Fixtures::Bookmark do
-    describe 'without URI' do
-      before :all do
-        @uri = nil
-        @resource = DataMapper::Types::Fixtures::Bookmark.new(
-          :title  => 'Check this out',
-          :uri    => @uri,
-          :shared => false,
-          :tags   => %w[ misc ]
-        )
-
-        @resource.save.should be_true
-      end
-
-      it 'can be found by uri' do
-        DataMapper::Types::Fixtures::Bookmark.first(:uri => @uri).should == @resource
-      end
-
-      describe 'when reloaded' do
+    supported_by :all do
+      describe 'without URI' do
         before :all do
-          @resource.reload
+          @uri = nil
+          @resource = DataMapper::Types::Fixtures::Bookmark.new(
+            :title  => 'Check this out',
+            :uri    => @uri,
+            :shared => false,
+            :tags   => %w[ misc ]
+          )
+
+          @resource.save.should be_true
         end
 
-        it 'has no uri' do
-          @resource.uri.should be_nil
+        it 'can be found by uri' do
+          DataMapper::Types::Fixtures::Bookmark.first(:uri => @uri).should == @resource
         end
-      end
-    end
 
-    describe 'with a blank URI' do
-      before :all do
-        @uri = ''
-        @resource = DataMapper::Types::Fixtures::Bookmark.new(
-          :title  => 'Check this out',
-          :uri    => @uri,
-          :shared => false,
-          :tags   => %w[ misc ]
-        )
-
-        @resource.save.should be_true
-      end
+        describe 'when reloaded' do
+          before :all do
+            @resource.reload
+          end
 
-      it 'can be found by uri' do
-        DataMapper::Types::Fixtures::Bookmark.first(:uri => @uri).should == @resource
+          it 'has no uri' do
+            @resource.uri.should be_nil
+          end
+        end
       end
 
-      describe 'when reloaded' do
+      describe 'with a blank URI' do
         before :all do
-          @resource.reload
+          @uri = ''
+          DataMapper::Types::Fixtures::Bookmark.auto_migrate!
+          @resource = DataMapper::Types::Fixtures::Bookmark.new(
+            :title  => 'Check this out',
+            :uri    => @uri,
+            :shared => false,
+            :tags   => %w[ misc ]
+          )
+
+          @resource.save.should be_true
         end
 
-        it 'is loaded as URI object' do
-          @resource.uri.should be_an_instance_of(Addressable::URI)
+        it 'can be found by uri' do
+          DataMapper::Types::Fixtures::Bookmark.first(:uri => @uri).should == @resource
         end
 
-        it 'has the same original URI' do
-          @resource.uri.to_s.should == @uri
+        describe 'when reloaded' do
+          before :all do
+            @resource.reload
+          end
+
+          it 'is loaded as URI object' do
+            @resource.uri.should be_an_instance_of(Addressable::URI)
+          end
+
+          it 'has the same original URI' do
+            @resource.uri.to_s.should == @uri
+          end
         end
       end
-    end
 
-    describe 'with invalid URI' do
-      before :all do
-        @uri = 'this is def. not URI'
-        @resource = DataMapper::Types::Fixtures::Bookmark.new(
-          :title  => 'Check this out',
-          :uri    => @uri,
-          :shared => false,
-          :tags   => %w[ misc ]
-        )
-      end
+      describe 'with invalid URI' do
+        before :all do
+          @uri = 'this is def. not URI'
+          @resource = DataMapper::Types::Fixtures::Bookmark.new(
+            :title  => 'Check this out',
+            :uri    => @uri,
+            :shared => false,
+            :tags   => %w[ misc ]
+          )
+        end
 
-      it 'is perfectly valid (URI type does not provide auto validations)' do
-        @resource.save.should be_true
+        it 'is perfectly valid (URI type does not provide auto validations)' do
+          @resource.save.should be_true
+        end
       end
-    end
 
-    %w[
+      %w[
       http://apple.com
       http://www.apple.com
       http://apple.com/
@@ -104,30 +106,31 @@ try_spec do
       http://www.hulu.com/watch/64923/terminator-the-sarah-connor-chronicles-to-the-lighthouse
       http://hulu.com:80/browse/popular/tv
       http://www.hulu.com/watch/62475/the-simpsons-gone-maggie-gone#s-p1-so-i0
-    ].each do |uri|
-      describe "with URI set to '#{uri}'" do
-        before :all do
-          @resource = DataMapper::Types::Fixtures::Bookmark.new(
-            :title  => 'Check this out',
-            :uri    => uri,
-            :shared => false,
-            :tags   => %w[ misc ]
-          )
-
-          @resource.save.should be_true
-        end
-
-        it 'can be found by uri' do
-          DataMapper::Types::Fixtures::Bookmark.first(:uri => uri).should_not be_blank
-        end
-
-        describe 'when reloaded' do
+      ].each do |uri|
+        describe "with URI set to '#{uri}'" do
           before :all do
-            @resource.reload
+            @resource = DataMapper::Types::Fixtures::Bookmark.new(
+              :title  => 'Check this out',
+              :uri    => uri,
+              :shared => false,
+              :tags   => %w[ misc ]
+            )
+
+            @resource.save.should be_true
           end
 
-          it 'has the same original URI' do
-            @resource.uri.to_s.should eql(uri)
+          it 'can be found by uri' do
+            DataMapper::Types::Fixtures::Bookmark.first(:uri => uri).should_not be_blank
+          end
+
+          describe 'when reloaded' do
+            before :all do
+              @resource.reload
+            end
+
+            it 'has the same original URI' do
+              @resource.uri.to_s.should eql(uri)
+            end
           end
         end
       end