dm-types 1.0.0 → 1.0.1

data/spec/fixtures/invention.rb

@@ -1,9 +1,7 @@
 module DataMapper
-  module Types
-    module Fixtures
+  module TypesFixtures
 
-      Invention = Struct.new(:name)
+    Invention = Struct.new(:name)
 
-    end
   end
 end

data/spec/fixtures/network_node.rb

@@ -1,38 +1,36 @@
 module DataMapper
-  module Types
-    module Fixtures
-
-      class NetworkNode
-        #
-        # Behaviors
-        #
-
-        include ::DataMapper::Resource
-
-        #
-        # Properties
-        #
-
-        property :id,               Serial
-        property :ip_address,       IPAddress
-        property :cidr_subnet_bits, Integer
-        property :node_uuid,        UUID
-
-        #
-        # API
-        #
-
-        alias uuid  node_uuid
-        alias uuid= node_uuid=
-
-        def runs_ipv6?
-          self.ip_address.ipv6?
-        end
-
-        def runs_ipv4?
-          self.ip_address.ipv4?
-        end
-      end # NetworkNode
-    end # Fixtures
-  end # Types
+  module TypesFixtures
+
+    class NetworkNode
+      #
+      # Behaviors
+      #
+
+      include ::DataMapper::Resource
+
+      #
+      # Properties
+      #
+
+      property :id,               Serial
+      property :ip_address,       IPAddress
+      property :cidr_subnet_bits, Integer
+      property :node_uuid,        UUID
+
+      #
+      # API
+      #
+
+      alias uuid  node_uuid
+      alias uuid= node_uuid=
+
+      def runs_ipv6?
+        self.ip_address.ipv6?
+      end
+
+      def runs_ipv4?
+        self.ip_address.ipv4?
+      end
+    end # NetworkNode
+  end # TypesFixtures
 end # DataMapper

data/spec/fixtures/person.rb

@@ -1,27 +1,24 @@
 module DataMapper
-  module Types
-    module Fixtures
+  module TypesFixtures
+    class Person
+      #
+      # Behaviors
+      #
 
-      class Person
-        #
-        # Behaviors
-        #
+      include DataMapper::Resource
 
-        include DataMapper::Resource
+      #
+      # Properties
+      #
 
-        #
-        # Properties
-        #
+      property :id,         Serial
+      property :name,       String
+      property :positions,  Json
+      property :inventions, Yaml
 
-        property :id,         Serial
-        property :name,       String
-        property :positions,  Json
-        property :inventions, Yaml
+      property :interests, CommaSeparatedList
 
-        property :interests, CommaSeparatedList
-
-        property :password, BCryptHash
-      end
+      property :password, BCryptHash
     end
   end
 end

data/spec/fixtures/software_package.rb

@@ -1,35 +1,33 @@
 module DataMapper
-  module Types
-    module Fixtures
+  module TypesFixtures
 
-      class SoftwarePackage
-        #
-        # Behaviors
-        #
+    class SoftwarePackage
+      #
+      # Behaviors
+      #
 
-        include ::DataMapper::Resource
+      include ::DataMapper::Resource
 
-        #
-        # Properties
-        #
+      #
+      # Properties
+      #
 
-        property :id, Serial
-        without_auto_validations do
-          property :node_number, Integer, :index => true
+      property :id, Serial
+      without_auto_validations do
+        property :node_number, Integer, :index => true
 
-          property :source_path,      FilePath
-          property :destination_path, FilePath
+        property :source_path,      FilePath
+        property :destination_path, FilePath
 
-          property :product,     String
-          property :version,     String
-          property :released_at, DateTime
+        property :product,     String
+        property :version,     String
+        property :released_at, DateTime
 
-          property :security_update,  Boolean
+        property :security_update,  Boolean
 
-          property :installed_at,     DateTime
-          property :installed_by,     String
-        end
-      end # SoftwarePackage
-    end # Fixtures
-  end # Types
+        property :installed_at,     DateTime
+        property :installed_by,     String
+      end
+    end # SoftwarePackage
+  end # TypesFixtures
 end # DataMapper

data/spec/fixtures/ticket.rb

@@ -1,23 +1,21 @@
 module DataMapper
-  module Types
-    module Fixtures
-      class Ticket
-        #
-        # Behaviors
-        #
+  module TypesFixtures
+    class Ticket
+      #
+      # Behaviors
+      #
 
-        include DataMapper::Resource
-        include DataMapper::Validations
+      include DataMapper::Resource
+      include DataMapper::Validations
 
-        #
-        # Properties
-        #
+      #
+      # Properties
+      #
 
-        property :id,     Serial
-        property :title,  String, :length => 255
-        property :body,   Text
-        property :status, Enum[:unconfirmed, :confirmed, :assigned, :resolved, :not_applicable]
-      end # Ticket
-    end
+      property :id,     Serial
+      property :title,  String, :length => 255
+      property :body,   Text
+      property :status, Enum[:unconfirmed, :confirmed, :assigned, :resolved, :not_applicable]
+    end # Ticket
   end
 end

data/spec/fixtures/tshirt.rb

@@ -1,6 +1,5 @@
 module DataMapper
-  module Types
-    module Fixtures
+  module TypesFixtures
 
       class TShirt
         #
@@ -21,6 +20,5 @@ module DataMapper
         property :color, Enum[:white, :black, :red, :orange, :yellow, :green, :cyan, :blue, :purple]
         property :size,  Flag[:xs, :small, :medium, :large, :xl, :xxl], :default => :xs
       end # Shirt
-    end # Fixtures
-  end # Types
+    end # TypesFixtures
 end # DataMapper

data/spec/integration/bcrypt_hash_spec.rb

@@ -4,13 +4,13 @@ try_spec do
 
   require './spec/fixtures/person'
 
-  describe DataMapper::Types::Fixtures::Person do
+  describe DataMapper::TypesFixtures::Person do
     supported_by :all do
       before :all  do
-        @resource  = DataMapper::Types::Fixtures::Person.create(:password => 'DataMapper R0cks!')
-        DataMapper::Types::Fixtures::Person.create(:password => 'password1')
+        @resource  = DataMapper::TypesFixtures::Person.create(:password => 'DataMapper R0cks!')
+        DataMapper::TypesFixtures::Person.create(:password => 'password1')
 
-        @people = DataMapper::Types::Fixtures::Person.all
+        @people = DataMapper::TypesFixtures::Person.all
         @resource.reload
       end
 

data/spec/integration/comma_separated_list_spec.rb

@@ -4,10 +4,10 @@ try_spec do
 
   require './spec/fixtures/person'
 
-  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 interests information' do

data/spec/integration/enum_spec.rb

@@ -4,11 +4,11 @@ try_spec do
 
   require './spec/fixtures/ticket'
 
-  describe DataMapper::Types::Fixtures::Ticket do
+  describe DataMapper::TypesFixtures::Ticket do
     supported_by :all do
       describe 'that is dumped and then loaded' do
         before :all do
