ashikawa-core 0.9.0 → 0.10.0

data/spec/unit/document_spec.rb

@@ -11,7 +11,7 @@ describe Ashikawa::Core::Document do
   let(:first_name) { double }
   let(:last_name) { double }
   let(:more_info) { double }
-  let(:delete_payload) {{ delete: {} }}
+  let(:delete_payload) { { delete: {} } }
   let(:raw_data) do
     {
       '_id' => id,
@@ -69,8 +69,8 @@ describe Ashikawa::Core::Document do
 
     its(['first_name']) { should be(first_name) }
     its(['no_name']) { should be_nil }
-    its(:hash) { should be_instance_of Hash }
-    its(:hash) { should include('first_name' => first_name) }
+    its(:to_h) { should be_instance_of Hash }
+    its(:to_h) { should include('first_name' => first_name) }
 
     it 'should be deletable' do
       expect(database).to receive(:send_request).with(path, delete_payload)

data/spec/unit/edge_spec.rb

@@ -58,7 +58,7 @@ describe Ashikawa::Core::Edge do
 
   describe 'initializing edge with additional data' do
     let(:more_info) { double }
-    let(:additional_data) {{ more_info: more_info }}
+    let(:additional_data) { { more_info: more_info } }
     subject { Ashikawa::Core::Edge.new(database, raw_data, additional_data) }
 
     its(['more_info']) { should eq(more_info) }

data/spec/unit/index_spec.rb

@@ -6,7 +6,7 @@ describe Ashikawa::Core::Index do
   let(:collection) { double }
   let(:id) { '167137465/168054969' }
   let(:path) { 'index/167137465/168054969' }
-  let(:delete_payload) {{ delete: {} }}
+  let(:delete_payload) { { delete: {} } }
   let(:type_as_sym) { double }
   let(:type) { double(to_sym: type_as_sym) }
   let(:field_as_sym) { double }

data/spec/unit/query_spec.rb

@@ -64,7 +64,7 @@ describe Ashikawa::Core::Query do
     end
 
     describe 'all by example' do
-      let(:example) {{ hello: 'world' }}
+      let(:example) { { hello: 'world' } }
       let(:response) { server_response('simple-queries/example') }
       let(:limit) { double }
       let(:skip) { double }

data/spec/unit/spec_helper.rb

@@ -13,7 +13,7 @@ RSpec.configure do |config|
 end
 
 # Do not run SimpleCov in Guard
-unless defined?(Guard)
+if ENV['COVERAGE'] == 'true'
   require 'simplecov'
   require 'coveralls'
 
@@ -30,8 +30,9 @@ unless defined?(Guard)
   end
 end
 
-# Helper to simulate Server Responses. Parses the fixtures in the spec folder
 require 'json'
+
+# Helper to simulate Server Responses. Parses the fixtures in the spec folder
 def server_response(path)
   JSON.parse(File.readlines("spec/fixtures/#{path}.json").join)
 end

data/tasks/adjustments.rake

@@ -15,17 +15,3 @@ namespace :spec do
     spec.pattern = 'spec/acceptance/*_spec.rb'
   end
 end
-
-## Metrics
-# Differences to Devtools:
-# * Do not run mutant yet
-
-Rake::Task['ci'].clear
-
-desc 'Run all metrics and specs'
-task ci: %w[
-  spec
-  ci:metrics
-]
-
-task default: :ci

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ashikawa-core
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - moonglum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.8
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: null_logger
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
 description: Ashikawa Core is a wrapper around the ArangoDB REST API. It provides
   low level access and is intended to be used in ArangoDB ODMs and other tools.
 email:
@@ -104,6 +118,7 @@ files:
 - lib/ashikawa-core/database.rb
 - lib/ashikawa-core/document.rb
 - lib/ashikawa-core/edge.rb
+- lib/ashikawa-core/error_response.rb
 - lib/ashikawa-core/exceptions/client_error.rb
 - lib/ashikawa-core/exceptions/client_error/authentication_failed.rb
 - lib/ashikawa-core/exceptions/client_error/bad_syntax.rb
@@ -118,8 +133,6 @@ files:
 - lib/ashikawa-core/index.rb
 - lib/ashikawa-core/key_options.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/transaction.rb
 - lib/ashikawa-core/version.rb
@@ -182,16 +195,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- ArangoDB, v1.4
+- ArangoDB, v1.4 or v2.0
 rubyforge_project: ashikawa-core
-rubygems_version: 2.1.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ashikawa Core is a wrapper around the ArangoDB REST API

data/lib/ashikawa-core/request_preprocessor.rb

@@ -1,50 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'faraday'
-require 'json'
-
-module Ashikawa
-  module Core
-    # Preprocessor for Faraday Requests
-    class RequestPreprocessor < Faraday::Middleware
-      # Create a new Request Preprocessor
-      #
-      # @param [Object] app Faraday internal
-      # @param [Object] logger The object you want to log to
-      # @return [RequestPreprocessor]
-      # @api private
-      def initialize(app, logger)
-        @app = app
-        @logger = logger
-      end
-
-      # Process a Request
-      #
-      # @param [Hash] env Environment info
-      # @return [Object]
-      # @api private
-      def call(env)
-        body = env[:body]
-        env[:body] = JSON.generate(body) if body
-        log(env[:method], env[:url], body)
-        @app.call(env)
-      end
-
-      private
-
-      # Log a Request
-      #
-      # @param [Symbol] method
-      # @param [String] url
-      # @param [String] body
-      # @return [nil]
-      # @api private
-      def log(method, url, body)
-        @logger.info("#{method.upcase} #{url} #{body}")
-        nil
-      end
-    end
-
-    Faraday.register_middleware :request,
-                                ashikawa_request: -> { RequestPreprocessor}
-  end
-end

data/lib/ashikawa-core/response_preprocessor.rb

@@ -1,160 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'faraday'
-require 'json'
-require 'ashikawa-core/exceptions/client_error'
-require 'ashikawa-core/exceptions/client_error/resource_not_found'
-require 'ashikawa-core/exceptions/client_error/resource_not_found/index_not_found'
-require 'ashikawa-core/exceptions/client_error/resource_not_found/document_not_found'
-require 'ashikawa-core/exceptions/client_error/resource_not_found/collection_not_found'
-require 'ashikawa-core/exceptions/client_error/bad_syntax'
-require 'ashikawa-core/exceptions/client_error/authentication_failed'
-require 'ashikawa-core/exceptions/server_error'
-require 'ashikawa-core/exceptions/server_error/json_error'
-
-module Ashikawa
-  module Core
-    # Preprocessor for Faraday Requests
-    class ResponsePreprocessor < Faraday::Middleware
-      BadSyntaxStatus = 400
-      AuthenticationFailed = 401
-      ResourceNotFoundError = 404
-      ClientErrorStatuses = 405...499
-      ServerErrorStatuses = 500...599
-
-      # Create a new Response Preprocessor
-      #
-      # @param [Object] app Faraday internal
-      # @param [Object] logger The object you want to log to
-      # @return [ResponsePreprocessor]
-      # @api private
-      def initialize(app, logger)
-        @app = app
-        @logger = logger
-      end
-
-      # Process a Response
-      #
-      # @param [Hash] env Environment info
-      # @return [Object]
-      # @api private
-      def call(env)
-        @app.call(env).on_complete do
-          log(env)
-          handle_status(env)
-          env[:body] = parse_json(env)
-        end
-      end
-
-      private
-
-      # Raise the fitting ResourceNotFoundException
-      #
-      # @raise [DocumentNotFoundException, CollectionNotFoundException, IndexNotFoundException]
-      # @return nil
-      # @api private
-      def resource_not_found_for(env)
-        raise case env[:url].path
-              when %r{\A(/_db/[^/]+)?/_api/document} then Ashikawa::Core::DocumentNotFoundException
-              when %r{\A(/_db/[^/]+)?/_api/collection} then Ashikawa::Core::CollectionNotFoundException
-              when %r{\A(/_db/[^/]+)?/_api/index} then Ashikawa::Core::IndexNotFoundException
-              else Ashikawa::Core::ResourceNotFound
-        end
-      end
-
-      # Raise a Bad Syntax Error
-      #
-      # @raise [BadSyntax]
-      # @return nil
-      # @api private
-      def bad_syntax
-        raise Ashikawa::Core::BadSyntax
-      end
-
-      # Raise an Authentication Failed Error
-      #
-      # @raise [AuthenticationFailed]
-      # @return nil
-      # @api private
-      def authentication_failed
-        raise Ashikawa::Core::AuthenticationFailed
-      end
-
-      # Raise a Client Error for a given body
-      #
-      # @raise [ClientError]
-      # @return nil
-      # @api private
-      def client_error_status_for(body)
-        raise Ashikawa::Core::ClientError, error(body)
-      end
-
-      # Raise a Server Error for a given body
-      #
-      # @raise [ServerError]
-      # @return nil
-      # @api private
-      def server_error_status_for(body)
-        raise Ashikawa::Core::ServerError, error(body)
-      end
-
-      # Parse the JSON
-      #
-      # @param [Hash] env Environment info
-      # @return [Hash] The parsed body
-      # @api private
-      def parse_json(env)
-        fail JSON::ParserError unless json_content_type?(env[:response_headers]['content-type'])
-        JSON.parse(env[:body])
-      rescue JSON::ParserError
-        raise Ashikawa::Core::JsonError
-      end
-
-      # Check if the Content Type is JSON
-      #
-      # @param [String] content_type
-      # @return [Boolean]
-      # @api private
-      def json_content_type?(content_type)
-        content_type == 'application/json; charset=utf-8'
-      end
-
-      # Handle the status code
-      #
-      # @param [Hash] env Environment info
-      # @return [nil]
-      # @api private
-      def handle_status(env)
-        case env[:status]
-        when BadSyntaxStatus then bad_syntax
-        when AuthenticationFailed then authentication_failed
-        when ResourceNotFoundError then resource_not_found_for(env)
-        when ClientErrorStatuses then client_error_status_for(env[:body])
-        when ServerErrorStatuses then server_error_status_for(env[:body])
-        end
-      end
-
-      # Log a Request
-      #
-      # @param [Hash] env Environment info
-      # @return [nil]
-      # @api private
-      def log(env)
-        @logger.info("#{env[:status]} #{env[:body]}")
-        nil
-      end
-
-      # Read the error message for the request
-      #
-      # @param [String] The raw body of the request
-      # @return [String] The formatted error message
-      # @api private
-      def error(body)
-        parsed_body = JSON.parse(body)
-        "#{parsed_body['errorNum']}: #{parsed_body["errorMessage"]}"
-      end
-    end
-
-    Faraday.register_middleware :response,
-                                ashikawa_response: -> { ResponsePreprocessor}
-  end
-end