ashikawa-core 0.5.1 → 0.6.0

data/lib/ashikawa-core/status.rb

@@ -0,0 +1,77 @@
+module Ashikawa
+  module Core
+    # Wrapper around the status of a collection
+    class Status
+      STATUS_NEW_BORN       = 1
+      STATUS_UNLOADED       = 2
+      STATUS_LOADED         = 3
+      STATUS_BEING_UNLOADED = 4
+      MAX_UNCORRUPTED       = 5
+
+      # Create a wrapper around a given status
+      #
+      # @param [Fixnum] code
+      # @api public
+      # @example Create a new status
+      #   status = Ashikawa::Core::Status.new(3)
+      def initialize(code)
+        @code = code
+      end
+
+      # Checks if the collection is new born
+      #
+      # @return [Boolean]
+      # @api public
+      # @example Is the collection new born?
+      #   status = Ashikawa::Core::Status.new(3)
+      #   status.new_born? #=> false
+      def new_born?
+        @code == STATUS_NEW_BORN
+      end
+
+      # Checks if the collection is unloaded
+      #
+      # @return [Boolean]
+      # @api public
+      # @example Is the collection unloaded?
+      #   status = Ashikawa::Core::Status.new(3)
+      #   status.unloaded? #=> false
+      def unloaded?
+        @code == STATUS_UNLOADED
+      end
+
+      # Checks if the collection is loaded
+      #
+      # @return [Boolean]
+      # @api public
+      # @example Is the collection loaded?
+      #   status = Ashikawa::Core::Status.new(3)
+      #   status.loaded? #=> true
+      def loaded?
+        @code == STATUS_LOADED
+      end
+
+      # Checks if the collection is in the process of being unloaded
+      #
+      # @return [Boolean]
+      # @api public
+      # @example Is the collection unloaded?
+      #   status = Ashikawa::Core::Status.new(3)
+      #   status.being_unloaded? #=> false
+      def being_unloaded?
+        @code == STATUS_BEING_UNLOADED
+      end
+
+      # Checks if the collection is corrupted
+      #
+      # @return [Boolean]
+      # @api public
+      # @example Is the collection corrupted?
+      #   status = Ashikawa::Core::Status.new(3)
+      #   status.corrupted? #=> false
+      def corrupted?
+        @code > MAX_UNCORRUPTED
+      end
+    end
+  end
+end

data/lib/ashikawa-core/version.rb

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

data/spec/acceptance/basic_spec.rb

@@ -3,10 +3,6 @@ require 'acceptance/spec_helper'
 describe "Basics" do
   subject { ARANGO_HOST }
 
-  # it "should have booted up an ArangoDB instance" do
-    # expect { RestClient.get(subject) }.to_not raise_error
-  # end
-
   describe "initialized database" do
     subject { Ashikawa::Core::Database.new ARANGO_HOST }
 
@@ -21,7 +17,7 @@ describe "Basics" do
     end
 
     it "should create and delete collections" do
-      subject.collections.should ==[]
+      subject.collections.should == []
       subject["collection_1"]
       subject["collection_2"]
       subject["collection_3"]
@@ -44,20 +40,20 @@ describe "Basics" do
 
     it "should be possible to load and unload collections" do
       my_collection = subject["test_collection"]
-      my_collection.loaded?.should be_true
+      my_collection.status.loaded?.should be_true
       my_collection.unload
       my_id = my_collection.id
       my_collection = subject[my_id]
-      subject[my_id].loaded?.should be_false
+      subject[my_id].status.loaded?.should be_false
     end
 
     it "should be possible to get figures" do
       my_collection = subject["test_collection"]
-      my_collection.figure(:datafiles_count).class.should == Fixnum
-      my_collection.figure(:alive_size).class.should == Fixnum
-      my_collection.figure(:alive_count).class.should == Fixnum
-      my_collection.figure(:dead_size).class.should == Fixnum
-      my_collection.figure(:dead_count).class.should == Fixnum
+      my_collection.figure.datafiles_count.class.should == Fixnum
+      my_collection.figure.alive_size.class.should == Fixnum
+      my_collection.figure.alive_count.class.should == Fixnum
+      my_collection.figure.dead_size.class.should == Fixnum
+      my_collection.figure.dead_count.class.should == Fixnum
     end
 
     it "should change and receive information about waiting for sync" do
