sigil 1.1.0 → 2.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sigil (1.1.0)
+    sigil (2.0.0)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/sigil/base.rb

@@ -29,16 +29,15 @@ module Sigil
     end
 
     def verify(provided_signature)
-      raise Sigil::Error, "Params not set" if params.empty?
-      raise Sigil::Error, "Signature not set" if provided_signature.blank?
-
-      signature == provided_signature
+      verify!(provided_signature)
+    rescue Sigil::Error
+      false
     end
 
     def verify!(provided_signature)
-      verified = verify(provided_signature)
-
-      raise Sigil::Error, "Signature does not match" unless verified
+      raise Sigil::Error, "Params not set" if params.empty?
+      raise Sigil::Error, "Signature not set" if provided_signature.blank?
+      raise Sigil::Error, "Signature does not match" unless signature == provided_signature
 
       true
     end

data/lib/sigil/version.rb

@@ -1,3 +1,3 @@
 module Sigil
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/spec/sigil/base_spec.rb

@@ -59,23 +59,27 @@ describe Sigil::Base do
   describe "input verification convenience methods" do
 
     it "should verify against a provided signature" do
-      @sigil.verify(@signature).should == true
+      @sigil.verify(@signature).should be_true
+      @sigil.verify!(@signature).should be_true
     end
 
     it "should verify against a wrong signature" do
-      @sigil.verify("abc").should == false
+      @sigil.verify("abc").should be_false
+      lambda { @sigil.verify!("abc") }.should raise_error(Sigil::Error, /Signature does not match/)
     end
 
     it "should raise an error if no params present" do
       sigil = Sigil::Base.new({}, @key)
-      lambda { sigil.verify("abc") }.should raise_error(Sigil::Error, /Params not set/)
+      sigil.verify("abc").should be_false
+      lambda { sigil.verify!("abc") }.should raise_error(Sigil::Error, /Params not set/)
     end
 
     it "should raise an error if no signature specified" do
       sigil = Sigil::Base.new(@params, @key)
-      lambda { sigil.verify("") }.should raise_error(Sigil::Error, /Signature not set/)
+      sigil.verify("").should be_false
+      lambda { sigil.verify!("") }.should raise_error(Sigil::Error, /Signature not set/)
     end
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sigil
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70215850260340 !ruby/object:Gem::Requirement
+  requirement: &70321865718580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70215850260340
+  version_requirements: *70321865718580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70215850259820 !ruby/object:Gem::Requirement
+  requirement: &70321865717980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70215850259820
+  version_requirements: *70321865717980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70215850259340 !ruby/object:Gem::Requirement
+  requirement: &70321865717240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70215850259340
+  version_requirements: *70321865717240
 description: Signs and verifies a set of parameters
 email:
 - steve@seven.net.nz