ashikawa-core 0.6.0 → 0.7.0

data/spec/unit/index_spec.rb

@@ -20,6 +20,7 @@ describe Ashikawa::Core::Index do
 
   it "should initialize an Index" do
     index = subject.new collection, raw_data
+    index.id.should == "167137465/168054969"
     index.type.should == :hash
     index.on.should == [:something]
     index.unique.should == true
@@ -31,7 +32,6 @@ describe Ashikawa::Core::Index do
     it "should be deletable" do
       collection.should_receive(:send_request).with("index/167137465/168054969",
         :delete => {})
-      collection.should_receive(:id).and_return(167137465)
 
       subject.delete
     end

data/spec/unit/query_spec.rb

@@ -16,7 +16,7 @@ describe Ashikawa::Core::Query do
     describe "get all" do
       it "should list all documents" do
         collection.stub(:send_request).and_return { server_response('simple-queries/all') }
-        collection.should_receive(:send_request).with("/simple/all", :put => {"collection" => "example_1"})
+        collection.should_receive(:send_request).with("simple/all", :put => {"collection" => "example_1"})
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -25,7 +25,7 @@ describe Ashikawa::Core::Query do
 
       it "should be able to limit the number of documents" do
         collection.stub(:send_request).and_return { server_response('simple-queries/all_skip') }
-        collection.should_receive(:send_request).with("/simple/all", :put => {"collection" => "example_1", "limit" => 1})
+        collection.should_receive(:send_request).with("simple/all", :put => {"collection" => "example_1", "limit" => 1})
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -34,7 +34,7 @@ describe Ashikawa::Core::Query do
 
       it "should be able to skip documents" do
         collection.stub(:send_request).and_return { server_response('simple-queries/all_limit') }
-        collection.should_receive(:send_request).with("/simple/all", :put => {"collection" => "example_1", "skip" => 1})
+        collection.should_receive(:send_request).with("simple/all", :put => {"collection" => "example_1", "skip" => 1})
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -49,7 +49,7 @@ describe Ashikawa::Core::Query do
         collection.stub(:database).and_return { double }
 
         collection.stub(:send_request).and_return { server_response('simple-queries/example') }
-        collection.should_receive(:send_request).with("/simple/first-example", :put =>
+        collection.should_receive(:send_request).with("simple/first-example", :put =>
           {"collection" => "example_1", "example" => { :hello => "world"}})
 
         Ashikawa::Core::Document.should_receive(:new)
@@ -63,7 +63,7 @@ describe Ashikawa::Core::Query do
 
       it "should find all fitting documents" do
         collection.stub(:send_request).and_return { server_response('simple-queries/example') }
-        collection.should_receive(:send_request).with("/simple/by-example", :put =>
+        collection.should_receive(:send_request).with("simple/by-example", :put =>
           {"collection" => "example_1", "example" => { :hello => "world"}})
 
         Ashikawa::Core::Cursor.should_receive(:new)
@@ -73,7 +73,7 @@ describe Ashikawa::Core::Query do
 
       it "should be able to limit the number of documents" do
         collection.stub(:send_request).and_return { server_response('simple-queries/example') }
-        collection.should_receive(:send_request).with("/simple/by-example", :put => {"collection" => "example_1", "limit" => 2, "example" => { :hello => "world"}})
+        collection.should_receive(:send_request).with("simple/by-example", :put => {"collection" => "example_1", "limit" => 2, "example" => { :hello => "world"}})
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -82,7 +82,7 @@ describe Ashikawa::Core::Query do
 
       it "should be able to skip documents" do
         collection.stub(:send_request).and_return { server_response('simple-queries/example') }
-        collection.should_receive(:send_request).with("/simple/by-example", :put =>
+        collection.should_receive(:send_request).with("simple/by-example", :put =>
           {"collection" => "example_1", "skip" => 1, "example" => { :hello => "world"}})
 
         Ashikawa::Core::Cursor.should_receive(:new)
@@ -94,7 +94,7 @@ describe Ashikawa::Core::Query do
     describe "near a geolocation" do
       it "should find documents based on latitude/longitude" do
         collection.stub(:send_request).and_return { server_response('simple-queries/near') }
-        collection.should_receive(:send_request).with("/simple/near", :put => { "collection" => "example_1", "latitude" => 0, "longitude" => 0 })
+        collection.should_receive(:send_request).with("simple/near", :put => { "collection" => "example_1", "latitude" => 0, "longitude" => 0 })
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -105,7 +105,7 @@ describe Ashikawa::Core::Query do
     describe "within a radious of a geolocation" do
       it "should look for documents based on latidude/longitude" do
         collection.stub(:send_request).and_return { server_response('simple-queries/within') }
-        collection.should_receive(:send_request).with("/simple/within" , :put => { "collection" => "example_1", "latitude" => 0, "longitude" => 0, "radius" => 2 })
+        collection.should_receive(:send_request).with("simple/within" , :put => { "collection" => "example_1", "latitude" => 0, "longitude" => 0, "radius" => 2 })
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -117,7 +117,7 @@ describe Ashikawa::Core::Query do
       it "should look for documents with an attribute in that range" do
         arguments = { "collection" => "example_1", "attribute" => "age", "left" => 50, "right" => 60, "closed" => false}
         collection.stub(:send_request).and_return { server_response('simple-queries/range') }
-        collection.should_receive(:send_request).with("/simple/range" , :put => arguments)
+        collection.should_receive(:send_request).with("simple/range" , :put => arguments)
 
         Ashikawa::Core::Cursor.should_receive(:new)
 
@@ -129,7 +129,7 @@ describe Ashikawa::Core::Query do
       it "should be able to execute it" do
         collection.stub(:database).and_return double
         collection.stub(:send_request).and_return { server_response("cursor/query") }
-        collection.should_receive(:send_request).with("/cursor", :post => {
+        collection.should_receive(:send_request).with("cursor", :post => {
           "query" => "FOR u IN users LIMIT 2 RETURN u",
           "count" => true,
           "batchSize" => 2
@@ -143,7 +143,7 @@ describe Ashikawa::Core::Query do
         query = "FOR u IN users LIMIT 2 RETURN u"
 
         collection.stub(:send_request).and_return { server_response("query/valid") }
-        collection.should_receive(:send_request).with("/query", :post => {
+        collection.should_receive(:send_request).with("query", :post => {
           "query" => query
         })
 
@@ -154,9 +154,9 @@ describe Ashikawa::Core::Query do
         query = "FOR u IN users LIMIT 2"
 
         collection.stub(:send_request) do
-          raise RestClient::BadRequest
+          raise Ashikawa::Core::BadSyntax
         end
-        collection.should_receive(:send_request).with("/query", :post => {
+        collection.should_receive(:send_request).with("query", :post => {
           "query" => query
         })
 
@@ -177,7 +177,7 @@ describe Ashikawa::Core::Query do
     describe "with an AQL query" do
       it "should be able to execute it" do
         database.stub(:send_request).and_return { server_response("cursor/query") }
-        database.should_receive(:send_request).with("/cursor", :post => {
+        database.should_receive(:send_request).with("cursor", :post => {
           "query" => "FOR u IN users LIMIT 2 RETURN u",
           "count" => true,
           "batchSize" => 2
@@ -191,7 +191,7 @@ describe Ashikawa::Core::Query do
         query = "FOR u IN users LIMIT 2 RETURN u"
 
         database.stub(:send_request).and_return { server_response("query/valid") }
-        database.should_receive(:send_request).with("/query", :post => {
+        database.should_receive(:send_request).with("query", :post => {
           "query" => query
         })
 
@@ -202,9 +202,9 @@ describe Ashikawa::Core::Query do
         query = "FOR u IN users LIMIT 2"
 
         database.stub(:send_request) do
-          raise RestClient::BadRequest
+          raise Ashikawa::Core::BadSyntax
         end
-        database.should_receive(:send_request).with("/query", :post => {
+        database.should_receive(:send_request).with("query", :post => {
           "query" => query
         })
 

data/spec/unit/spec_helper.rb

@@ -1,19 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
-if defined? version and version != '1.8.7'
-  require 'simplecov'
-  SimpleCov.start do
-      add_filter "spec/"
-  end
-  SimpleCov.minimum_coverage 100
-end
-
-# For HTTP Testing
-require 'webmock/rspec'
-require 'json'
-
 # Helper to simulate Server Responses. Parses the fixtures in the spec folder
+require 'multi_json'
 def server_response(path)
-  return JSON.parse(File.readlines("spec/fixtures/#{path}.json").join)
+  return MultiJson.load(File.readlines("spec/fixtures/#{path}.json").join)
 end
+
+ARANGO_HOST = "http://localhost:8529"

data/tasks/adjustments.rake

@@ -1,6 +1,7 @@
 # Remove some tasks defined by devtools to redefine them
 
 Rake::Task["spec"].clear
+Rake::Task["spec:integration"].clear
 Rake::Task["ci:metrics"].clear
 Rake::Task["ci"].clear
 
@@ -38,9 +39,9 @@ end
 # * On the CI, ArangoDB is already running so use the special acceptance task
 
 namespace :ci do
-  desc 'Run metrics'
+  desc 'Run all metrics except mutant'
   task :metrics => %w[ metrics:verify_measurements metrics:flog metrics:flay metrics:reek metrics:roodi ]
 end
 
-desc 'Run metrics with Mutant'
+desc 'Run all metrics and specs'
 task :ci => %w[ spec:unit spec:acceptance_with_running_arangodb ci:metrics ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ashikawa-core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,15 +27,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,25 +43,41 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: null_logger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.3
-  type: :development
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.3
+        version: 2.8.2
 description: Ashikawa Core is a wrapper around the ArangoDB REST API. It provides
-  low level access and will be used in different ArangoDB ODMs.
+  low level access and will be used in different ArangoDB ODMs and other tools.
 email:
 - me@moonglum.net
 - tobias.eilert@me.com
@@ -93,14 +109,21 @@ files:
 - lib/ashikawa-core/cursor.rb
 - lib/ashikawa-core/database.rb
 - lib/ashikawa-core/document.rb
-- lib/ashikawa-core/exceptions/collection_not_found.rb
-- lib/ashikawa-core/exceptions/document_not_found.rb
-- lib/ashikawa-core/exceptions/index_not_found.rb
+- lib/ashikawa-core/edge.rb
+- lib/ashikawa-core/exceptions/client_error.rb
+- lib/ashikawa-core/exceptions/client_error/bad_syntax.rb
+- lib/ashikawa-core/exceptions/client_error/resource_not_found.rb
+- lib/ashikawa-core/exceptions/client_error/resource_not_found/collection_not_found.rb
+- lib/ashikawa-core/exceptions/client_error/resource_not_found/document_not_found.rb
+- lib/ashikawa-core/exceptions/client_error/resource_not_found/index_not_found.rb
 - lib/ashikawa-core/exceptions/no_collection_provided.rb
-- lib/ashikawa-core/exceptions/unknown_path.rb
+- lib/ashikawa-core/exceptions/server_error.rb
+- lib/ashikawa-core/exceptions/server_error/json_error.rb
 - lib/ashikawa-core/figure.rb
 - lib/ashikawa-core/index.rb
 - lib/ashikawa-core/query.rb
+- lib/ashikawa-core/request_preprocessor.rb
+- lib/ashikawa-core/response_preprocessor.rb
 - lib/ashikawa-core/status.rb
 - lib/ashikawa-core/version.rb
 - spec/acceptance/arango_helper.rb
@@ -111,18 +134,19 @@ files:
 - spec/acceptance_auth/arango_helper.rb
 - spec/acceptance_auth/auth_spec.rb
 - spec/acceptance_auth/spec_helper.rb
-- spec/fixtures/collections/4588.json
-- spec/fixtures/collections/4590-properties.json
-- spec/fixtures/collections/4590.json
-- spec/fixtures/collections/73482-figures.json
+- spec/fixtures/collections/60768679-count.json
+- spec/fixtures/collections/60768679-figures.json
+- spec/fixtures/collections/60768679-properties-volatile.json
+- spec/fixtures/collections/60768679-properties.json
+- spec/fixtures/collections/60768679.json
 - spec/fixtures/collections/all.json
 - spec/fixtures/collections/not_found.json
 - spec/fixtures/cursor/26011191-2.json
 - spec/fixtures/cursor/26011191-3.json
 - spec/fixtures/cursor/26011191.json
 - spec/fixtures/cursor/query.json
-- spec/fixtures/documents/4590-333.json
-- spec/fixtures/documents/new-4590-333.json
+- spec/fixtures/documents/example_1-137249191.json
+- spec/fixtures/documents/new-example_1-137249191.json
 - spec/fixtures/indices/all.json
 - spec/fixtures/indices/hash-index.json
 - spec/fixtures/indices/new-hash-index.json
@@ -141,6 +165,7 @@ files:
 - spec/unit/cursor_spec.rb
 - spec/unit/database_spec.rb
 - spec/unit/document_spec.rb
+- spec/unit/edge_spec.rb
 - spec/unit/exception_spec.rb
 - spec/unit/figure_spec.rb
 - spec/unit/index_spec.rb
@@ -159,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,9 +193,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2208395334206716502
+      hash: 4417308042617954753
 requirements:
-- ArangoDB, v1.1.2
+- ArangoDB, v1.2
 rubyforge_project: ashikawa-core
 rubygems_version: 1.8.25
 signing_key: 
@@ -185,18 +210,19 @@ test_files:
 - spec/acceptance_auth/arango_helper.rb
 - spec/acceptance_auth/auth_spec.rb
 - spec/acceptance_auth/spec_helper.rb
-- spec/fixtures/collections/4588.json
-- spec/fixtures/collections/4590-properties.json
-- spec/fixtures/collections/4590.json
-- spec/fixtures/collections/73482-figures.json
+- spec/fixtures/collections/60768679-count.json
+- spec/fixtures/collections/60768679-figures.json
+- spec/fixtures/collections/60768679-properties-volatile.json
+- spec/fixtures/collections/60768679-properties.json
+- spec/fixtures/collections/60768679.json
 - spec/fixtures/collections/all.json
 - spec/fixtures/collections/not_found.json
 - spec/fixtures/cursor/26011191-2.json
 - spec/fixtures/cursor/26011191-3.json
 - spec/fixtures/cursor/26011191.json
 - spec/fixtures/cursor/query.json
-- spec/fixtures/documents/4590-333.json
-- spec/fixtures/documents/new-4590-333.json
+- spec/fixtures/documents/example_1-137249191.json
+- spec/fixtures/documents/new-example_1-137249191.json
 - spec/fixtures/indices/all.json
 - spec/fixtures/indices/hash-index.json
 - spec/fixtures/indices/new-hash-index.json
@@ -215,6 +241,7 @@ test_files:
 - spec/unit/cursor_spec.rb
 - spec/unit/database_spec.rb
 - spec/unit/document_spec.rb
+- spec/unit/edge_spec.rb
 - spec/unit/exception_spec.rb
 - spec/unit/figure_spec.rb
 - spec/unit/index_spec.rb

data/lib/ashikawa-core/exceptions/unknown_path.rb

@@ -1,15 +0,0 @@
-module Ashikawa
-  module Core
-    # This Exception is thrown when you request
-    # a path from the server which is not known
-    class UnknownPath < RuntimeError
-      # String representation of the exception
-      #
-      # @return String
-      # @api private
-      def to_s
-        "The path is unknown"
-      end
-    end
-  end
-end

data/spec/fixtures/collections/4590-properties.json

@@ -1,9 +0,0 @@
-{
-	"name": "new_collection",
-	"waitForSync": true,
-	"id": 4590,
-	"status": 3,
-	"error": false,
-	"code": 200,
-	"count": 54
-}

data/spec/fixtures/collections/4590.json

@@ -1,8 +0,0 @@
-{
-	"name": "new_collection",
-	"waitForSync": true,
-	"id": 4590,
-	"status": 3,
-	"error": false,
-	"code": 200
-}