rom-neo4j 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434f1e9e4586f8d8a826631dc3df4acb084fd636
-  data.tar.gz: f8856d06f8ca5f12b65f21b793bc91e9ca88d1a0
+  metadata.gz: 0223ebc6313d58b19a54c660a159abe607ebf078
+  data.tar.gz: 0db461806b855450fc74c1d655fb3322ad0e1ab8
 SHA512:
-  metadata.gz: 8d1aea0e308f15dd1e66e98cdff967bab262bb6b0f840c8166610a156d84a134dc5ce3d4b29e6dd0c103e42ca79303c74923dd24413918f7082979066f1c86ca
-  data.tar.gz: 506f5147ffd33784f81a10e700238f79e484c53cbcd699fbc1996af979a1067ab2e936303a91eef05852c2a19344845886dabb3852825cc1548b54bdc7fca2d4
+  metadata.gz: f70b19f16c66fb7278dda9a1793fabb65a6bb27e63f0f6a356ffebe3bc67d88eb7adeb66332df8f18714c8f5f972060f4f172a04208f755ea7fd1825fe4ff25e
+  data.tar.gz: 60ce87a5c86c3a8833068977379ca257545fbf55b3b094aa7bfb52f27b6ee990e22783159c079d36e487058d4a47a37c3ef99501196f4c601f88b548b66a3338

data/README.md

@@ -4,12 +4,24 @@ Map objects returned from Neo4j graph traversals using the [Ruby Object Mapper](
 
 ## Status
 
-Incomplete experimental sketch.
+**Incomplete experimental sketch.**
 
 The adapter spec passes with the generic movies dataset distributed with Neo4j, but that's about all at this point.
 
 ## Install
 
+Install with Rubygems:
+
+```
+gem install rom-neo4j
+```
+
+Or add the dependency to your `Gemfile`:
+
+```
+gem 'rom-neo4j'
+```
+
 Right now, the fastest way to get started is to run the tests.
 
 You’ll need to have Neo4j installed on your system. If it’s not already running, start the database server with:
@@ -38,7 +50,6 @@ setup.relation(:movies) do
   def titled(title)
     where('m.title' => title)
   end
-
 end
 
 movie = rom.read(:movies).titled('The Matrix').first
@@ -56,7 +67,6 @@ setup.relation(:directors) do
   def by_movie(title)
     where('movie.title' => title)
   end
-
 end
 
 director = rom.read(:directors).by_movie('RescueDawn').first

data/TODO.md

@@ -0,0 +1,28 @@
+# TODO
+
+## Features
+
+- Add command wrapper
+- Surface write capabilities from Neo4j::Core
+- Support embedded mode (JRuby only)
+
+## API
+
+- Class method/DSL/convention for relation shared SELECT/MATCH
+- Wrapper with prefix/select (?)
+
+## Mappers
+
+- Find out why prefix mapping isn't working
+
+## Dataset
+
+- Unit test of cypher query building
+- Documentation of instance methods
+
+## Housekeeping
+
+- Add LICENSE
+- Tidy up README
+- Add Travis CI hooks
+- Configurable host URI in tests

data/lib/rom/neo4j/support/core_ext.rb

@@ -1,44 +1,24 @@
 # Extensions to the Neo4j::Core library making it easier to integrate with ROM.
 module Neo4j
   module Core
-    # DSL for generating Cypher queries and enumerating their results
+    UnsupportedDriver = Class.new(StandardError)
+
+    # DSL for generating Cypher queries and enumerating their results.
     #
     # @see http://www.rubydoc.info/gems/neo4j-core/Neo4j/Core/Query
     class Query
-      # def each
-      #   response = self.response
-      #   if response.is_a?(Neo4j::Server::CypherResponse)
-      #     response.to_node_enumeration
-      #   else
-      #     Neo4j::Embedded::ResultWrapper.new(response, to_cypher)
-      #   end.each { |object| yield object }
-      # end
-    end
-  end
-  module Server
-    class CypherResponse
-      # Coerces result objects from structs to hashes in results. 
-      class HashEnumeration
-        def each(&block)
-          @response.each_data_row do |row|
-            yield(row.each_with_index.each_with_object(struct.new) do |(value, i), result|
-              result[columns[i].to_sym] = value
-            end.to_h)
-          end
-        end
-      end
-      # Coerces result objects from structs to hashes in results. 
-      def to_node_enumeration(cypher = '', session = Neo4j::Session.current)
-        Enumerator.new do |yielder|
-          @result_index = 0
-          to_struct_enumeration(cypher).each do |row|
-            @row_index = 0
-            yielder << row.each_pair.each_with_object(@struct.new) do |(column, value), result|
-              result[column] = map_row_value(value, session)
-              @row_index += 1
-            end.to_h
-            @result_index += 1
+      def each
+        return enum_for(:each) unless block_given?
+
+        response = self.response
+        columns = response.columns.map { |c| c.to_sym }
+
+        if response.is_a?(Neo4j::Server::CypherResponse)
+          response.data.map do |row|
+            yield Hash[columns.zip(row)]
           end
+        else
+          raise Neo4j::Core::UnsupportedDriver, 'Neo4j::Embedded is not supported (yet)'
         end
       end
     end

data/lib/rom/neo4j/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Neo4j
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
   end
 end

data/rom-neo4j.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rom', '~> 0.6'
-  spec.add_runtime_dependency 'neo4j-core', '~> 4.0'
+  spec.add_runtime_dependency 'neo4j-core', '4.0.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '~> 0.28.0'
 end

data/spec/integration/adapter_spec.rb

@@ -15,14 +15,18 @@ describe 'Neo4j adapter' do
         def by_title(title)
           where('m.title' => title)
         end
+
+        def by_year(year)
+          where('m.released' => year)
+        end
       end
 
       setup.mappers do
         define(:movies) do
           relation :movies
           model name: 'Movie'
-          #prefix :m
-          #prefix_separator '.'
+          # prefix :m
+          # prefix_separator '.'
           attribute :title
           attribute :released
           attribute :tagline
@@ -45,6 +49,9 @@ describe 'Neo4j adapter' do
       end
     end
 
+    it 'maps movies #by_year' do
+      expect(movies.by_year(1999).to_a.count).to eq(4)
+    end
   end
 
   context 'with directors relation and mapper' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-neo4j
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -28,16 +28,16 @@ dependencies:
   name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +104,7 @@ files:
 - ".gitignore"
 - Gemfile
 - README.md
+- TODO.md
 - lib/rom-neo4j.rb
 - lib/rom/neo4j.rb
 - lib/rom/neo4j/dataset.rb
@@ -122,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Neo4j graph relations for Ruby Object Mapper