dm-persevere-adapter 0.47.1 → 0.48.0

data/VERSION

@@ -1 +1 @@
-0.47.1
+0.48.0

data/lib/model_json_support.rb

@@ -23,13 +23,27 @@ module DataMapper
   class Property
     def to_json_schema_hash(repo)
       tm = repository(repo).adapter.type_map
-      json_hash = { "type" => tm[type][:primitive] }
-      json_hash.merge!( tm[type].reject{ |key,value| key == :primitive } )
-      json_hash.merge!({ "optional" => true }) unless required?
-      json_hash.merge!({ "unique"  => true})   if     unique?
-      json_hash.merge!({"position" => @position }) unless @position.nil?
-      json_hash.merge!({"prefix" => @prefix }) unless @prefix.nil?
-      json_hash.merge!({"separator" => @separator }) unless @separator.nil?
+      json_hash = {}
+      
+      if type.eql?(DataMapper::Types::JsonReference)
+        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}"}
+                    }
+        #  "maxItems" => # For 0..3 
+        #  "minItems" =>
+      else
+        json_hash = { "type" => tm[type][:primitive] }
+        json_hash.merge!( tm[type].reject{ |key,value| key == :primitive } )
+        json_hash.merge!({ "optional" => true }) unless required?
+        json_hash.merge!({ "unique"  => true})   if     unique?
+        json_hash.merge!({"position" => @position }) unless @position.nil?
+        json_hash.merge!({"prefix" => @prefix }) unless @prefix.nil?
+        json_hash.merge!({"separator" => @separator }) unless @separator.nil?
+      end
+      
       # MIN
       # MAX
       json_hash

data/lib/persevere_adapter.rb

@@ -9,6 +9,9 @@ require 'bigdecimal'
 require 'model_json_support'
 require 'persevere'
 
+require 'types/json_reference'
+require 'types/json_reference_collection'
+
 class BigDecimal
   alias to_json_old to_json
   
@@ -600,17 +603,25 @@ module DataMapper
       def make_json_compatible_hash(resource)
         json_rsrc = Hash.new                
         resource.attributes(:property).each do |property, value|
-          next if value.nil? 
-          json_rsrc[property.field] = case value
-            when DateTime then value.new_offset(0).strftime("%Y-%m-%dT%H:%M:%SZ")
-            when Date then value.to_s
-            when Time then value.strftime("%H:%M:%S")
-            when Float then value.to_f
-            when BigDecimal then value.to_f
-            when Integer then value.to_i
-            else resource[property.name]
+
+          next if value.nil? || (value.is_a?(Array) && value.empty?)
+
+          if property.type == DataMapper::Types::JsonReference || 
+             property.type == DataMapper::Types::JsonReferenceCollection
+            json_rsrc[property.field] = property.value(value)
+          else
+            json_rsrc[property.field] = case value
+              when DateTime then value.new_offset(0).strftime("%Y-%m-%dT%H:%M:%SZ")
+              when Date then value.to_s
+              when Time then value.strftime("%H:%M:%S")
+              when Float then value.to_f
+              when BigDecimal then value.to_f
+              when Integer then value.to_i
+              else resource[property.name]
+            end
           end
-        end        
+        end
+
         json_rsrc
       end
 

data/lib/types/json_reference.rb

