dm-persevere-adapter 0.48.0 → 0.48.1

data/VERSION

@@ -1 +1 @@
-0.48.0
+0.48.1

data/lib/model_json_support.rb

@@ -26,11 +26,11 @@ module DataMapper
       json_hash = {}
       
       if type.eql?(DataMapper::Types::JsonReference)
-        json_hash = { "type" => {"$ref" => "../#{@reference_class.storage_name}"}, "optional" => true }
+        json_hash = { "type" => {"$ref" => "../#{reference_class.storage_name}"}, "optional" => true }
       elsif type.eql?(DataMapper::Types::JsonReferenceCollection)
         json_hash = { "type" => "array", 
                       "optional" => true,  
-                      "items" => {"$ref" => "../#{@reference_class.storage_name}"}
+                      "items" => {"$ref" => "../#{reference_class.storage_name}"}
                     }
         #  "maxItems" => # For 0..3 
         #  "minItems" =>
@@ -48,5 +48,6 @@ module DataMapper
       # MAX
       json_hash
     end
+    
   end
 end

data/lib/persevere_adapter.rb

@@ -9,6 +9,7 @@ require 'bigdecimal'
 require 'model_json_support'
 require 'persevere'
 
+require 'types/property'
 require 'types/json_reference'
 require 'types/json_reference_collection'
 

data/lib/types/json_reference.rb

@@ -41,7 +41,6 @@ module DataMapper
       def self.bind(property)
         property.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
           def primitive?(value)
-            puts "This is my primitive!"
 
             value.kind_of?(Array)
           end
@@ -51,15 +50,4 @@ module DataMapper
     end
   end
   
-  class Property
-    attr_accessor :reference_class
-    
-    alias initialize_without_reference_class initialize
-    def initialize_with_reference_class(model, name, type, options = {})
-      @reference_class = options.delete(:reference)
-      
-      initialize_without_reference_class(model, name, type, options)
-    end
-    alias initialize initialize_with_reference_class
-  end
 end

data/lib/types/property.rb

@@ -0,0 +1,20 @@
+module DataMapper
+  class Property
+    
+    alias initialize_without_reference_class initialize
+    def initialize_with_reference_class(model, name, type, options = {})
+      @_reference_class = options.delete(:reference)
+      
+      initialize_without_reference_class(model, name, type, options)
+    end
+    alias initialize initialize_with_reference_class
+    
+    def reference_class
+      return @_reference_class if @_reference_class.kind_of?(Class)
+      
+      @_reference_class = Extlib::Inflection.constantize(@_reference_class.to_s)
+      
+      return @_reference_class
+    end
+  end
+end

data/spec/persevere_adapter_spec.rb

@@ -344,7 +344,7 @@ describe DataMapper::Adapters::PersevereAdapter do
       Author.auto_migrate!
       Comment.auto_migrate!
       Address.auto_migrate!
-      BlogPost.send(:property, :comments, DataMapper::Types::JsonReferenceCollection, :reference => Comment)
+      BlogPost.send(:property, :comments, DataMapper::Types::JsonReferenceCollection, :reference => :Comment)
       BlogPost.auto_migrate!
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 48
-  - 0
-  version: 0.48.0
+  - 1
+  version: 0.48.1
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -67,6 +67,7 @@ files:
 - lib/persevere_adapter.rb
 - lib/types/json_reference.rb
 - lib/types/json_reference_collection.rb
+- lib/types/property.rb
 - persevere/History.txt
 - persevere/LICENSE.txt
 - persevere/Manifest.txt