@@ -71,8 +67,8 @@ describe "Basics" do
     it "should be possible to get information about the number of documents" do
       empty_collection = subject["empty_collection"]
       empty_collection.length.should == 0
-      empty_collection << { name: "testname", age: 27}
-      empty_collection << { name: "anderer name", age: 28}
+      empty_collection << { :name => "testname", :age => 27}
+      empty_collection << { :name => "anderer name", :age => 28}
       empty_collection.length.should == 2
       empty_collection.truncate!
       empty_collection.length.should == 0
@@ -81,7 +77,7 @@ describe "Basics" do
     it "should be possible to update the attributes of a document" do
       collection = subject["documenttests"]
 
-      document = collection.create name: "The Dude", bowling: true
+      document = collection.create :name => "The Dude", :bowling => true
       document_id = document.id
       document["name"] = "Other Dude"
       document.save
@@ -92,11 +88,11 @@ describe "Basics" do
     it "should be possible to access and create documents from a collection" do
       collection = subject["documenttests"]
 
-      document = collection.create name: "The Dude", bowling: true
+      document = collection.create :name => "The Dude", :bowling => true
       document_id = document.id
       collection[document_id]["name"].should == "The Dude"
 
-      collection[document_id] = { name: "Other Dude", bowling: true }
+      collection[document_id] = { :name => "Other Dude", :bowling => true }
       collection[document_id]["name"].should == "Other Dude"
     end
   end
@@ -104,7 +100,7 @@ describe "Basics" do
   describe "created document" do
     let(:database) { Ashikawa::Core::Database.new ARANGO_HOST }
     let(:collection) { database["documenttests"] }
-    subject { collection.create name: "The Dude" }
+    subject { collection.create :name => "The Dude" }
     let(:document_id) { subject.id }
 
     it "should be possible to manipulate documents and save them" do

data/spec/acceptance/index_spec.rb

@@ -3,13 +3,13 @@ require 'acceptance/spec_helper'
 describe "Indices" do
   let(:database) { Ashikawa::Core::Database.new ARANGO_HOST }
   subject { database["documenttest"] }
-  let(:index) { subject.add_index :skiplist, on: [:identifier] }
+  let(:index) { subject.add_index :skiplist, :on => [:identifier] }
 
   it "should be possible to set indices" do
     index.delete
 
     expect {
-      subject.add_index :skiplist, on: [:identifier]
+      subject.add_index :skiplist, :on => [:identifier]
     }.to change { subject.indices.length }.by(1)
   end
 
@@ -19,6 +19,8 @@ describe "Indices" do
   end
 
   it "should be possible to remove indices" do
+    pending "Delete doesn't work at random"
+
     expect {
       index.delete
     }.to change { subject.indices.length }.by(-1)

data/spec/acceptance/query_spec.rb

@@ -6,18 +6,17 @@ describe "Queries" do
 
   describe "AQL query via the database" do
     it "should return the documents" do
+      query = "FOR u IN my_collection FILTER u.bowling == true RETURN u"
+      options = { :batch_size => 2, :count => true }
+
       collection << { "name" => "Jeff Lebowski",    "bowling" => true }
       collection << { "name" => "Walter Sobchak",   "bowling" => true }
       collection << { "name" => "Donny Kerabatsos", "bowling" => true }
       collection << { "name" => "Jeffrey Lebowski", "bowling" => false }
 
-      query = "FOR u IN my_collection FILTER u.bowling == true RETURN u"
-      results = database.query.execute query, batch_size: 2, count: true
-
-      results.length.should == 3
-      results = results.map { |person| person["name"] }
-      results.should     include "Jeff Lebowski"
-      results.should_not include "Jeffrey Lebowski"
+      names = database.query.execute(query, options).map { |person| person["name"] }
+      names.should     include "Jeff Lebowski"
+      names.should_not include "Jeffrey Lebowski"
     end
 
     it "should be possible to validate" do