@@ -0,0 +1,65 @@
+module DataMapper
+  module Types
+    class JsonReference < Type
+      primitive String
+      length    50
+      lazy      true
+      
+      # Return the Ruby hash (to be turned into JSON) for insertion into the database
+      # @api semipublic
+      def self.dump(value, property)
+        value.save! unless value.saved?
+        return nil if value.nil?
+        ref_path = "../#{property.reference_class.storage_name}/#{value[:id]}"
+        result = { "$ref" => ref_path }
+
+        return result
+      end
+      
+      # @api semipublic
+      def self.load(value, property)
+        return value if value.class.eql?(property.reference_class)
+        return nil if value.nil?
+        
+        id = value.has_key?("$ref") ? value["$ref"] : value["id"]
+        id = id.split("/")[-1]
+        property.reference_class.get(id)
+      end
+      
+      # Should return the public value we are looking for.
+      # @api semipublic
+      def self.typecast(value, property)
+        return value if value.class.eql?(property.reference_class)
+        return nil if value.nil?
+    
+        id = value.has_key?("$ref") ? value["$ref"] : value["id"]
+        id = id.split("/")[-1]
+        property.reference_class.get(id)
+      end
+      
+       # @api private
+      def self.bind(property)
+        property.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def primitive?(value)
+            puts "This is my primitive!"
+
+            value.kind_of?(Array)
+          end
+        RUBY
+      end
+      
+    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/json_reference_collection.rb

@@ -0,0 +1,92 @@
+require 'ruby-debug'
+module DataMapper
+  module Types
+    class JsonReferenceCollection < Type
+      primitive String
+      length 5000
+      lazy true
+      
+      def self.dump(value, property)
+        return nil unless value.class.eql?(Array) || value.blank?
+        value.map{|v| v.save! unless v.saved? }
+        results = value.map{|v| { "$ref" => "../#{property.reference_class.storage_name}/#{v[:id]}" }}
+
+        return results
+      end
+      
+      def self.load(value, property)
+       return [] if value.nil?
+
+        value.map do |v|
+          if v.class.eql?(property.reference_class)
+            v
+          elsif v.class.eql?(Hash)
+            id = v.has_key?("$ref") ? v["$ref"] : v["id"]
+            id = id.split("/")[-1]
+            property.reference_class.get(id)
+          else
+            nil
+          end
+        end
+      end
+      
+      # Should return the public value we are looking for.
+      def self.typecast(value, property)
+        return [] if value.nil?
+        
+        value.map do |v|
+          if v.class.eql?(property.reference_class)
+            v
+          elsif v.class.eql?(Hash)
+            id = v.has_key?("$ref") ? v["$ref"] : v["id"]
+            id = id.split("/")[-1]
+            property.reference_class.get(id)
+          else
+            nil
+          end
+        end
+      end
+      
+      # @api private
+      def self.bind(property)
+        model                  = property.model
+        name                   = property.name.to_s
+        instance_variable_name = property.instance_variable_name
+        
+        property.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
+          # Primitive error checking. Get it?
+          def primitive?(value)
+            value.kind_of?(Array)
+          end
+          
+
+        RUBY
+        
+        # This is hack`n slash that should be reworked.
+        model.class_eval <<-RUBY, __FILE__, __LINE__ +1
+          def #{name}
+            original_attributes[properties[#{name.inspect}]] = []
+            return #{instance_variable_name} if defined?(#{instance_variable_name})
+            #{instance_variable_name} = properties[#{name.inspect}].get(self)
+          end
+        RUBY
+        
+        model.send(:resource_methods).add(name)
+
+      end
+      
+    end
+  end
+
+  # Setup in json_reference.rb
+  # class Property
+  #   attr_accessor :reference_class
+  #   
+  #   alias original_initialize initialize
+  #   def initialize(model, name, type, options = {})
+  #     @reference_class = options.delete(:reference)
+  #     
+  #     original_initialize(model, name, type, options)
+  #   end
+  # end
+end

data/spec/persevere_adapter_spec.rb

@@ -89,7 +89,7 @@ describe DataMapper::Adapters::PersevereAdapter do
   end
 
   after :all do 
-    DataMapper::Model.descendants.each{|cur_model| cur_model.auto_migrate_down! }
+   DataMapper::Model.descendants.each{|cur_model| cur_model.auto_migrate_down! }
   end
   
   it_should_behave_like 'An Adapter'
@@ -120,7 +120,7 @@ describe DataMapper::Adapters::PersevereAdapter do
        it 'should create the json schema for the hash under the specified project' do
          @adapter.put_schema(@test_schema_hash_alt).should_not == false
        end 
-     end
+    end
    
      describe '#get_schema' do       
        it 'should return all of the schemas (in json) if no name is provided' do
@@ -306,4 +306,84 @@ describe DataMapper::Adapters::PersevereAdapter do
     end
   end
   
+  describe 'associations' do
+    before(:all) do
+      class ::BlogPost
+        include DataMapper::Resource
+        property :id, Serial
+        property :title, String
+        property :body, Text
+        
+        # property :comment, JsonReference, :reference => ::Comment
+     end
+
+      class ::Comment
+        include DataMapper::Resource
+        property :id,     Serial
+        property :contents, Text
+        property :rating, Integer
+        
+        property :blog_post, JsonReference, :reference => BlogPost
+      end
+      
+      class ::Author
+        include DataMapper::Resource
+        property :id,     Serial
+        property :name, String
+      end
+
+      class ::Address
+        include DataMapper::Resource
+        property :id,     Serial
+        property :addr,   String
+      end      
+    end
+    
+    before(:each) do
+      BlogPost.auto_migrate!
+      Author.auto_migrate!
+      Comment.auto_migrate!
+      Address.auto_migrate!
+      BlogPost.send(:property, :comments, DataMapper::Types::JsonReferenceCollection, :reference => Comment)
+      BlogPost.auto_migrate!
+    end
+    
+    it "should create associations between models" do
+
+      # Create the instances
+      bpost = BlogPost.create(:title => "Test Post", :body => "This is the body of the test post.")
+      comment = Comment.new(:contents => "I think the post is great!", :rating => 4)
+      comment.blog_post = bpost
+      # bpost.comment = comment
+      # bpost.save
+      comment.save
+      
+      Comment.first.blog_post.should be_kind_of(BlogPost)
+      Comment.first.blog_post.id.should eql(1)
+      
+      # confirm it actually works with tests
+      # bpost.comments.length.should eql 2
+    end
+    
+    it "should be able to handle collections of relationships" do
+      bpost = BlogPost.new(:title => "A new post", :body => "This one will have many comments")
+
+      bpost.comments = [Comment.new(:contents => "This is the best", :rating => 5)]
+      bpost.save
+      BlogPost.first.comments.should be_kind_of(Array)
+      BlogPost.first.comments.length.should eql(1)
+      BlogPost.first.comments.first.should be_kind_of(Comment)
+
+      bpost.comments << Comment.new(:contents => "No, this is the best!", :rating => 3)
+      bpost.save
+      BlogPost.first.comments.length.should eql(2)
+    end
+    
+    after(:all) do
+      BlogPost.auto_migrate_down!
+      Author.auto_migrate_down!
+      Address.auto_migrate_down!
+      Comment.auto_migrate_down!
+    end
+  end
 end

data/spec/persevere_spec.rb

@@ -66,7 +66,7 @@ describe Persevere do
        JSON.parse(result.body).should == @blobObj
        # This shouldn't be a 201, it should say something mean.
      end
-   end
+  end
   
    #
    # Test GET to retrieve the list of classes from Persvr

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-persevere-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.47.1
+  prerelease: false
+  segments: 
+  - 0
+  - 48
+  - 0
+  version: 0.48.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -10,29 +15,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -06:00
+date: 2010-04-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 1
         version: 0.10.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A DataMapper Adapter for persevere
 email: 
 - irjudson [a] gmail [d] com
@@ -54,6 +65,8 @@ files:
 - lib/model_json_support.rb
 - lib/persevere.rb
 - lib/persevere_adapter.rb
+- lib/types/json_reference.rb
+- lib/types/json_reference_collection.rb
 - persevere/History.txt
 - persevere/LICENSE.txt
 - persevere/Manifest.txt
@@ -77,18 +90,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A DataMapper Adapter for persevere