querylet 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec97dcd15beb09f85b656e57b8ab282ec722955f411afaaef3db77ac3682230
-  data.tar.gz: 1d532fbbc2a5335703348f00d645f48ffe406943a0084ebf8ebf2ac97ba9c3c5
+  metadata.gz: 89d1a03b5028328b79f0d575c2aeadec57ebf47f1d743fe5722b4c4a4b165fc6
+  data.tar.gz: 5db0889a5a8fc5a21aca04bb27f406522a22de46f91ef1fd95af5f0137983156
 SHA512:
-  metadata.gz: f48440d625e46181aea476dfe79f3e4f354c2848cb7d6b480f4e093ebc739d1b30a019cf55356bb338db2bab29bc1be54817d4691f528817c4b54a8607a00dd0
-  data.tar.gz: 86552d7a090baf83feb29d94aff63474af7a8f43816027c74e07a05d35f67d3b329ffd9784348b98a6ce87d7c892cf80462755b6b5affedb50e2d29a38745a0d
+  metadata.gz: 296e9452984b0099681d8567ac291e1c71e9ee62cb706d96668927c0e2cab8062ac54f0c1186eed56bdf2e0a93ee463602a75928525fcb1d02eefe3089fae665
+  data.tar.gz: 3b1f422e8cabd1ee7dfbb977df2e3b77ed4d28a6b5bb93f0007cf20aff608737276a8504ca40239671dcd8b66d4e4f8bacaf2a8db92a62d746c200a5e7d7f687

data/lib/querylet/context.rb

@@ -1,5 +1,10 @@
 module Querylet
-  module Context
+  class Context
+    def initialize(querylet, data)
+      @querylet = querylet
+      @data = data
+    end
+
     def get(value)
       @data.merge(locals)[value.to_sym]
     end
@@ -12,15 +17,21 @@ module Querylet
       hash.map { |k, v| add_item(k, v) }
     end
 
-    def with_temporary_context(args = {})
-      saved = args.keys.collect { |key| [key, get(key.to_s)] }.to_h
+    def get_partial name, dot_path, data
+      @querylet.get_partial name, dot_path, @data.merge(data)
+    end
 
-      add_items(args)
-      block_result = yield
-      locals.merge!(saved)
+    # This never appears to be used
+    # commented out unless I find a use for it.
+    #def with_temporary_context(args = {})
+    #  saved = args.keys.collect { |key| [key, get(key.to_s)] }.to_h
 
-      block_result
-    end
+    #  add_items(args)
+    #  block_result = yield
+    #  locals.merge!(saved)
+
+    #  block_result
+    #end
 
     private
 

data/lib/querylet/template.rb

@@ -1,4 +1,4 @@
-#require_relative 'context'
+require_relative 'context'
 
 module Querylet
   class Template
@@ -7,13 +7,19 @@ module Querylet
       @ast = ast
     end
 
+    # In Ruby, the call method is used to invoke a block, proc, or lambda, 
+    # which are all different types of callable objects in Ruby.
+    #
+    # This is how querylet will get called in a developers code.
+    #
+    # querylet = Querylet::Querylet.new path: 'path/to/sql'
+    # querylet.compile(template).call(data)
+    # @args is the initial values passed to the template
     def call(args = nil)
-      if args
-        @querylet.set_context(args)
-      end
+      ctx = Context.new(@querylet, args)
 
       # AST should return a Querylet::Tree and call its eval method
-      @ast.eval(@querylet)
+      @ast.eval(ctx)
     end
-  end
-end
+  end # Template
+end # Querylet

data/lib/querylet/tree.rb

@@ -36,10 +36,12 @@ module Querylet
 
     class Partial < TreeItem.new(:partial, :path, :parameters)
       def _eval(context)
+        data = {}
         [parameters].flatten.map(&:values).map do |vals|
-          context.add_item vals.first.to_s, vals.last._eval(context)
+          # we have to set it as sym so it overrides correctly
+          data[vals.first.to_sym] = vals.last._eval(context)
         end
-        content = context.get_partial(partial.to_s, path)
+        content = context.get_partial(partial.to_s, path, data)
         if partial == 'array'
         <<-HEREDOC.chomp
 (SELECT COALESCE(array_to_json(array_agg(row_to_json(array_row))),'[]'::json) FROM (

data/lib/querylet/version.rb

@@ -1,4 +1,4 @@
 module Querylet
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end
 

data/lib/querylet.rb

@@ -6,7 +6,6 @@ require_relative 'querylet/context'
 
 module Querylet
   class Querylet
-    include Context
     def initialize(path:)
       @sql_path = path
     end
@@ -19,17 +18,15 @@ module Querylet
       #puts deep_nested_hash
       abstract_syntax_tree = transform.apply deep_nested_hash
       #puts abstract_syntax_tree
-      Template.new self, abstract_syntax_tree
-    end
 
-    def set_context(ctx)
-      @data = ctx
+      # Querylet::Template
+      Template.new self, abstract_syntax_tree
     end
 
-    def get_partial name, dot_path
+    def get_partial name, dot_path, data={}
       path = @sql_path + '/' + dot_path.to_s.split('.').join('/') + '.sql'
       template = File.read(path).to_s.chomp
-      self.compile(template).call(@data)
+      self.compile(template).call(data)
     end
   end # class Querylet
 end # module Querylet

data/spec/querylet_spec.rb

@@ -23,66 +23,40 @@ describe Querylet::Querylet do
 
     context 'helpers' do
       it 'include' do
-query = <<-SQL.chomp
-(SELECT
-  users.email
-FROM users
-WHERE
-  users.id = 1) as email
-SQL
+        query = "(SELECT users.email FROM users WHERE users.id = 1) as email"
         expect(evaluate("({{> include 'examples.include' }}) as email")).to eq(query)
       end
 
       it 'include with variables' do
-query = <<-SQL.chomp
-(SELECT
-  users.email
-FROM users
-WHERE
-  users.id = 100) as email
-SQL
+        query = "(SELECT users.email FROM users WHERE users.id = 100) as email"
         template = "({{> include 'examples.include_with_vars' }}) as email"
         expect(evaluate(template, {id: 100})).to eq(query)
       end
 
       it 'include with parameters' do
-query = <<-SQL.chomp
-(SELECT
-  users.email,
-  'andrew' as name
-FROM users
-WHERE
-  users.id = 200) as email
-SQL
+        query = "(SELECT users.email, 'andrew' as name FROM users WHERE users.id = 200) as email"
         template = "({{> include 'examples.include_with_params' id='200' name='andrew' }}) as email"
         expect(evaluate(template, {id: 100})).to eq(query)
       end
 
       it 'include with parameters variable' do
-query = <<-SQL.chomp
-(SELECT
-  users.email
-FROM users
-WHERE
-  users.id = 300) as email
-SQL
+        query = "(SELECT users.email FROM users WHERE users.id = 300) as email"
         template = "({{> include 'examples.include_with_params_vars' id={{user_id}} name='andrew' }}) as email"
         expect(evaluate(template, {user_id: 300})).to eq(query)
       end
 
       it 'include with parameters filter' do
-query = <<-SQL.chomp
-(SELECT
-  users.email,
-  'Andrew' as name
-FROM users
-WHERE
-  users.id = 100) as email
-SQL
+        query = "(SELECT users.email, 'Andrew' as name FROM users WHERE users.id = 100) as email"
         template = "({{> include 'examples.include_with_params_filter' name={{str my_name}} }}) as email"
         expect(evaluate(template, {my_name: "Andrew", id: 100})).to eq(query)
       end
 
+      it 'variable overrides' do
+        query = "(SELECT questions.id, (SELECT que.id FROM questions que WHERE que.id = 555) as sub FROM questions WHERE questions.id = 100"
+        template = "(SELECT questions.id, ({{> include 'examples.vars_overrides_include' xid={{sub_id}} }}) as sub FROM questions WHERE questions.id = {{xid}}"
+        expect(evaluate(template, {sub_id: 555, xid: 100})).to eq(query)
+      end
+
       it 'object' do
 query = <<-SQL.chomp
 (SELECT COALESCE(row_to_json(object_row),'{}'::json) FROM (
@@ -177,5 +151,5 @@ SQL
       end
 
     end # context 'helpers'
-  end # context 'evaluating'
+ end # context 'evaluating'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querylet
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ExamPro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet