agraph 0.1.2 → 0.1.3

data/Rakefile

@@ -1,37 +1,38 @@
 require 'rubygems'
-gem 'rspec', '>= 2'
+
+gem 'rspec'
 require 'rspec'
-require "rake/rdoctask"
-require 'rake/gempackagetask'
 require 'rspec/core/rake_task'
 
+gem 'reek'
+require 'reek/rake/task'
+
+require 'rake/rdoctask'
+
 task :default => :spec
 
-specification = Gem::Specification.new do |specification|
-  specification.name              = "agraph"
-  specification.version           = "0.1.2"
-  specification.date              = "2010-11-17"
-  specification.email             = "b.phifty@gmail.com"
-  specification.homepage          = "http://github.com/phifty/agraph"
-  specification.summary           = "Client for the AllegroGraph 4.x graph database."
-  specification.description       = "The gem provides a client for the AllegroGraph 4.x RDF graph database. Features like searching geo-spatial data, type mapping and transactions are supported."
-  specification.rubyforge_project = "agraph"
-  specification.has_rdoc          = true
-  specification.authors           = [ "Philipp Bruell" ]
-  specification.files             = [ "README.rdoc", "Rakefile" ] + Dir["{lib,spec}/**/*"]
-  specification.extra_rdoc_files  = [ "README.rdoc" ]
-  specification.require_path      = "lib"
+namespace :gem do
+
+  desc "Builds the gem"
+  task :build do
+    system "gem build *.gemspec && mkdir -p pkg/ && mv *.gem pkg/"
+  end
+
+  desc "Builds and installs the gem"
+  task :install => :build do
+    system "gem install pkg/"
+  end
+
 end
 
-Rake::GemPackageTask.new(specification) do |package|
-  package.gem_spec = specification
+Reek::Rake::Task.new do |task|
+  task.fail_on_error = true
 end
 
 desc "Generate the rdoc"
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.add [ "README.rdoc", "lib/**/*.rb" ]
-  rdoc.main   = "README.rdoc"
-  rdoc.title  = "Client for the AllegroGraph 4.x graph database."
+  rdoc.main = "README.rdoc"
 end
 
 desc "Run all specs in spec directory"

data/lib/allegro_graph.rb

@@ -1,8 +1,7 @@
+require 'transport'
 
 module AllegroGraph
 
-  autoload :Transport,          File.join(File.dirname(__FILE__), "allegro_graph", "transport")
-  autoload :ExtendedTransport,  File.join(File.dirname(__FILE__), "allegro_graph", "extended_transport")
   autoload :Server,             File.join(File.dirname(__FILE__), "allegro_graph", "server")
   autoload :Catalog,            File.join(File.dirname(__FILE__), "allegro_graph", "catalog")
   autoload :Resource,           File.join(File.dirname(__FILE__), "allegro_graph", "resource")

data/lib/allegro_graph/catalog.rb

@@ -31,10 +31,10 @@ module AllegroGraph
     end
 
     def repositories
-      repositories = @server.request :get, self.path + "/repositories", :expected_status_code => 200
+      repositories = @server.request_json :get, self.path + "/repositories", :expected_status_code => 200
       repositories.map { |repository| Repository.new self, repository["id"] }
     end
 
   end
 
-end
+end

data/lib/allegro_graph/proxy/geometric.rb

@@ -19,7 +19,7 @@ module AllegroGraph
 
       def cartesian_type(parameters = { })
         parameters = Utility::ParameterMapper.map parameters, :cartesian_type
-        type = @resource.request :post, self.path + "/types/cartesian", :parameters => parameters, :expected_status_code => 200
+        type = @resource.request_http :post, self.path + "/types/cartesian", :parameters => parameters, :expected_status_code => 200
         type.sub! /^.*</, "<"
         type.sub! />.*$/, ">"
         type
@@ -27,7 +27,7 @@ module AllegroGraph
 
       def spherical_type(parameters = { })
         parameters = Utility::ParameterMapper.map parameters, :spherical_type
-        type = @resource.request :post, self.path + "/types/spherical", :parameters => parameters, :expected_status_code => 200
+        type = @resource.request_http :post, self.path + "/types/spherical", :parameters => parameters, :expected_status_code => 200
         type.sub! /^.*</, "<"
         type.sub! />.*$/, ">"
         type
@@ -40,7 +40,7 @@ module AllegroGraph
         raise ArgumentError, "at least three points has to defined" unless points.is_a?(Array) && points.size >= 3
         parameters[:point] = points.map{ |point| "\"%+g%+g\"^^%s" % [ point[0], point[1], type ] }
 
-        @resource.request :put, self.path + "/polygon", :parameters => parameters, :expected_status_code => 204
+        @resource.request_json :put, self.path + "/polygon", :parameters => parameters, :expected_status_code => 204
         true
       end
 

