dm-types 1.1.0 → 1.2.0.rc1

data/lib/dm-types/yaml.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'dm-core'
+require 'dm-types/support/dirty_minder'
 
 module DataMapper
   class Property
@@ -15,7 +16,7 @@ module DataMapper
         elsif value.is_a?(::String)
           ::YAML.load(value)
         else
-          raise ArgumentError.new("+value+ of a property of YAML type must be nil or a String")
+          raise ArgumentError, '+value+ of a property of YAML type must be nil or a String'
         end
       end
 
@@ -33,6 +34,8 @@ module DataMapper
         value
       end
 
+      include ::DataMapper::Property::DirtyMinder
+
     end # class Yaml
   end # class Property
 end # module DataMapper

data/spec/fixtures/api_user.rb

@@ -0,0 +1,14 @@
+module DataMapper
+  module TypesFixtures
+    class APIUser
+
+      include DataMapper::Resource
+
+      property :id, Serial
+
+      property :name, String
+
+      property :api_key, APIKey
+    end
+  end
+end

data/spec/fixtures/person.rb

@@ -15,6 +15,7 @@ module DataMapper
       property :name,       String
       property :positions,  Json
       property :inventions, Yaml
+      property :birthday,   EpochTime
 
       property :interests, CommaSeparatedList
 

data/spec/integration/api_key_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+try_spec do
+  require './spec/fixtures/api_user'
+
+  describe DataMapper::TypesFixtures::APIUser do
+    supported_by :all do
+      subject { described_class.new(:name => 'alice') }
+
+      let(:original_api_key) { subject.api_key }
+
+      it "should have a default value" do
+        original_api_key.should_not be_nil
+      end
+
+      it "should preserve the default value" do
+        subject.api_key.should == original_api_key
+      end
+
+      it "should generate unique API Keys for each resource" do
+        other_resource = described_class.new(:name => 'eve')
+
+        other_resource.api_key.should_not == original_api_key
+      end
+    end
+  end
+end

data/spec/integration/dirty_minder_spec.rb

@@ -0,0 +1,197 @@
+require 'spec_helper'
+
+try_spec do
+
+  # FIXME: DirtyMinder is currently unsupported on RBX, because unlike the other
+  # supported Rubies, RBX core class (e.g. Array, Hash) methods use #send().  In
+  # other words, the other Rubies don't use #send() (they map directly to their
+  # C functions).
+  #
+  # The current methodology takes advantage of this by using #send() to forward
+  # method invocations we've hooked.  Supporting RBX will require finding
+  # another way, possibly for all Rubies.  In the meantime, something is better
+  # than nothing.
+  next if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'rbx'
+
+  require './spec/fixtures/person'
+
+  describe DataMapper::TypesFixtures::Person do
+    supported_by :all do
+      before :all do
+        @resource = DataMapper::TypesFixtures::Person.new(:name => 'Thomas Edison')
+      end
+
+      describe 'with positions indirectly mutated as a hash' do
+        before :all do
+          @resource.positions = {
+            'company' => "Soon To Be Dirty, LLC",
+            'title'   => "Layperson",
+            'details' => { 'awesome' => true },
+          }
+          @resource.save
+          @resource.reload
+          @resource.positions['title'].should == 'Layperson'
+        end
+
+        describe "when I change positions" do
+          before :all do
+            @resource.clean?.should == true
+            @resource.positions['title'] = 'Chief Layer of People'
+            @resource.save
+            @resource.reload
+          end
+
+          it "should remember the new position" do
+            @resource.positions['title'].should == 'Chief Layer of People'
+          end
+        end
+
+        describe "when I add a new attribute of the position" do
+          before :all do
+            @resource.clean?.should == true
+            @resource.positions['pays_buttloads_of_money'] = true
+            @resource.save
+            @resource.reload
+          end
+
+          it "should remember the new attribute" do
+            @resource.positions['pays_buttloads_of_money'].should be(true)
+          end
+        end
+
+        describe "when I change the details of the position" do
+          before :all do
+            @resource.clean?.should == true
+            @resource.positions['details'].merge!('awesome' => "VERY TRUE")
+            @resource.save
+            @resource.reload
+          end
+
+          it "should remember the changed detail" do
+            pending "not supported (YET)" do
+              # TODO: Not supported (yet?) -- this is a much harder problem to
+              # solve: using mutating accessors of nested objects.  We could
+              # detect it from #dirty? (using the #hash method), but #dirty?
+              # only returns the status of known-mutated properties (not full,
+              # on-demand scan of object dirty-ness).
+              @resource.positions['details']['awesome'].should == 'VERY TRUE'
+            end
+          end
+        end
+
+        describe "when I reload the resource while the property is dirty" do
+          before :all do
+            @resource.positions['title'] = 'Chief Layer of People'
+            @resource.reload
+          end
+
+          it "should reflect the previously set/persisted value" do
+            @resource.positions.should_not be_nil
+            @resource.positions['title'].should == 'Layperson'
+          end
+        end
+
+      end # positions indirectly mutated as a hash
+
+      describe 'with positions indirectly mutated as an array' do
+        before :all do
+          @resource.positions = [
+            { 'company' => "Soon To Be Dirty, LLC",
+              'title'   => "Layperson",
+              'details' => { 'awesome' => true },
+            },
+          ]
+          @resource.save
+          @resource.reload
+          @resource.positions.first['title'].should == 'Layperson'
+        end
+
+        describe "when I remove the position" do
+          before :all do
+            @resource.clean?.should == true
+            @resource.positions.pop
+            @resource.save
+            @resource.reload
+          end
+
+          it "should know there aren't any positions" do
+            @resource.positions.should == []
+          end
+        end
+
+        describe "when I add a new position" do
+          before :all do
+            @resource.clean?.should == true
+            @resource.positions << {
+              'company' => "Down and Dirty, LP",
+              'title'   => "Porn Star",
+              'details' => { 'awesome' => "also true" },
+            }
+            @resource.save
+            @resource.reload
+          end
+
+          it "should know there's two positions" do
+            @resource.positions.length.should == 2
+          end
+
+          it "should know which position is which" do
+            @resource.positions.first['title'].should == "Layperson"
+            @resource.positions.last['title'].should == "Porn Star"
+          end
+
+          describe "when I change the details of one of the positions" do
+            before :all do
+              @resource.positions.last['details'].merge!('high_risk' => true)
+              @resource.save
+              @resource.reload
+            end
+
+            it "should remember the changed detail" do
+              pending "not supported (YET)" do
+                # TODO: Not supported (yet?) -- this is a much harder problem to
+                # solve: using mutating accessors of nested objects.  We could
+                # detect it from #dirty? (using the #hash method), but #dirty?
+                # only returns the status of known-mutated properties (not full,
+                # on-demand scan of object dirty-ness).
+                @resource.positions.last['details']['high_risk'].should == true
+              end
+            end
+          end
+        end # when I add a new position
+
+        describe "when I remove the position with a block-based mutator" do
+          before :all do
+            @resource.clean?.should == true
+            @resource.positions.reject! { |_| true }
+            @resource.save
+            @resource.reload
+          end
+
+          it "should know there aren't any positions" do
+            @resource.positions.should == []
+          end
+        end
+
+        describe "when I mutate positions through a reference" do
+          before :all do
+            @resource.clean?.should == true
+            @positions = @resource.positions
+            @positions << {
+              'company' => "Ooga Booga, Inc",
+              'title'   => "Rocker",
+            }
+          end
+
+          it "should reflect the change in both the property and the reference" do
+            @resource.positions.length.should == 2
+            @resource.positions.last['title'].should == 'Rocker'
+            @positions.last['title'].should == 'Rocker'
+          end
+        end
+
+      end # positions indirectly mutated as an array
+
+    end
+  end
+end

data/spec/integration/epoch_time_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+try_spec do
+
+  require './spec/fixtures/person'
+
+  describe DataMapper::TypesFixtures::Person do
+    supported_by :all do
+      before :all do
+        @resource = DataMapper::TypesFixtures::Person.new(:name => '')
+      end
+
+      describe 'with a birthday' do
+        before :all do
+          @resource.birthday = '1983-05-03'
+        end
+
+        describe 'after typecasting string input' do
+          it 'has a valid birthday' do
+            @resource.birthday.should == ::Time.parse('1983-05-03')
+          end
+        end
+
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be(true)
+            @resource.reload
+          end
+
+          it 'has a valid birthday' do
+            @resource.birthday.should == ::Time.parse('1983-05-03')
+          end
+        end
+      end
+
+      describe 'without a birthday' do
+        before :all do
+          @resource.birthday = nil
+        end
+
+        describe 'after typecasting nil' do
+          it 'has a nil value for birthday' do
+            @resource.birthday.should be_nil
+          end
+        end
+
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be(true)
+            @resource.reload
+          end
+
+          it 'has a nil value for birthday' do
+            @resource.birthday.should be_nil
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/integration/ip_address_spec.rb

@@ -1,15 +1,11 @@
 require 'spec_helper'
 
-Spec::Matchers.define :run_ipv4 do |model|
-  match do |model|
-    model.runs_ipv4?
-  end
+Spec::Matchers.define :run_ipv4 do
+  match { |model| model.runs_ipv4? }
 end
 
-Spec::Matchers.define :run_ipv6 do |model|
-  match do |model|
-    model.runs_ipv6?
-  end
+Spec::Matchers.define :run_ipv6 do
+  match { |model| model.runs_ipv6? }
 end
 
 try_spec do

data/spec/integration/json_spec.rb

@@ -66,6 +66,7 @@ try_spec do
           end
         end
       end
+
     end
   end
 end

data/spec/integration/slug_spec.rb

@@ -25,35 +25,39 @@ try_spec do
         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 "set with title '#{title}'" do
-          before :all do
-            @resource = DataMapper::TypesFixtures::Article.new(:title => title)
-            @resource.valid?.should be(true)
-          end
-
-          it "has slug equal to '#{slug}'" do
-            @resource.slug.should == slug
-          end
-
-          describe "and persisted" do
+      # FIXME: when stringex fixes the problems it has with it's YAML
+      # files not being parsable by psych remove this conditional.
+      unless RUBY_PLATFORM =~ /java/ && JRUBY_VERSION >= '1.6' && RUBY_VERSION >= '1.9.2'
+        [
+          [ '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 "set with title '#{title}'" do
             before :all do
-              @resource.save.should be(true)
-              @resource.reload
+              @resource = DataMapper::TypesFixtures::Article.new(:title => title)
+              @resource.valid?.should be(true)
             end
 
-            it 'can be found by slug' do
-              DataMapper::TypesFixtures::Article.first(:slug => slug).should == @resource
+            it "has slug equal to '#{slug}'" do
+              @resource.slug.should == slug
+            end
+
+            describe "and persisted" do
+              before :all do
+                @resource.save.should be(true)
+                @resource.reload
+              end
+
+              it 'can be found by slug' do
+                DataMapper::TypesFixtures::Article.first(:slug => slug).should == @resource
+              end
             end
           end
         end

data/spec/unit/epoch_time_spec.rb

@@ -21,22 +21,38 @@ describe DataMapper::Property::EpochTime do
       it { should == value.to_i }
     end
 
+    describe 'with nil' do
+      let(:value) { nil }
+
+      it { should == value }
+    end
+  end
+
+  describe '#typecast' do
+    subject { @property.typecast(value) }
+
     describe 'with a DateTime instance' do
       let(:value) { DateTime.now }
 
-      it { should == Time.parse(value.to_s).to_i }
+      it { should == Time.parse(value.to_s) }
     end
 
     describe 'with a number' do
       let(:value) { Time.now.to_i }
 
-      it { should == value }
+      it { should == ::Time.at(value) }
     end
 
-    describe 'with nil' do
-      let(:value) { nil }
+    describe 'with a numeric string' do
+      let(:value) { Time.now.to_i.to_s }
 
-      it { should == value }
+      it { should == ::Time.at(value.to_i) }
+    end
+
+    describe 'with a DateTime string' do
+      let(:value) { '2011-07-11 15:00:04 UTC' }
+
+      it { should == ::Time.parse(value) }
     end
   end