datamapper-shim 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    datamapper-shim (0.0.1)
+    datamapper-shim (0.0.2)
       activerecord (~> 3.2.0)
       composite_primary_keys (~> 5.0.0)
       json (~> 1.4)

data/datamapper-shim.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "datamapper-shim"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["ecin"]
   spec.email         = ["ecin@copypastel.com"]
   spec.description   = "Dress ActiveRecord models in DataMapper robes"

data/lib/data_mapper/shim.rb

@@ -116,7 +116,7 @@ module DataMapper
         obs_domain = "#{atom}([.]#{atom})*"
         domain = "(?:#{dot_atom}|#{domain_literal}|#{obs_domain})"
         addr_spec = "#{local_part}\@#{domain}"
-        pattern = /^#{addr_spec}$/
+        pattern = /^#{addr_spec}$/n
       end
 
       # Helpers
@@ -328,7 +328,12 @@ module DataMapper
           @__datamapper_shim_primary_keys ||= []
           @__datamapper_shim_primary_keys << name
 
-          self.primary_keys = *@__datamapper_shim_primary_keys
+          if @__datamapper_shim_primary_keys.length == 1
+            self.primary_key = @__datamapper_shim_primary_keys.first
+          else
+            self.primary_keys = *@__datamapper_shim_primary_keys
+          end
+
           validates_presence_of name
         end
 
@@ -415,9 +420,9 @@ module DataMapper
             # Here, we capture the exception AR raises if a model
             # can't be destroyed due to an association.
             self.instance_eval do
-              define_method(:destroy) do
+              define_method(:destroy) do |*args|
                 begin
-                  super
+                  super(*args)
                 rescue ActiveRecord::DeleteRestrictionError => e
                   false
                 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper-shim
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - ecin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-28 00:00:00 Z
+date: 2014-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json