ashikawa-core 0.7.1 → 0.7.2

data/Gemfile.devtools

@@ -1,27 +1,26 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.0.3'
+  gem 'rake',  '~> 10.0.4'
   gem 'rspec', '~> 2.13.0'
-  gem 'yard',  '~> 0.8.5'
+  gem 'yard',  '~> 0.8.6'
 end
 
 group :yard do
-  gem 'kramdown', '~> 0.14.2'
+  gem 'kramdown', '~> 1.0.1'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.6.2'
+  gem 'guard',         '~> 1.7.0'
   gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.4.1'
+  gem 'guard-rspec',   '~> 2.5.3'
 
   # file system change event handling
+  gem 'listen',     '~> 0.7.3'
   gem 'rb-fchange', '~> 0.0.6', :require => false
   gem 'rb-fsevent', '~> 0.9.3', :require => false
   gem 'rb-inotify', '~> 0.9.0', :require => false
 
-  gem 'listen', '~> 0.7.3'
-
   # notification handling
   gem 'libnotify',               '~> 0.8.0', :require => false
   gem 'rb-notifu',               '~> 0.0.4', :require => false
@@ -29,25 +28,19 @@ group :guard do
 end
 
 group :metrics do
-  gem 'flay',            '~> 2.1.0'
-  gem 'flog',            '~> 3.2.2'
+  gem 'backports',       '~> 3.3', '>= 3.3.0'
+  gem 'coveralls',       '~> 0.6.5'
+  gem 'flay',            '~> 2.2.0'
+  gem 'flog',            '~> 3.2.3'
   gem 'reek',            '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
-  gem 'metric_fu-roodi', '~> 2.2.1'
-  gem 'yardstick',       '~> 0.9.4'
-
-  platforms :ruby_18, :ruby_19 do
-    # this indirectly depends on ffi which does not build on ruby-head
-    gem 'yard-spellcheck', '~> 0.1.5'
-  end
+  gem 'simplecov',       '~> 0.7.1'
+  gem 'yardstick',       '~> 0.9.6'
+  gem 'yard-spellcheck', '~> 0.1.5'
 
   platforms :mri_19, :rbx do
     gem 'mutant', '~> 0.2.20'
   end
 
-  platforms :mri_19 do
-    gem 'simplecov', '~> 0.7.1'
-  end
-
   platforms :rbx do
     gem 'pelusa', '~> 0.2.2'
   end
@@ -59,6 +52,6 @@ end
 
 platform :jruby do
   group :jruby do
-    gem 'jruby-openssl', '~> 0.8.2'
+    gem 'jruby-openssl', '~> 0.8.5'
   end
 end

data/README.md