data/lib/allegro_graph/proxy/mapping.rb

@@ -18,13 +18,13 @@ module AllegroGraph
 
       def create(type, encoding)
         parameters = { :type => type, :encoding => encoding }
-        @resource.request :put, self.path + "/type", :parameters => parameters, :expected_status_code => 204
+        @resource.request_http :put, self.path + "/type", :parameters => parameters, :expected_status_code => 204
         true
       end
 
       def delete(type)
         parameters = { :type => type }
-        @resource.request :delete, self.path + "/type", :parameters => parameters, :expected_status_code => 204
+        @resource.request_http :delete, self.path + "/type", :parameters => parameters, :expected_status_code => 204
         true
       end
 

data/lib/allegro_graph/proxy/query.rb

@@ -29,7 +29,7 @@ module AllegroGraph
 
       def perform(query)
         parameters = { :query => query, :queryLn => @language.to_s }
-        @resource.request :get, self.path, :parameters => parameters, :expected_status_code => 200
+        @resource.request_json :get, self.path, :parameters => parameters, :expected_status_code => 200
       end
 
     end

data/lib/allegro_graph/proxy/statements.rb

@@ -20,7 +20,7 @@ module AllegroGraph
       def create(subject, predicate, object, context = nil)
         statement = [ subject, predicate, object ]
         statement << context if context
-        @resource.request :post, self.path + "/statements", :body => [ statement ], :expected_status_code => 204
+        @resource.request_json :post, self.path + "/statements", :body => [ statement ], :expected_status_code => 204
         true
       end
 
@@ -32,7 +32,7 @@ module AllegroGraph
           parameters.merge! parameter_key => value if value
         end
 
-        @resource.request :delete, self.path + "/statements", :parameters => parameters, :expected_status_code => 200
+        @resource.request_http :delete, self.path + "/statements", :parameters => parameters, :expected_status_code => 200
       end
 
       def find(options = { })
@@ -51,31 +51,31 @@ module AllegroGraph
 
         parameters = nil if parameters.empty?
 
-        @resource.request :get, self.path + "/statements", :parameters => parameters, :expected_status_code => 200
+        @resource.request_json :get, self.path + "/statements", :parameters => parameters, :expected_status_code => 200
       end
 
       def find_inside_box(parameters = { })
         parameters = Utility::ParameterMapper.map parameters, :find_inside_box
-        @resource.request :get, self.path + "/geo/box", :parameters => parameters, :expected_status_code => 200
+        @resource.request_json :get, self.path + "/geo/box", :parameters => parameters, :expected_status_code => 200
       end
 
       def find_inside_circle(parameters = { })
         parameters = Utility::ParameterMapper.map parameters, :find_inside_circle
-        @resource.request :get, self.path + "/geo/circle", :parameters => parameters, :expected_status_code => 200
+        @resource.request_json :get, self.path + "/geo/circle", :parameters => parameters, :expected_status_code => 200
       end
 
       def find_inside_haversine(parameters = { })
         parameters = Utility::ParameterMapper.map parameters, :find_inside_haversine
-        @resource.request :get, self.path + "/geo/haversine", :parameters => parameters, :expected_status_code => 200
+        @resource.request_json :get, self.path + "/geo/haversine", :parameters => parameters, :expected_status_code => 200
       end
 
       def find_inside_polygon(parameters = { })
         parameters = Utility::ParameterMapper.map parameters, :find_inside_polygon
-        @resource.request :get, self.path + "/geo/polygon", :parameters => parameters, :expected_status_code => 200
+        @resource.request_json :get, self.path + "/geo/polygon", :parameters => parameters, :expected_status_code => 200
       end
 
     end
 
   end
 
-end
+end

data/lib/allegro_graph/repository.rb

@@ -24,8 +24,12 @@ module AllegroGraph
       "#{@catalog.path}/repositories/#{@name}"
     end
 
-    def request(http_method, path, options = { })
-      @server.request http_method, path, options
+    def request_http(*arguments)
+      @server.request_http *arguments
+    end
+
+    def request_json(*arguments)
+      @server.request_json *arguments
     end
 
     def exists?
@@ -33,9 +37,9 @@ module AllegroGraph
     end
 
     def create!
-      @server.request :put, self.path, :expected_status_code => 204
+      @server.request_http :put, self.path, :expected_status_code => 204
       true
-    rescue ExtendedTransport::UnexpectedStatusCodeError => error
+    rescue ::Transport::UnexpectedStatusCodeError => error
       return false if error.status_code == 400
       raise error
     end
@@ -45,9 +49,9 @@ module AllegroGraph
     end
 
     def delete!
-      @server.request :delete, self.path, :expected_status_code => 200
+      @server.request_http :delete, self.path, :expected_status_code => 200
       true
