agraph 0.1.0.beta2 → 0.1.0

data/README.rdoc

@@ -68,7 +68,11 @@ The result will be an array that holds arrays of all matching statements.
 Before coordinates can be added, a fitting type has to be requested from the database. Coordinates can have the
 cartesian (x and y) or spherical (latitude and longitude) type. When creating the type, also a range has to be defined.
 
-  cartesian_type = repository.geometric.cartesian_type 1, 0, 0, 100, 100
+  cartesian_type = repository.geometric.cartesian_type :strip_width => 1,
+                                                       :x_min       => 0,
+                                                       :y_min       => 0,
+                                                       :x_max       => 100,
+                                                       :y_max       => 100
 
 The first argument specifies the strip width and the last four the top-left and bottom-right corner of the rectangle
 that represent the boundaries for any coordinate.

data/Rakefile

@@ -9,8 +9,8 @@ task :default => :spec
 
 specification = Gem::Specification.new do |specification|
   specification.name              = "agraph"
-  specification.version           = "0.1.0.beta2"
-  specification.date              = "2010-03-30"
+  specification.version           = "0.1.0"
+  specification.date              = "2010-04-05"
   specification.email             = "b.phifty@gmail.com"
   specification.homepage          = "http://github.com/phifty/agraph"
   specification.summary           = "Client for the AllegroGraph 4.x graph database."

data/lib/allegro_graph/transport.rb

@@ -1,7 +1,6 @@
 require 'uri'
 require 'cgi'
 require 'net/http'
-require 'base64'
 require 'json'
 
 module AllegroGraph
@@ -42,8 +41,11 @@ module AllegroGraph
     end
 
     def initialize_request_path
-      serialize_parameters
-      @request_path = @uri.path + @serialized_parameters
+      @request_path = @uri.path # + (@uri.query ? "?" + @uri.query : "")
+      unless parameter_body?
+        serialize_parameters
+        @request_path += @serialized_parameters
+      end
     end
 
     def serialize_parameters
@@ -72,8 +74,10 @@ module AllegroGraph
     end
     
     def initialize_request_body
-      return unless [ :post, :put ].include?(@http_method.to_sym)
-      @request.body = @body ? @body : @serialized_parameters.sub(/^\?/, "")
+      if parameter_body?
+        serialize_parameters
+        @request.body = @body ? @body : @serialized_parameters.sub(/^\?/, "")
+      end
     end
 
     def perform_request
@@ -82,6 +86,10 @@ module AllegroGraph
       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
@@ -133,12 +141,16 @@ module AllegroGraph
     private
 
     def initialize_headers
+      @headers["Accept"] = "application/json"
+    end
+
+    def initialize_request
+      super
       if @auth_type == :basic
-        @headers["Authorization"] = "Basic " + Base64.encode64("#{@username}:#{@password}")
+        @request.basic_auth @username, @password
       elsif !@auth_type.nil?
         raise NotImplementedError, "the given auth_type [#{@auth_type}] is not implemented"
       end
-      @headers["Accept"] = "application/json"
     end
 
     def initialize_request_body

data/spec/integration/basic_spec.rb

@@ -262,11 +262,10 @@ describe "integration" do
         end
 
         it "should find objects inside that polygon" do
-          pending
           result = @statements.find_inside_polygon :type         => @type,
                                                    :predicate    => "\"at\"",
                                                    :polygon_name => "test_polygon"
-          result.should include([ "\"test_subject\"", "\"at\"", "\"+1+1\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/cartesian/2.0/20.0/2.0/20.0/1.0>"])
+          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
 
       end

data/spec/lib/allegro_graph/transport_spec.rb

@@ -84,9 +84,7 @@ describe AllegroGraph::ExtendedTransport do
     end
 
     it "should initialize the correct request object" do
-      Net::HTTP::Get.should_receive(:new).with(
-        "/", { "Authorization" => "Basic dGVzdDp0ZXN0\n", "Accept" => "application/json" }
-      ).and_return(@request)
+      Net::HTTP::Get.should_receive(:new).with("/", { "Accept" => "application/json" }).and_return(@request)
       do_request
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: agraph
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 1
   - 0
-  - beta2
-  version: 0.1.0.beta2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Philipp Bruell
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +02:00
+date: 2010-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -77,13 +76,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: agraph