dm-core 0.10.1 → 0.10.2

data/lib/dm-core/type.rb

@@ -84,20 +84,18 @@ module DataMapper
   #   end # module Types
   # end # module DataMapper
   class Type
-
     # Until cooperation of Property and Type does not change, each must
     # have a separate list of options, because plugins (ex.: dm-validations)
     # may want to extend one or the other, and expects no side effects
     PROPERTY_OPTIONS = [
       :accessor, :reader, :writer,
-      :lazy, :default, :nullable, :key, :serial, :field, :size, :length,
+      :lazy, :default, :key, :serial, :field, :size, :length,
       :format, :index, :unique_index, :auto_validation,
-      :validates, :unique, :precision, :scale, :min, :max
+      :validates, :unique, :precision, :scale, :min, :max,
+      :allow_nil, :allow_blank, :required
     ]
 
     class << self
-
-      # TODO: document
       # @api private
       def configure(primitive_type, options)
         warn "DataMapper.Type.configure is deprecated, specify the primitive and options explicitly (#{caller[0]})"
@@ -126,6 +124,16 @@ module DataMapper
       def primitive(primitive = nil)
         return @primitive if primitive.nil?
         @primitive = primitive
+
+        return unless @primitive.respond_to?(:options)
+        options = @primitive.options
+
+        return unless options.respond_to?(:each)
+
+        # inherit the options from the primitive if any
+        options.each do |key, value|
+          send(key, value) unless send(key)
+        end
       end
 
       # Load Property options
@@ -141,6 +149,12 @@ module DataMapper
         RUBY
       end
 
+      def nullable(value)
+        # :required is preferable to :allow_nil, but :nullable maps precisely to :allow_nil
+        warn "#nullable is deprecated, use #required instead (#{caller[0]})"
+        allow_nil(value)
+      end
+
       # Gives all the options set on this type
       #
       # @return [Hash] with all options and their values set on this type

data/lib/dm-core/types/discriminator.rb

@@ -3,15 +3,15 @@ module DataMapper
     class Discriminator < Type
       primitive Class
       default   lambda { |resource, property| resource.model }
-      nullable  false
+      required  true
 
-      # TODO: document
       # @api private
       def self.bind(property)
         repository_name = property.repository_name
         model           = property.model
+        property_name   = property.name
 
-        model.default_scope(repository_name).update(property.name => model.descendants)
+        model.default_scope(repository_name).update(property_name => model.descendants)
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           extend Chainable
@@ -38,7 +38,7 @@ module DataMapper
             private
 
             def set_discriminator_scope_for(model)