-    rescue ExtendedTransport::UnexpectedStatusCodeError => error
+    rescue ::Transport::UnexpectedStatusCodeError => error
       return false if error.status_code == 400
       raise error
     end
@@ -57,7 +61,7 @@ module AllegroGraph
     end
 
     def size
-      response = @server.request :get, self.path + "/size", :type => :text, :expected_status_code => 200
+      response = @server.request_http :get, self.path + "/size", :type => :text, :expected_status_code => 200
       response.to_i
     end
 
@@ -73,7 +77,7 @@ module AllegroGraph
         session.rollback
         raise error
       end
-      session.commit      
+      session.commit
     end
 
   end

data/lib/allegro_graph/server.rb

@@ -1,3 +1,4 @@
+require 'logger'
 
 module AllegroGraph
 
@@ -23,21 +24,25 @@ module AllegroGraph
       other.is_a?(self.class) && @host == other.host && @port == other.port
     end
 
-    def request(http_method, path, options = { })
-      ExtendedTransport.request http_method, self.url + path, credentials.merge(options)
+    def request_http(http_method, path, options = { })
+      ::Transport::HTTP.request http_method, (self.url + path), credentials.merge(options)
+    end
+
+    def request_json(http_method, path, options = { })
+      ::Transport::JSON.request http_method, self.url + path, credentials.merge(options).merge(:logger => Logger.new(STDOUT))
     end
 
     def version
       {
-        :version  => self.request(:get, "/version",          :expected_status_code => 200),
-        :date     => self.request(:get, "/version/date",     :expected_status_code => 200),
-        :revision => self.request(:get, "/version/revision", :expected_status_code => 200)
+        :version  => self.request_http(:get, "/version",          :expected_status_code => 200),
+        :date     => self.request_http(:get, "/version/date",     :expected_status_code => 200),
+        :revision => self.request_http(:get, "/version/revision", :expected_status_code => 200)
       }
     end
 
     def catalogs
       result = [ @root_catalog ]
