agraph 0.1.4 → 0.1.5

data/README.rdoc

@@ -13,6 +13,8 @@ The features that are exposed by this client are...
 * performing SparQL and Prolog queries
 * mapping of data type
 
+{<img src="http://travis-ci.org/phifty/agraph.png" />}[http://travis-ci.org/phifty/agraph]
+
 == Installation
 
 There are no special dependencies. Just type
@@ -149,3 +151,8 @@ More examples can be found in the integration specs (spec/integration)
 Any contribution - especially bug reports - is welcome.
 
 Fork or send mail to b.phifty@gmail.com
+
+== Support
+
+Apart from contribution, support via
+Flattr[http://flattr.com/thing/108992/Ruby-client-for-the-AllegroGraph-RDF-graph-database] is welcome.

data/lib/allegro_graph/catalog.rb

@@ -30,6 +30,30 @@ module AllegroGraph
       @server.catalogs.include? self
     end
 
+    def create!
+      @server.request_http :put, self.path, :expected_status_code => 204
+      true
+    rescue ::Transport::UnexpectedStatusCodeError => error
+      return false if error.status_code == 400
+      raise error
+    end
+
+    def create_if_missing!
+      create! unless exists?
+    end
+
+    def delete!
+      @server.request_http :delete, self.path, :expected_status_code => 204
+      true
+    rescue ::Transport::UnexpectedStatusCodeError => error
+      return false if error.status_code == 400
+      raise error
+    end
+
+    def delete_if_exists!
+      delete! if exists?
+    end
+
     def repositories
       repositories = @server.request_json :get, self.path + "/repositories", :expected_status_code => 200
       repositories.map { |repository| Repository.new self, repository["id"] }

data/lib/allegro_graph/repository.rb

@@ -65,12 +65,12 @@ module AllegroGraph
       response.to_i
     end
 
-    def transaction(&block)
-      self.class.transaction self, &block
+    def transaction(options = { }, &block)
+      self.class.transaction self, options, &block
     end
 
-    def self.transaction(repository, &block)
-      session = Session.create repository
+    def self.transaction(repository, options = { }, &block)
+      session = Session.create repository, options
       begin
         session.instance_eval &block
       rescue Object => error

data/lib/allegro_graph/server.rb

@@ -21,6 +21,18 @@ module AllegroGraph
 
     def ==(other)
       other.is_a?(self.class) && @host == other.host && @port == other.port
+    end    
+    
+    def url
+      "http://#{@host}:#{@port}"
+    end
+    
+    def path
+      ""
+    end
+    
+    def server
+      self
     end
 
     def request_http(http_method, path, options = { })
@@ -49,10 +61,6 @@ module AllegroGraph
       result
     end
 
-    def url
-      "http://#{@host}:#{@port}"
-    end
-
     private
 
     def credentials

data/lib/allegro_graph/session.rb

@@ -37,10 +37,20 @@ module AllegroGraph
       true
     end
 
-    def self.create(repository)
-      response = repository.request_http :post, repository.path + "/session", :expected_status_code => 200
+    def size
+      response = self.request_http :get, "/size", :type => :text, :expected_status_code => 200
+      response.to_i
+    end
+
+    def self.create(repository_or_server, options = { })
+      path = repository_or_server.path
+      raise ArgumentError, "The :store parameter is missing!" if path.empty? && !options.has_key?(:store)
+
+      response = repository_or_server.request_http :post,
+                                                   path + "/session",
+                                                   { :expected_status_code => 200, :parameters => build_parameters(options) }
       url = response.sub(/^"/, "").sub(/"$/, "")
-      server = repository.server
+      server = repository_or_server.server
       new :url => url, :username => server.username, :password => server.password
     end
 
@@ -50,6 +60,20 @@ module AllegroGraph
       { :auth_type => :basic, :username => @username, :password => @password }
     end
 
+    def self.build_parameters(options)
+      parameters = { }
+
+      store = options[:store]
+      parameters[:store] = store.is_a?(Array) ? "<#{store.join('>+<')}>" : "<#{store}>" if store
+
+      # See http://www.franz.com/agraph/support/documentation/current/http-protocol.html#sessions
+      [ :autoCommit, :lifetime, :loadInitFile, :script ].each do |parameters_name|
+        parameters[parameters_name] = options[parameters_name] if options.has_key?(parameters_name)
+      end
+
+      parameters
+    end
+
   end
 
 end

data/spec/fake_transport.yml

@@ -10,6 +10,12 @@
   :response:
     :code:      "204"
     :body:      ""
+-
+  :http_method: "get"
+  :url:         "http://session:5555/size"
+  :response:
+    :code:      "200"
+    :body:      "6"
 -
   :http_method: "get"
   :url:         "http://localhost:10035/version"
@@ -50,7 +56,19 @@
   :http_method: "put"
   :url:         "http://localhost:10035/catalogs/not_existing"
   :response:
-    :code:      "201"
+    :code:      "204"
+    :body:      ""
+-
+  :http_method: "delete"
+  :url:         "http://localhost:10035/catalogs/test_catalog"
+  :response:
+    :code:      "204"
+    :body:      ""
+-
+  :http_method: "delete"
+  :url:         "http://localhost:10035/catalogs/not_existing"
+  :response:
+    :code:      "400"
     :body:      ""
 -
   :http_method: "get"

data/spec/integration/server_spec.rb

@@ -11,8 +11,8 @@ describe "server" do
 
   it "should return the server's version" do
     @server.version.should == {
-      :version  => "4.1.1",
-      :date     => "October 23, 2010 16:25:51 GMT-0700",
+      :version  => "4.3.3",
+      :date     => "September 30, 2011 11:55:21 GMT-0700",
       :revision => "internal reversion unknown"
     }
   end

data/spec/lib/allegro_graph/catalog_spec.rb

@@ -71,6 +71,119 @@ describe AllegroGraph::Catalog do
 
   end
 
+  describe "create!" do
+
+    context "for a catalog that already exists" do
+
+      it "should return false" do
+        @catalog.create!.should be_false
+      end
+
+    end
+
+    context "for a catalog that not exists" do
+
+      before :each do
+        @catalog.name = "not_existing"
+      end
+
+      it "should return true" do
+        @catalog.create!.should be_true
+      end
+
+    end
+
+  end
+
+  describe "create_if_missing!" do
+
+    context "for a catalog that already exists" do
+
+      before :each do
+        @catalog.stub!(:exists?).and_return(true)
+      end
+
+      it "should do nothing" do
+        @catalog.should_not_receive(:create!)
+        @catalog.create_if_missing!
+      end
+
+    end
+
+    context "for a catalog that not exists" do
+
+      before :each do
+        @catalog.stub!(:exists?).and_return(false)
+      end
+
+      it "should call create!" do
+        @catalog.should_receive(:create!)
+        @catalog.create_if_missing!
+      end
+
+    end
+
+  end
+
+  describe "delete!" do
+
+    context "for a catalog that already exists" do
+
+      it "should return true" do
+        @catalog.delete!.should be_true
+      end
+
+      it "should return true even if a #{Transport::JSON::ParserError} is raised" do
+        @catalog.stub(:request).and_raise(Transport::JSON::ParserError)
+        @catalog.delete!.should be_true
+      end
+
+    end
+
+    context "for a catalog that not exists" do
+
+      before :each do
+        @catalog.name = "not_existing"
+      end
+
+      it "should return false" do
+        @catalog.delete!.should be_false
+      end
+
+    end
+
+  end
+
+  describe "delete_if_exists!" do
+
+    context "for a catalog that already exists" do
+
+      before :each do
+        @catalog.stub!(:exists?).and_return(true)
+      end
+
+      it "should call delete!" do
+        @catalog.should_receive(:delete!)
+        @catalog.delete_if_exists!
+      end
+
+    end
+
+    context "for a catalog that not exists" do
+
+      before :each do
+        @catalog.stub!(:exists?).and_return(false)
+      end
+
+      it "should do nothing" do
+        @catalog.should_not_receive(:delete!)
+        @catalog.delete_if_exists!
+      end
+
+    end
+
+  end
+
   describe "repositories" do
 
     before :each do

data/spec/lib/allegro_graph/server_spec.rb

@@ -21,6 +21,14 @@ describe AllegroGraph::Server do
     end
 
   end
+  
+  describe "server" do
+    
+    it "should return the server itself" do
+      @server.server.should == @server
+    end
+    
+  end
 
   describe "request_http" do
 

data/spec/lib/allegro_graph/session_spec.rb

@@ -56,21 +56,53 @@ describe AllegroGraph::Session do
 
   end
 
+  describe "size" do
+
+    it "should return the number of statements" do
+      @session.size.should == 6
+    end
+
+  end
+
   describe "create" do
 
     before :each do
-      @server = mock AllegroGraph::Server, :username => "test", :password => "test"
+      @server = mock AllegroGraph::Server,
+        :username => "test",
+        :password => "test",
+        :path => ""
+      @server.stub(:server).and_return(@server)
       @repository = mock AllegroGraph::Repository,
         :path => "/repositories/test_repository",
         :request_http => "http://session:5555",
         :server => @server
     end
 
-    it "should request a session" do
+    it "should request a session on a store using the repository" do
       @repository.should_receive(:request_http).with(
-        :post, "/repositories/test_repository/session", :expected_status_code => 200
+        :post, "/repositories/test_repository/session", { :expected_status_code => 200, :parameters => { :autoCommit => true } }
       ).and_return("http://session:5555")
-      AllegroGraph::Session.create @repository
+      AllegroGraph::Session.create @repository, :autoCommit => true
+    end
+
+    it "should request a session on a store using the server" do
+      @server.should_receive(:request_http).with(
+        :post, "/session", { :expected_status_code => 200, :parameters => { :store => '<store_x>' } }
+      ).and_return("http://session:5555")
+      AllegroGraph::Session.create @server, :store => 'store_x'
+    end
+
+    it "should request a session on a federated store" do
+      @server.should_receive(:request_http).with(
+        :post, "/session", { :expected_status_code => 200, :parameters => { :store => '<store_x>+<store_y>' } }
+      ).and_return("http://session:5555")
+      AllegroGraph::Session.create @server, :store => ['store_x', 'store_y']
+    end
+
+    it "should raise an error if no store is supplied" do
+      lambda do
+        AllegroGraph::Session.create @server
+      end.should raise_error(ArgumentError)
     end
 
     it "should return a session" do

metadata

@@ -1,149 +1,117 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: agraph
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
-- "Philipp Br\xC3\xBCll"
+authors:
+- Philipp Brüll
+- Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-15 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: transport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &22664080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *22664080
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &22662900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: reek
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *22662900
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: &22661640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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.
+  prerelease: false
+  version_requirements: *22661640
+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: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - Rakefile
-- lib/allegro_graph.rb
-- lib/agraph.rb
-- lib/code_smells.reek
-- lib/allegro_graph/server.rb
-- lib/allegro_graph/catalog.rb
-- lib/allegro_graph/resource.rb
 - lib/allegro_graph/utility.rb
-- lib/allegro_graph/utility/parameter_mapper.rb
-- lib/allegro_graph/session.rb
-- lib/allegro_graph/proxy.rb
-- lib/allegro_graph/proxy/query.rb
 - lib/allegro_graph/proxy/mapping.rb
 - lib/allegro_graph/proxy/statements.rb
 - lib/allegro_graph/proxy/geometric.rb
+- lib/allegro_graph/proxy/query.rb
+- lib/allegro_graph/catalog.rb
+- lib/allegro_graph/proxy.rb
+- lib/allegro_graph/utility/parameter_mapper.rb
+- lib/allegro_graph/resource.rb
+- lib/allegro_graph/session.rb
 - lib/allegro_graph/repository.rb
-- spec/integration/mapping_spec.rb
-- spec/integration/query_spec.rb
-- spec/integration/repository_spec.rb
-- spec/integration/transactions_spec.rb
-- spec/integration/geo_spatial_spec.rb
-- spec/integration/statements_spec.rb
-- spec/integration/server_spec.rb
-- 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/utility/parameter_mapper_spec.rb
-- spec/lib/allegro_graph/repository_spec.rb
-- spec/lib/allegro_graph/proxy/mapping_spec.rb
+- lib/allegro_graph/server.rb
+- lib/agraph.rb
+- lib/allegro_graph.rb
+- lib/code_smells.reek
 - spec/lib/allegro_graph/proxy/query_spec.rb
-- spec/lib/allegro_graph/proxy/geometric_spec.rb
 - spec/lib/allegro_graph/proxy/statements_spec.rb
+- spec/lib/allegro_graph/proxy/geometric_spec.rb
+- spec/lib/allegro_graph/proxy/mapping_spec.rb
+- spec/lib/allegro_graph/session_spec.rb
+- spec/lib/allegro_graph/resource_spec.rb
+- spec/lib/allegro_graph/utility/parameter_mapper_spec.rb
+- spec/lib/allegro_graph/catalog_spec.rb
 - spec/lib/allegro_graph/server_spec.rb
-- spec/fake_transport_helper.rb
+- spec/lib/allegro_graph/repository_spec.rb
 - spec/spec_helper.rb
+- spec/fake_transport_helper.rb
 - spec/fake_transport.yml
-has_rdoc: true
-homepage: http://github.com/phifty/agraph
+- spec/integration/query_spec.rb
+- spec/integration/server_spec.rb
+- spec/integration/repository_spec.rb
+- spec/integration/statements_spec.rb
+- spec/integration/transactions_spec.rb
+- spec/integration/geo_spatial_spec.rb
+- spec/integration/mapping_spec.rb
+homepage: http://github.com/abrisse/agraph
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: agraph
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Client for the AllegroGraph 4.x graph database.
 test_files: []
-