cypher_builder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a296dcf5a03aae2c6ad43c178ed2150808b7cf56
-  data.tar.gz: 586c6549b516bb866d454a3f1bdb26a9b9069bdd
+  metadata.gz: 875bb9cde808a0014d2d16a22bbba9f9fa050f32
+  data.tar.gz: a8dc8091e8b7862273da2c20d81b9c1a956c5e0d
 SHA512:
-  metadata.gz: bbc86c29b2ee15020301b4317a95bdd74889624a272e8917a3b4732f87a8ed060ed65aa987700aa408d3c19053b4f65d6b3fb2e4f560e1e2401105ecd5c9db82
-  data.tar.gz: c7b25acf4446a29861dadc71905c3af1458d05583c453be7f64481196ca4615b9a62dca49a9374a14208fa8d8045c6da17b03cce683bc1a7ed05f0ed6773dc5a
+  metadata.gz: 1f67659909ed0a09587c0779e491980e4cd7745f9a83e6a14065c6b0f45cee962106b32863267b219ccd8450bdadfd849a41191854f3a674115823bd0207d6f8
+  data.tar.gz: 270f94f3052508ff0ac7ad7d74a63fb68a2b335eb4eb860fb033eea4eb0dfb6e1d330274e849624fb36a3c2a0dfed5a83e643ef6b745a599f81f492a550350e9

data/Guardfile

@@ -32,7 +32,7 @@ clearing :on
 #  * zeus: 'zeus rspec' (requires the server to be started separately)
 #  * 'just' rspec: 'rspec'
 
-guard :rspec, cmd: 'bundle exec rspec' do
+guard :rspec, cmd: 'bundle exec rspec', all_on_start: true, keep: true, all_after_pass: true, run_all: { cmd: 'bundle exec rspec -f progress' }  do
   require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 

data/README.md

@@ -1,5 +1,7 @@
 # CypherBuilder
 
+[![Gem Version](https://badge.fury.io/rb/cypher_builder.svg)](http://badge.fury.io/rb/cypher_builder)
+
 Build Cypher query classes (Neo4j).
 
 It creates Command classes that executes Cypher queries using Neography. The goal is make class creation easier.

data/lib/cypher_builder.rb

@@ -11,16 +11,20 @@ if defined?(::Neography)
   CypherBuilder::Adapter::DEFAULT = CypherBuilder::Adapter::Neography.new
 end
 
-require 'cypher_builder/payload'
-require 'cypher_builder/context'
-require 'cypher_builder/resolver'
-require 'cypher_builder/runner'
-require 'cypher_builder/cypher'
+require 'cypher_builder/infra/payload'
+require 'cypher_builder/infra/context'
+require 'cypher_builder/infra/resolver'
+require 'cypher_builder/infra/runner'
 
+# Not in Cypher
+require 'cypher_builder/cypher'
 require 'cypher_builder/as_is'
 require 'cypher_builder/opt'
+
+# Cypher
 require 'cypher_builder/field'
 require 'cypher_builder/node'
+require 'cypher_builder/rel'
 require 'cypher_builder/param'
 require 'cypher_builder/literal'
 require 'cypher_builder/match'
@@ -30,3 +34,5 @@ require 'cypher_builder/eql'
 require 'cypher_builder/like'
 require 'cypher_builder/return'
 require 'cypher_builder/alias'
+require 'cypher_builder/order_by'
+require 'cypher_builder/limit'

data/lib/cypher_builder/alias.rb

@@ -11,7 +11,7 @@ module CypherBuilder
       @an_alias = an_alias
     end
 
-    def as_cypher(payload:, context: )
+    def as_cypher(payload:, context:)
       sprintf('%s AS %s', resolve(@field, payload: payload, context: context.add(self)), @an_alias)
     end
   end

data/lib/cypher_builder/{resolver.rb → infra/resolver.rb}

@@ -3,6 +3,8 @@ module CypherBuilder::Resolver
     values.map do |v|
       if v.respond_to?(:as_cypher)
         v
+      elsif Symbol === v
+        AsIs.new(v)
       else
         Literal.new(v)
       end

data/lib/cypher_builder/limit.rb

@@ -0,0 +1,16 @@
+module CypherBuilder
+  def Limit(*args)
+    Limit.new(*args)
+  end
+
+  class Limit
+    include Resolver
+    def initialize(value)
+      @value = value
+    end
+
+    def as_cypher(_)
+      sprintf('LIMIT %d', @value.to_i)
+    end
+  end
+end

data/lib/cypher_builder/match.rb

@@ -11,7 +11,7 @@ module CypherBuilder
     end
 
     def as_cypher(payload:, context: )
-      resolve(@parts, format: 'MATCH (%s)', separator: ', ', payload: payload, context: context.add(self))
+      resolve(@parts, format: 'MATCH %s', separator: ', ', payload: payload, context: context.add(self))
     end
   end
 end

data/lib/cypher_builder/node.rb

@@ -9,7 +9,7 @@ module CypherBuilder
     end
 
     def as_cypher(_ = nil)
-      [@prefix, *@labels].compact.join(':')
+      ::Kernel.sprintf('(%s)', [@prefix, *@labels].compact.join(':'))
     end
 
     def respond_to_missing?(name, include_private = false)
@@ -17,7 +17,7 @@ module CypherBuilder
     end
 
     def method_missing(name, *_)
-      ::Field.new(@prefix, name)
+      Field.new(@prefix, name)
     end
   end
 end

data/lib/cypher_builder/order_by.rb

@@ -0,0 +1,32 @@
+module CypherBuilder
+  class MicroResolver < Struct.new(:payload, :context)
+    include Resolver
+    def execute(value)
+      resolve(value, payload: payload, context: context)
+    end
+  end
+
+  def OrderBy(first, *rest)
+    OrderBy.new(first, *rest)
+  end
+
+  class OrderBy
+    include Resolver
+    def initialize(first, *rest)
+      @parts = wrap(*([first] + rest))
+    end
+
+    def as_cypher(payload:, context:)
+      rsv = MicroResolver.new(payload, context.add(self))
+      
+      ps = @parts.reduce([]) do |r, v|
+        if r.last && AsIs === v
+          r[0..-2] + [[r.last, rsv.execute(v)].join(' ')]
+        else
+          r + [rsv.execute(v)]
+        end
+      end
+      sprintf('ORDER BY %s', ps.join(', '))
+    end
+  end
+end

data/lib/cypher_builder/rel.rb

@@ -0,0 +1,37 @@
+module CypherBuilder
+  def Rel(prefix, labels: [])
+    Rel.new(prefix, labels: labels)
+  end
+
+  class Rel < BasicObject
+    def initialize(prefix, labels: [], from: nil, to: nil)
+      @prefix, @labels = prefix, ::Kernel.Array(labels)
+      @from, @to = from, to
+    end
+
+    def as_cypher(payload:, context:)
+      ::Kernel.sprintf('%s-[%s]->%s',
+                       (@from ? @from.as_cypher(payload: payload, context: context.add(self)) : '()'),
+                       [@prefix, *@labels].compact.join(':'),
+                       (@to ? @to.as_cypher(payload: payload, context: context.add(self)) : '()'))
+    end
+
+    def from(node = nil)
+      return Field.new(@prefix, 'from') if node == nil
+      Rel.new(@prefix, labels: @labels, from: node, to: @to)
+    end
+
+    def to(node = nil)
+      return Field.new(@prefix, 'to') if node == nil
+      Rel.new(@prefix, labels: @labels, from: @from, to: node)
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      true
+    end
+
+    def method_missing(name, *_)
+      Field.new(@prefix, name)
+    end
+  end
+end

data/lib/cypher_builder/version.rb

@@ -1,3 +1,3 @@
 module CypherBuilder
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/cypher_builder/cypher_spec.rb

@@ -24,14 +24,27 @@ describe Cypher do
       cypher_class.new(adapter).execute
       expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name AS name', {})
     end
+    it 'executes a query with relationships' do
+      c = Node('c')
+      n = Node('n')
+      r = Rel('r', labels: 'TEST')
+      cypher_class = Cypher(Match(r.from(c).to(n)),
+                            Return(c.name))
+      cypher_class.new(adapter).execute
+      expect(adapter).to have_received(:execute).with('MATCH (c)-[r:TEST]->(n) RETURN c.name AS name', {})
+    end
     it 'executes the most complex query possible (exercises everything currently implemented)' do
       c = Node('c', labels: 'what')
-      cypher_class = Cypher(Match(c),
+      n = Node('n')
+      r = Rel('r')
+      cypher_class = Cypher(Match(r.from(c).to(n)),
                             Where(And(Eql(c.stuff, Param('thing')),
                                       Like(c.staff, 'test%'))),
-                            Return(c.name, Alias(c.stuff, 'something')))
+                            Return(c.name, Alias(c.stuff, 'something')),
+                            OrderBy(c.name, :desc, c.stuff),
+                            Limit(10))
       cypher_class.new(adapter).execute(thing: 'of course')
-      expect(adapter).to have_received(:execute).with('MATCH (c:what) WHERE c.stuff = {thing} AND c.staff LIKE "test%" RETURN c.name AS name, c.stuff AS something', {thing: 'of course'})
+      expect(adapter).to have_received(:execute).with('MATCH (c:what)-[r]->(n) WHERE c.stuff = {thing} AND c.staff LIKE "test%" RETURN c.name AS name, c.stuff AS something ORDER BY c.name desc, c.stuff LIMIT 10', {thing: 'of course'})
     end
     context 'with Opt' do
       before do

data/spec/cypher_builder/node_spec.rb

@@ -8,9 +8,9 @@ describe Node do
     let(:node_multiple_labels) { Node('x', labels: ['uga', 'buga']) }
 
     it 'converts to be used in "match"' do
-      expect(node.as_cypher).to eq 'x:uga'
-      expect(node_prefix_only.as_cypher).to eq 'x'
-      expect(node_multiple_labels.as_cypher).to eq 'x:uga:buga'
+      expect(node.as_cypher).to eq '(x:uga)'
+      expect(node_prefix_only.as_cypher).to eq '(x)'
+      expect(node_multiple_labels.as_cypher).to eq '(x:uga:buga)'
     end
   end
 

data/spec/cypher_builder/order_by_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe OrderBy do
+  describe '#as_cypher' do
+    let(:payload) { instance_spy(Payload) }
+    let(:context) { instance_spy(Context) }
+    let(:c) { Node('c') }
+
+    it 'formats simple case' do
+      ob = OrderBy(c.something)
+      expect(ob.as_cypher(payload: payload, context: context)).to eq 'ORDER BY c.something'
+    end
+
+    it 'formats multiple elements' do
+      ob = OrderBy(c.something, c.other)
+      expect(ob.as_cypher(payload: payload, context: context)).to eq 'ORDER BY c.something, c.other'
+    end
+
+    it 'formats using :asc/:desc' do
+      ob = OrderBy(c.something, :desc, c.other)
+      expect(ob.as_cypher(payload: payload, context: context)).to eq 'ORDER BY c.something desc, c.other'
+    end
+  end
+end

data/spec/cypher_builder/rel_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Rel do
+  let(:rel) { Rel('x', labels: 'uga') }
+
+  describe '#as_cypher' do
+    let(:payload) { spy(Payload) }
+    let(:context) { spy(Context) }
+
+    it 'converts to be used in "match"' do
+      expect(rel.as_cypher(payload: payload, context: context)).to eq '()-[x:uga]->()'
+
+      c = Node('c')
+      nr = rel.from(c)
+      expect(nr.as_cypher(payload: payload, context: context)).to eq '(c)-[x:uga]->()'
+
+      x = Node('x', labels: 'test')
+      nr = rel.from(c).to(x)
+      expect(nr.as_cypher(payload: payload, context: context)).to eq '(c)-[x:uga]->(x:test)'
+    end
+  end
+
+  describe '#respond_to?' do
+    it 'is true for #as_cypher' do
+      expect(rel.respond_to?(:as_cypher)).to be_truthy
+    end
+    it 'is true for any method' do
+      expect(rel.respond_to?(:anything)).to be_truthy
+    end
+  end
+
+  describe 'any method' do
+    it 'responds with a Field' do
+      expect(rel.some_field).to be_instance_of Field
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cypher_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,25 +87,30 @@ files:
 - lib/cypher_builder/alias.rb
 - lib/cypher_builder/and.rb
 - lib/cypher_builder/as_is.rb
-- lib/cypher_builder/context.rb
 - lib/cypher_builder/cypher.rb
 - lib/cypher_builder/eql.rb
 - lib/cypher_builder/field.rb
+- lib/cypher_builder/infra/context.rb
+- lib/cypher_builder/infra/payload.rb
+- lib/cypher_builder/infra/resolver.rb
+- lib/cypher_builder/infra/runner.rb
 - lib/cypher_builder/like.rb
+- lib/cypher_builder/limit.rb
 - lib/cypher_builder/literal.rb
 - lib/cypher_builder/match.rb
 - lib/cypher_builder/node.rb
 - lib/cypher_builder/opt.rb
+- lib/cypher_builder/order_by.rb
 - lib/cypher_builder/param.rb
-- lib/cypher_builder/payload.rb
-- lib/cypher_builder/resolver.rb
+- lib/cypher_builder/rel.rb
 - lib/cypher_builder/return.rb
-- lib/cypher_builder/runner.rb
 - lib/cypher_builder/version.rb
 - lib/cypher_builder/where.rb
 - spec/cypher_builder/adapter/neography_spec.rb
 - spec/cypher_builder/cypher_spec.rb
 - spec/cypher_builder/node_spec.rb
+- spec/cypher_builder/order_by_spec.rb
+- spec/cypher_builder/rel_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ruliana/cypher_builder
 licenses:
@@ -135,4 +140,6 @@ test_files:
 - spec/cypher_builder/adapter/neography_spec.rb
 - spec/cypher_builder/cypher_spec.rb
 - spec/cypher_builder/node_spec.rb
+- spec/cypher_builder/order_by_spec.rb
+- spec/cypher_builder/rel_spec.rb
 - spec/spec_helper.rb