@@ -62,3 +62,4 @@ If you want to contribute to the project, see CONTRIBUTING.md for details. It co
 * Lucas Dohmen ([@moonglum](https://github.com/moonglum)): Developer
 * Tobias Eilert ([@EinLama](https://github.com/EinLama)): Contributor
 * Markus Schirp ([@mbj](https://github.com/mbj)): Contributor
+* Ettore Berardi ([@ettomatic](https://github.com/ettomatic)): Contributor

data/ashikawa-core.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "faraday", "~> 0.8.6"
-  gem.add_dependency "multi_json", "~> 1.6.1"
+  gem.add_dependency "multi_json", "~> 1.7.2"
   gem.add_dependency "null_logger", "~> 0.0.1"
   gem.add_dependency "backports", [ '~> 3.0', '>= 3.0.3' ]
 end

data/config/{site.reek → reek.yml}

@@ -40,6 +40,7 @@ FeatureEnvy:
   - Ashikawa::Core::Index#parse_raw_index
   - Ashikawa::Core::Query#allowed_options
   - Ashikawa::Core::Query#prepare_request_data
+  - Ashikawa::Core::Cursor#parse_documents_cursor
   enabled: true
 ClassVariable:
   exclude: []

data/config/yardstick.yml

@@ -1,2 +1,2 @@
 ---
-threshold: 98.1
+threshold: 98.2

data/lib/ashikawa-core/cursor.rb

@@ -80,11 +80,34 @@ module Ashikawa
       def parse_raw_cursor(raw_cursor)
         @id       = raw_cursor['id']
         @has_more = raw_cursor['hasMore']
-        @length   = raw_cursor['count'].to_i if raw_cursor.has_key?('count')
-        @current  = raw_cursor['result']
+        if raw_cursor['result']
+          parse_documents_cursor(raw_cursor)
+        elsif raw_cursor['document']
+          parse_document_cursor(raw_cursor)
+        end
         self
       end
 
+      # Parse the cursor for multiple documents
+      #
+      # @param [Hash] raw_cursor
+      # @return self
+      # @api private
+      def parse_documents_cursor(raw_cursor)
+        @current = raw_cursor['result']
+        @length  = raw_cursor['count'].to_i if raw_cursor.has_key?('count')
+      end
+
+      # Parse the cursor for a single document
+      #
+      # @param [Hash] raw_cursor
+      # @return self
+      # @api private
+      def parse_document_cursor(raw_cursor)
+        @current = [raw_cursor['document']]
+        @length  = 1
+      end
+
       # Get a new batch from the server
       #
       # @return [Boolean] Is there a next batch?

data/lib/ashikawa-core/query.rb

@@ -71,10 +71,9 @@ module Ashikawa
       #   query = Ashikawa::Core::Query.new(collection)
       #   query.first_example({ "color" => "red"}) # => #<Document id=2444 color="red">
       def first_example(example = {})
-        response = simple_query_request("simple/first-example",
+        simple_query_request("simple/first-example",
           { :example => example },
           [:example])
-        response.first
       end
 
       # Looks for documents in a collection based on location

data/lib/ashikawa-core/version.rb

@@ -1,6 +1,6 @@
 module Ashikawa
   module Core
     # Current version of Ashikawa::Core
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

data/spec/acceptance/query_spec.rb

@@ -55,6 +55,12 @@ describe "Queries" do
       result.length.should == 1
     end
 
+    it "should be possible to query first document by example" do
+      subject << { "name" => "Single Document" }
+      result = subject.query.first_example :name => "Single Document"
+      result.length.should == 1
+    end
+
     describe "query by geo coordinates" do
       before :each do
         subject.add_index :geo, :on => [:latitude, :longitude]

data/spec/unit/query_spec.rb

@@ -52,7 +52,7 @@ describe Ashikawa::Core::Query do
         collection.should_receive(:send_request).with("simple/first-example", :put =>
           {"collection" => "example_1", "example" => { :hello => "world"}})
 
-        Ashikawa::Core::Document.should_receive(:new)
+        Ashikawa::Core::Cursor.should_receive(:new)
 
         subject.first_example example
       end

data/tasks/adjustments.rake

@@ -10,7 +10,6 @@ Rake::Task["ci"].clear
 # * Acceptance, no integration tests
 # * Special Case: ArangoDB needed for Acceptance Tests
 
-
 desc 'Run all specs'
 task :spec => %w[ spec:unit spec:acceptance ]
 
@@ -39,8 +38,8 @@ end
 # * On the CI, ArangoDB is already running so use the special acceptance task
 
 namespace :ci do
-  desc 'Run all metrics except mutant'
-  task :metrics => %w[ metrics:verify_measurements metrics:flog metrics:flay metrics:reek metrics:roodi ]
+  desc 'Run all metrics except mutant and reek'
+  task :metrics => %w[ metrics:coverage spec:integration metrics:yardstick:verify metrics:flog metrics:flay ]
 end
 
 desc 'Run all metrics and specs'

metadata

@@ -1,105 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ashikawa-core
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.7.2
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
 platform: ruby
-authors: 
+authors:
 - moonglum
 - EinLama
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.8.6
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.6
+- !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
+      - !ruby/object:Gem::Version
+        version: 1.7.2
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+- !ruby/object:Gem::Dependency
   name: null_logger
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   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
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  requirement: *id004
-description: Ashikawa Core is a wrapper around the ArangoDB REST API. It provides low level access and will be used in different ArangoDB ODMs and other tools.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+description: Ashikawa Core is a wrapper around the ArangoDB REST API. It provides
+  low level access and will be used in different ArangoDB ODMs and other tools.
+email:
 - me@moonglum.net
 - tobias.eilert@me.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -115,8 +106,8 @@ files:
 - config/flay.yml
 - config/flog.yml
 - config/mutant.yml
+- config/reek.yml
 - config/roodi.yml
-- config/site.reek
 - config/yardstick.yml
 - lib/ashikawa-core.rb
 - lib/ashikawa-core/collection.rb
@@ -190,40 +181,33 @@ files:
 - tasks/adjustments.rake
 homepage: http://triagens.github.com/ashikawa-core
 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-requirements: 
+      hash: 1495105476276020209
+requirements:
 - ArangoDB, v1.2
 rubyforge_project: ashikawa-core
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ashikawa Core is a wrapper around the ArangoDB REST API
-test_files: 
+test_files:
 - spec/acceptance/arango_helper.rb
 - spec/acceptance/basic_spec.rb
 - spec/acceptance/index_spec.rb