persevere 0.18.0 → 0.21.0

data/README.txt

@@ -2,8 +2,6 @@
 
 A DataMapper adapter for Persevere (http://www.persvr.org/)
 
-This requires the persevere gem (http://github.com/irjudson/persevere) which provides a ruby interface to Persevere.
-
 == Usage
 
 DM Persevere Adapter is very simple and very similar to the REST
@@ -21,6 +19,9 @@ DataMapper.setup(:default, {
                    :host => 'localhost',
                    :port => '8080'
                  })
+                 
+# Or, 
+# DataMapper.setup(:default, "persevere://localhost:8080")                 
 
 class MyUser
   include DataMapper::Resource
@@ -57,6 +58,8 @@ production:
 
 == Code
 
+MyUser.auto_migrate!
+
 # Create
 user = MyUser.new(:username => "dmtest", :uuid => UUID.random_create().to_s,
                   :name => "DataMapper Test", :homedirectory => "/home/dmtest",
@@ -81,5 +84,6 @@ puts "Result: #{result}"
 
 == To Do:
 
-- Make a do-adapter for persevere.
 - Cleanup Documentation
+- Add more negative / failure tests
+

data/lib/persevere.rb

@@ -13,6 +13,23 @@ require 'uri'
 require 'rubygems'
 require 'json'
 
+# Ugly Monkey patching because Persever uses non-standard content-range headers.
+module Net
+  module HTTPHeader
+    alias old_content_range content_range
+    # Returns a Range object which represents Content-Range: header field.
+    # This indicates, for a partial entity body, where this fragment
+    # fits inside the full entity body, as range of byte offsets.
+    def content_range
+      return nil unless @header['content-range']
+       m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
+           return nil
+       m[1].to_i .. m[2].to_i + 1
+    end
+
+  end
+end
+
 class PersevereResult
   attr_reader :location, :code, :message, :body
 
@@ -49,7 +66,7 @@ class Persevere
 
   # Pass in a resource hash
   def create(path, resource, headers = {})
-    json_blob = resource.to_json
+    json_blob = resource.reject{|key,value| value.nil? }.to_json
     response = nil
     while response.nil?
       begin
@@ -69,7 +86,7 @@ class Persevere
         response = @persevere.send_request('GET', path, nil, HEADERS.merge(headers))
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-        puts "Persevere Create Failed: #{e}, Trying again."
+        puts "Persevere Retrieve Failed: #{e}, Trying again."
       end
     end
     return PersevereResult.make(response)
@@ -92,6 +109,7 @@ class Persevere
 
   def delete(path, headers = {})
     response = nil
+#    puts "DELETING #{path}"
     while response.nil?
       begin
         response = @persevere.send_request('DELETE', path, nil, HEADERS.merge(headers))

data/spec/persevere_spec.rb

@@ -11,9 +11,9 @@ describe Persevere do
     @blobObj = {
       'id' => 'Yogo',
       'properties' => {
-        'cid' => {'type' => 'string' },
-        'parent' => { 'type' => 'string'},
-        'data' => { 'type' => 'string'}
+        'cid' => {'type' => 'string', 'optional' => true },
+        'parent' => { 'type' => 'string', 'optional' => true},
+        'data' => { 'type' => 'string', 'optional' => true}
       }
     }
     
@@ -29,90 +29,164 @@ describe Persevere do
     @mockObj = {
       'id' => 'Yogo',
       'properties' => {
-        'cid' => {'type' => 'string' },
-        'parent' => { 'type' => 'string'},
-        'data' => { 'type' => 'string'}
+        'cid' => {'type' => 'string', 'optional' => true },
+        'parent' => { 'type' => 'string', 'optional' => true},
+        'data' => { 'type' => 'string', 'optional' => true}
       },
       'prototype' => {}
     }
+    
+    @object = {
+      'cid' => '123',
+      'parent' => 'none',
+      'data' => 'A Chunk Of Data'
+    }
+    
   end
   
-  #
+  
   # Test POST to create a new class
-  #
+  
   describe '#post' do
-    it 'should create a new object in persevere' do
-      result = @p.create('/Class/', @blobObj)
-      result.code.should == "201"
-      JSON.parse(result.body).should == @mockObj
-    end
-    
-    it 'should not allow posting with a bad object' do
-      result = @p.create('/Class/', @corruptObj)
-      result.code.should == "500"
-      result.body.should == "\"Can not modify queries\""
-    end
-    
-    it 'should not allow posting to an existing object/id/path' do
-      result = @p.create('/Class/', @blobObj)
-      result.code.should == "201"
-      JSON.parse(result.body).should == @blobObj
-      # This shouldn't be a 201, it should say something mean.
+     it 'should create a new object in persevere' do
+       result = @p.create('/Class/', @blobObj)
+       result.code.should == "201"
+       JSON.parse(result.body).should == @mockObj
+     end
+     
+     it 'should not allow posting with a bad object' do
+       result = @p.create('/Class/', @corruptObj)
+       result.code.should == "500"
+       result.body.should == "\"Can not modify queries\""
+     end
+     
+     it 'should not allow posting to an existing object/id/path' do
+       result = @p.create('/Class/', @blobObj)
+       result.code.should == "201"
+       JSON.parse(result.body).should == @blobObj
+       # This shouldn't be a 201, it should say something mean.
+     end
+   end
+  
+   #
+   # Test GET to retrieve the list of classes from Persvr
+   #
+   describe '#get' do
+     it 'should retrieve the previously created object from persevere' do
+       result = @p.retrieve('/Class/Yogo')
+       result.code.should == "200"
+       JSON.parse(result.body).should == @blobObj
+     end
+     
+     it 'should 404 on a non-existent object' do
+       result = @p.retrieve('/Class/GetNotThere')
+       result.code.should == "404"
+       result.message.should == "Not Found"
+     end
+   end
+  
+   #
+   # Test PUT to modify an existing class
+   #
+   describe '#put' do
+     it 'should modify the previously created object in persevere' do
+       @blobObj['properties']['tstAttribute'] = { 'type' => 'string' }
+       result = @p.update('/Class/Yogo', @blobObj)
+       result.code.should == "200"
+       JSON.parse(result.body).should == @blobObj
+     end
+     
+     it 'should fail to modify a non-existent item' do
+       result = @p.update('/Class/NonExistent', @blobObj)
+       result.code.should == "500"
+       result.body.should == "\"id does not match location\""
+       @p.delete('/Class/NonExistent') # A bug(?) in Persevere makes a broken NonExistent class.
+       # This should be a 404 and not throw a persevere server exception
+     end
+   end
+  
+   #
+   # Test DELETE to remove the previously created and modified class
+   #
+   describe '#delete' do
+     it 'should remove the previously created and modified object from persevere' do
+       result = @p.delete('/Class/Yogo')
+       result.code.should == "204"
+       @p.retrieve('/Class/Yogo').code.should == "404"
+     end
+     
+     it 'should fail to delete a non-existent item' do
+       result = @p.delete('/Class/NotThere')
+       result.code.should == "404"
+       result.message.should == "Not Found"
+       result.body.should == "\"Class/NotThere not found\""
+     end
+   end
+   
+   describe "POSTing objects" do
+     before(:all) do
+       @p.create('/Class/', @blobObj)
+     end
+     
+     it "should not allow nil fields to be posted" do
+       obj_with_nil = @object.merge({'cid' => nil})
+       result = @p.create('/Yogo', obj_with_nil)
+       result.code.should == "201"
+       JSON.parse(result.body).reject{|key,value| key == 'id' }.should == 
+          obj_with_nil.reject{|key,value| value.nil?}
+     end
+     
+     after(:all) do
+       @p.delete('/Class/Yogo')
+     end
+   end
+  
+  describe "GETting limits and offsets" do
+    before(:all) do
+      @p.create('/Class/', @blobObj)
+      (0..99).each do |i|
+        @p.create('/Yogo/', @object.merge({'cid' => "#{i}"}))
+      end
     end
-  end
 
-  #
-  # Test GET to retrieve the list of classes from Persvr
-  #
-  describe '#get' do
-    it 'should retrieve the previously created object from persevere' do
-      result = @p.retrieve('/Class/Yogo')
+    it "should only retrieve all objects" do
+      result = @p.retrieve('/Yogo/')
       result.code.should == "200"
-      JSON.parse(result.body).should == @blobObj
+      JSON.parse(result.body).length.should == 100
     end
     
-    it 'should 404 on a non-existent object' do
-      result = @p.retrieve('/Class/GetNotThere')
-      result.code.should == "404"
-      result.message.should == "Not Found"
-    end
-  end
-
-  #
-  # Test PUT to modify an existing class
-  #
-  describe '#put' do
-    it 'should modify the previously created object in persevere' do
-      @blobObj['properties']['tstAttribute'] = { 'type' => 'string' }
-      result = @p.update('/Class/Yogo', @blobObj)
+    it "should retrieve the first objects" do
+      result = @p.retrieve('/Yogo/1')
       result.code.should == "200"
-      JSON.parse(result.body).should == @blobObj
+      JSON.parse(result.body)['id'].should == '1'
     end
     
-    it 'should fail to modify a non-existent item' do
-      result = @p.update('/Class/NonExistent', @blobObj)
-      result.code.should == "500"
-      result.body.should == "\"id does not match location\""
-      @p.delete('/Class/NonExistent') # A bug(?) in Persevere makes a broken NonExistent class.
-      # This should be a 404 and not throw a persevere server exception
+    it "should retrieve a 10 of the objects" do
+        result = @p.retrieve('/Yogo/', {'Range' => "items=1-10"})
+        result.code.should == '206'
+        JSON.parse(result.body).length.should == 10
     end
-  end
-
-  #
-  # Test DELETE to remove the previously created and modified class
-  #
-  describe '#delete' do
-    it 'should remove the previously created and modified object from persevere' do
-      result = @p.delete('/Class/Yogo')
-      result.code.should == "204"
-      @p.retrieve('/Class/Yogo').code.should == "404"
+    
+    it "should return the first 2 objects" do
+      result = @p.retrieve('/Yogo/', {'Range' => "items=0-1"})
+      result.code.should == '206'
+      json = JSON.parse(result.body)
+      json.length.should == 2
+      json[0]['id'].should == '1'
+      json[1]['id'].should == '2'
+    end
+    
+    it "should return 21 and up objects" do
+      result = @p.retrieve('/Yogo/', {'Range' => 'items=20-'})
+      result.code.should == '206'
+      json = JSON.parse(result.body)
+      json.length.should == 80
+      json[0]['id'].should == '21'
+      json[-1]['id'].should == '100'      
     end
     
-    it 'should fail to delete a non-existent item' do
-      result = @p.delete('/Class/NotThere')
-      result.code.should == "404"
-      result.message.should == "Not Found"
-      result.body.should == "\"Class/NotThere not found\""
+    after(:all) do
+      @p.delete('/Class/Yogo')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,52 +1,15 @@
 require 'pathname'
 require 'rubygems'
-
 require 'addressable/uri'
 require 'spec'
-
-require 'ruby-debug'
-
+ 
 require 'dm-core'
 
-require 'adapter_shared_spec'
-
-SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
-# $LOAD_PATH.unshift(SPEC_ROOT.parent + 'lib')
-
-Pathname.glob((SPEC_ROOT + '{lib,*/shared}/**/*.rb').to_s).each { |file| require file }
-
-ENV['ADAPTERS'] ||= 'all'
-
-ADAPTERS = []
-
-PRIMARY = {
-  'persevere' => {:adapter => 'persevere', :host => 'localhost', :port => '8080'}
-}
-
-adapters = ENV['ADAPTERS'].split(' ').map { |adapter_name| adapter_name.strip.downcase }.uniq
-adapters = PRIMARY.keys if adapters.include?('all')
-
-PRIMARY.only(*adapters).each do |name, default|
-  connection_string = ENV["#{name.upcase}_SPEC_URI"] || default
-  begin
-    adapter = DataMapper.setup(name.to_sym, connection_string)
-
-    # test the connection if possible
-    if adapter.respond_to?(:query)
-      name == 'oracle' ? adapter.select('SELECT 1 FROM dual') : adapter.select('SELECT 1')
-    end
-
-    ADAPTERS << name
-    PRIMARY[name] = connection_string  # ensure *_SPEC_URI is saved
-   rescue Exception => exception
-     puts "Could not connect to the database using #{connection_string.inspect} because: #{exception.inspect}"
+def path_to(gem_name, version=nil)
+  version = version ? Gem::Requirement.create(version) : Gem::Requirement.default
+  specs = Gem.source_index.find_name(gem_name, version)
+  paths = specs.map do |spec|
+    spec_path = spec.loaded_from
+    expanded_path = File.join(File.dirname(spec_path), '..', 'gems', "#{spec.name}-#{spec.version}")
   end
-end
-
-logger = DataMapper::Logger.new(DataMapper.root / 'log' / 'dm.log', :debug)
-logger.auto_flush = true
-
-Spec::Runner.configure do |config|
-  config.extend(DataMapper::Spec::AdapterHelpers)
-  # config.include(DataMapper::Spec::PendingHelpers)
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification 
 name: persevere
 version: !ruby/object:Gem::Version 
-  version: 0.18.0
+  version: 0.21.0
 platform: ruby
 authors: 
-- Ivan R. Judson
-- The Yogo Data Management Development Team
+  - Ivan R. Judson
+  - The Yogo Data Management Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -07:00
+date: 2010-01-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: A ruby wrapper for persevere
 email: 
-- irjudson [a] gmail [d] com
+  - irjudson [a] gmail [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
-- README.txt
+  - LICENSE.txt
+  - README.txt
 files: 
-- LICENSE.txt
-- Rakefile
-- lib/persevere.rb
-- persevere/History.txt
-- persevere/README.txt
-- README.txt
+  - LICENSE.txt
+  - Rakefile
+  - lib/persevere.rb
+  - persevere/History.txt
+  - persevere/README.txt
+  - README.txt
 has_rdoc: true
 homepage: http://github.com/yogo/persevere
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- persevere/README.txt
+  - --main
+  - persevere/README.txt
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 requirements: []
 
@@ -61,6 +61,6 @@ signing_key:
 specification_version: 3
 summary: A ruby wrapper for persevere
 test_files: 
-- spec/persevere_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+  - spec/persevere_spec.rb
+  - spec/spec.opts
+  - spec/spec_helper.rb