modl 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50e0895120efc15886ab14e88925610d92c41a683f98faa56cbb95ab90bd77d
-  data.tar.gz: da66a46c8837e2dc27ce6218df30ffdf9f47a5778d4a14a451ebfc286dc75fc1
+  metadata.gz: 4ac4822ef0d304cf504228f0c13b138d40550eb66e93559586fc3995ba46eacc
+  data.tar.gz: b8116a683a54fede8adfe0b649974ec743ad817a600f4443f9c4376e9eac46d5
 SHA512:
-  metadata.gz: fdafe65158efb8cda5280997ca0ba6be9142c24b3249d596a5b12c59d298d78b7e3424101112e11720cbad2d65b4a2138042f47e9a907e4f8126bbc760e4ff02
-  data.tar.gz: 33170d670ca8aa92d1dd828323eec2484a7f42e13513d700d7b2b7143f45a78c5c1d32cafed2476cd315126909bfc0c97c2075aad4d328d304f216c2aad41b72
+  metadata.gz: 684d94505d18c20d4f76f148319b575137a2c43b00ba7e4fe1195a41507c027384d91218a24483301259d5fff9b14b528fbf06bcc6c18b837463f8f6926185bf
+  data.tar.gz: 5ab166816510f1d359471f34a538b9078874040a4f8e9d2fba2299294add9bfff4e2de64e3a813d0510df5750d32ee7f3976ababce5938822a8d37d7c39fd94d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.3.9
+===
+- Fix GitHub Issue #18 - Quoted strings not handled correctly in references
+
 0.3.8
 ===
 - Add MIT license to all non-auto-generated Ruby files.

data/lib/modl/parser/evaluator.rb

@@ -63,7 +63,7 @@ module MODL
           when '='
             wild = value2.is_a?(String) && value2.include?('*') ? true : false
             if wild
-              regex = '^'
+              regex = '^'.dup
               value2.each_char do |c|
                 regex << (c == '*' ? '.*' : c)
               end

data/lib/modl/parser/modl_method.rb

@@ -109,31 +109,35 @@ module MODL
     end
 
     class StandardMethods
-      def self.run_method(m, str)
-        case m[0]
-        when 'u'
+
+      @@mthd_names = %w(u d i s e r t p upcase downcase initcap sentence urlencode replace trim punydecode)
+
+      def self.run_method(mthd, str)
+        m = mthd.match(/\w*/)[0]
+        case m
+        when 'u', 'upcase'
           str.upcase
-        when 'd'
+        when 'd', 'downcase'
           str.downcase
-        when 'i'
+        when 'i', 'initcap'
           str.split.map(&:capitalize) * ' '
-        when 's'
+        when 's', 'sentence'
           split = str.split
           split[0].capitalize!
           split.join(' ')
-        when 'e'
+        when 'e', 'urlencode'
           CGI.escape(str)
-        when 'r'
-          s1, s2 = get_subst_parts m
+        when 'r', 'replace'
+          s1, s2 = get_subst_parts(mthd)
           str.sub(s1, s2)
-        when 't'
-          s1 = extract_params m
+        when 't', 'trim'
+          s1 = extract_params mthd
           i = str.index(s1)
           Sutil.head(str, i)
-        when 'p'
+        when 'p', 'punydecode'
           Punycode.decode(str)
         else
-          str + '.' + m
+          str.nil? ? '.' + mthd : str.to_s + '.' + mthd
         end
       end
 
@@ -153,7 +157,7 @@ module MODL
       end
 
       def self.valid_method?(mthd)
-        return 'udisertp'.include?(mthd)
+        return @@mthd_names.include?(mthd)
       end
     end
   end

data/lib/modl/parser/ref_processor.rb

@@ -137,20 +137,48 @@ module MODL
             result = if n.to_s == p
                        # Numeric ref
                        if !result.nil? && !result.respond_to?(:find_property)
-                         raise InterpreterError, 'Interpreter Error: Invalid obejct reference: ' + degraved
+                         raise InterpreterError, 'Interpreter Error: Invalid object reference: ' + degraved
                        end
                        result.nil? ? global.index_value(n, degraved) : result.find_property(n)
                      else
                        # String ref
                        if result.is_a? String
-                         StandardMethods.run_method(p, result)
+                         if StandardMethods.valid_method?(p)
+                           StandardMethods.run_method(p, result)
+                         else
+                           mthd = global.user_method(p)
+                           if !mthd.nil?
+                             mthd.run(result)
+                           else
+                             mthd
+                           end
+                         end
+                       elsif result.is_a? Parsed::ParsedPair
+                         if result.text
+                           if StandardMethods.valid_method?(p)
+                             StandardMethods.run_method(p, result.text)
+                           else
+                             mthd = global.user_method(p)
+                             if !mthd.nil?
+                               mthd.run(result.text)
+                             else
+                               mthd
+                             end
+                           end
+                         else
+                           result.find_property(p)
+                         end
                        elsif result.is_a? Array
                          nil
                        else
                          if !result.nil? && !result.respond_to?(:find_property)
-                           raise InterpreterError, 'Interpreter Error: Invalid obejct reference: ' + degraved
+                           raise InterpreterError, 'Interpreter Error: Invalid object reference: ' + degraved
+                         end
+                         if result.nil?
+                           global.pair(p)
+                         else
+                           result.find_property(p)
                          end
-                         result.nil? ? global.pair(p) : result.find_property(p)
                        end
                      end
             break if result.nil?

data/lib/modl/parser/version.rb

@@ -24,6 +24,6 @@
 
 module MODL
   module Parser
-    VERSION = "0.3.8"
+    VERSION = "0.3.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr4-runtime