proxy_pac_rb 0.2.4 → 0.2.5

data/files/sample2.pac

@@ -1,5 +1,5 @@
 function FindProxyForURL(url, host) {
-  if ( MyIpAddress() == '127.0.0.2' ) {
+  if ( myIpAddress() == '127.0.0.2' ) {
     return "DIRECT";
   } else {
     return "PROXY localhost:8080";

data/lib/proxy_pac_rb/environment.rb

@@ -28,12 +28,8 @@ module ProxyPacRb
         :isResolvable,
         :isInNet,
         :dnsResolve,
-#        :MyIpAddress ,
         :dnsDomainLevels,
         :shExpMatch,
-#        :weekdayRange,
-#        :dateRange,
-#        :timeRange,
       ]
     end
 
@@ -65,10 +61,6 @@ module ProxyPacRb
       resolve_host(host)
     end
 
-    def myIpAddress 
-      IPAddr.new(client_ip).to_s
-    end
-
     def dnsDomainLevels(host)
       host.scan(".").size
     end
@@ -77,90 +69,8 @@ module ProxyPacRb
       ::File.fnmatch(shexp, str)
     end
 
-    def weekdayRange(wd1, wd2 = nil, gmt = nil)
-      fail Exceptions::InvalidArgument, "wd1 needs to be one of #{days.keys.collect {|k| "\"#{k}\""}.join(', ')}" unless days.key?(wd1)
-      fail Exceptions::InvalidArgument, "wd2 needs to be one of #{days.keys.collect {|k| "\"#{k}\""}.join(', ')}" if wd2 and !days.key?(wd2)
-
-      if gmt == "GMT"
-        local_time = time.utc 
-      else
-        local_time = time
-      end
-
-      (days[wd1]..days[wd2 || wd1]).include? local_time.wday
-    end
-
-    def dateRange(*args)
-      fail Exceptions::InvalidArgument, "range needs to be one of #{months.keys.collect {|k| "\"#{k}\""}.join(', ')}" if args.any? { |a| !months.key?(a)  }
-
-      if args.last == "GMT" and args.pop
-        local_time = time.utc 
-      else
-        local_time = time
-      end
-
-      case args.size
-      when 1
-        check_date_part(local_time, args[0])
-      when 2
-        check_date_part(local_time, args[0]..args[1])
-      when 4
-        check_date_part(local_time, args[0]..args[2]) and
-          check_date_part(local_time, args[1]..args[3])
-      when 6
-        check_date_part(local_time, args[0]..args[3]) and
-          check_date_part(local_time, args[1]..args[4]) and
-          check_date_part(local_time, args[2]..args[5])
-      else
-        fail ArgumentError, "wrong number of arguments"
-      end
-    end
-
-    def timeRange(*args)
-      fail Exceptions::InvalidArgument, "args need to be integer values" if args.any? { |a| !a.kind_of? Fixnum }
-
-      if args.last == "GMT" and args.pop
-        local_time = time.utc 
-      else
-        local_time = time
-      end
-
-      case args.size
-      when 1
-        local_time.hour == args[0]
-      when 2
-        (args[0]..args[1]).include? local_time.hour
-      when 4
-        (args[0]..args[2]).include? local_time.hour and
-          (args[1]..args[3]).include? local_time.min
-      when 6
-        (args[0]..args[3]).include? local_time.hour and
-          (args[1]..args[4]).include? local_time.min  and
-          (args[2]..args[5]).include? local_time.sec
-      else
-        fail ArgumentError, "wrong number of arguments"
-      end
-    end
-
     private
 
-    def check_date_part(time, part, operation = :==)
-      case part
-      when String
-        time.month.send(operation, months[part])
-      when Integer
-        if part < 100
-          time.day.send(operation, part)
-        else
-          time.year.send(operation, part)
-        end
-      when Range
-        check_date_part(time, part.begin, :>=) and check_date_part(time, part.end, :<=)
-      else
-        fail ArgumentError, "wrong type"
-      end
-    end
-
     def resolve_host(host)
       Resolv.each_address(host) do |address|
         begin

data/lib/proxy_pac_rb/proxy_pac_js.rb

@@ -4,7 +4,7 @@ module ProxyPacRb
     class << self
       def my_ip_address_template(value)
         <<-EOS.strip_heredoc
-          function MyIpAddress() {
+          function myIpAddress() {
             return "#{value}";
           }
         EOS

data/lib/proxy_pac_rb/version.rb

@@ -1,4 +1,4 @@
 #main ProxyPacRb
 module ProxyPacRb
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/spec/environment_spec.rb

@@ -77,15 +77,6 @@ describe ProxyPacRb::Environment do
     end
   end
 
-  describe '#myIpAddress ' do
-    it 'returns the given ip address' do
-      ip = '127.0.0.1'
-      environment = Environment.new(client_ip: ip, time: Time.now)
-
-      expect(environment.myIpAddress).to eq(ip)
-    end
-  end
-
   describe '#dnsDomainLevels' do
     it 'returns the count of domain levels (dots)' do
       result = environment.dnsDomainLevels('maps.google.com')
@@ -105,67 +96,6 @@ describe ProxyPacRb::Environment do
     end
   end
 
-  describe '#weekdayRange' do
-    let(:environment) { Environment.new(client_ip: '127.0.0.1', time: Time.parse('1991-08-25 12:00')) }
-
-    it 'returns true for SUN - MON' do
-      result = environment.weekdayRange("SUN", "MON")
-      expect(result).to be_true
-    end
-
-    it 'returns false for FR' do
-      result = environment.weekdayRange("FRI")
-      expect(result).to be_false
-    end
-
-    it 'fails if wd1 or wd2 are not valid, e.g. German SO for Sunday' do
-      expect {
-        environment.weekdayRange("SO")
-      }.to raise_error Exceptions::InvalidArgument
-    end
-
-  end
-
-  describe '#dateRange' do
-    let(:environment) { Environment.new(client_ip: '127.0.0.1', time: Time.parse('1991-08-25 12:00')) }
-
-    it 'returns true for JUL - SEP' do
-      result = environment.dateRange("JUL", "SEP")
-      expect(result).to be_true
-    end
-
-    it 'returns false for MAR' do
-      result = environment.dateRange("MAR")
-      expect(result).to be_false
-    end
-
-    it 'fails if range is not valid' do
-      expect {
-        environment.dateRange("SEPT")
-      }.to raise_error Exceptions::InvalidArgument
-    end
-  end
-
-  describe '#timeRange' do
-    let(:environment) { Environment.new(client_ip: '127.0.0.1', time: Time.parse('1991-08-25 12:00')) }
-
-    it 'returns true for 8 - 18h' do
-      result = environment.timeRange(8, 18)
-      expect(result).to be_true
-    end
-
-    it 'returns false for MAR' do
-      result = environment.timeRange(13,14)
-      expect(result).to be_false
-    end
-
-    it 'fails if range is not valid' do
-      expect {
-        environment.timeRange("SEPT")
-      }.to raise_error Exceptions::InvalidArgument
-    end
-  end
-
   describe '#alert' do
     it 'outputs msg' do
       result = capture(:stderr) do
@@ -182,7 +112,7 @@ describe ProxyPacRb::Environment do
       environment.prepare(string)
 
       %w[
-      MyIpAddress
+      myIpAddress
       weekdayRange
       dateRange
       timeRange

data/spec/file_spec.rb

@@ -13,7 +13,7 @@ describe File do
   let(:client_ip_pac) do 
     <<-EOS.strip_heredoc
       function FindProxyForURL(url, host) {
-        if ( MyIpAddress() == '127.0.0.2' ) {
+        if ( myIpAddress() == '127.0.0.2' ) {
           return "DIRECT";
         } else {
           return "PROXY localhost:8080";

data/spec/parser_spec.rb

@@ -35,7 +35,7 @@ describe ProxyPacRb::Parser do
     it 'supports a changeable ip address' do
       string = <<-EOS
       function FindProxyForURL(url, host) {
-        if ( MyIpAddress() == '127.0.0.2' ) {
+        if ( myIpAddress() == '127.0.0.2' ) {
           return "DIRECT";
         } else {
           return "PROXY localhost:8080";

data/tmp/script.rb

@@ -5,7 +5,7 @@ require 'proxy_pac_rb'
 
 string = <<-EOS
 function FindProxyForURL(url, host) {
-  if ( MyIpAddress() == '127.0.0.2' ) {
+  if ( myIpAddress() == '127.0.0.2' ) {
     return "DIRECT";
   } else {
     return "PROXY localhost:8080";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2077589213194333842
+      hash: 2846235873076525490
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2077589213194333842
+      hash: 2846235873076525490
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23