-          @resource = DataMapper::Types::Fixtures::Ticket.new(
+          @resource = DataMapper::TypesFixtures::Ticket.new(
             :title  => "Can't order by aggregated fields",
             :id     => 789,
             :body   => "I'm trying to use the aggregate method and sort the results by a summed field, but it doesn't work.",
@@ -26,7 +26,7 @@ try_spec do
 
       describe 'that is supplied a matching enumeration value' do
         before :all do
-          @resource = DataMapper::Types::Fixtures::Ticket.new(:status => :assigned)
+          @resource = DataMapper::TypesFixtures::Ticket.new(:status => :assigned)
         end
 
         it 'typecasts it for outside reader' do
@@ -36,7 +36,7 @@ try_spec do
 
       describe '#get' do
         before :all do
-          @resource = DataMapper::Types::Fixtures::Ticket.new(
+          @resource = DataMapper::TypesFixtures::Ticket.new(
             :title  => '"sudo make install" of drizzle fails because it tries to chown mysql',
             :id     => 257497,
             :body   => "Note that at the very least, there should be a check to see whether or not the user is created before chown'ing a file to the user.",
@@ -46,19 +46,19 @@ try_spec do
         end
 
         it 'supports queries with equality operator on enumeration property' do
-          DataMapper::Types::Fixtures::Ticket.all(:status => :confirmed).
+          DataMapper::TypesFixtures::Ticket.all(:status => :confirmed).
             should include(@resource)
         end
 
         it 'supports queries with inequality operator on enumeration property' do
-          DataMapper::Types::Fixtures::Ticket.all(:status.not => :confirmed).
+          DataMapper::TypesFixtures::Ticket.all(:status.not => :confirmed).
             should_not include(@resource)
         end
       end
 
       describe 'with value unknown to enumeration property' do
         before :all do
-          @resource = DataMapper::Types::Fixtures::Ticket.new(:status => :undecided)
+          @resource = DataMapper::TypesFixtures::Ticket.new(:status => :undecided)
         end
 
         # TODO: consider sharing shared spec exampels with dm-validations,

data/spec/integration/file_path_spec.rb

@@ -4,12 +4,12 @@ try_spec do
 
   require './spec/fixtures/software_package'
 
-  describe DataMapper::Types::Fixtures::SoftwarePackage do
+  describe DataMapper::TypesFixtures::SoftwarePackage do
     supported_by :all do
       describe 'with source path at /var/cache/apt/archives/linux-libc-dev_2.6.28-11.40_i386.deb' do
         before :all do
           @source_path = '/var/cache/apt/archives/linux-libc-dev_2.6.28-11.40_i386.deb'
-          @resource    = DataMapper::Types::Fixtures::SoftwarePackage.new(:source_path => @source_path)
+          @resource    = DataMapper::TypesFixtures::SoftwarePackage.new(:source_path => @source_path)
         end
 
         describe 'when is a new record' do
@@ -49,7 +49,7 @@ try_spec do
       describe 'with destination path at /usr/local' do
         before :all do
           @destination_path = '/usr/local'
-          @resource         = DataMapper::Types::Fixtures::SoftwarePackage.new(:destination_path => @destination_path)
+          @resource         = DataMapper::TypesFixtures::SoftwarePackage.new(:destination_path => @destination_path)
         end
 
         describe 'when saved and reloaded' do
@@ -91,7 +91,7 @@ try_spec do
       describe 'with no (nil) source path' do
         before :all do
           @source_path = nil
-          @resource    = DataMapper::Types::Fixtures::SoftwarePackage.new(:source_path => @source_path)
+          @resource    = DataMapper::TypesFixtures::SoftwarePackage.new(:source_path => @source_path)
         end
 
         describe 'when saved and reloaded' do
@@ -109,7 +109,7 @@ try_spec do
       describe 'with a blank source path' do
         before :all do
           @source_path = ''
-          @resource    = DataMapper::Types::Fixtures::SoftwarePackage.new(:source_path => @source_path)
+          @resource    = DataMapper::TypesFixtures::SoftwarePackage.new(:source_path => @source_path)
         end
 
         describe 'when saved and reloaded' do
@@ -127,7 +127,7 @@ try_spec do
       describe 'with a source path assigned to an empty array' do
         before :all do
           @source_path = []
-          @resource    = DataMapper::Types::Fixtures::SoftwarePackage.new(:source_path => @source_path)
+          @resource    = DataMapper::TypesFixtures::SoftwarePackage.new(:source_path => @source_path)
         end
 
         describe 'when saved and reloaded' do
@@ -150,7 +150,7 @@ try_spec do
         describe 'when instantiated' do
           it 'raises an exception' do
             lambda do
-              DataMapper::Types::Fixtures::SoftwarePackage.new(:source_path => @source_path)
+              DataMapper::TypesFixtures::SoftwarePackage.new(:source_path => @source_path)
             end.should raise_error(TypeError)
           end
         end

data/spec/integration/flag_spec.rb

@@ -4,10 +4,10 @@ try_spec do
 
   require './spec/fixtures/tshirt'
 
-  describe DataMapper::Types::Fixtures::TShirt do
+  describe DataMapper::TypesFixtures::TShirt do
     supported_by :all do
       before do
-        @resource = DataMapper::Types::Fixtures::TShirt.new(
+        @resource = DataMapper::TypesFixtures::TShirt.new(
           :writing     => 'Fork you',
           :has_picture => true,
           :picture     => :octocat,
@@ -17,7 +17,7 @@ try_spec do
 
       describe 'with the default value' do
         it 'returns it as an array' do
-          @resource.size.should eql([DataMapper::Types::Fixtures::TShirt.properties[:size].default])
+          @resource.size.should eql([DataMapper::TypesFixtures::TShirt.properties[:size].default])
         end
       end
 

data/spec/integration/ip_address_spec.rb

@@ -14,10 +14,10 @@ try_spec do
 
   require './spec/fixtures/network_node'
 
-  describe DataMapper::Types::Fixtures::NetworkNode do
+  describe DataMapper::TypesFixtures::NetworkNode do
     supported_by :all do
       before :all do
-        @resource = DataMapper::Types::Fixtures::NetworkNode.new(
+        @resource = DataMapper::TypesFixtures::NetworkNode.new(
           :node_uuid        => '25a44800-21c9-11de-8c30-0800200c9a66',
           :ip_address       => nil,
           :cidr_subnet_bits => nil

data/spec/integration/json_spec.rb

@@ -4,10 +4,10 @@ try_spec do
 
   require './spec/fixtures/person'
 
-  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 => 'Thomas Edison')
+        @resource = DataMapper::TypesFixtures::Person.new(:name => 'Thomas Edison')
       end
 
       describe 'with no positions information' do

data/spec/integration/slug_spec.rb

@@ -6,12 +6,12 @@ try_spec do
 
   require './spec/fixtures/article'
 
-  describe DataMapper::Types::Fixtures::Article do
+  describe DataMapper::TypesFixtures::Article do
     supported_by :all 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 = DataMapper::TypesFixtures::Article.create(:title => @input, :slug => @input)
 
           @resource.reload
         end
@@ -21,7 +21,7 @@ try_spec do
         end
 
         it 'can be found by slug' do
-          DataMapper::Types::Fixtures::Article.first(:slug => 'new-datamapper-type').should == @resource
+          DataMapper::TypesFixtures::Article.first(:slug => 'new-datamapper-type').should == @resource
         end
       end
 
@@ -38,7 +38,7 @@ try_spec do
       ].each do |title, slug|
         describe "set with title '#{title}'" do
           before :all do
-            @resource = DataMapper::Types::Fixtures::Article.new(:title => title)
+            @resource = DataMapper::TypesFixtures::Article.new(:title => title)
             @resource.valid?.should be(true)
           end
 
@@ -53,7 +53,7 @@ try_spec do
             end
 
             it 'can be found by slug' do
-              DataMapper::Types::Fixtures::Article.first(:slug => slug).should == @resource
+              DataMapper::TypesFixtures::Article.first(:slug => slug).should == @resource
             end
           end
         end