iron-web 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0ae26b5b55908940fb087539868211db2c4fe87
-  data.tar.gz: 7a48ab544ab37e93db0d321025e8de437561f26b
+SHA256:
+  metadata.gz: a6764a4ad1a9cb02a61bb112b2c2cbe1f15a834df243016b783343a4c448d8ca
+  data.tar.gz: 19dfff119eb150c98bee372a242ad40e5394e1cef5a488c91be60164a9dca4a6
 SHA512:
-  metadata.gz: 70a20cfa63fe5d761ce8f7435a6d41d7e448d7410804c654f16e5bc7d5418abc4e23613e72e172cbcd0429dbc4998fdad8ea8295626291cae0d59c6b8c2c9545
-  data.tar.gz: f33c36381b5babc95a9b4410368ce6a92fc19d747981712826b8399558fce5602eea16cf51d36487754dc343714ec6c192c0d04f62b358d6c1f037f0c6fa4296
+  metadata.gz: e283a8f8f8d94d12dae3029f26f69fd74e5a5754219f03c0797b0ee3d73452e7f1f02332a9790ab99f8e934409c147b0f4d6832bb38af17712c7b12ca7c969cb
+  data.tar.gz: beb061e2269af5cd42cb62a0a494f8599c0073fbe7ec72ebce98ad72ddebd02bc1f62f9739658e77123e842222fc6f170330838bebc84af3566fdd0a0b795c1b

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.6 / 2018-02-23
+
+* Add ability to set a default port for Url#make_absolute
+
 == 1.1.5 / 2015-09-08
 
 * Remove requirement to require 'iron/web' instead of more obvious 'iron-web'

data/README.rdoc

@@ -18,6 +18,8 @@ A set of classes useful in the generation of HTML content.
     => '/home?key=some+value'
     >> url.make_absolute(false, 'google.com')
     => 'http://google.com/home?key=some+value'
+    >> url.make_absolute(true, 'bing.com', 8080)
+    => 'https://bing.com:8080/home?key=some+value'
 
 * Color - an RGB/A color manipulation class, useful in generating CSS etc.
 

data/Version.txt

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/iron/web/url.rb

@@ -38,6 +38,14 @@ class Url
     @default_server = server
   end
 
+  def self.default_port
+    @default_port
+  end
+  
+  def self.default_port=(port)
+    @default_port = port
+  end
+
   def self.default_scheme
     @default_scheme || 'http'
   end
@@ -220,13 +228,13 @@ class Url
   end
 
   # Ensure url contains a server + scheme section, eg converts '/foo' into 'http://example.com/foo'.
-  def make_absolute(secure = false, server = nil)
+  def make_absolute(secure = false, server = :default, port = :default)
     unless absolute? && secure? == secure
-      raise 'No default server set for Url#make_absolute' unless server || @server || Url.default_server
-      @server ||= (server || Url.default_server)
+      raise 'No default server set for Url#make_absolute' unless server != :default || @server || Url.default_server
+      @server ||= server == :default ? Url.default_server : server
       unless @scheme
         @scheme = Url.default_scheme 
-        @port = nil
+        @port = port == :default ? Url.default_port : port
       end
       if secure
         raise "No secure scheme for scheme #{@scheme} in Url#make_absolute" unless SECURE_SCHEME_MAPPING[@scheme]

data/spec/web/url_spec.rb

@@ -1,5 +1,10 @@
 describe Url do
   
+  before do
+    Url.default_port = nil
+    Url.default_server = nil
+  end
+  
   it 'should parse url paths' do
     {
       '/' => '/',
@@ -100,6 +105,13 @@ describe Url do
     u.make_absolute.should == 'http://irongaze.com/bar'
   end
   
+  it 'should support ports in absolute URL generation' do
+    u = Url.parse('/bar')
+    Url.default_server = 'irongaze.com'
+    Url.default_port = '3000'
+    u.make_absolute.should == 'http://irongaze.com:3000/bar'
+  end
+  
   it 'should allow explicit servers in make_absolute' do
     u = Url.parse('/bob')
     u.make_absolute(true, 'microsoft.com').should == 'https://microsoft.com/bob'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron-web
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Rob Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron-extensions
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Helper classes for generating web content