semi 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f7b3709ae388fbca46439b4eb751f5393c1188
-  data.tar.gz: 98495dcaa1f7b8d6e2b598415c0cd2da3e149b7d
+  metadata.gz: 5aafc2d5867f7093b74d1bd90ca165ea3da22354
+  data.tar.gz: f394cd460581e6e883fe23d182c43bd00b2fa1da
 SHA512:
-  metadata.gz: f53f6464cb5279c899693a3329801281f677598e462237080839b184d923680d597ebd6e3011a8a4603a7f7981fddd0f24e9412a6ba9d9c612198622be3860e7
-  data.tar.gz: 2df03e469ef11dc22c35c314068c127c091eff7d976d106edf555770722f758bbfd75c4bcfcaa47c9fb72054aae82af0081009a3fbae8ce7184b67e25767fe5a
+  metadata.gz: ee879f014907fd71ded5389af61c12de915a9e51ea4e6aca559bfd74fbe81dffb2c0168494f97f15588ba1593d8bd59415dda03cb16037c8b6f67faec76f07e1
+  data.tar.gz: c5ce3748b761dfa249577a4c105c3256ce03fd51e17268e07f622b72380cb3b11d7d8600270a2beb8c4fb553c9af62257a6ad267cbe9ef4d4acda9be21fc0df4

data/lib/semi/driver.rb

@@ -12,14 +12,18 @@ module Semi
       # Initialize the dictionary with the defaults
       @dictionary = {}
       @config.defaults.each_pair do |name,val|
-        @dictionary[name] = Semi::Variable.import(val)
+        hints = @config.validators[name] || nil
+        @dictionary[name] = Semi::Variable.import(val, hints)
       end
 
       # Now manually merge in the env vars
       ENV.each_pair do |name, val|
-        @dictionary[name] = Semi::Variable.import(val)
+        hints = @config.validators[name] || nil
+        @dictionary[name] = Semi::Variable.import(val, hints)
       end
 
+      #puts @dictionary.inspect
+
       # Check any validations being asserted
       @config.validators.each_key { |key|
         begin
@@ -42,7 +46,7 @@ module Semi
         # Read the template file and render
         if File.exist? file
           contents = File.open(file, 'r') do |fp|
-            renderer = ERB.new(fp.readlines.join)
+            renderer = ERB.new(fp.readlines.join, nil, '%<>-')
             renderer.result(@dictionary.instance_eval {binding})
           end
 

data/lib/semi/validate.rb

@@ -28,13 +28,13 @@ module Semi
       # test for regular expression
       if rule.start_with?('/') and rule.end_with?('/')
         re = Regexp.new(rule[1..-2])
-        tests[rule] = true if re.match(value)
+        tests[rule] = true if re.match(value.to_s)
       end
     end
 
     failures = tests.each_pair.map { |r,t| r if not t }.compact
     unless failures.empty?
-      raise ValidationError, "#{value} does not validate against #{failures} rules"
+      raise ValidationError, "#{value}(#{value.class}) does not validate against #{failures} rules"
     end
   end
 end

data/lib/semi/variable.rb

@@ -11,8 +11,22 @@ module Semi
 
   module Variable
 
-    def self.import(val)
-      puts "#{val}: #{val.class}"
+    # Variable types are ordered from most to least specific
+    @@var_types = { 'url'       =>   Semi::Variables::Url,
+                    'path'      =>   Semi::Variables::Path,
+                    'boolean'   =>   Semi::Variables::Boolean,
+                    'integer'   =>   Semi::Variables::Integer,
+                    'string'    =>   Semi::Variables::String, }
+
+    def self.import(val, hints=nil)
+      # If hints have been supplied, try to create from them
+      if not hints.nil?
+        hints = [hints].flatten.select {|h| @@var_types.include? h }
+        if hints.count > 0
+          return @@var_types[hints[0]].new(val)
+        end
+      end
+      
       # look for the obsure patterns before returning a string var
       case
       when Semi::Variables::Url::validate(val)

data/lib/semi/variables/base.rb

@@ -14,10 +14,15 @@ module Semi
       def to_s
         @value.to_s
       end
-      
+
       def value
         @value
       end
+
+      def method_missing(m, *args, &block)
+        @value.to_s.send(m, *args, &block)
+      end
+      
     end
   end
 end

data/lib/semi/variables/boolean.rb

@@ -27,6 +27,11 @@ module Semi::Variables
     def self.validate(value)
       real_value = nil
 
+      # If Semi::Variables::Boolean, then get the string representation
+      if value.class == Semi::Variables::Boolean
+        value = value.to_s
+      end
+      
       # test to see if the value is a common true value
       if value =~ /true|yes|enable/i
         real_value = true

data/lib/semi/variables/integer.rb

@@ -21,11 +21,14 @@ module Semi::Variables
     def self.validate(value)
       if value.class == Fixnum
         return true
-      elsif value.class == Semi::Variables::Integer and value.value =~ /^\d+$/
+      elsif value.class == Semi::Variables::Integer and value.to_s =~ /^\d+$/
         return true
       end
       false
     end
     
+    def method_missing(m, *args, &block)
+        @value.to_i.send(m, *args, &block)
+      end
   end
 end

data/lib/semi/variables/path.rb

@@ -4,6 +4,7 @@ module Semi::Variables
   class Path < Semi::Variables::Base
 
     @@path_re = Regexp.new('^(?<path>(?:\/|\.{1,2}\/|~(?:[a-z_][a-z0-9_]{0,30})?\/?|[^~][^\/\000]+\/)*?)(?<file>[^\/\000]+)?$')
+    @@path_score_threshold = 0.200
 
     def initialize(val)
       if @@path_re.match(val)
@@ -19,13 +20,28 @@ module Semi::Variables
     
     def self.validate(value)
       if ['String', 'Semi::Variables::Path'].include? value.class.to_s
-        if @@path_re.match(value)
-          return true
+        if @@path_re.match(value.to_s)
+          if path_score(value.to_s) > @@path_score_threshold
+            return true
+          end
         end
       end
       false
     end
     
+    # provide a simple scoring method to assist in identifying
+    # a string as a path. 0.0 is a pure string with no path
+    # markers, 
+    def self.path_score(path)
+      return 0.0 if path.empty?
+
+      # use path "special" chars to calculate the score
+      metach = path.count('/.~')
+      plen = path.length
+      #puts "#{path} m/p/s = #{metach}/#{plen}/#{1.0 - (((plen - metach) * 1.0) / (plen + metach))}"
+      1.0 - (((plen - metach)*1.0) / (plen + metach))
+    end
+    
     def path
       match = @@path_re.match(@value)
       if match 

data/lib/semi/variables/string.rb

@@ -8,7 +8,7 @@ module Semi::Variables
     end
 
     def self.validate(value)
-      if value.class.to_s == 'String'
+      if ['String', 'Semi::Variables::String'].include? value.class.to_s
         return true
       end
       false

data/lib/semi/variables/url.rb

@@ -19,7 +19,7 @@ module Semi::Variables
 
     def self.validate(val)
       if ['String', 'Semi::Variables::Url'].include? val.class.to_s
-        if @@url_re.match(val)
+        if @@url_re.match(val.to_s)
           return true
         end
       end

data/lib/semi/version.rb

@@ -1,3 +1,3 @@
 module Semi
-  version = '0.3.3'
+  version = '0.3.5'
 end

data/spec/semi_validator_spec.rb

@@ -20,7 +20,7 @@ describe "Semi::validator" do
     ['/etc/passwd', 'path',                        true],
     ['../parent', ['path'],                        true],
     ['.005',      'path',                          true],
-    ['file.name', 'path',                          true],
+    ['file.name', 'path',                          false],
     ['~user',     'path',                          true],
     ['~user/dir/file', 'path',                     true],
     ['http://www.simple.com', 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semi
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Gerard Hickey