@@ -34,39 +33,39 @@ describe "Queries" do
     before(:each) { subject.truncate! }
 
     it "should return all documents of a collection" do
-      subject << { name: "testname", age: 27}
+      subject << { :name => "testname", :age => 27}
       subject.query.all.first["name"].should == "testname"
     end
 
     it "should be possible to limit and skip results" do
-      subject << { name: "test1"}
-      subject << { name: "test2"}
-      subject << { name: "test3"}
+      subject << { :name => "test1"}
+      subject << { :name => "test2"}
+      subject << { :name => "test3"}
 
-      subject.query.all(limit: 2).length.should == 2
-      subject.query.all(skip: 2).length.should == 1
+      subject.query.all(:limit => 2).length.should == 2
+      subject.query.all(:skip => 2).length.should == 1
     end
 
     it "should be possible to query documents by example" do
       subject << { "name" => "Random Document" }
-      result = subject.query.by_example name: "Random Document"
+      result = subject.query.by_example :name => "Random Document"
       result.length.should == 1
     end
 
     describe "query by geo coordinates" do
       before :each do
-        subject.add_index :geo, on: [:latitude, :longitude]
+        subject.add_index :geo, :on => [:latitude, :longitude]
         subject << { "name" => "cologne", "latitude" => 50.948045, "longitude" => 6.961212 }
         subject << { "name" => "san francisco", "latitude" => -122.395899, "longitude" => 37.793621 }
       end
 
       it "should be possible to query documents near a certain location" do
-        found_places = subject.query.near latitude: 50, longitude: 6
+        found_places = subject.query.near :latitude => 50, :longitude => 6
         found_places.first["name"].should == "cologne"
       end
 
       it "should be possible to query documents within a certain range" do
-        found_places = subject.query.within latitude: 50.948040, longitude: 6.961210, radius: 2
+        found_places = subject.query.within :latitude => 50.948040, :longitude => 6.961210, :radius => 2
         found_places.length.should == 1
         found_places.first["name"].should == "cologne"
       end
@@ -74,14 +73,14 @@ describe "Queries" do
 
     describe "queries by integer ranges" do
       before :each do
-        subject.add_index :skiplist, on: [:age]
+        subject.add_index :skiplist, :on => [:age]
         subject << { "name" => "Georg", "age" => 12 }
         subject << { "name" => "Anne", "age" => 21 }
         subject << { "name" => "Jens", "age" => 49 }
       end
 
       it "should be possible to query documents for numbers in a certain range" do
-        found_people = subject.query.in_range attribute: "age", left: 20, right: 30, closed: true
+        found_people = subject.query.in_range :attribute => "age", :left => 20, :right => 30, :closed => true
         found_people.length.should == 1
         found_people.first["name"].should == "Anne"
       end

data/spec/acceptance_auth/auth_spec.rb

@@ -20,7 +20,7 @@ describe "authenticated database" do
 
     context "with user and password" do
       it "should allow acces to DB" do
-        subject.authenticate_with username: 'testuser', password: 'testpassword'
+        subject.authenticate_with :username => 'testuser', :password => 'testpassword'
 
         expect do
           subject["new_collection"]
@@ -29,7 +29,7 @@ describe "authenticated database" do
       end
 
       it "should deny acces if username and password are wrong" do
-        subject.authenticate_with username: 'ruffy', password: 'three_headed_monkey'
+        subject.authenticate_with :username => 'ruffy', :password => 'three_headed_monkey'
 
         expect do
           subject["denied"]

data/spec/setup/arangodb.sh

@@ -3,60 +3,55 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-#VERSION=1.0.2
-VERSION=1.1.beta1
-
+VERSION=1.1.2
 NAME=ArangoDB-$VERSION
 
 if [ ! -d "$DIR/$NAME" ]; then
   # download ArangoDB
+  echo "wget http://www.arangodb.org/travisCI/$NAME.tar.gz"
   wget http://www.arangodb.org/travisCI/$NAME.tar.gz
+  echo "tar zxf $NAME.tar.gz"
   tar zxf $NAME.tar.gz
 fi
 
-
+ARCH=$(arch)
 PID=$(echo $PPID)
 TMP_DIR="/tmp/arangodb.$PID"
 PID_FILE="/tmp/arangodb.$PID.pid"
 ARANGODB_DIR="$DIR/$NAME"
-UPDATE_SCRIPT="${ARANGODB_DIR}/js/server/arango-upgrade.js"
 
-# create database directory
-mkdir ${TMP_DIR}
+ARANGOD="${ARANGODB_DIR}/bin/arangod"
+if [ "$ARCH" == "x86_64" ]; then
+  ARANGOD="${ARANGOD}_x86_64"
+fi
 
-# check for update script
-echo "looking for: $UPDATE_SCRIPT"
-if [ -f "$UPDATE_SCRIPT" ] ; then
-  # version 1.1
-  ${ARANGODB_DIR}/bin/arangod \
-    --database.directory ${TMP_DIR}  \
-    --configuration none  \
-    --server.endpoint tcp://127.0.0.1:8529 \
-    --javascript.startup-directory ${ARANGODB_DIR}/js \
-    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules \
-    --javascript.script "$UPDATE_SCRIPT"
+# (re-)create database directory
+rm -rf ${TMP_DIR}
+mkdir ${TMP_DIR}
 
-  ${ARANGODB_DIR}/bin/arangod \
-    --database.directory ${TMP_DIR}  \
-    --configuration none  \
-    --server.endpoint tcp://127.0.0.1:8529 \
-    --javascript.startup-directory ${ARANGODB_DIR}/js \
-    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules \
-    --javascript.action-directory ${ARANGODB_DIR}/js/actions/system  \
-    --database.maximal-journal-size 1048576  \
-    --server.disable-admin-interface true \
-    --server.disable-authentication true \
-    --javascript.gc-interval 1 &
-else
-  # version 1.0
-  ${ARANGODB_DIR}/bin/arangod ${TMP_DIR}  \
-    --configuration none  \
-    --pid-file ${PID_FILE} \
-    --javascript.startup-directory ${ARANGODB_DIR}/js \
-    --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules \
-    --javascript.action-directory ${ARANGODB_DIR}/js/actions/system  \
-    --database.maximal-journal-size 1000000  \
-    --javascript.gc-interval 1 &
+echo "Starting arangodb '${ARANGOD}'"
+
+${ARANGOD} \
+  --database.directory ${TMP_DIR}  \
+  --configuration none  \
+  --server.endpoint tcp://127.0.0.1:8529 \
+  --javascript.startup-directory ${ARANGODB_DIR}/js \
+  --javascript.modules-path ${ARANGODB_DIR}/js/server/modules:${ARANGODB_DIR}/js/common/modules \
+  --javascript.action-directory ${ARANGODB_DIR}/js/actions/system  \
+  --database.maximal-journal-size 1048576  \
+  --server.disable-admin-interface true \
+  --server.disable-authentication true \
+  --javascript.gc-interval 1 &
+
+sleep 2
+
+echo "Check for arangod process"
+process=$(ps auxww | grep "bin/arangod" | grep -v grep)
+
+if [ "x$process" == "x" ]; then
+  echo "no 'arangod' process found"
+  echo "ARCH = $ARCH"
+  exit 1
 fi
 
 echo "Waiting until ArangoDB is ready on port 8529"

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+
+  SimpleCov.start do
+    command_name     'spec:unit'
+    add_filter       'config'
+    add_filter       'spec'
+    minimum_coverage 100
+  end
+end
+
+require 'ashikawa-core'
+require 'rspec'
+
+if RUBY_VERSION < '1.9'
+  require 'rspec/autorun'
+end
+
+# require spec support files and shared behavior
+Dir[File.expand_path('../{support,shared}/**/*.rb', __FILE__)].each do |file|
+  require file
+end
+
+RSpec.configure do |config|
+end

data/spec/unit/collection_spec.rb

@@ -28,45 +28,6 @@ describe Ashikawa::Core::Collection do
     collection.query
   end
 
