dm-persevere-adapter 0.48.2 → 0.50.0

data/VERSION

@@ -1 +1 @@
-0.48.2
+0.50.0

data/lib/persevere.rb

@@ -55,7 +55,7 @@ class Persevere
               'Content-Type' => 'application/json'
             } unless defined?(HEADERS)
 
-  attr_accessor :server_url, :pservr
+  attr_accessor :server_url, :persevere
 
 
   def initialize(url)

data/lib/persevere_adapter.rb

@@ -191,7 +191,7 @@ module DataMapper
       extend Chainable
       extend Deprecate
       
-      RESERVED_CLASSNAMES = ['User','Transaction','Capability','File','Class', 'Object']
+      RESERVED_CLASSNAMES = ['User','Transaction','Capability','File','Class', 'Object', 'Versioned']
 
       include Migrations::PersevereAdapter
 
@@ -477,6 +477,7 @@ module DataMapper
           end
         end
         schema_hash['properties'].delete('id') if schema_hash['properties'].has_key?('id')
+        schema_hash['extends'] = { "$ref" => "/Class/Versioned" } if @options[:versioned]
         result = @persevere.create(path, schema_hash)
         if result.code == '201'
           return JSON.parse(result.body)
@@ -555,7 +556,7 @@ module DataMapper
         uri_or_options.each do |k,v|
           @options[k.to_sym] = v
         end
-
+        
         @options[:scheme] = @options[:adapter]
         @options.delete(:scheme)
 
@@ -567,7 +568,7 @@ module DataMapper
 
         connect
       end
-
+      
       def connect
         if ! @prepped
           uri = URI::HTTP.build(@options).to_s
@@ -592,8 +593,48 @@ module DataMapper
         else
           puts "Error retrieving existing tables: ", result
         end
+        
+        #
+        # If the user specified a versioned datastore load the versioning REST code
+        # 
+        if ! @classes.include?("Versioned") && @options[:versioned]
+          json_contents = <<-EOF
+          {
+            id:"Versioned",
+            prototype: {
+              getVersionMethod: function() { 
+                  return java.lang.Class.forName("org.persvr.data.Persistable").getMethod("getVersion"); 
+            },
+              isCurrentVersion: function() { return this.getVersionMethod.invoke(this).isCurrent(); },
+              getVersion: function() { return this.getVersionMethod.invoke(this).getVersionNumber(); },
+              getPreviousVersion: function() { 
+                var prev = getVersionMethod.invoke(this).getPreviousVersion();
+                return prev;
+              },
+              "representation:application/json+versioned": {
+                quality:0.2,
+                output:function(object) {
+                  var prev = object.getPreviousVersion();
+                  response.setContentType("application/json+versioned");
+                  response.getOutputStream().print(serialize({
+                    version: object.getVersion(),
+                    "parent-versions": prev ? [prev] : [],
+                    content: object
+                  }));
+                }
+              }
+            }
+          }
+          EOF
+          begin
+            response = @persevere.persevere.send_request('POST', URI.encode('/Class/'), json_contents, { 'Content-Type' => 'application/javascript' } )
+          rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+                Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+            puts "Persevere Create Failed: #{e}, Trying again."
+          end
+        end
       end
-
+      
       ##
       # Convert a DataMapper Resource to a JSON.
       #

data/spec/persevere_adapter_spec.rb

@@ -11,7 +11,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'lib/persevere_adapter'
 describe DataMapper::Adapters::PersevereAdapter do
   before :all do
     # This needs to point to a valid persevere server
-    @adapter = DataMapper.setup(:default, { :adapter => 'persevere', :host => 'localhost', :port => '8080' })
+    @adapter = DataMapper.setup(:default, { :adapter => 'persevere', :host => 'localhost', :port => '8080', :versioned => true })
     @repository = DataMapper.repository(@adapter.name)
 
     class ::Bozon
@@ -112,6 +112,13 @@ describe DataMapper::Adapters::PersevereAdapter do
        it 'should create the json schema for the hash' do
          @adapter.put_schema(@test_schema_hash).should_not == false
        end 
+       
+       it 'should create the schema as an extension of the Versioned schema' do
+        @adapter.put_schema(@test_schema_hash).should_not == false
+        test_result = @adapter.get_schema(@test_schema_hash['id'])
+        puts test_result.inspect
+        test_result[0]['extends']['$ref'].should eql "Versioned"
+       end
    
        it 'should create the json schema for the hash under the specified project' do
          @adapter.put_schema(@test_schema_hash, "test").should_not == false

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 48
-  - 2
-  version: 0.48.2
+  - 50
+  - 0
+  version: 0.50.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -06:00
+date: 2010-04-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency