raka 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9181e13ec5517b0c40faba8c2e121a9b44c9da29de439bd5303d8fa5ee50870
-  data.tar.gz: a4c9f8d7e03f067f8266cf77cef52b2d153111c3b24c13a37f9927fe5b543fe5
+  metadata.gz: b2a81d9e837185c89f4c0b306675a40e4196e409d6cbafb1cf094d29493bac18
+  data.tar.gz: a2fc038c599be3f1d4ba8e4cc39dbd29d485e24723321a54ce937a243175b36d
 SHA512:
-  metadata.gz: 03cfe492010d2621bd84aa0c03f452be71de1d26d1d1e354a608893dca47d512ad666a42fb1c0e1d7b89522ad60acbcdd77a9466da388917a6992c9c9afbc8cd
-  data.tar.gz: f5f1d930083bf7342cac0285ba625219f6eb24fea7e1d61241e81bceda711a49496fa58b899de89759573143671adc74f142c730cfe7343b3663855ca91fcc1a
+  metadata.gz: 520eb293b32a8ce0447fe1219c1a8c99672a50222ba903a7080b01a15efdc98a662b19c122332e8f9dca63bc3ba5a14e4cdd3e0a30f502bb4d6a52b96c98b93d
+  data.tar.gz: a8756e782078a30fc3a3751def61862273833e308131fa5a98cd2d60f5dc9a696beaa3caf8f4d6793f5944b9c8a089694d1992717fff42c27f01fcdcaa3a34a6

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.2

data/lib/raka/lang/psql/impl.rb

@@ -37,10 +37,10 @@ class Psql
 
     if @create.to_s == 'table'
       'DROP TABLE IF EXISTS :_schema_:_name_;' \
-        'CREATE TABLE :schema:_name_ AS (' + code + ');'
+        'CREATE TABLE :_schema_:_name_ AS (' + code + ');'
     elsif @create.to_s == 'mview'
       'DROP MATERIALIZED VIEW IF EXISTS :_schema_:_name_;' \
-        'CREATE MATERIALIZED VIEW :schema:_name_ AS (' + code + ');'
+        'CREATE MATERIALIZED VIEW :_schema_:_name_ AS (' + code + ');'
     else
       code
     end

data/lib/raka/token.rb

@@ -9,8 +9,7 @@ end
 
 # Context to preserve during the token chaining
 class Context
-  attr_reader :ext
-  attr_reader :scopes
+  attr_reader :ext, :scopes
 
   def initialize(ext, scopes = [])
     @ext = ext
@@ -36,6 +35,7 @@ class Token
     @inline_scope = inline_scope
     @options = {}
     @options[:input_exts] = input_exts
+    @compiler_options = @compiler.instance_variable_get(:@options)
   end
 
   def _options_
@@ -53,7 +53,7 @@ class Token
     # xxx? is for minimal match
     out_pattern = %r{^((?<scope>\S+)/)?}.source
     out_pattern += %r{(?<target_scope>#{@inline_scope})/}.source unless @inline_scope.nil?
-    out_pattern += /(?<stem>(\S+))(?<ext>\.[^\.]+)$/.source
+    out_pattern += /(?<stem>(\S+))(?<ext>\.[^.]+)$/.source
     info = Regexp.new(out_pattern).match(output)
     res = Hash[info.names.zip(info.captures)]
     unless info[:scope].nil?
@@ -153,23 +153,47 @@ class Token
   end
 
   # These two methods indicate that this is a pattern token
-  def [](pattern)
+  def [](pattern, options = {})
     symbol = @chain.pop.to_s
     # if the pattern contains child pattern like percent_(\d+), we change the capture to
     # named capture so that it can be captured later. The name is symbol with the index, like func0
     pattern = pattern.to_s.gsub(/\(\S+?\)/).with_index { |m, i| "(?<#{symbol}#{i}>#{m})" }
 
+    # merge global pattern defaults with provided options
+    options = @compiler_options&.pattern_options&.merge(options)
+
+    # build the pattern based on match mode
+    refined_pattern = case options[:match_mode]
+                      when 'exact'
+                        pattern.to_s
+                      when 'prefix'
+                        "#{pattern}\\w*"
+                      else
+                        raise "Invalid match_mode: #{match_mode}. Use 'exact' or 'prefix'"
+                      end
+
     # if the symbol is _, \S+ will be put in chain, it indicates not to capture,
     # so just replace it with the refined pattern
     if symbol == Pattern::ANY # match-everything and not bound
-      @chain.push "#{pattern}\\w*"
+      @chain.push refined_pattern
     else
-      @chain.push "(?<#{symbol}>(#{pattern}\\w*))"
+      @chain.push "(?<#{symbol}>(#{refined_pattern}))"
     end
     self
   end
 
-  def []=(pattern, value)
-    @compiler.compile(self[pattern], value)
+  def []=(pattern, *args)
+    case args.length
+    when 1
+      # Standard: txt._[:pattern] = value
+      value = args[0]
+      @compiler.compile(self[pattern], value)
+    when 2
+      # With options: txt._[:pattern, {match_mode: 'exact'}] = value
+      options, value = args
+      @compiler.compile(self[pattern, options], value)
+    else
+      raise ArgumentError, "wrong number of arguments (given #{args.length + 1}, expected 2 or 3)"
+    end
   end
 end

data/lib/raka.rb

@@ -46,8 +46,10 @@ class Raka
       type_aliases: {},
       scopes: [],
       lang: ['lang/shell'],
-      user_lang: []
+      user_lang: [],
+      pattern_options: { match_mode: 'prefix' }
     }
+    options[:pattern_options] = defaults[:pattern_options].merge(options[:pattern_options] || {})
     @options = options = OpenStruct.new(defaults.merge(options))
 
     create_logger options.log_level || (ENV['LOG_LEVEL'] || Logger::INFO).to_i
@@ -58,7 +60,7 @@ class Raka
     end
     # specify root of scopes in options, scopes will append to each root
     @scopes = options.scopes.empty? ? [] : [options.scopes]
-    @options.lang.each { |path| load File::join(File::dirname(__FILE__), "raka/#{path}/impl.rb") }
+    @options.lang.each { |path| load File.join(File.dirname(__FILE__), "raka/#{path}/impl.rb") }
     @options.user_lang.each { |path| load path.to_s + '.rb' }
 
     # These are where the dsl starts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raka
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.2
 platform: ruby
 authors:
 - yarray