-  describe "the status code" do
-    it "should know if the collection is new born" do
-      my_collection = subject.new @database, { "status" => "1" }
-      my_collection.new_born?.should == true
-
-      my_collection = subject.new @database, { "status" => "200" }
-      my_collection.new_born?.should == false
-    end
-
-    it "should know if the collection is unloaded" do
-      my_collection = subject.new @database, { "status" => "2" }
-      my_collection.unloaded?.should == true
-
-      my_collection = subject.new @database, { "status" => "200" }
-      my_collection.unloaded?.should == false
-    end
-
-    it "should know if the collection is loaded" do
-      my_collection = subject.new @database, { "status" => "3" }
-      my_collection.loaded?.should == true
-
-      my_collection = subject.new @database, { "status" => "200" }
-      my_collection.loaded?.should == false
-    end
-
-    it "should know if the collection is being unloaded" do
-      my_collection = subject.new @database, { "status" => "4" }
-      my_collection.being_unloaded?.should == true
-
-      my_collection = subject.new @database, { "status" => "200" }
-      my_collection.being_unloaded?.should == false
-    end
-
-    it "should know if the collection is corrupted" do
-      my_collection = subject.new @database, { "status" => "6" }
-      my_collection.corrupted?.should == true
-    end
-  end
-
   describe "attributes of a collection" do
     it "should check if the collection waits for sync" do
       @database.stub(:send_request).with("/collection/4590/properties", {}).and_return { server_response("/collections/4590") }
@@ -88,12 +49,12 @@ describe Ashikawa::Core::Collection do
       @database.stub(:send_request).with("/collection/73482/figures", {}).and_return { server_response("/collections/73482-figures") }
       @database.should_receive(:send_request).with("/collection/73482/figures", {}).at_least(1).times
 
+      mock Ashikawa::Core::Figure
+      Ashikawa::Core::Figure.stub(:new)
+      Ashikawa::Core::Figure.should_receive(:new).exactly(1).times.with(server_response("/collections/73482-figures")["figures"])
+
       my_collection = subject.new @database, { "id" => "73482" }
-      my_collection.figure(:datafiles_count).should == 1
-      my_collection.figure(:alive_size).should      == 0
-      my_collection.figure(:alive_count).should     == 0
-      my_collection.figure(:dead_size).should       == 2384
-      my_collection.figure(:dead_count).should      == 149
+      my_collection.figure
     end
   end
 
@@ -101,43 +62,43 @@ describe Ashikawa::Core::Collection do
     subject { Ashikawa::Core::Collection.new @database, { "id" => "4590", "name" => "example_1" } }
 
     it "should get deleted" do
-      @database.stub(:send_request).with("/collection/4590", delete: {})
-      @database.should_receive(:send_request).with("/collection/4590", delete: {})
+      @database.stub(:send_request).with("/collection/4590", :delete => {})
+      @database.should_receive(:send_request).with("/collection/4590", :delete => {})
 
       subject.delete
     end
 
     it "should get loaded" do
-      @database.stub(:send_request).with("/collection/4590/load", put: {})
-      @database.should_receive(:send_request).with("/collection/4590/load", put: {})
+      @database.stub(:send_request).with("/collection/4590/load", :put => {})
+      @database.should_receive(:send_request).with("/collection/4590/load", :put => {})
 
       subject.load
     end
 
     it "should get unloaded" do
-      @database.stub(:send_request).with("/collection/4590/unload", put: {})
-      @database.should_receive(:send_request).with("/collection/4590/unload", put: {})
+      @database.stub(:send_request).with("/collection/4590/unload", :put => {})
+      @database.should_receive(:send_request).with("/collection/4590/unload", :put => {})
 
       subject.unload
     end
 
     it "should get truncated" do
-      @database.stub(:send_request).with("/collection/4590/truncate", put: {})
-      @database.should_receive(:send_request).with("/collection/4590/truncate", put: {})
+      @database.stub(:send_request).with("/collection/4590/truncate", :put => {})
+      @database.should_receive(:send_request).with("/collection/4590/truncate", :put => {})
 
       subject.truncate!
     end
 
     it "should change if it waits for sync" do
