agraph 0.1.3 → 0.1.4

data/lib/allegro_graph/proxy/geometric.rb

@@ -33,7 +33,7 @@ module AllegroGraph
         type
       end
 
-      def create_polygon(points, parameters = { })
+      def create_cartesian_polygon(points, parameters = { })
         type = parameters.delete :type
         parameters = Utility::ParameterMapper.map parameters, :create_polygon
 
@@ -44,6 +44,22 @@ module AllegroGraph
         true
       end
 
+      def create_spherical_polygon(points, parameters = { })
+        type = parameters.delete :type
+        parameters = Utility::ParameterMapper.map parameters, :create_polygon
+
+        raise ArgumentError, "at least three points has to defined" unless points.is_a?(Array) && points.size >= 3
+        parameters[:point] = points.map do |point|
+          "\"" +
+            Utility::ParameterMapper.latitude_to_iso(point[0]) +
+            Utility::ParameterMapper.longitude_to_iso(point[1]) +
+            "\"^^#{type}"
+        end
+
+        @resource.request_json :put, self.path + "/polygon", :parameters => parameters, :expected_status_code => 204
+        true
+      end
+
     end
 
   end

data/lib/allegro_graph/server.rb

@@ -1,4 +1,3 @@
-require 'logger'
 
 module AllegroGraph
 
@@ -29,7 +28,7 @@ module AllegroGraph
     end
 
     def request_json(http_method, path, options = { })
-      ::Transport::JSON.request http_method, self.url + path, credentials.merge(options).merge(:logger => Logger.new(STDOUT))
+      ::Transport::JSON.request http_method, self.url + path, credentials.merge(options)
     end
 
     def version

data/spec/fake_transport.yml

@@ -189,6 +189,19 @@
   :response:
     :code:      "204"
     :body:      ""
+-
+  :http_method: "put"
+  :url:         "http://localhost:10035/catalogs/test_catalog/repositories/test_repository/geo/polygon"
+  :parameters:
+    :resource:    "\"test_polygon\""
+    :point:
+      - "\"+02.0000000+002.0000000\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/cartesian/2.0/20.0/2.0/20.0/1.0>"
+      - "\"+10.0000000+002.0000000\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/cartesian/2.0/20.0/2.0/20.0/1.0>"
+      - "\"+10.0000000+010.0000000\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/cartesian/2.0/20.0/2.0/20.0/1.0>"
+      - "\"+02.0000000+010.0000000\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/cartesian/2.0/20.0/2.0/20.0/1.0>"
+  :response:
+    :code:      "204"
+    :body:      ""
 -
   :http_method: "get"
   :url:         "http://localhost:10035/catalogs/test_catalog/repositories/test_repository/geo/box"

data/spec/integration/geo_spatial_spec.rb

@@ -47,7 +47,7 @@ describe "geo-spatial data" do
     end
 
     it "should return true" do
-      result = @geometric.create_polygon @polygon, :name => "test_polygon", :type => @type
+      result = @geometric.create_cartesian_polygon @polygon, :name => "test_polygon", :type => @type
       result.should be_true
     end
 
@@ -90,9 +90,9 @@ describe "geo-spatial data" do
     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
+      @geometric.create_cartesian_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\"",
@@ -112,6 +112,10 @@ describe "geo-spatial data" do
                                         :latitude_max  => 20.0,
                                         :longitude_max => 20.0
       @statements.create "\"test_subject\"", "\"at\"", "\"+10.00+010.00\"^^#{@type}"
+      @statement_one = [ "\"test_subject\"", "\"at\"", "\"+100000+0100000\"^^#{@type}"]
+
+      @statements.create "\"another_subject\"", "\"at\"", "\"+15.00+015.00\"^^#{@type}"
+      @statement_two = [ "\"another_subject\"", "\"at\"", "\"+150000+0150000\"^^#{@type}"]
     end
 
     it "should find objects inside a haversine" do
@@ -121,7 +125,20 @@ describe "geo-spatial data" do
                                                  :longitude  => 9.0,
                                                  :radius     => 200.0,
                                                  :unit       => :km
-      result.should include([ "\"test_subject\"", "\"at\"", "\"+100000+0100000\"^^<http://franz.com/ns/allegrograph/3.0/geospatial/spherical/degrees/2.0/20.0/2.0/20.0/1.0>"])
+      result.should include(@statement_one)
+      result.should_not include(@statement_two)
+    end
+
+    it "should find objects inside that polygon" do
+      @geometric.create_spherical_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/lib/allegro_graph/proxy/geometric_spec.rb

@@ -50,14 +50,27 @@ describe AllegroGraph::Proxy::Geometric do
 
   end
 
-  describe "create_polygon" do
+  describe "create_cartesian_polygon" do
 
     before :each do
       @polygon = [ [ 2.0, 2.0 ], [ 10.0, 2.0 ], [ 10.0, 10.0 ], [ 2.0, 10.0 ] ]
     end
 
     it "should create a polygon" do
-      result = @geometric.create_polygon @polygon, :name => "test_polygon", :type => @type
+      result = @geometric.create_cartesian_polygon @polygon, :name => "test_polygon", :type => @type
+      result.should be_true
+    end
+
+  end
+
+  describe "create_spherical_polygon" do
+
+    before :each do
+      @polygon = [ [ 2.0, 2.0 ], [ 10.0, 2.0 ], [ 10.0, 10.0 ], [ 2.0, 10.0 ] ]
+    end
+
+    it "should create a polygon" do
+      result = @geometric.create_spherical_polygon @polygon, :name => "test_polygon", :type => @type
       result.should be_true
     end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: agraph
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +01:00
+date: 2010-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         version: "2"
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -119,6 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
@@ -129,6 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"