datamapper-shim 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,3 +1,11 @@
+PATH
+  remote: .
+  specs:
+    datamapper-shim (0.0.1)
+      activerecord (~> 3.2.0)
+      composite_primary_keys (~> 5.0.0)
+      json (~> 1.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -13,8 +21,6 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    attribute-defaults (0.6.0)
-      activerecord (>= 3.0.0)
     builder (3.0.4)
     coderay (1.1.0)
     composite_primary_keys (5.0.13)
@@ -36,10 +42,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2.0)
-  attribute-defaults (~> 0.6.0)
-  composite_primary_keys (~> 5.0.0)
-  json (~> 1.4)
+  bundler (~> 1.3)
+  datamapper-shim!
   minitest (~> 5.2.3)
-  pry
+  pry (~> 0.9.12.4)
   sqlite3 (~> 1.3.8)

data/datamapper-shim.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "datamapper-shim"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["ecin"]
   spec.email         = ["ecin@copypastel.com"]
-  spec.description   = "Dress ActiveRecord models in DataMapper robes."
-  spec.summary       = "Migrate DataMapper models to ActiveRecord."
+  spec.description   = "Dress ActiveRecord models in DataMapper robes"
+  spec.summary       = "Migrate DataMapper models to ActiveRecord"
   spec.homepage      = "https://github.com/typekit/datamapper-shim"
   spec.license       = "MIT"
 
@@ -19,11 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "json", "~> 1.4"
   spec.add_dependency "activerecord", "~> 3.2.0"
-  spec.add_dependency "attribute-defaults", "~> 0.6.0"
   spec.add_dependency "composite_primary_keys", "~> 5.0.0"
-  spec.add_dependency "json", "~> 1.4"
-  spec.add_dependency "sqlite3", "~> 1.3.8"
 
+  spec.add_development_dependency "sqlite3", "~> 1.3.8"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest", "~> 5.2.3"
   spec.add_development_dependency "pry", "~> 0.9.12.4"

data/lib/data_mapper/shim.rb

@@ -1,6 +1,5 @@
 require "active_record"
 require "active_support/concern"
-require "attribute_defaults"
 require "composite_primary_keys"
 require "json"
 
@@ -101,7 +100,7 @@ module DataMapper
         atext = "[#{alpha}#{digit}\!\#\$\%\&\'\*+\/\=\?\^\_\`\{\|\}\~\-]"
         dot_atom_text = "#{atext}+([.]#{atext}*)*"
         dot_atom = "#{dot_atom_text}"
-        qtext = '[^\\x0d\\x22\\x5c\\x8  0-\\xff]'
+        qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
         text = "[\\x01-\\x09\\x11\\x12\\x14-\\x7f]"
         quoted_pair = "(\\x5c#{text})"
         qcontent = "(?:#{qtext}|#{quoted_pair})"
@@ -262,7 +261,7 @@ module DataMapper
           # :if => :class guarantees that the default value is always returned
           attr_default(name, :if => :class, :persisted => false) do |record|
             if record.new_record? && !record.__send__(:"#{name}_changed?")
-              default
+              default.respond_to?(:call) ? default.call : default
             else
               record.instance_eval do
                 read_attribute(name)
@@ -718,6 +717,51 @@ module DataMapper
           warn message
         end
       end
+
+      # Borrowed from https://github.com/bsm/attribute-defaults/blob/master/lib/attribute_defaults.rb
+      # Copyright (C) 2011 Dimitrij Denissenko
+
+      # Permission is hereby granted, free of charge, to any person obtaining
+      # a copy of this software and associated documentation files (the
+      # "Software"), to deal in the Software without restriction, including
+      # without limitation the rights to use, copy, modify, merge, publish,
+      # distribute, sublicense, and/or sell copies of the Software, and to
+      #	permit persons to whom the Software is furnished to do so, subject to
+      #	the following conditions:
+      #
+      #	The above copyright notice and this permission notice shall be
+      #	included in all copies or substantial portions of the Software.
+      #
+      #	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      #	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      #	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      #	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+      #	LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      #	OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      #	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      def attr_default(sym, *args, &block)
+        options = args.extract_options!
+        default = options.delete(:default) || args.shift
+        raise 'Default value or block required' unless !default.nil? || block
+
+        evaluator = "__eval_attr_default_for_#{sym}".to_sym
+        setter    = "__set_attr_default_for_#{sym}".to_sym
+        block   ||= default.is_a?(Proc) ? default : proc { default }
+
+        after_initialize setter.to_sym
+        define_method(evaluator, &block)
+
+        module_eval(<<-EVAL, __FILE__, __LINE__ + 1)
+          def #{setter}
+            #{'return if persisted?' if options[:persisted] == false}
+            return unless self.__send__(:#{sym}).__send__(:#{options[:if] || 'nil?'})
+            value = #{evaluator}#{'(self)' unless block.arity.zero?}
+            self.__send__(:#{sym}=, value.duplicable? ? value.dup : value)
+          rescue ActiveModel::MissingAttributeError
+          end
+        EVAL
+        private evaluator, setter
+      end
     end
   end
 end

data/test/data_mapper/shim_test.rb

@@ -46,6 +46,7 @@ describe DataMapper::Shim do
     t.text :body
     t.references :user
     t.datetime :deleted_at
+    t.boolean :unread
     t.timestamps
   end
 
@@ -135,6 +136,8 @@ describe DataMapper::Shim do
     include DataMapper::Shim
 
     property :deleted_at, ParanoidDateTime, :writer => :protected
+    property :updated_at, DateTime, :default => proc { DateTime.now }, :reader => :protected
+    property :unread, Boolean, :default => true, :writer => :protected
     property :body, Text
 
     belongs_to :user
@@ -491,7 +494,6 @@ describe DataMapper::Shim do
       end
     end
 
-
   end
 
   describe "typecasted properties" do
@@ -640,6 +642,16 @@ describe DataMapper::Shim do
       Channel.new.state.must_equal :open
     end
 
+    it "handles default values on properties with protected writers" do
+      message = Message.new
+      message.unread.must_equal true
+    end
+
+    it "handles default values on properties with protected readers" do
+      message = Message.new
+      message.__send__(:updated_at).must_be_instance_of DateTime
+    end
+
     it "handles default boolean values" do
       User.new.must_be :active?
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper-shim
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - ecin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-27 00:00:00 Z
+date: 2014-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -48,26 +48,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: attribute-defaults
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: composite_primary_keys
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,26 +63,11 @@ dependencies:
         - 0
         version: 5.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +78,12 @@ dependencies:
         - 3
         - 8
         version: 1.3.8
-  type: :runtime
-  version_requirements: *id006
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,11 +94,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,11 +110,11 @@ dependencies:
         - 3
         version: 5.2.3
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: pry
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,8 +127,8 @@ dependencies:
         - 4
         version: 0.9.12.4
   type: :development
-  version_requirements: *id009
-description: Dress ActiveRecord models in DataMapper robes.
+  version_requirements: *id007
+description: Dress ActiveRecord models in DataMapper robes
 email: 
 - ecin@copypastel.com
 executables: []
@@ -206,6 +175,6 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Migrate DataMapper models to ActiveRecord.
+summary: Migrate DataMapper models to ActiveRecord
 test_files: 
 - test/data_mapper/shim_test.rb