persevere 0.17.0 → 0.18.0

data/lib/persevere.rb

@@ -34,10 +34,9 @@ class PersevereResult
 end
 
 class Persevere
-  VERSION = '1.1'
   HEADERS = { 'Accept' => 'application/json',
               'Content-Type' => 'application/json'
-            }
+            } unless defined?(HEADERS)
 
   attr_accessor :server_url, :pservr
 
@@ -49,12 +48,12 @@ class Persevere
   end
 
   # Pass in a resource hash
-  def create(path, resource)
+  def create(path, resource, headers = {})
     json_blob = resource.to_json
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('POST', path, json_blob, HEADERS)
+        response = @persevere.send_request('POST', path, json_blob, 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."
@@ -63,11 +62,11 @@ class Persevere
     return PersevereResult.make(response)
   end
 
-  def retrieve(path)
+  def retrieve(path, headers = {})
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('GET', path, nil, HEADERS)
+        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."
@@ -76,13 +75,13 @@ class Persevere
     return PersevereResult.make(response)
   end
 
-  def update(path, resource)
+  def update(path, resource, headers = {})
     json_blob = resource.to_json
 #    puts "JSON to PERSEVERE: #{json_blob}"
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('PUT', path, json_blob, HEADERS)
+        response = @persevere.send_request('PUT', path, json_blob, 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."
@@ -91,11 +90,11 @@ class Persevere
     return PersevereResult.make(response)
   end
 
-  def delete(path)
+  def delete(path, headers = {})
     response = nil
     while response.nil?
       begin
-        response = @persevere.send_request('DELETE', path, nil, HEADERS)
+        response = @persevere.send_request('DELETE', 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."

data/spec/persevere_spec.rb

@@ -57,7 +57,6 @@ describe Persevere do
       result = @p.create('/Class/', @blobObj)
       result.code.should == "201"
       JSON.parse(result.body).should == @blobObj
-#      result.body.should == "\"Can not modify queries\""
       # This shouldn't be a 201, it should say something mean.
     end
   end
@@ -73,7 +72,7 @@ describe Persevere do
     end
     
     it 'should 404 on a non-existent object' do
-      result = @p.retrieve('/Class/NotThere')
+      result = @p.retrieve('/Class/GetNotThere')
       result.code.should == "404"
       result.message.should == "Not Found"
     end
@@ -91,9 +90,10 @@ describe Persevere do
     end
     
     it 'should fail to modify a non-existent item' do
-      result = @p.update('/Class/NotThere', @blobObj)
+      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
@@ -110,10 +110,9 @@ describe Persevere do
     
     it 'should fail to delete a non-existent item' do
       result = @p.delete('/Class/NotThere')
-      result.code.should == "204"
-      result.message.should == "No Content"
-      result.body.should be_nil
-      # This should be a 404 and not fail silently with a 204
+      result.code.should == "404"
+      result.message.should == "Not Found"
+      result.body.should == "\"Class/NotThere not found\""
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,52 @@
-# require 'pathname'
-# require 'rubygems'
-#require 'spec'
-
-# DataMapper.setup(:default, {
-#                             :adapter => 'persevere',
-#                             :host => 'localhost',
-#                             :port => '8080',
-#                             :uri => 'http://localhost:8080'
-#                            })
-
-#
-# I need to make the Book class for Books to relate to
-#
+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}"
+  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.17.0
+  version: 0.18.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-11 00:00:00 -07:00
+date: 2010-01-13 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