dm-persevere-adapter 0.50.0 → 0.51.0

data/VERSION

@@ -1 +1 @@
-0.50.0
+0.51.0

data/lib/persevere_adapter.rb

@@ -194,7 +194,7 @@ module DataMapper
       RESERVED_CLASSNAMES = ['User','Transaction','Capability','File','Class', 'Object', 'Versioned']
 
       include Migrations::PersevereAdapter
-
+      
       # Default types for all data object based adapters.
       #
       # @return [Hash] default types for data objects adapters.
@@ -225,6 +225,9 @@ module DataMapper
         end
       end
       
+      # This should go away when we have more methods exposed to retrieve versioned data (and schemas)
+      attr_accessor :persevere
+      
       ##
       # Used by DataMapper to put records into a data-store: "INSERT"
       # in SQL-speak.  It takes an array of the resources (model
@@ -598,36 +601,54 @@ module DataMapper
         # If the user specified a versioned datastore load the versioning REST code
         # 
         if ! @classes.include?("Versioned") && @options[:versioned]
-          json_contents = <<-EOF
+          versioned_class = <<-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
-                  }));
-                }
+              id: "Versioned",
+              prototype: {
+                  getVersionMethod: function() {
+                      return java.lang.Class.forName("org.persvr.data.Persistable").getMethod("getVersion");
+                  },
+                  isCurrentVersion: function() {
+                      return this.getVersionMethod().invoke(this).isCurrent();
+                  },
+                  getVersionNumber: function() {
+                      return this.getVersionMethod().invoke(this).getVersionNumber();
+                  },
+                  getPrevious: function() {
+                    var prev = this.getVersionMethod().invoke(this).getPreviousVersion();
+                    return prev;
+                  },
+                  getAllPrevious: function() {
+
+                      var current = this;
+                      var prev = current && current.getPrevious();
+
+                      var versions = []
+                      while(current && prev) {
+                        versions.push(prev);
+                        current = prev;
+                        prev = current.getPrevious();
+                      }
+
+                      return versions;
+                  },
+                  "representation:application/json+versioned": {
+                      quality: 0.2,
+                      output: function(object) {
+                          var previous = object.getAllPrevious();
+                          response.setContentType("application/json+versioned");
+                          response.getOutputStream().print(JSON.stringify({
+                              version: object.getVersionNumber(),
+                              current: object,
+                              versions: previous
+                          }));
+                      }
+                  }
               }
-            }
           }
           EOF
           begin
-            response = @persevere.persevere.send_request('POST', URI.encode('/Class/'), json_contents, { 'Content-Type' => 'application/javascript' } )
+            response = @persevere.persevere.send_request('POST', URI.encode('/Class/'), versioned_class, { '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."

data/spec/persevere_adapter_spec.rb

@@ -116,7 +116,6 @@ describe DataMapper::Adapters::PersevereAdapter do
        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
    
@@ -191,8 +190,11 @@ describe DataMapper::Adapters::PersevereAdapter do
       @dragons   = Dragon.all
       @countries = Country.all
     end
+   
     it_should_behave_like 'An Aggregatable Class'
     
+    it "should be able to get a count of objects within a range of dates"
+    
     it "should count with like conditions" do
       Country.count(:name.like => '%n%').should == 4
     end
@@ -241,6 +243,56 @@ describe DataMapper::Adapters::PersevereAdapter do
     end
   end
   
+  # From Ryan's Gist:
+  # s = Patron::Session.new
+  # s.base_url = "http://localhost:8080"
+  # s.headers['Content-Type'] = "application/json"
+  # resp = []
+  # resp << s.put("/Versioned/1", %{{"id":1, "name":"first version"}})
+  # resp << s.put("/Versioned/1", %{{"id":1, "name":"second version"}})
+  # resp << s.put("/Versioned/1", %{{"id":1, "name":"third version"}})
+  # resp << s.get("/Versioned/1")
+  # resp << s.get("/Versioned/1", {"Accept" => "application/json+versioned"})
+  # 
+  # resp.each do |r|
+  #   puts r.status
+  #   puts r.headers['Content-Type']
+  #   puts r.body
+  #   puts
+  # end
+  
+  describe 'when using versioned data' do
+    before(:each) do
+      Nugaton.auto_migrate!
+    end
+    
+    it "should store all the versions of the data element" do
+      version = 1
+      
+      # Create the first version
+      nugat = Nugaton.create(:name => "version #{version}")
+      
+      # Create a second version
+      nugat.name = "version #{version += 1}"
+      nugat.save
+      
+      # Create a third version
+      
+      nugat.name = "version #{version += 1}"
+      nugat.save
+      
+      # Retrieve all versions and see if there are three
+      raw_result = @adapter.persevere.retrieve("/nugaton/1", { "Accept" => "application/json+versioned" })
+      results = JSON.parse( raw_result.body )
+      results['current']['name'].should eql "version #{version}"
+      results['versions'].length.should eql 2
+    end
+    
+    after(:each) do
+      Nugaton.auto_migrate_down!
+    end
+  end
+  
   describe 'when finding models,' do
     before(:each) do
       Bozon.auto_migrate!

metadata

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