ardm-types 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d3d24b7d203fef1dd08c5c63fb97af6e7ffbdd
-  data.tar.gz: 2ce41762914595258f160111247c308b1f32fe99
+  metadata.gz: f3bf1eab52fe398667a3f2665a8c3f954dc330e3
+  data.tar.gz: 3210487984089459beae24f5ec224851e86bdea5
 SHA512:
-  metadata.gz: e95ea2e08793070c9def64cb04d5cbaa88cfc84ca42c3cff11a25ee05dd1453e74210b1c30fc39a6f747a5a410e721bb84c610e9a74d0ee54be8f758726e0ab0
-  data.tar.gz: 58809ba9545ede43fce6982293d049bc1270cb015d796a4a75683870843b34b0ad3880576033b8c1f1165c0749bfe647ba6aebadd4c3df365728b9607026b4aa
+  metadata.gz: 7aebe5e21e47ef53179805a70701846ebb553a8ab6ab6cea2f5907229c23a1f55d1c9d0c77e933180c068ac2395768dc6a63618c6f29e0183dbb739d2b29cd87
+  data.tar.gz: 3029238bbfa1ce468165fced1e0ea5394d940d4824be163c9013fa3177dabb1f1f13378b4b7684c22df0ce01c0e2ffea6e201ad4803fe144c78cbb19a53f87ce

data/.travis.yml

@@ -7,5 +7,4 @@ rvm:
   - 2.2.0
 matrix:
   allow_failures:
-    - rvm: 2.1.5
     - rvm: 2.2.0

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/ar-dm'
-DM_VERSION     = '~> 1.2.0'
+DM_VERSION     = '~> 1.2'
 DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')

data/README.md

@@ -0,0 +1,10 @@
+# ardm-types
+
+A fork of [`dm-types`](https://github.com/datamapper/dm-types).
+
+## Install
+
+See [ardm-core](https://github.com/ar-dm/ardm-core) for more information.
+
+Unless they are specific to this gem, please ask general `ardm-` questions
+and open issues on `ardm-core`.

data/ardm-types.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.files            = `git ls-files`.split("\n")
   gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
-  gem.extra_rdoc_files = %w[LICENSE README.rdoc]
+  gem.extra_rdoc_files = %w[LICENSE README.md]
   gem.require_paths    = [ "lib" ]
 
   gem.add_runtime_dependency 'ardm-core',   '~> 1.2'

data/lib/dm-types/support/dirty_minder.rb

@@ -148,7 +148,10 @@ module DataMapper
 
       # Catch any direct assignment (#set), and any Resource#reload (set!).
       def set!(resource, value)
-        hook_value(resource, value) unless value.kind_of? Hooker
+        # Do not extend non observed value classes 
+        if Hooker::MUTATION_METHODS.keys.detect { |klass| value.kind_of?(klass) }
+          hook_value(resource, value) unless value.kind_of? Hooker
+        end
         super
       end
 

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = '1.2.2'
+    VERSION = '1.2.3'
   end
 end

data/spec/integration/yaml_spec.rb

@@ -64,6 +64,24 @@ try_spec do
           end
         end
       end
+
+      describe 'with inventions as a string' do
+        before :all do
+          object = "Foo and Bar" #.freeze
+          @resource.inventions = object
+        end
+
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be(true)
+            @resource.reload
+          end
+
+          it 'has correct inventions' do
+            @resource.inventions.should == 'Foo and Bar'
+          end
+        end
+      end
     end
   end
 end

data/spec/unit/dirty_minder_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'dm-types/support/dirty_minder'
+
+describe DataMapper::Property::DirtyMinder,'set!' do
+
+  let(:property_class) do
+    Class.new(DataMapper::Property::Object) do
+      include DataMapper::Property::DirtyMinder
+    end
+  end
+
+  let(:model) do
+    property_class = self.property_class
+    Class.new do
+      include DataMapper::Resource
+      property :id,DataMapper::Property::Serial
+      property :name,property_class
+
+      def self.name; 'FredsClass'; end
+    end
+  end
+
+  let(:resource) { model.new }
+
+  let(:object) { model.properties[:name] }
+
+  subject { object.set!(resource,value) }
+
+  shared_examples_for 'a non hooked value' do
+    it 'should not extend value with hook' do
+      value.should_not be_kind_of(DataMapper::Property::DirtyMinder::Hooker)
+    end
+  end
+
+  shared_examples_for 'a hooked value' do
+    it 'should extend value with hook' do
+      value.should be_kind_of(DataMapper::Property::DirtyMinder::Hooker)
+    end
+  end
+
+  before do
+    subject
+  end
+
+  context 'when setting nil' do
+    let(:value) { nil }
+    it_should_behave_like 'a non hooked value'
+  end
+
+  context 'when setting a String' do
+    let(:value) { "The fred" }
+    it_should_behave_like 'a non hooked value'
+  end
+
+  context 'when setting an Array' do
+    let(:value) { ["The fred"] }
+    it_should_behave_like 'a hooked value'
+  end
+
+  context 'when setting a Hash' do
+    let(:value) { {"The" => "fred"} }
+    it_should_behave_like 'a hooked value'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm-types
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Martin Emde
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ardm-core
@@ -131,13 +131,13 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - ardm-types.gemspec
 - lib/ardm-types.rb
@@ -193,6 +193,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/bcrypt_hash_spec.rb
 - spec/unit/csv_spec.rb
+- spec/unit/dirty_minder_spec.rb
 - spec/unit/enum_spec.rb
 - spec/unit/epoch_time_spec.rb
 - spec/unit/file_path_spec.rb
@@ -228,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ardm fork of dm-types

data/README.rdoc

@@ -1,3 +0,0 @@
-= dm-types
-
-DataMapper plugin providing many extra types for use in data models.