guillotine 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d986d69f6fe67b818ddff9840da0152fb162612
-  data.tar.gz: 88999b8313a3bd1a28e501bebc63cf40d67e839f
+  metadata.gz: 71f791dc9ce8bba78a3987b80c7f0547de7083cb
+  data.tar.gz: 1df76ed34aecaaec28587ba9c7344e3bcdc94743
 SHA512:
-  metadata.gz: 112f961035b5e0fcbcb1ba45ad5a91e062bbc9db84cee403426ad814758fa0313834e48612a92fabd0e16c6f858b1cdc164b83fb729874fdce5d78a1ea43e6a1
-  data.tar.gz: f46526621c883b5f307fa1547994f31cea2ce274b70159a8901db0fc5d646935ddff93e4067f3fea120a7abc027ca182019db55fbfc5ef3c3e76017b225fe782
+  metadata.gz: 491e0384c4c3351a5581d5c43e494f3c4d4b3cfa6672282d6c88a7b98a9aaa06b8cada82f21eaa63641c85bbd769570fdf7e8de0ba25701acfc071df8ed27515
+  data.tar.gz: b85366ea7bd8f2bda6f655f71162e6abb98a4bf3128fdaca9e2dfc07a989c55329c69695e6022f9c90e54cc5ca03e2758e67bb90dbf6afcfa940653e885fa761

data/guillotine.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'guillotine'
-  s.version           = '1.4.1'
-  s.date              = '2014-12-23'
+  s.version           = '1.4.2'
+  s.date              = '2015-01-22'
   s.rubyforge_project = 'guillotine'
 
   ## Make sure your summary is short. The description may be as long

data/lib/guillotine.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 
   class Error < StandardError
   end

data/lib/guillotine/service.rb

@@ -18,7 +18,7 @@ module Guillotine
             opt[key] = value
           end
           opt
-        when self then value
+        when Options then value
         else
           raise ArgumentError, "Unable to convert to Options: #{value.inspect}"
         end

data/test/service_test.rb

@@ -123,6 +123,115 @@ module Guillotine
       assert_equal 201, status
     end
 
+    def test_options_from_nil
+      options = Service::Options.from(nil)
+      assert_nil options.required_host
+      assert_nil options.strip_query
+      assert_nil options.strip_anchor
+      assert_nil options.length
+      assert_nil options.charset
+      assert_nil options.default_url
+    end
+
+    def test_options_from_empty_string
+      options = Service::Options.from("")
+      assert_nil options.required_host
+      assert_nil options.strip_query
+      assert_nil options.strip_anchor
+      assert_nil options.length
+      assert_nil options.charset
+      assert_nil options.default_url
+    end
+
+    def test_options_from_string
+      options = Service::Options.from("ok")
+      assert_equal "ok", options.required_host
+      assert_nil options.strip_query
+      assert_nil options.strip_anchor
+      assert_nil options.length
+      assert_nil options.charset
+      assert_nil options.default_url
+    end
+
+    def test_options_from_hash
+      options = Service::Options.from(
+        :required_host => "ok",
+        :strip_query => "a",
+        :strip_anchor => "b",
+        :length => "c",
+        :charset => "d",
+        :default_url => "e"
+      )
+      assert_equal "ok", options.required_host
+      assert_equal "a", options.strip_query
+      assert_equal "b", options.strip_anchor
+      assert_equal "c", options.length
+      assert_equal "d", options.charset
+      assert_equal "e", options.default_url
+    end
+
+    def test_options_from_options
+      options = Service::Options.from(
+        :required_host => "ok",
+        :strip_query => "a",
+        :strip_anchor => "b",
+        :length => "c",
+        :charset => "d",
+        :default_url => "e"
+      )
+
+      options = Service::Options.from(options)
+
+      assert_equal "ok", options.required_host
+      assert_equal "a", options.strip_query
+      assert_equal "b", options.strip_anchor
+      assert_equal "c", options.length
+      assert_equal "d", options.charset
+      assert_equal "e", options.default_url
+    end
+
+    def test_options_from_options_sub_class
+      klass = Class.new(Service::Options)
+      options = klass.from(
+        :required_host => "ok",
+        :strip_query => "a",
+        :strip_anchor => "b",
+        :length => "c",
+        :charset => "d",
+        :default_url => "e"
+      )
+
+      options = Service::Options.from(options)
+
+      assert_equal "ok", options.required_host
+      assert_equal "a", options.strip_query
+      assert_equal "b", options.strip_anchor
+      assert_equal "c", options.length
+      assert_equal "d", options.charset
+      assert_equal "e", options.default_url
+    end
+
+    def test_options_to_options_sub_class
+      klass = Class.new(Service::Options)
+      options = Service::Options.from(
+        :required_host => "ok",
+        :strip_query => "a",
+        :strip_anchor => "b",
+        :length => "c",
+        :charset => "d",
+        :default_url => "e"
+      )
+
+      options = klass.from(options)
+
+      assert_equal "ok", options.required_host
+      assert_equal "a", options.strip_query
+      assert_equal "b", options.strip_anchor
+      assert_equal "c", options.length
+      assert_equal "d", options.charset
+      assert_equal "e", options.default_url
+    end
+
     def test_fixed_charset_code
       @db = MemoryAdapter.new
       length = 4
@@ -141,4 +250,3 @@ module Guillotine
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra