cypher_builder 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab4195a4df744da8eb1f73ce1a4fd4572ba6dc52
-  data.tar.gz: 15140e002d3c33d9fbbefa43d44b9a65f1c27188
+  metadata.gz: a296dcf5a03aae2c6ad43c178ed2150808b7cf56
+  data.tar.gz: 586c6549b516bb866d454a3f1bdb26a9b9069bdd
 SHA512:
-  metadata.gz: f7458389e9d48d6c078a84338707f755397ed93f76260dd48c633d2c8eb1169b36cb89d6a2d50ad025226d68bc3345d819828a74719e24e4d71ad602a1388160
-  data.tar.gz: fbb03ca65fe4c12ee72b037c703e6e0a6444e8d13b0b93c0c67ae537000567cc5f1993d41a9eb1048740b35fabd584380333fe3fc55ebd35c899542ffd1285fc
+  metadata.gz: bbc86c29b2ee15020301b4317a95bdd74889624a272e8917a3b4732f87a8ed060ed65aa987700aa408d3c19053b4f65d6b3fb2e4f560e1e2401105ecd5c9db82
+  data.tar.gz: c7b25acf4446a29861dadc71905c3af1458d05583c453be7f64481196ca4615b9a62dca49a9374a14208fa8d8045c6da17b03cce683bc1a7ed05f0ed6773dc5a

data/lib/cypher_builder.rb

@@ -12,10 +12,12 @@ if defined?(::Neography)
 end
 
 require 'cypher_builder/payload'
+require 'cypher_builder/context'
 require 'cypher_builder/resolver'
 require 'cypher_builder/runner'
 require 'cypher_builder/cypher'
 
+require 'cypher_builder/as_is'
 require 'cypher_builder/opt'
 require 'cypher_builder/field'
 require 'cypher_builder/node'

data/lib/cypher_builder/alias.rb

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

data/lib/cypher_builder/and.rb

@@ -10,8 +10,8 @@ module CypherBuilder
       @parts = wrap(*parts)
     end
 
-    def as_cypher(opts)
-      resolve(@parts, separator: ' AND ', ** opts)
+    def as_cypher(payload:, context: )
+      resolve(@parts, separator: ' AND ', payload: payload, context: context.add(self))
     end
   end
 end

data/lib/cypher_builder/as_is.rb

@@ -0,0 +1,16 @@
+module CypherBuilder
+  def AsIs(*args)
+    AsIs.new(*args)
+  end
+
+  class AsIs
+    include Resolver
+    def initialize(value)
+      @value = value
+    end
+
+    def as_cypher(_)
+      @value.to_s
+    end
+  end
+end

data/lib/cypher_builder/context.rb

@@ -0,0 +1,13 @@
+class CypherBuilder::Context
+  def initialize(context = [])
+    @parents = context
+  end
+
+  def add(part)
+    Context.new([part] + @parents)
+  end
+
+  def ancestor?(a_class)
+    @parents.find { |p| a_class === p }
+  end
+end

data/lib/cypher_builder/cypher.rb

@@ -12,8 +12,8 @@ module CypherBuilder
       @parts = wrap(*parts)
     end
 
-    def as_cypher(opts)
-      resolve(@parts, ** opts)
+    def as_cypher(payload:, context:)
+      resolve(@parts, payload: payload, context: context.add(self))
     end
   end
 end

data/lib/cypher_builder/eql.rb

@@ -10,8 +10,10 @@ module CypherBuilder
       @left, @right = wrap(left, right)
     end
 
-    def as_cypher(opts)
-      sprintf('%s = %s', resolve(@left, ** opts), resolve(@right, ** opts))
+    def as_cypher(payload:, context: )
+      sprintf('%s = %s',
+              resolve(@left, payload: payload, context: context.add(self)),
+              resolve(@right, payload: payload, context: context.add(self)))
     end
   end
 end

data/lib/cypher_builder/field.rb

@@ -4,12 +4,26 @@ module CypherBuilder
   end
 
   class Field
+    attr_reader :name
+
     def initialize(prefix = nil, name)
       @prefix, @name = prefix, name
     end
 
-    def as_cypher(_)
+    def as_cypher(payload:, context:)
+      if context.ancestor?(Return) && !context.ancestor?(Alias)
+        aliased
+      else
+        prefixed_name
+      end
+    end
+
+    def prefixed_name
       [@prefix, @name].compact.join('.')
     end
+
+    def aliased
+      sprintf('%s AS %s', prefixed_name, name)
+    end
   end
 end

data/lib/cypher_builder/like.rb

@@ -10,8 +10,10 @@ module CypherBuilder
       @left, @right = wrap(left, right)
     end
 
-    def as_cypher(opts)
-      sprintf('%s LIKE %s', resolve(@left, ** opts), resolve(@right, ** opts))
+    def as_cypher(payload:, context: )
+      sprintf('%s LIKE %s',
+              resolve(@left, payload: payload, context: context.add(self)),
+              resolve(@right, payload: payload, context: context.add(self)))
     end
   end
 end

data/lib/cypher_builder/match.rb

@@ -10,8 +10,8 @@ module CypherBuilder
       @parts = wrap(*parts)
     end
 
-    def as_cypher(opts)
-      resolve(@parts, format: 'MATCH (%s)', separator: ', ', ** opts)
+    def as_cypher(payload:, context: )
+      resolve(@parts, format: 'MATCH (%s)', separator: ', ', payload: payload, context: context.add(self))
     end
   end
 end

data/lib/cypher_builder/opt.rb

@@ -10,12 +10,12 @@ module CypherBuilder
       @params_and_parts = Hash[params_and_parts.map { |k, v| [k, wrap(v)] }]
     end
 
-    def as_cypher(payload:)
+    def as_cypher(payload:, context:)
       param, part = @params_and_parts.find { |k, _| payload.include?(k) }
       part = @params_and_parts.values.first unless part
       payload.already_used(param) if param
 
-      resolve(part, payload: payload)
+      resolve(part, payload: payload, context: context.add(self))
     end
   end
 end

data/lib/cypher_builder/param.rb

@@ -8,7 +8,7 @@ module CypherBuilder
       @name = name
     end
 
-    def as_cypher(payload:)
+    def as_cypher(payload:, context:)
       payload.will_be_used(@name)
       sprintf('{%s}', @name)
     end

data/lib/cypher_builder/resolver.rb

@@ -9,7 +9,9 @@ module CypherBuilder::Resolver
     end
   end
 
-  def resolve(parts, format: '%s', separator: ' ', payload:)
-    Array(parts).map { |p| sprintf(format, p.as_cypher(payload: payload)) }.join(separator).strip
+  def resolve(parts, format: '%s', separator: ' ', ** opts)
+    Array(parts).map do |p|
+      sprintf(format, p.as_cypher(** opts))
+    end.join(separator).strip
   end
 end

data/lib/cypher_builder/return.rb

@@ -10,8 +10,8 @@ module CypherBuilder
       @parts = wrap(*parts)
     end
 
-    def as_cypher(opts)
-      sprintf('RETURN %s', resolve(@parts, separator: ', ', **opts))
+    def as_cypher(payload:, context: )
+      sprintf('RETURN %s', resolve(@parts, separator: ', ', payload: payload, context: context.add(self)))
     end
   end
 end

data/lib/cypher_builder/runner.rb

@@ -16,7 +16,8 @@ module CypherBuilder
 
     def execute(** params)
       payload = Payload.new(params)
-      cypher = self.class.cypher.as_cypher(payload: payload)
+      context = Context.new
+      cypher = self.class.cypher.as_cypher(payload: payload, context: context)
       @adapter.execute(cypher, payload.necessary)
     end
   end

data/lib/cypher_builder/version.rb

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

data/lib/cypher_builder/where.rb

@@ -10,8 +10,8 @@ module CypherBuilder
       @parts = wrap(*parts)
     end
 
-    def as_cypher(opts)
-      resolve(@parts, format: 'WHERE %s', separator: ' AND ', ** opts)
+    def as_cypher(payload:, context: )
+      resolve(@parts, format: 'WHERE %s', separator: ' AND ', payload: payload, context: context.add(self))
     end
   end
 end

data/spec/cypher_builder/cypher_spec.rb

@@ -8,7 +8,7 @@ describe Cypher do
       cypher_class = Cypher(Match(c),
                             Return(c.name))
       cypher_class.exec(adapter)
-      expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name', {})
+      expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name AS name', {})
     end
   end
   describe '#execute' do
@@ -22,7 +22,7 @@ describe Cypher do
       cypher_class = Cypher(Match(c),
                             Return(c.name))
       cypher_class.new(adapter).execute
-      expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name', {})
+      expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name AS name', {})
     end
     it 'executes the most complex query possible (exercises everything currently implemented)' do
       c = Node('c', labels: 'what')
@@ -31,7 +31,7 @@ describe Cypher do
                                       Like(c.staff, 'test%'))),
                             Return(c.name, Alias(c.stuff, 'something')))
       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, c.stuff AS something', {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'})
     end
     context 'with Opt' do
       before do
@@ -47,23 +47,23 @@ describe Cypher do
       end
       it 'generates first option' do
         @cypher_class.new(adapter).execute(name: true)
-        expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name', {})
+        expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name AS name', {})
       end
       it 'generates first option with multiple uses' do
         @cypher_class2.new(adapter).execute(name: 'Testing Test')
-        expect(adapter).to have_received(:execute).with('MATCH (c) WHERE c.name = {name} RETURN c.name', {name: 'Testing Test'})
+        expect(adapter).to have_received(:execute).with('MATCH (c) WHERE c.name = {name} RETURN c.name AS name', {name: 'Testing Test'})
       end
       it 'generates second option' do
         @cypher_class.new(adapter).execute(thing: true)
-        expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.thing', {})
+        expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.thing AS thing', {})
       end
       it 'generates second option with multiple uses' do
         @cypher_class2.new(adapter).execute(thing: 123)
-        expect(adapter).to have_received(:execute).with('MATCH (c) WHERE c.thing = {thing} RETURN c.thing', {thing: 123})
+        expect(adapter).to have_received(:execute).with('MATCH (c) WHERE c.thing = {thing} RETURN c.thing AS thing', {thing: 123})
       end
       it 'defaults to firts option' do
         @cypher_class.new(adapter).execute
-        expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name', {})
+        expect(adapter).to have_received(:execute).with('MATCH (c) RETURN c.name AS name', {})
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypher_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ronie Uliana
@@ -86,6 +86,8 @@ files:
 - lib/cypher_builder/adapter/neography.rb
 - 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