-      catalogs = self.request :get, "/catalogs", :expected_status_code => 200
+      catalogs = self.request_json :get, "/catalogs", :expected_status_code => 200
       catalogs.each do |catalog|
         id = catalog["id"]
         result << Catalog.new(self, id.sub(/^\//, "")) unless id == "/"

data/lib/allegro_graph/session.rb

@@ -19,24 +19,27 @@ module AllegroGraph
       ""
     end
 
-    def request(http_method, path, options = { })
-      ExtendedTransport.request http_method, self.url + path, credentials.merge(options)
+    def request_http(http_method, path, options = { })
+      ::Transport::HTTP.request http_method, self.url + path, credentials.merge(options)
+    end
+
+    def request_json(http_method, path, options = { })
+      ::Transport::JSON.request http_method, self.url + path, credentials.merge(options)
     end
 
     def commit
-      self.request :post, "/commit", :expected_status_code => 204
+      self.request_http :post, "/commit", :expected_status_code => 204
       true
     end
 
     def rollback
-      self.request :post, "/rollback", :expected_status_code => 204
+      self.request_http :post, "/rollback", :expected_status_code => 204
       true
     end
 
     def self.create(repository)
-      url = repository.request :post, repository.path + "/session", :expected_status_code => 200
-      url.sub! /^"/, ""
-      url.sub! /"$/, ""
+      response = repository.request_http :post, repository.path + "/session", :expected_status_code => 200
+      url = response.sub(/^"/, "").sub(/"$/, "")
       server = repository.server
       new :url => url, :username => server.username, :password => server.password
     end
@@ -46,7 +49,7 @@ module AllegroGraph
     def credentials
       { :auth_type => :basic, :username => @username, :password => @password }
     end
-    
+
   end
 
 end

data/spec/integration/geo_spatial_spec.rb

@@ -62,7 +62,10 @@ describe "geo-spatial data" do
                                         :x_max       => 20.0,
                                         :y_max       => 20.0
       @statements.create "\"test_subject\"", "\"at\"", "\"+10+10\"^^#{@type}"
+      @statement_one = [ "\"test_subject\"", "\"at\"", "\"+10.000000000931323+10.000000000931323\"^^#{@type}"]
+
       @statements.create "\"another_subject\"", "\"at\"", "\"+15+15\"^^#{@type}"
+      @statement_two = [ "\"another_subject\"", "\"at\"", "\"+15.000000000465661+15.000000000465661\"^^#{@type}"]
     end
 
     it "should find objects inside a box" do
@@ -72,8 +75,8 @@ describe "geo-spatial data" do
                                            :y_min      => 8.0,
                                            :x_max      => 11.0,
                                            :y_max      => 11.0
-      result.should include([ "\"test_subject\"", "\"at\"", "\"+10.000000000931323+10.000000000931323\"^^#{@type}"])
-      result.should_not include([ "\"another_subject\"", "\"at\"", "\"+15.000000000465661+15.000000000465661\"^^#{@type}"])
+      result.should include(@statement_one)
+      result.should_not include(@statement_two)
     end
 
     it "should find objects inside a circle" do
@@ -82,31 +85,20 @@ describe "geo-spatial data" do
                                               :x         => 9.0,
                                               :y         => 9.0,
                                               :radius    => 2.0
-      result.should include([ "\"test_subject\"", "\"at\"", "\"+10.000000000931323+10.000000000931323\"^^#{@type}"])
-      result.should_not include([ "\"another_subject\"", "\"at\"", "\"+15.000000000465661+15.000000000465661\"^^#{@type}"])
+      result.should include(@statement_one)
+      result.should_not include(@statement_two)
     end
 
-    context "with a defined polygon" do
-
-      before :each do
-        @type = @geometric.cartesian_type :strip_width => 1,
-                                          :x_min       => -100,
-                                          :y_min       => -100,
-                                          :x_max       => 100,
-                                          :y_max       => 100
-        @statements.create "\"test_subject\"", "\"at\"", "\"+1+1\"^^#{@type}"
-        @geometric.create_polygon [ [ 0, -100 ], [ 0, 100 ], [ 100, 100 ], [ 100, -100 ] ],
-                                  :name => "test_polygon",
-                                  :type => @type
-      end
-
-      it "should find objects inside that polygon" do
-        result = @statements.find_inside_polygon :type         => @type,
-                                                 :predicate    => "\"at\"",
-                                                 :polygon_name => "test_polygon"
-        result.should include([ "\"test_subject\"", "\"at\"", "\"+0.9999999776482582+0.9999999776482582\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/cartesian/-100.0/100.0/-100.0/100.0/1.0>"])
-      end
+    it "should find objects inside that polygon" do
+      @geometric.create_polygon [ [ 5.0, 5.0 ], [ 5.0, 12.0 ], [ 12.0, 12.0 ], [ 12.0, 5.0 ] ],
+                                :name => "test_polygon",
+                                :type => @type
 
+      result = @statements.find_inside_polygon :type         => @type,
+                                               :predicate    => "\"at\"",
+                                               :polygon_name => "test_polygon"
+      result.should include(@statement_one)
+      result.should_not include(@statement_two)
     end
 
   end

data/spec/integration/mapping_spec.rb

@@ -3,11 +3,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "a
 
 describe "mapping" do
 
-  use_real_transport!
-
   before :each do
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
-    @repository = AllegroGraph::Repository.new @server, "test_repository"    
+    @repository = AllegroGraph::Repository.new @server, "test_repository"
     @repository.create_if_missing!
     @statements = @repository.statements
     @mapping = @repository.mapping
@@ -16,7 +14,7 @@ describe "mapping" do
   describe "creating a type" do
 
     it "should return true" do
-      result = @mapping.create "<time>", "<http://www.w3.org/2001/XMLSchema#dateTime>"
+      result = @mapping.create "<http://test.com/time>", "<http://www.w3.org/2001/XMLSchema#dateTime>"
       result.should be_true
     end
 
@@ -44,7 +42,7 @@ describe "mapping" do
       @statements.create "\"event_three\"", "<happened>", "\"2010-03-29T19:00:00\"^^<time>"
     end
 
-    it "should findthe statements for the given time" do
+    it "should find the statements for the given time" do
       result = @statements.find :predicate => "<happened>", :object => [ "\"2010-03-29T16:30:00\"^^<time>", "\"2010-03-29T18:30:00\"^^<time>" ]
       result.should include([ "\"event_one\"", "<happened>", "\"2010-03-29T17:00:00Z\"^^<http://www.w3.org/2001/XMLSchema#dateTime>" ])
       result.should include([ "\"event_two\"", "<happened>", "\"2010-03-29T18:00:00Z\"^^<http://www.w3.org/2001/XMLSchema#dateTime>" ])

data/spec/integration/query_spec.rb

@@ -3,8 +3,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "a
 
 describe "query" do
 
-  use_real_transport!
-
   before :each do
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @repository = AllegroGraph::Repository.new @server, "test_repository"

data/spec/integration/server_spec.rb

@@ -11,9 +11,9 @@ describe "server" do
 
   it "should return the server's version" do
     @server.version.should == {
-      :version  => "\"4.0.4\"",
-      :date     => "\"June 10, 2010 17:37:10 GMT-0700\"",
-      :revision => "\"[unknown]\""
+      :version  => "4.1.1",
+      :date     => "October 23, 2010 16:25:51 GMT-0700",
+      :revision => "internal reversion unknown"
     }
   end
 

data/spec/integration/statements_spec.rb

@@ -8,8 +8,8 @@ describe "statements" do
   before :each do
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @repository = AllegroGraph::Repository.new @server, "test_repository"
-
     @repository.create_if_missing!
+
     @statements = @repository.statements
   end
 

data/spec/integration/transactions_spec.rb

@@ -8,6 +8,8 @@ describe "transactions" do
   before :each do
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @repository = AllegroGraph::Repository.new @server, "test_repository"
+    @repository.create_if_missing!
+
     @repository.statements.delete
   end
 

data/spec/lib/allegro_graph/catalog_spec.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "li
 describe AllegroGraph::Catalog do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @catalog = AllegroGraph::Catalog.new @server, "test_catalog"
   end
@@ -79,7 +80,7 @@ describe AllegroGraph::Catalog do
     it "should return the catalog's repositories" do
       @catalog.repositories.should == [ @repository ]
     end
-    
+
   end
 
 end

data/spec/lib/allegro_graph/proxy/geometric_spec.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe AllegroGraph::Proxy::Geometric do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @catalog = AllegroGraph::Catalog.new @server, "test_catalog"
     @repository = AllegroGraph::Repository.new @catalog, "test_repository"

data/spec/lib/allegro_graph/proxy/mapping_spec.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe AllegroGraph::Proxy::Geometric do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @catalog = AllegroGraph::Catalog.new @server, "test_catalog"
     @repository = AllegroGraph::Repository.new @catalog, "test_repository"
@@ -24,7 +25,7 @@ describe AllegroGraph::Proxy::Geometric do
       result = @mapping.create "<time>", "<http://www.w3.org/2001/XMLSchema#dateTime>"
       result.should be_true
     end
-    
+
   end
 
   describe "delete" do

data/spec/lib/allegro_graph/proxy/query_spec.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe AllegroGraph::Proxy::Query do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @catalog = AllegroGraph::Catalog.new @server, "test_catalog"
     @repository = AllegroGraph::Repository.new @catalog, "test_repository"
@@ -48,7 +49,7 @@ describe AllegroGraph::Proxy::Query do
       }
     end
 
-    it "should return the query result" do
+    it "should return the prolog query result" do
       @query.language = :prolog
       result = @query.perform "(select (?subject) (q- ?subject !<http://xmlns.com/foaf/0.1/knows> ?object))"
       result.should == {

data/spec/lib/allegro_graph/proxy/statements_spec.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..
 describe AllegroGraph::Proxy::Statements do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @catalog = AllegroGraph::Catalog.new @server, "test_catalog"
     @repository = AllegroGraph::Repository.new @catalog, "test_repository"
@@ -20,7 +21,7 @@ describe AllegroGraph::Proxy::Statements do
     it "should return the correct path" do
       @statements.path.should == @repository.path
     end
-    
+
   end
 
   describe "create" do

data/spec/lib/allegro_graph/repository_spec.rb

@@ -4,9 +4,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "li
 describe AllegroGraph::Repository do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
     @catalog = AllegroGraph::Catalog.new @server, "test_catalog"
-    @repository = AllegroGraph::Repository.new @catalog, "test_repository"    
+    @repository = AllegroGraph::Repository.new @catalog, "test_repository"
   end
 
   describe "==" do
@@ -31,15 +32,28 @@ describe AllegroGraph::Repository do
 
   end
 
-  describe "request" do
+  describe "request_http" do
 
     before :each do
-      @server.stub!(:request)
+      @server.stub(:request_http)
     end
 
     it "should call the server's request method" do
-      @server.should_receive(:request).with(:get, "/", { })
-      @repository.request :get, "/"
+      @server.should_receive(:request_http).with(:get, "/", { })
+      @repository.request_http :get, "/", { }
+    end
+
+  end
+
+  describe "request_json" do
+
+    before :each do
+      @server.stub(:request_json)
+    end
+
+    it "should call the server's request method" do
+      @server.should_receive(:request_json).with(:get, "/", { })
+      @repository.request_json :get, "/", { }
     end
 
   end
@@ -130,6 +144,11 @@ describe AllegroGraph::Repository do
         @repository.delete!.should be_true
       end
 
+      it "should return true even if a #{Transport::JSON::ParserError} is raised" do
+        @server.stub(:request).and_raise(Transport::JSON::ParserError)
+        @repository.delete!.should be_true
+      end
+
     end
 
     context "for a repository that not exists" do
@@ -181,7 +200,7 @@ describe AllegroGraph::Repository do
     it "should return the number of statements" do
       @repository.size.should == 3
     end
-    
+
   end
 
   describe "transaction" do

data/spec/lib/allegro_graph/server_spec.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "li
 describe AllegroGraph::Server do
 
   before :each do
+    fake_transport!
     @server = AllegroGraph::Server.new :username => "test", :password => "test"
   end
 
@@ -21,17 +22,32 @@ describe AllegroGraph::Server do
 
   end
 
-  describe "request" do
+  describe "request_http" do
 
     before :each do
-      AllegroGraph::ExtendedTransport.stub!(:request)
+      Transport::HTTP.stub(:request)
     end
 
-    it "should perform an extended request" do
-      AllegroGraph::ExtendedTransport.should_receive(:request).with(
+    it "should perform a http request" do
+      Transport::HTTP.should_receive(:request).with(
         :get, "http://localhost:10035/", hash_including(:expected_status_code => 200)
       ).and_return("test" => "test")
-      @server.request(:get, "/", :expected_status_code => 200).should == { "test" => "test" }
+      @server.request_http(:get, "/", :expected_status_code => 200).should == { "test" => "test" }
+    end
+
+  end
+
+  describe "request_json" do
+
+    before :each do
+      Transport::JSON.stub(:request)
+    end
+
+    it "should perform a json request" do
+      Transport::JSON.should_receive(:request).with(
+        :get, "http://localhost:10035/", hash_including(:expected_status_code => 200)
+      ).and_return("test" => "test")
+      @server.request_json(:get, "/", :expected_status_code => 200).should == { "test" => "test" }
     end
 
   end

data/spec/lib/allegro_graph/session_spec.rb

@@ -4,20 +4,36 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "li
 describe AllegroGraph::Session do
 
   before :each do
+    fake_transport!
     @session = AllegroGraph::Session.new :url => "http://session:5555", :username => "test", :password => "test"
   end
 
-  describe "request" do
+  describe "request_http" do
 
     before :each do
-      AllegroGraph::ExtendedTransport.stub!(:request)
+      Transport::HTTP.stub(:request)
     end
 
-    it "should perform an extended request" do
-      AllegroGraph::ExtendedTransport.should_receive(:request).with(
+    it "should perform a http request" do
+      Transport::HTTP.should_receive(:request).with(
         :get, "http://session:5555/", hash_including(:expected_status_code => 200)
       ).and_return("test" => "test")
-      @session.request(:get, "/", :expected_status_code => 200).should == { "test" => "test" }
+      @session.request_http(:get, "/", :expected_status_code => 200).should == { "test" => "test" }
+    end
+
+  end
+
+  describe "request_json" do
+
+    before :each do
+      Transport::JSON.stub(:request)
+    end
+
+    it "should perform a json request" do
+      Transport::JSON.should_receive(:request).with(
+        :get, "http://session:5555/", hash_including(:expected_status_code => 200)
+      ).and_return("test" => "test")
+      @session.request_json(:get, "/", :expected_status_code => 200).should == { "test" => "test" }
     end
 
   end
@@ -43,17 +59,15 @@ describe AllegroGraph::Session do
   describe "create" do
 
     before :each do
-      @server = Object.new
-      @server.stub!(:username).and_return("test")
-      @server.stub!(:password).and_return("test")
-      @repository = Object.new
-      @repository.stub!(:path).and_return("/repositories/test_repository")
-      @repository.stub!(:request).and_return("http://session:5555")
-      @repository.stub!(:server).and_return(@server)
+      @server = mock AllegroGraph::Server, :username => "test", :password => "test"
+      @repository = mock AllegroGraph::Repository,
+        :path => "/repositories/test_repository",
+        :request_http => "http://session:5555",
+        :server => @server
     end
 
     it "should request a session" do
-      @repository.should_receive(:request).with(
+      @repository.should_receive(:request_http).with(
         :post, "/repositories/test_repository/session", :expected_status_code => 200
       ).and_return("http://session:5555")
       AllegroGraph::Session.create @repository

data/spec/spec_helper.rb

@@ -1,15 +1,13 @@
 require 'rubygems'
 gem 'rspec', '>= 2'
 require 'rspec'
+require 'transport/spec'
 
 require File.join(File.dirname(__FILE__), "..", "lib", "allegro_graph")
 require File.join(File.dirname(__FILE__), "fake_transport_helper")
 
-FakeTransport.enable!
-RSpec.configure do |configuration|
-  configuration.before :each do
-    FakeTransport.fake!
-  end
+def fake_transport!
+  Transport::Spec::Faker.fake! File.join(File.dirname(__FILE__), "fake_transport.yml")
 end
 
 def use_real_transport!

metadata

@@ -5,19 +5,60 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
-- Philipp Bruell
+- "Philipp Br\xC3\xBCll"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2010-11-29 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: transport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: reek
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :development
+  version_requirements: *id003
 description: The gem provides a client for the AllegroGraph 4.x RDF graph database. Features like searching geo-spatial data, type mapping and transactions are supported.
 email: b.phifty@gmail.com
 executables: []
@@ -36,9 +77,7 @@ files:
 - lib/allegro_graph/catalog.rb
 - lib/allegro_graph/resource.rb
 - lib/allegro_graph/utility.rb
-- lib/allegro_graph/extended_transport.rb
 - lib/allegro_graph/utility/parameter_mapper.rb
-- lib/allegro_graph/transport.rb
 - lib/allegro_graph/session.rb
 - lib/allegro_graph/proxy.rb
 - lib/allegro_graph/proxy/query.rb
@@ -56,10 +95,8 @@ files:
 - spec/lib/allegro_graph/catalog_spec.rb
 - spec/lib/allegro_graph/resource_spec.rb
 - spec/lib/allegro_graph/session_spec.rb
-- spec/lib/allegro_graph/transport_spec.rb
 - spec/lib/allegro_graph/utility/parameter_mapper_spec.rb
 - spec/lib/allegro_graph/repository_spec.rb
-- spec/lib/allegro_graph/extended_transport_spec.rb
 - spec/lib/allegro_graph/proxy/mapping_spec.rb
 - spec/lib/allegro_graph/proxy/query_spec.rb
 - spec/lib/allegro_graph/proxy/geometric_spec.rb
@@ -83,8 +120,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/lib/allegro_graph/extended_transport.rb

@@ -1,84 +0,0 @@
-require 'json'
-
-module AllegroGraph
-  
-  # Extended transport layer for http transfers. Basic authorization and JSON transfers are supported.
-  class ExtendedTransport < Transport
-
-    # The UnexpectedStatusCodeError is raised if the :expected_status_code option is given to
-    # the :request method and the responded status code is different from the expected one.
-    class UnexpectedStatusCodeError < StandardError
-
-      attr_reader :status_code
-      attr_reader :message
-
-      def initialize(status_code, message)
-        @status_code, @message = status_code, message
-      end
-
-      def to_s
-        "#{super} received status code #{self.status_code}" + (@message ? " [#{@message}]" : "")
-      end
-
-    end
-
-    attr_reader :expected_status_code
-    attr_reader :auth_type
-    attr_reader :username
-    attr_reader :password
-
-    def initialize(http_method, url, options = { })
-      super http_method, url, options
-      @expected_status_code = options[:expected_status_code]
-      @auth_type            = options[:auth_type]
-      @username             = options[:username]
-      @password             = options[:password]
-    end
-
-    def perform
-      initialize_headers
-      super
-      check_status_code
-      parse_response
-    end
-
-    private
-
-    def initialize_headers
-      @headers["Accept"] = "application/json"
-    end
-
-    def initialize_request
-      super
-      if @auth_type == :basic
-        @request.basic_auth @username, @password
-      elsif !@auth_type.nil?
-        raise NotImplementedError, "the given auth_type [#{@auth_type}] is not implemented"
-      end
-    end
-
-    def initialize_request_body
-      super
-      if @body
-        @request.body = @body.to_json
-        @request["Content-Type"] = "application/json"
-      end
-    end
-
-    def check_status_code
-      return unless @expected_status_code
-      response_code = @response.code
-      response_body = @response.body
-      raise UnexpectedStatusCodeError.new(response_code.to_i, response_body) if @expected_status_code.to_s != response_code
-    end
-
-    def parse_response
-      body = @response.body
-      @response = body.nil? ? nil : JSON.parse(body)
-    rescue JSON::ParserError
-      @response = body.to_s
-    end
-
-  end
-
-end

data/lib/allegro_graph/transport.rb

@@ -1,100 +0,0 @@
-require 'uri'
-require 'cgi'
-require 'net/http'
-
-module AllegroGraph
-
-  # Common transport layer for http transfers.
-  class Transport
-
-    attr_reader :http_method
-    attr_reader :url
-    attr_reader :options
-    attr_reader :headers
-    attr_reader :parameters
-    attr_reader :body
-    attr_reader :response
-
-    def initialize(http_method, url, options = { })
-      @http_method  = http_method
-      @uri          = URI.parse url
-      @headers      = options[:headers]     || { }
-      @parameters   = options[:parameters]  || { }
-      @body         = options[:body]
-    end
-
-    def perform
-      initialize_request_class
-      initialize_request_path
-      initialize_request
-      initialize_request_body
-      perform_request
-    end
-
-    private
-
-    def initialize_request_class
-      request_class_name = @http_method.to_s.capitalize
-      raise NotImplementedError, "the request method #{http_method} is not implemented" unless Net::HTTP.const_defined?(request_class_name)
-      @request_class = Net::HTTP.const_get request_class_name
-    end
-
-    def initialize_request_path
-      @request_path = @uri.path # + (@uri.query ? "?" + @uri.query : "")
-      unless parameter_body?
-        serialize_parameters
-        @request_path += @serialized_parameters
-      end
-    end
-
-    def serialize_parameters
-      quote_parameters
-      @serialized_parameters = if @parameters.nil? || @parameters.empty?
-        ""
-      else
-        "?" + @quoted_parameters.collect do |key, value|
-          value.is_a?(Array) ?
-            value.map{ |element| "#{key}=#{element}" }.join("&") :
-            "#{key}=#{value}"
-        end.join("&")
-      end
-    end
-
-    def quote_parameters
-      @quoted_parameters = { }
-      @parameters.each do |key, value|
-        quoted_key = CGI.escape(key.to_s)
-        @quoted_parameters[quoted_key] = value.is_a?(Array) ? value.map{ |element| CGI.escape element } : CGI.escape(value)
-      end
-    end
-    
-    def initialize_request
-      @request = @request_class.new @request_path, @headers
-    end
-    
-    def initialize_request_body
-      if parameter_body?
-        serialize_parameters
-        @request.body = @body ? @body : @serialized_parameters.sub(/^\?/, "")
-      end
-    end
-
-    def perform_request
-      @response = Net::HTTP.start(@uri.host, @uri.port) do |connection|
-        connection.request @request
-      end
-    end
-
-    def parameter_body?
-      [ :post, :put ].include? @http_method.to_sym
-    end
-
-    def self.request(http_method, url, options = { })
-      transport = new http_method, url, options
-      transport.perform
-      transport.response
-    end
-
-  end
-
-end

data/spec/lib/allegro_graph/extended_transport_spec.rb

@@ -1,59 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "allegro_graph", "extended_transport"))
-
-describe AllegroGraph::ExtendedTransport do
-
-  use_real_transport!
-
-  describe "request" do
-
-    before :each do
-      @http_method = :get
-      @url = "http://localhost:5984/"
-      @options = {
-        :auth_type            => :basic,
-        :username             => "test",
-        :password             => "test",
-        :expected_status_code => 200
-      }
-
-      @request = Net::HTTP::Get.new "/", { }
-      @response = Object.new
-      @response.stub!(:code).and_return("200")
-      @response.stub!(:body).and_return("{\"test\":\"test\"}")
-      Net::HTTP.stub!(:start).and_return(@response)
-    end
-
-    def do_request(options = { })
-      AllegroGraph::ExtendedTransport.request @http_method, @url, @options.merge(options)
-    end
-
-    it "should initialize the correct request object" do
-      Net::HTTP::Get.should_receive(:new).with("/", { "Accept" => "application/json" }).and_return(@request)
-      do_request
-    end
-
-    it "should perform the request" do
-      Net::HTTP.should_receive(:start).and_return(@response)
-      do_request
-    end
-
-    it "should return the parsed response" do
-      do_request.should == { "test" => "test" }
-    end
-
-    it "should raise NotImplementedError if the given auth_type is wrong" do
-      lambda do
-        do_request :auth_type => :invalid
-      end.should raise_error(NotImplementedError)
-    end
-
-    it "should raise UnexpectedStatusCodeError if responded status code is wrong" do
-      lambda do
-        do_request :expected_status_code => 201
-      end.should raise_error(AllegroGraph::ExtendedTransport::UnexpectedStatusCodeError)
-    end
-
-  end
-
-end

data/spec/lib/allegro_graph/transport_spec.rb

@@ -1,57 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "allegro_graph", "transport"))
-
-describe AllegroGraph::Transport do
-
-  use_real_transport!
-    
-  describe "request" do
-
-    before :each do
-      @http_method = :get
-      @url = "http://localhost:5984/"
-      @options = { }
-
-      @request = Net::HTTP::Get.new "/", { }
-      @response = Object.new
-      @response.stub!(:code).and_return("200")
-      @response.stub!(:body).and_return("test")
-      Net::HTTP.stub!(:start).and_return(@response)
-    end
-
-    def do_request(options = { })
-      AllegroGraph::Transport.request @http_method, @url, @options.merge(options)
-    end
-
-    it "should initialize the correct request object" do
-      Net::HTTP::Get.should_receive(:new).with("/", { }).and_return(@request)
-      do_request
-    end
-
-    it "should perform the request" do
-      Net::HTTP.should_receive(:start).and_return(@response)
-      do_request
-    end
-
-    it "should return the response" do
-      do_request.body.should == "test"
-    end
-
-    context "with parameters" do
-
-      before :each do
-        @options.merge! :parameters => { :foo => "bar", :test => [ "value1", "value2" ] }
-      end
-
-      it "should initialize the correct request object" do
-        Net::HTTP::Get.should_receive(:new).with(
-          "/?foo=bar&test=value1&test=value2", { }
-        ).and_return(@request)
-        do_request
-      end
-
-    end
-
-  end
-
-end