guillotine 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## master
+## v1.2.1
+
+* Fix WildcardHostChecker error responses.
+
+## v1.2.0
 
 * Add a simple wildcard host checker.
 

data/guillotine.gemspec

@@ -13,7 +13,7 @@ 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.2.0'
+  s.version           = '1.2.1'
   s.date              = '2012-06-04'
   s.rubyforge_project = 'guillotine'
 

data/lib/guillotine.rb

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

data/lib/guillotine/host_checkers.rb

@@ -11,10 +11,10 @@ module Guillotine
       @all ||= []
     end
 
-    attr_reader :error, :error_response
+    attr_reader :error
 
     def initialize(arg = nil)
-      @error_response = [422, {}, @error]
+      @error_response = nil
     end
 
     def valid?(url)
@@ -22,7 +22,11 @@ module Guillotine
     end
 
     def call(url)
-      @error_response unless valid?(url)
+      error_response unless valid?(url)
+    end
+
+    def error_response
+      @error_response ||= [422, {}, @error]
     end
   end
 

data/test/host_checker_test.rb

@@ -79,7 +79,7 @@ module Guillotine
     end
 
     def test_builds_custom_error
-      assert_match /must be from foo\.com/, checker.error
+      assert_match /must be from foo\.com/, checker.error_response[2]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70351788208980 !ruby/object:Gem::Requirement
+  requirement: &70118903831360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70351788208980
+  version_requirements: *70118903831360
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70351788208520 !ruby/object:Gem::Requirement
+  requirement: &70118903830900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70351788208520
+  version_requirements: *70118903830900
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70351788208140 !ruby/object:Gem::Requirement
+  requirement: &70118903830520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351788208140
+  version_requirements: *70118903830520
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []