semi 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d44cc9f0c53b0135a006f573fe9381d69d62528
-  data.tar.gz: 1a820829b1a3fd4be635ba52db765bfa381d11e7
+  metadata.gz: 5ddcfc2b2c39716b3545162f16871750194bd3b4
+  data.tar.gz: 9256ddba7ee653ec38f3d7b5f0be59b9353efa42
 SHA512:
-  metadata.gz: 4e15d06945634ed354e841971024f72951308b9076773447b1d812d5aa1bfe8d708c9ab22f33ec844d30531fd406d982b3261a3fe9e33e5b612049e487a186d0
-  data.tar.gz: a1f596242c41b2b22a9ae182cf7c113f4ee912085c11b5d6ca2eccfad6e5fdb78e299e01860ff24fbbf23993a6a3526a9ee55fbc98fff197b2001ba6cc7fbcf4
+  metadata.gz: 3e59adc27e9693d872d224173daba47be734a609ae5a6679d3b0dc205fd7481cdc7bd69df93e56d80a88fae573ccdadda76f96b4359c3edfe70c017f210d293f
+  data.tar.gz: f6c8f58b7371a8a928740664036309e74a653929c61e99a6df247a3d354555147ad4bb24cf9788c62bffbeec5ce73194a10e9253aa745b00e7143b25bbfff79a

data/lib/semi/variables/base.rb

@@ -12,9 +12,12 @@ module Semi
       end
 
       def to_s
-        @value
+        @value.to_s
       end
       
+      def value
+        @value
+      end
     end
   end
 end

data/lib/semi/variables/boolean.rb

@@ -5,10 +5,15 @@ module Semi::Variables
 
 
     def set(val)
-      # test to see if the value is a common true value
-      if val =~ /true|yes|enable/i
+      if val.instance_of? TrueClass
+        @value = true
+      elsif val.instance_of? FalseClass
+        @value = false
+      elsif val =~ /true|yes|on|enable/i
+        # test to see if the value is a common true value
         @value = true
-      elsif val =~ /false|no|disable/i
+      elsif val =~ /false|no|off|disable/i
+        # test to see if the value is a common false value
         @value = false
       else
         raise Semi::VariableError, "#{val} trying to be set as a boolean"
@@ -18,7 +23,7 @@ module Semi::Variables
     def validate
       self.validate(@value)
     end
-    
+
     def self.validate(value)
       real_value = nil
 
@@ -34,6 +39,74 @@ module Semi::Variables
       end
       false
     end
-    
+
+    def onoff
+      if @value
+        'on'
+      else
+        'off'
+      end
+    end
+
+    def ONOFF
+      onoff.upcase
+    end
+
+    def OnOff
+      onoff.capitalize
+    end
+
+
+    def yesno()
+      if @value
+        'yes'
+      else
+        'no'
+      end
+    end
+
+    def YESNO
+      yesno.upcase
+    end
+
+    def YesNo
+      yesno.capitalize
+    end
+
+
+    def enabledisable
+      if @value
+        'enable'
+      else
+        'disable'
+      end
+    end
+
+    def ENABLEDISABLE
+      enabledisable.upcase
+    end
+
+    def EnableDisable
+      enabledisable.capitalize
+    end
+
+
+    def truefalse
+      if @value
+        'true'
+      else
+        'false'
+      end
+    end
+
+    def TRUEFALSE
+      truefalse.upcase
+    end
+
+    def TrueFalse
+      truefalse.capitalize
+    end
   end
+
+
 end

data/lib/semi/variables/path.rb

@@ -3,7 +3,15 @@ require_relative 'base'
 module Semi::Variables
   class Path < Semi::Variables::Base
 
-    @@path_re = Regexp.new('^(?<path>(?:\.{1,2}|\/).*?)\/(?<file>[^\/]+)?$')
+    @@path_re = Regexp.new('^(?<path>(?:\/|\.{1,2}\/|~(?:[a-z_][a-z0-9_]{0,30})?\/?|[^~][^\/\000]+\/)*?)(?<file>[^\/\000]+)?$')
+
+    def initialize(val)
+      if @@path_re.match(val)
+        @value = val
+      else
+        raise Semi::VariableError, '#{val} does not look like a path'
+      end
+    end
 
     def validate
       self.validate(@value)
@@ -18,5 +26,19 @@ module Semi::Variables
       false
     end
     
+    def path
+      match = @@path_re.match(@value)
+      if match 
+        match['path']
+      end
+    end
+
+    def file
+      match = @@path_re.match(@value)
+      if match 
+        match['file']
+      end
+    end
+
   end
 end

data/lib/semi/variables/url.rb

@@ -3,20 +3,70 @@ 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)
+    @@url_re = Regexp.new('^(?<proto>https?|ftp):\/{2}(?!\/)(?<host>[a-z\.0-9\-_]+)?(?::(?<port>\d{1,5}))?\/?(?<path>.*?)\/?(?<file>[^\/\?]+)?(?:\?(?<params>.*?))?$', Regexp::IGNORECASE)
+
+    def initialize(val)
+      if @@url_re.match(val)
+        @value = val
+      else
+        raise Semi::VariableError, '#{val} does not look like a URL'
+      end
+    end
 
     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)
+
+    def self.validate(val)
+      if ['String', 'Semi::Variables::Url'].include? val.class.to_s
+        if @@url_re.match(val)
           return true
         end
       end
       false
     end
+
+
+    def proto
+      match = @@url_re.match(@value)
+      if match 
+        match['proto']
+      end
+    end
     
+    def host
+      match = @@url_re.match(@value)
+      if match 
+        match['host']
+      end
+    end
+
+    def port
+      match = @@url_re.match(@value)
+      if match 
+        match['port']
+      end
+    end
+
+    def path
+      match = @@url_re.match(@value)
+      if match 
+        match['path']
+      end
+    end
+
+    def file
+      match = @@url_re.match(@value)
+      if match 
+        match['file']
+      end
+    end
+
+    def params
+      match = @@url_re.match(@value)
+      if match 
+        match['params']
+      end
+    end
   end
 end

data/lib/semi/version.rb

@@ -1,3 +1,3 @@
 module Semi
-  version = '0.3.1'
+  version = '0.3.2'
 end

data/spec/semi_validator_spec.rb

@@ -19,7 +19,10 @@ describe "Semi::validator" do
     [nil,        ['required'],                     false],
     ['/etc/passwd', 'path',                        true],
     ['../parent', ['path'],                        true],
-    ['.005',      'path',                          false],
+    ['.005',      'path',                          true],
+    ['file.name', 'path',                          true],
+    ['~user',     'path',                          true],
+    ['~user/dir/file', 'path',                     true],
     ['http://www.simple.com', 
                   'url',                           true],
     ['http://abit.more.complex.com/',

data/spec/semi_variables_boolean_spec.rb

@@ -0,0 +1,145 @@
+require 'spec_helper'
+
+describe Semi::Variables::Boolean do
+
+  [
+    # test value,  real value
+    [true,         true],
+    [false,        false],
+    ['true',       true],
+    ['yes',        true],
+    ['on',         true],
+    ['enable',     true],
+    ['false',      false],
+    ['no',         false],
+    ['off',        false],
+    ['disable',    false]
+  ].each do |test|
+    it "set '#{test[0]}' as #{test[1]}" do
+      expect(Semi::Variables::Boolean.new(test[0]).value).to eq test[1]
+    end
+  end
+
+  [
+    # test value,  exception?
+    ['true',       'not raise'],
+    ['false',      'not raise'],
+    ['foo',        'raise'],
+    ['bar',        'raise'],
+    ['1',          'raise'],
+    ['0',          'raise'],
+    [1,            'raise'],
+    [0,            'raise'],
+    [nil,          'raise']
+  ].each do |test|
+    it "set '#{test[0]}' to #{test[1]} exception" do
+      if test[1] == 'raise'
+        expect{Semi::Variables::Boolean.new(test[0])}.to raise_error(Semi::VariableError)
+      else
+        expect{Semi::Variables::Boolean.new(test[0])}.not_to raise_error
+      end
+    end
+  end
+
+  ##
+  # Test variable specific output methods
+  let (:on)  {Semi::Variables::Boolean.new('true')}
+  let (:off) {Semi::Variables::Boolean.new('false')}
+
+  it "#onoff returns 'on'" do
+    expect(on.onoff).to eq 'on'
+  end
+
+  it "#ONOFF returns 'ON'" do
+    expect(on.ONOFF).to eq 'ON'
+  end
+
+  it "#OnOff returns 'On'" do
+    expect(on.OnOff).to eq 'On'
+  end
+
+  it "#onoff returns 'off'" do
+    expect(off.onoff).to eq 'off'
+  end
+
+  it "#ONOFF returns 'OFF'" do
+    expect(off.ONOFF).to eq 'OFF'
+  end
+
+  it "#OnOff returns 'Off'" do
+    expect(off.OnOff).to eq 'Off'
+  end
+
+  it "#yesno returns 'yes'" do
+    expect(on.yesno).to eq 'yes'
+  end
+
+  it "#YESNO returns 'YES'" do
+    expect(on.YESNO).to eq 'YES'
+  end
+
+  it "#YesNo returns 'Yes'" do
+    expect(on.YesNo).to eq 'Yes'
+  end
+
+  it "#yesno returns 'no'" do
+    expect(off.yesno).to eq 'no'
+  end
+
+  it "#YESNO returns 'NO'" do
+    expect(off.YESNO).to eq 'NO'
+  end
+
+  it "#YesNo returns 'No'" do
+    expect(off.YesNo).to eq 'No'
+  end
+
+  it "#enabledisable returns 'enable'" do
+    expect(on.enabledisable).to eq 'enable'
+  end
+  
+  it "#ENABLEDISABLE returns 'ENABLE'" do
+    expect(on.ENABLEDISABLE).to eq 'ENABLE'
+  end
+
+  it "#EnableDisable returns 'Enable'" do
+    expect(on.EnableDisable).to eq 'Enable'
+  end
+
+  it "#enabledisable returns 'disable'" do
+    expect(off.enabledisable).to eq 'disable'
+  end
+  
+  it "#ENABLEDISABLE returns 'DISABLE'" do
+    expect(off.ENABLEDISABLE).to eq 'DISABLE'
+  end
+
+  it "#EnableDisable returns 'Disable'" do
+    expect(off.EnableDisable).to eq 'Disable'
+  end
+
+  it "#truefalse returns 'true'" do
+    expect(on.truefalse).to eq 'true'
+  end
+
+  it "#TRUEFALSE returns 'TRUE'" do
+    expect(on.TRUEFALSE).to eq 'TRUE'
+  end
+
+  it "#TrueFalse returns 'True'" do
+    expect(on.TrueFalse).to eq 'True'
+  end
+
+  it "#truefalse returns 'false'" do
+    expect(off.truefalse).to eq 'false'
+  end
+
+  it "#TRUEFALSE returns 'FALSE'" do
+    expect(off.TRUEFALSE).to eq 'FALSE'
+  end
+
+  it "#TrueFalse returns 'False'" do
+    expect(off.TrueFalse).to eq 'False'
+  end
+
+end

data/spec/semi_variables_path_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Semi::Variables::Path do
+
+  [
+    # Test string,
+    '/',
+    '/bin',
+    '/usr/local/bin/csh',
+    '~user',
+    '~/.bashrc',
+    '~looser/plan.txt',
+    './test',
+    '../../usr/bin/foobar',
+    '.././.././test-file',
+    '/tmp/backup~',
+    '/home/user/.git/config',
+    'sub/directory/file.txt',
+  ].each do |test|
+    it "stores '#{test}' correctly" do
+      expect(Semi::Variables::Path.new(test).value).to eq test
+    end
+  end
+  
+  # Currently the regex used to identify paths allows almost 
+  # any string.
+  #[
+  #  'foo.txt',
+  #].each do |test|
+  #  it "rejects '#{test}'" do
+  #    expect{Semi::Variables::Path.new(test)}.to raise_error(Semi::VariableError)
+  #  end
+  #end
+
+  context "with relative paths" do
+    let (:path)  {Semi::Variables::Path.new('../some/dir/file.txt')}
+
+    it "#path returns ../some/dir/" do
+      expect(path.path).to eq '../some/dir/'
+    end
+  
+    it "#file returns file.text" do
+      expect(path.file).to eq 'file.txt'
+    end
+  end
+
+  context "with absolute paths" do
+    let (:path)  {Semi::Variables::Path.new('/some/dir/file.txt')}
+
+    it "#path returns /some/dir/" do
+      expect(path.path).to eq '/some/dir/'
+    end
+  
+    it "#file returns file.text" do
+      expect(path.file).to eq 'file.txt'
+    end
+  end
+
+  context "with partial paths" do
+    let (:path)  {Semi::Variables::Path.new('some/dir/file.txt')}
+
+    it "#path returns some/dir/" do
+      expect(path.path).to eq 'some/dir/'
+    end
+  
+    it "#file returns file.text" do
+      expect(path.file).to eq 'file.txt'
+    end
+  end
+end

data/spec/semi_variables_url_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Semi::Variables::Url do
+
+  [
+    # Test string,                          pass?
+    ['http://web.com',                      'http://web.com'],
+    ['http://web.com/',                     'http://web.com/'],
+    ['https://www.help.org',                'https://www.help.org'],
+    ['ftp://ftp.org/foo',                   'ftp://ftp.org/foo'],
+    ['http://host.com:8080/',               'http://host.com:8080/'],
+    ['http://www/',                         'http://www/'],
+    ['http://some.host.com/page.html',      'http://some.host.com/page.html'],
+    ['http://a.com/page?key=val',           'http://a.com/page?key=val']
+  ].each do |test|
+    it "set '#{test[0]}' as #{test[1]}" do
+      expect(Semi::Variables::Url.new(test[0]).value).to eq test[1]
+    end
+  end
+  
+  [
+    'htt://www.host.com',
+    'https:///foo.bar.com/',
+    'file:///some/file/path/doc.txt',
+  ].each do |test|
+    it "rejects '#{test}'" do
+      expect{Semi::Variables::Url.new(test)}.to raise_error(Semi::VariableError)
+    end
+  end
+
+  let (:url)  {Semi::Variables::Url.new('https://www:994/short/path/file.name?q=foo&e=bar')}
+
+  it "#proto returns https" do
+    expect(url.proto).to eq 'https'
+  end
+  
+  it "#host returns www" do
+    expect(url.host).to eq 'www'
+  end
+  
+  it "#port returns 994" do
+    expect(url.port).to eq '994'
+  end
+  
+  it "#path returns short/path" do
+    expect(url.path).to eq 'short/path'
+  end
+  
+  it "#file returns file.name" do
+    expect(url.file).to eq 'file.name'
+  end
+  
+  it "#params returns q=foo&e=bar" do
+    expect(url.params).to eq 'q=foo&e=bar'
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Gerard Hickey
@@ -91,6 +91,9 @@ files:
 - lib/semi/variables/url.rb
 - lib/semi/version.rb
 - spec/semi_validator_spec.rb
+- spec/semi_variables_boolean_spec.rb
+- spec/semi_variables_path_spec.rb
+- spec/semi_variables_url_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hickey/semi
 licenses: []