semi 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80fb95486ba180d4b96a45f40360ffa8df51b044
-  data.tar.gz: ed494f2aac254260547e5ebe76d9ce32a61c7d29
+  metadata.gz: c88aca233d156427126e2693c9d21017314452b2
+  data.tar.gz: 4f34c48307d462e0f99ef3b9f7d24fad6a5ff8af
 SHA512:
-  metadata.gz: 1e9b7a6311d3fedae0fefd7de3332f191434913e1817dd858ba7bbda072ea360005483ff58cea1b0fe3de9bc584c568d43c6c654333ddda5e76cc5f17de57c86
-  data.tar.gz: 013a7b0ecb085481b9c9e81195ca04ae029c4f3101b5ef94d5b9d6da1209f84c66b2fc2a78381ded61061a6f792fb64b48047dbf2f497b098178dc2514f14c65
+  metadata.gz: 32c8dd6903b8b38a3c0bd2c6f7cecfce654e09be9c03a5de9b9fa51e7507b9f1791cd5281d92ac7c1af3c0e40ba447fb3b70e10ceaa2731dbf0249dcd8130629
+  data.tar.gz: dfecc677729c0941179a42af404b07c553bba3f2eb665ac8b405d852a23c4b25dae586d5493be8c312d008d7fd9d64d0485eb2387c27936dce41110511164a00

data/Gemfile

@@ -1 +1,4 @@
-gemspec
+source "https://rubygems.org/"
+
+gemspec
+

data/lib/semi/driver.rb

@@ -10,7 +10,12 @@ module Semi
 
     def start
       # Merge defaults into the environment
-      @dictionary = @config.defaults.dup
+      @dictionary = {}
+      @config.defaults.each_pair do |name,val|
+        @dictionary[name] = Semi::Variable.import(val)
+      end
+
+      puts "dictionary = #{@dictionary.inspect}"
       @dictionary.merge!(ENV.to_h)
 
       # Check any validations being asserted

data/lib/semi/validate.rb

@@ -11,14 +11,18 @@ module Semi
 
     tests.keys.each do |rule|
       case rule
-    when 'required'
+      when 'required'
         tests[rule] = true unless value.nil?
       when 'integer'
-        tests[rule] = true if value.is_a? Integer
+        tests[rule] = Semi::Variables::Integer.validate(value)
       when 'string'
-        tests[rule] = true if value.is_a? String
+        tests[rule] = Semi::Variables::String.validate(value)
       when 'boolean'
-        tests[rule] = true if value.is_a? Boolean
+        tests[rule] = Semi::Variables::Boolean.validate(value)
+      when 'path'
+        tests[rule] = Semi::Variables::Path.validate(value)
+      when 'url'
+        tests[rule] = Semi::Variables::Url.validate(value)
       end
 
       # test for regular expression

data/lib/semi/variable.rb

@@ -0,0 +1,42 @@
+
+require 'semi/variables/string'
+require 'semi/variables/integer'
+require 'semi/variables/boolean'
+require 'semi/variables/path'
+require 'semi/variables/url'
+
+module Semi
+
+  class VariableError < RuntimeError; end 
+
+  module Variable
+
+    def self.import(val)
+      puts "#{val}: #{val.class}"
+      # look for the obsure patterns before returning a string var
+      case
+      when Semi::Variables::Url::validate(val)
+        return Semi::Variables::Url.new(val)
+      when Semi::Variables::Path.validate(val)
+        return Semi::Variables::Path.new(val)
+      when Semi::Variables::Boolean.validate(val)
+        return Semi::Variables::Boolean.new(val)
+      when Semi::Variables::Integer.validate(val)
+        return Semi::Variables::Integer.new(val)
+      when val.class == Fixnum
+        return Semi::Variables::Integer.new(val)
+      when val.class == TrueClass
+        return Semi::Variables::Boolean.new(val)
+      when val.class == FalseClass
+        return Semi::Variables::Boolean.new(val)
+      else
+        return Semi::Variables::String.new(val)
+      end
+      
+    end
+
+    
+
+
+  end
+end

data/lib/semi/variables/base.rb

@@ -0,0 +1,20 @@
+
+module Semi
+  module Variables
+    class Base
+
+      def initialize(val)
+        set(val)
+      end
+
+      def set(val)
+        @value = val
+      end
+
+      def to_s
+        @value
+      end
+      
+    end
+  end
+end

data/lib/semi/variables/boolean.rb

@@ -0,0 +1,39 @@
+require_relative 'base'
+
+module Semi::Variables
+  class Boolean < Semi::Variables::Base
+
+
+    def set(val)
+      # test to see if the value is a common true value
+      if value =~ /true|yes|enable/i
+        @value = true
+      elsif value =~ /false|no|disable/i
+        @value = false
+      else
+        raise Semi::VariableError, "#{val} trying to be set as a boolean"
+      end
+    end
+
+    def validate
+      self.validate(@value)
+    end
+    
+    def self.validate(value)
+      real_value = nil
+
+      # test to see if the value is a common true value
+      if value =~ /true|yes|enable/i
+        real_value = true
+      elsif value =~ /false|no|disable/i
+        real_value = false
+      end
+
+      if !!real_value == real_value
+        return true
+      end
+      false
+    end
+    
+  end
+end

data/lib/semi/variables/integer.rb

@@ -0,0 +1,31 @@
+require_relative 'base'
+
+module Semi::Variables
+  class Integer < Semi::Variables::Base
+
+    #def set(val)
+    #  # test to see if the value is a common true value
+    #  if value =~ /true|yes|enable/i
+    #    @value = true
+    #  elsif value =~ /false|no|disable/i
+    #    @value = false
+    #  else
+    #    raise Semi::VariableError, "#{val} trying to be set as a boolean"
+    #  end
+    #end
+
+    def validate
+      self.validate(@value)
+    end
+    
+    def self.validate(value)
+      if value.class == Fixnum
+        return true
+      elsif value.class == Semi::Variables::Integer and value.value =~ /^\d+$/
+        return true
+      end
+      false
+    end
+    
+  end
+end

data/lib/semi/variables/path.rb

@@ -0,0 +1,22 @@
+require_relative 'base'
+
+module Semi::Variables
+  class Path < Semi::Variables::Base
+
+    @@path_re = Regexp.new('^(?<path>(?:\.{1,2}|\/).*?)\/(?<file>[^\/]+)?$')
+
+    def validate
+      self.validate(@value)
+    end
+    
+    def self.validate(value)
+      if ['String', 'Semi::Variables::Path'].include? value.class.to_s
+        if @@path_re.match(value)
+          return true
+        end
+      end
+      false
+    end
+    
+  end
+end

data/lib/semi/variables/string.rb

@@ -0,0 +1,18 @@
+require_relative 'base'
+
+module Semi::Variables
+  class String < Semi::Variables::Base
+
+    def validate
+      self.validate(@value)
+    end
+
+    def self.validate(value)
+      if value.class.to_s == 'String'
+        return true
+      end
+      false
+    end
+    
+  end
+end

data/lib/semi/variables/url.rb

@@ -0,0 +1,22 @@
+require_relative 'base'
+
+module Semi::Variables
+  class Url < Semi::Variables::Base
+
+    @@url_re = Regexp.new('^(?<proto>https?|ftp|file):\/\/(?<host>[a-z\.0-9\-_]+)?(?::(?<port>\d{1,5}))?\/?(?<path>.*?)\/?(?<file>[^\/\?]+)?(?:\?(?<params>.*?))?$', Regexp::IGNORECASE)
+
+    def validate
+      self.validate(@value)
+    end
+    
+    def self.validate(value)
+      if ['String', 'Semi::Variables::Url'].include? value.class.to_s
+        if @@url_re.match(value)
+          return true
+        end
+      end
+      false
+    end
+    
+  end
+end

data/lib/semi/version.rb

@@ -1,3 +1,3 @@
 module Semi
-  version = '0.2.1'
+  version = '0.3.0'
 end

data/lib/semi.rb

@@ -1,4 +1,5 @@
 require 'semi/version'
 require 'semi/config'
 require 'semi/validate'
+require 'semi/variable'
 require 'semi/driver'

data/spec/semi_validator_spec.rb

@@ -16,7 +16,24 @@ describe "Semi::validator" do
     ['foobar',   ['/foo/'],                        true],
     ['foobar',   ['/fubar/'],                      false],
     [nil,        'required',                       false],
-    [nil,        ['required'],                     false]
+    [nil,        ['required'],                     false],
+    ['/etc/passwd', 'path',                        true],
+    ['../parent', ['path'],                        true],
+    ['.005',      'path',                          false],
+    ['http://www.simple.com', 
+                  'url',                           true],
+    ['http://abit.more.complex.com/',
+                  'url',                           true],
+    ['http://www.complex.com:8080/some/page.html',
+                  'url',                           true],
+    ['http://really.complex.com:888/a/lot/of/dirs/1/2/3/4/5/p.json?key=value&key2=val2',
+                  'url',                           true],
+    ['no',        'boolean',                       true],
+    ['false',     'boolean',                       true],
+    ['yes',       'boolean',                       true],
+    ['true',      'boolean',                       true],
+    ['enable',    'boolean',                       true],
+    ['disable',   'boolean',                       true]
    ].each do |ruleset|
     it "validates #{ruleset[0]} against #{ruleset[1]}" do
       if ruleset[2] == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerard Hickey
@@ -82,6 +82,13 @@ files:
 - lib/semi/config.rb
 - lib/semi/driver.rb
 - lib/semi/validate.rb
+- lib/semi/variable.rb
+- lib/semi/variables/base.rb
+- lib/semi/variables/boolean.rb
+- lib/semi/variables/integer.rb
+- lib/semi/variables/path.rb
+- lib/semi/variables/string.rb
+- lib/semi/variables/url.rb
 - lib/semi/version.rb
 - spec/semi_validator_spec.rb
 - spec/spec_helper.rb