-      @database.stub(:send_request).with("/collection/4590/properties", put: {"waitForSync" => true})
-      @database.should_receive(:send_request).with("/collection/4590/properties", put: {"waitForSync" => true})
+      @database.stub(:send_request).with("/collection/4590/properties", :put => {"waitForSync" => true})
+      @database.should_receive(:send_request).with("/collection/4590/properties", :put => {"waitForSync" => true})
 
       subject.wait_for_sync = true
     end
 
     it "should change its name" do
-      @database.stub(:send_request).with("/collection/4590/rename", put: {"name" => "my_new_name"})
-      @database.should_receive(:send_request).with("/collection/4590/rename", put: {"name" => "my_new_name"})
+      @database.stub(:send_request).with("/collection/4590/rename", :put => {"name" => "my_new_name"})
+      @database.should_receive(:send_request).with("/collection/4590/rename", :put => {"name" => "my_new_name"})
 
       subject.name = "my_new_name"
     end
@@ -154,17 +115,17 @@ describe Ashikawa::Core::Collection do
       end
 
       it "should replace a document by ID" do
-        @database.stub(:send_request).with("/document/4590/333", put: {"name" => "The Dude"})
-        @database.should_receive(:send_request).with("/document/4590/333", put: {"name" => "The Dude"})
+        @database.stub(:send_request).with("/document/4590/333", :put => {"name" => "The Dude"})
+        @database.should_receive(:send_request).with("/document/4590/333", :put => {"name" => "The Dude"})
 
         subject[333] = {"name" => "The Dude"}
       end
 
       it "should create a new document" do
-        @database.stub(:send_request).with("/document?collection=4590", post: { "name" => "The Dude" }).and_return do
+        @database.stub(:send_request).with("/document?collection=4590", :post => { "name" => "The Dude" }).and_return do
           server_response('documents/new-4590-333')
         end
-        @database.stub(:send_request).with("/document/4590/333", post: { "name" => "The Dude" }).and_return { server_response('documents/4590-333') }
+        @database.stub(:send_request).with("/document/4590/333", :post => { "name" => "The Dude" }).and_return { server_response('documents/4590-333') }
 
         # Documents need to get initialized:
         Ashikawa::Core::Document.should_receive(:new)
@@ -173,7 +134,7 @@ describe Ashikawa::Core::Collection do
       end
 
       it "should create a new document with `<<`" do
-        @database.stub(:send_request).with("/document?collection=4590", post: { "name" => "The Dude" }).and_return do
+        @database.stub(:send_request).with("/document?collection=4590", :post => { "name" => "The Dude" }).and_return do
           server_response('documents/new-4590-333')
         end
         @database.stub(:send_request).with("/document/4590/333").and_return { server_response('documents/4590-333') }
@@ -184,28 +145,19 @@ describe Ashikawa::Core::Collection do
         subject << {"name" => "The Dude"}
       end
 
-      it "should raise an exception if a document is not found" do
-        @database.stub(:send_request).with("/document/4590/333") do
-          raise RestClient::ResourceNotFound
-        end
-        @database.should_receive(:send_request).with("/document/4590/333")
-
-        expect { subject[333] }.to raise_error(Ashikawa::Core::DocumentNotFoundException)
-      end
-
       describe "indices" do
         it "should add a new index" do
-          @database.stub(:send_request).with("/index?collection=4590", post: {
+          @database.stub(:send_request).with("/index?collection=4590", :post => {
             "type" => "hash", "fields" => [ "a", "b" ]
           }).and_return { server_response('indices/new-hash-index') }
-          @database.should_receive(:send_request).with("/index?collection=4590", post: {
+          @database.should_receive(:send_request).with("/index?collection=4590", :post => {
             "type" => "hash", "fields" => [ "a", "b" ]
           })
 
           Ashikawa::Core::Index.should_receive(:new).with(subject,
             server_response('indices/new-hash-index'))
 
-          subject.add_index :hash, on: [ :a, :b ]
+          subject.add_index :hash, :on => [ :a, :b ]
         end
 
         it "should get an index by ID" do