-              model.default_scope(#{repository_name.inspect}).update(#{property.name.inspect} => model.descendants)
+              model.default_scope(#{repository_name.inspect}).update(#{property_name.inspect} => model.descendants)
             end
           end
         RUBY

data/lib/dm-core/types/object.rb

@@ -1,23 +1,18 @@
 module DataMapper
   module Types
     class Object < Type
-      primitive String
-      length    65535
-      lazy      true
+      primitive Text
 
-      # TODO: document
       # @api private
       def self.typecast(value, property)
         value
       end
 
-      # TODO: document
       # @api private
       def self.dump(value, property)
-        [ Marshal.dump(value) ].pack('m')
+        [ Marshal.dump(value) ].pack('m') unless value.nil?
       end
 
-      # TODO: document
       # @api private
       def self.load(value, property)
         Marshal.load(value.unpack('m').first) unless value.nil?

data/lib/dm-core/types/paranoid_boolean.rb

@@ -5,7 +5,6 @@ module DataMapper
       default   false
       lazy      true
 
-      # TODO: document
       # @api private
       def self.bind(property)
         repository_name = property.repository_name
@@ -22,10 +21,17 @@ module DataMapper
           end
 
           def destroy
+            paranoid_destroy
+          end
+
+          def paranoid_destroy
             self.class.paranoid_properties.each do |name, blk|
               attribute_set(name, blk.call(self))
             end
-            save
+            save_self
+            @_destroyed = true
+            @_readonly  = true
+            reset
           end
         RUBY
 

data/lib/dm-core/types/paranoid_datetime.rb

@@ -4,7 +4,6 @@ module DataMapper
       primitive DateTime
       lazy      true
 
-      # TODO: document
       # @api private
       def self.bind(property)
         repository_name = property.repository_name
@@ -21,10 +20,17 @@ module DataMapper
           end
 
           def destroy
+            paranoid_destroy
+          end
+
+          def paranoid_destroy
             self.class.paranoid_properties.each do |name, blk|
               attribute_set(name, blk.call(self))
             end
-            save
+            save_self
+            @_destroyed = true
+            @_readonly  = true
+            reset
           end
         RUBY
 

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.10.2'.freeze
 end

data/script/performance.rb

@@ -1,12 +1,12 @@
-#!/usr/bin/env ruby -KU
+#!/usr/bin/env ruby -Ku
 
 require 'ftools'
 require 'rubygems'
 
-gem 'activerecord', '~>2.3.2'
-gem 'addressable',  '~>2.0'
-gem 'faker',        '~>0.3.1'
-gem 'rbench',       '~>0.2.3'
+gem 'activerecord', '~> 2.3.4'
+gem 'addressable',  '~> 2.1'
+gem 'faker',        '~> 0.3.1'
+gem 'rbench',       '~> 0.2.3'
 
 require 'active_record'
 require 'addressable/uri'
@@ -144,13 +144,13 @@ else
 
   if sqlfile
     answer = nil
-    until answer && answer[/^$|y|yes|n|no/]
+    until answer && answer[/\A(?:y(?:es)?|no?)\b/i]
       print('Would you like to dump data into tmp/performance.sql (for faster setup)? [Yn]');
       STDOUT.flush
       answer = gets
     end
 
-    if answer[/^$|y|yes/]
+    if %w[ y yes ].include?(answer.downcase)
       File.makedirs(File.dirname(sqlfile))
       #adapter.execute("SELECT * INTO OUTFILE '#{sqlfile}' FROM exhibits;")
       `#{mysqldump_bin} -u #{c[:username]} #{"-p#{c[:password]}" unless c[:password].blank?} #{c[:database]} exhibits users > #{sqlfile}`

data/script/profile.rb

@@ -1,11 +1,11 @@
-#!/usr/bin/env ruby -KU
+#!/usr/bin/env ruby -Ku
 
 require 'ftools'
 require 'rubygems'
 
-gem 'addressable', '~>2.0'
-gem 'faker',       '~>0.3.1'
-gem 'ruby-prof',   '~>0.7.3'
+gem 'addressable', '~> 2.1'
+gem 'faker',       '~> 0.3.1'
+gem 'ruby-prof',   '~> 0.7.3'
 
 require 'addressable/uri'
 require 'faker'
@@ -139,13 +139,13 @@ else
 
   if sqlfile
     answer = nil
-    until answer && answer[/^$|y|yes|n|no/]
+    until answer && answer[/\A(?:y(?:es)?|no?)\b/i]
       print('Would you like to dump data into tmp/performance.sql (for faster setup)? [Yn]');
       STDOUT.flush
       answer = gets
     end
 
-    if answer[/^$|y|yes/]
+    if %w[ y yes ].include?(answer.downcase)
       File.makedirs(File.dirname(sqlfile))
       #adapter.execute("SELECT * INTO OUTFILE '#{sqlfile}' FROM exhibits;")
       `#{mysqldump_bin} -u #{c[:username]} #{"-p#{c[:password]}" unless c[:password].blank?} #{c[:database]} exhibits users > #{sqlfile}`

data/spec/lib/collection_helpers.rb

@@ -6,10 +6,10 @@ module DataMapper::Spec
         base.loaded = false
       end
 
-      def should_not_be_a_kicker
+      def should_not_be_a_kicker(ivar = :@articles)
         unless loaded
           it 'should not be a kicker' do
-            @articles.should_not be_loaded
+            instance_variable_get(ivar).should_not be_loaded
           end
         end
       end

data/spec/lib/pending_helpers.rb

@@ -1,6 +1,8 @@
 module DataMapper::Spec
   module PendingHelpers
-    def pending_if(message, boolean = true)
+    def pending_if(*args)
+      message, boolean = parse_args(*args)
+
       if boolean
         pending(message) { yield }
       else
@@ -8,7 +10,9 @@ module DataMapper::Spec
       end
     end
 
-    def rescue_if(message, boolean = true)
+    def rescue_if(*args)
+      message, boolean = parse_args(*args)
+
       if boolean
         raised = nil
         begin
@@ -18,10 +22,25 @@ module DataMapper::Spec
           raised = true
         end
 
-        raise 'should have raised' if raised == false
+        raise "should have raised: #{message || 'TODO'}" if raised == false
       else
         yield
       end
     end
+
+    private
+
+    def parse_args(*args)
+      case args.map { |arg| arg.class }
+        when [ String, TrueClass ], [ String, FalseClass ] then args
+        when [ String, NilClass ]                          then [ args.first, false      ]
+        when [ String ]                                    then [ args.first, true       ]
+        when [ TrueClass ], [ FalseClass ]                 then [ '',         args.first ]
+        when [ NilClass ]                                  then [ '',         false      ]
+        when []                                            then [ '',         true       ]  # defaults
+        else
+          raise ArgumentError, "Invalid arguments: #{args.inspect}"
+      end
+    end
   end
 end

data/spec/lib/rspec_immediate_feedback_formatter.rb

@@ -33,6 +33,7 @@ module Spec
           end
 
           output.puts(red(message))
+          # output.puts(failure.expectation_not_met? ? red(message) : message)
           dump_failure(counter, failure)  # dump stacktrace immediately
           output.flush
         end

data/spec/public/associations/many_to_many_spec.rb

@@ -40,12 +40,12 @@ end
           include DataMapper::Resource
 
           property :id,       Serial
-          property :title,    String, :nullable => false
+          property :title,    String, :required => true
           property :content,  Text
           property :subtitle, String
 
           has n, :authors, :through => Resource
-          belongs_to :original, self, :nullable => true
+          belongs_to :original, self, :required => false
           has n, :revisions, self, :child_key => [ :original_id ]
           has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
           has n, :publications, :through => Resource
@@ -94,6 +94,7 @@ end
       it_should_behave_like 'A public Association Collection'
       it_should_behave_like 'A Collection supporting Strategic Eager Loading' unless loaded
       it_should_behave_like 'Finder Interface'
+      it_should_behave_like 'Collection Finder Interface'
       it_should_behave_like 'A Limited Many to Many Collection'
     end
   end
@@ -129,7 +130,7 @@ end
           include DataMapper::Resource
 
           property :id,      Serial
-          property :title,   String, :nullable => false
+          property :title,   String, :required => true
           property :content, Text
           property :subtitle, String
 
@@ -137,7 +138,7 @@ end
 
           belongs_to :site
           has n, :authors, :through => :site
-          belongs_to :original, self, :nullable => true
+          belongs_to :original, self, :required => false
           has n, :revisions, self, :child_key => [ :original_id ]
           has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
           has n, :publications, :through => Resource
@@ -187,6 +188,7 @@ end
       it_should_behave_like 'A public Association Collection'
       it_should_behave_like 'A Collection supporting Strategic Eager Loading' unless loaded
       it_should_behave_like 'Finder Interface'
+      it_should_behave_like 'Collection Finder Interface'
       it_should_behave_like 'A Limited Many to Many Collection'
     end
   end

data/spec/public/associations/many_to_one_spec.rb

@@ -12,7 +12,10 @@ describe 'Many to One Associations' do
         property :description, Text
         property :admin,       Boolean, :accessor => :private
 
-        belongs_to :referrer, self, :nullable => true
+        belongs_to :parent, self, :required => false
+        has n, :children, self, :inverse => :parent
+
+        belongs_to :referrer, self, :required => false
         has n, :comments
 
         # FIXME: figure out a different approach than stubbing things out
@@ -51,6 +54,12 @@ describe 'Many to One Associations' do
       end
     end
 
+    class ::Default
+      include DataMapper::Resource
+
+      property :name, String, :key => true, :default => 'a default value'
+    end
+
     @user_model      = Blog::User
     @author_model    = Blog::Author
     @comment_model   = Blog::Comment

data/spec/public/associations/many_to_one_with_boolean_cpk_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+# TODO: combine this into many_to_one_spec.rb
+
+describe 'Many to One Associations when foreign key is part of a composite key, with an integer and a boolean making up the composite key' do
+  before :all do
+    class ::ManyModel
+      include DataMapper::Resource
+
+      property :integer_key, Integer, :key => true
+      property :boolean_key, Boolean, :key => true
+
+      belongs_to :one_model, :child_key => [ :integer_key ]
+    end
+
+    class ::OneModel
+      include DataMapper::Resource
+
+      property :integer_key, Integer, :key => true
+
+      has n, :many_models, :child_key => [ :integer_key ]
+    end
+  end
+
+  supported_by :all do
+    before :all do
+      @one  = OneModel.create(:integer_key => 1)
+      @many = ManyModel.create(:integer_key => 1, :boolean_key => false)
+    end
+
+    it 'should be able to access parent' do
+      @many.one_model.should == @one
+    end
+
+    it 'should be able to access the child' do
+      @one.many_models.should == [ @many ]
+    end
+  end
+end

data/spec/public/associations/one_to_many_spec.rb

@@ -23,12 +23,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_hel
           include DataMapper::Resource
 
           property :id,       Serial
-          property :title,    String, :nullable => false
+          property :title,    String, :required => true
           property :content,  Text
           property :subtitle, String
 
-          belongs_to :author, :nullable => true
-          belongs_to :original, self, :nullable => true
+          belongs_to :author, :required => false
+          belongs_to :original, self, :required => false
           has n, :revisions, self, :child_key => [ :original_id ]
           has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
           has n, :publications, :through => Resource
@@ -72,6 +72,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_hel
       it_should_behave_like 'A public Association Collection'
       it_should_behave_like 'A Collection supporting Strategic Eager Loading'
       it_should_behave_like 'Finder Interface'
+      it_should_behave_like 'Collection Finder Interface'
     end
   end
 end