ashikawa-core 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1415f79ce912907851e91f4f1810668fb0a83024
-  data.tar.gz: 4076c3f55aecd6f194057cfbc6a7f0e0c671b774
+  metadata.gz: 5174468b7c49a72458d5d91bf9939caf77023f2c
+  data.tar.gz: dc22ceaaacccfd9133638c4707eac3581b71e56d
 SHA512:
-  metadata.gz: cbca0fdac8f1f59c2597d684b58bd1c3f6cfdf28fa5df3cf7aecda655cb9430e1117ab72bd56b7bcaa88751fa23915ac48e86157e5f06f1adfebb71f6f8325f9
-  data.tar.gz: 98687992409d83cb2c894156019e0c4ebb539ad2eb94e2d036815c5d935b07320abf6ce24d69829726d3244e45ec0d4c9d66a5a6b25eabf9dafb1f9dd58baa65
+  metadata.gz: 690e9a24ebd4757b14992231d2601b314a9c27c3e7dcb85ceee47b571252cfdb9dcdc30f3b001b17b8ec81a94c25f807bf0acafc86418072bf4644753ecab9bf
+  data.tar.gz: 458b6482db0c04a39b3616901765991f398801ea0db65978b921d439be91603c70f728b566ccaf81c5902394bbd2c75c7a6f8aee880f7b78a26b510209e4c61c

data/.travis.yml

@@ -1,14 +1,17 @@
 language: ruby
 before_script:
-  - ./spec/setup/arangodb.sh
+- "./spec/setup/arangodb.sh"
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - jruby-1.7.12
+- 1.9.3
+- 2.0.0
+- 2.1.2
+- jruby-1.7.12
 env:
-  - ARANGODB_DISABLE_AUTHENTIFICATION=false VERSION=2.2
-script: "bundle exec rake ci"
+- ARANGODB_DISABLE_AUTHENTIFICATION=false VERSION=2.2
+script: bundle exec rake ci
 addons:
   code_climate:
     repo_token: 4d49e70568a106875f85f2918698df75118b4a83af20ad57317b10f5fc40d5e0
+notifications:
+  slack:
+    secure: qx+GdQL63v5xCKi9m+GcEoX8XER9xbRUw7lJVn1CI1tcKLeTerEYoPknUoroCj9IpR3ebXa666L51pMaU0ZCIazefr7YPDTm3gdAIDcPyEUWr2ym2AONzBDpNAQE8o9AF3FAiFI6oZ7VRTxd1KcmvZAwONepyQSZ7tsUC08JfPY=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.13.1
+
+* **Important Bugfix: Please update immediately**
+* Fixes associating documents with the graph if loaded through a `VertexCollection` (#137)
+
 # Version 0.13.0
 
 **Codename: Galadriel**

data/lib/ashikawa-core/collection.rb

@@ -392,7 +392,7 @@ module Ashikawa
       def create_document(attributes)
         raise "Can't create a document in an edge collection" if @content_type == :edge
         response = send_request_for_content(post: attributes)
-        Document.new(@database, response, attributes)
+        build_content_class(response, attributes)
       end
 
       # Create a new edge between two documents with certain attributes
@@ -492,10 +492,11 @@ module Ashikawa
       # Builds an instance for the content class
       #
       # @param [Hash] data The raw data to be used to instatiate the class
+      # @param [Hash] additional_attributes Initial attributes to be passed to the underlying content class
       # @return [Document] The instatiated document
       # @api private
-      def build_content_class(data)
-        @content_class.new(@database, data)
+      def build_content_class(data, additional_attributes = {})
+        @content_class.new(@database, data, additional_attributes)
       end
 
       private

data/lib/ashikawa-core/edge_collection.rb

@@ -70,10 +70,11 @@ module Ashikawa
       # Builds a new edge object and passes the current graph to it
       #
       # @param [Hash] data The raw data to be used to instatiate the class
+      # @param [Hash] additional_atttributes Initial attributes to be passed to the Edge
       # @return [Edge] The instatiated edge
       # @api private
-      def build_content_class(data)
-        Edge.new(@database, data, graph: graph)
+      def build_content_class(data, additional_atttributes = {})
+        Edge.new(@database, data, additional_atttributes.merge(graph: graph))
       end
 
       private

data/lib/ashikawa-core/version.rb

@@ -2,7 +2,7 @@
 module Ashikawa
   module Core
     # Current version of Ashikawa::Core
-    VERSION = '0.13.0'
+    VERSION = '0.13.1'
 
     # The lowest supported ArangoDB major version
     ARANGODB_MAJOR_VERSION = 2

data/lib/ashikawa-core/vertex_collection.rb

@@ -30,6 +30,16 @@ module Ashikawa
 
         raise CollectionNotInGraphException unless @graph.has_vertex_collection?(name)
       end
+
+      # Builds a new document object and passes the current graph to it
+      #
+      # @param [Hash] data The raw data to be used to instatiate the class
+      # @param [Hash] additional_atttributes Initial attributes to be passed to the document
+      # @return [Edge] The instatiated edge
+      # @api private
+      def build_content_class(data, additional_atttributes = {})
+        Document.new(@database, data, additional_atttributes.merge(graph: graph))
+      end
     end
   end
 end

data/spec/unit/collection_spec.rb

@@ -236,12 +236,21 @@ describe Ashikawa::Core::Collection do
     its(:content_type) { should be(:document) }
 
     context 'building the content classes' do
+      let(:additional_attributes) { double('Hash') }
+
       it 'should build documents' do
         expect(Ashikawa::Core::Document).to receive(:new)
-          .with(database, raw_document)
+          .with(database, raw_document, {})
 
         subject.build_content_class(raw_document)
       end
+
+      it 'should accept additional attributes to be passed to the content class' do
+        expect(Ashikawa::Core::Document).to receive(:new)
+          .with(database, raw_document, additional_attributes)
+
+        subject.build_content_class(raw_document, additional_attributes)
+      end
     end
 
     context 'when using the key' do
@@ -301,8 +310,8 @@ describe Ashikawa::Core::Collection do
       allow(database).to receive(:send_request)
         .with('document?collection=60768679', post: raw_document)
         .and_return(response)
-      expect(Ashikawa::Core::Document).to receive(:new)
-        .with(database, response, raw_document)
+      expect(subject).to receive(:build_content_class)
+        .with(response, raw_document)
         .and_return(document)
 
       subject.create_document(raw_document)
@@ -329,7 +338,7 @@ describe Ashikawa::Core::Collection do
     context 'building the content classes' do
       it 'should build documents' do
         expect(Ashikawa::Core::Edge).to receive(:new)
-          .with(database, raw_document)
+          .with(database, raw_document, {})
 
         subject.build_content_class(raw_document)
       end

data/spec/unit/edge_collection_spec.rb

@@ -94,12 +94,24 @@ describe Ashikawa::Core::EdgeCollection do
       subject.send(:send_request_for_this_collection, 'edge_key')
     end
 
-    it 'should overwrite the #build_content_class to create edges with the graph attached' do
-      expect(Ashikawa::Core::Edge).to receive(:new)
-        .with(database, raw_edge, graph: graph)
-        .and_return(new_edge)
+    context 'building edge documents' do
+      let(:additional_attributes) { { moar: 'data' } }
 
-      subject.build_content_class(raw_edge)
+      it 'should overwrite the #build_content_class to create edges with the graph attached' do
+        expect(Ashikawa::Core::Edge).to receive(:new)
+          .with(database, raw_edge, graph: graph)
+          .and_return(new_edge)
+
+        subject.build_content_class(raw_edge)
+      end
+
+      it 'should overwrite the #build_content_class to create edges with the graph attached' do
+        expect(Ashikawa::Core::Edge).to receive(:new)
+          .with(database, raw_edge, graph: graph, moar: 'data')
+          .and_return(new_edge)
+
+        subject.build_content_class(raw_edge, additional_attributes)
+      end
     end
   end
 end

data/spec/unit/vertex_collection_spec.rb

@@ -2,6 +2,7 @@
 require 'unit/spec_helper'
 require 'ashikawa-core/vertex_collection'
 require 'ashikawa-core/graph'
+require 'ashikawa-core/document'
 require 'ashikawa-core/database'
 
 describe Ashikawa::Core::VertexCollection do
@@ -17,6 +18,8 @@ describe Ashikawa::Core::VertexCollection do
     }
   end
   let(:graph) { instance_double('Ashikawa::Core::Graph') }
+  let(:new_document) { instance_double('Ashikawa::Core::Document') }
+  let(:raw_document) { double('RawDocument') }
 
   context 'building a vertex collection' do
     before do
@@ -44,5 +47,25 @@ describe Ashikawa::Core::VertexCollection do
     it 'should have a reference to its graph' do
       expect(subject.graph).to eq graph
     end
+
+    context 'building documents' do
+      let(:additional_attributes) { { moar: 'data' } }
+
+      it 'should overwrite the #build_content_class to create documents with the graph attached' do
+        expect(Ashikawa::Core::Document).to receive(:new)
+          .with(database, raw_document, graph: graph)
+          .and_return(new_document)
+
+        subject.build_content_class(raw_document)
+      end
+
+      it 'should overwrite the #build_content_class to create edges with the graph attached' do
+        expect(Ashikawa::Core::Document).to receive(:new)
+          .with(database, raw_document, graph: graph, moar: 'data')
+          .and_return(new_document)
+
+        subject.build_content_class(raw_document, additional_attributes)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ashikawa-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - moonglum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday