hwacha 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db9188491e5762e93306d3fb87df48855322ee4
-  data.tar.gz: 849b5056ecb3e715e3d8dd5e6df7377df14c325f
+  metadata.gz: 884f21ac66ab0773bec6d88e5c72661219f90f28
+  data.tar.gz: 5bafab080d51c358950b527fd5f23c882c5141a0
 SHA512:
-  metadata.gz: 7e9ff6ec0f1bc4138170a857e1da3343f2ea1509ecd08a56df1f9e5e5edfbc95113b462d6ea59a1848cc54d06b80ab182841726ce733644c13efdb77063130f5
-  data.tar.gz: c3f9987340c8986f5ec36585c7eb072f798d79380d6e97a09d7fd942c2eb2e368d7fd9b11759cacbe22b7f7b42737d9bfe1857d03b1e646ae072c2952fc585e1
+  metadata.gz: 8bdf95bb35cde8f1293bb60fd51609e77c0e650a350ae48c1760ac617dff69dfe4279cda1e26e97359353d639da984e99f2ca257ab0e396c3e0b354eade8b10b
+  data.tar.gz: 2d8e01e0fd1bdae865236d1ed4436918f9b2a86311b6d808ed25f2d63d0a03aa97859c57aff37439dce03603932b824ab8d4be54ed76e3f50988bf65c9b8912f

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hwacha (1.0.1)
+    hwacha (1.0.2)
       typhoeus
 
 GEM

data/README.md

@@ -1,4 +1,4 @@
-# Hwacha [![Build Status](https://travis-ci.org/sdball/hwacha.png?branch=master)](https://travis-ci.org/sdball/hwacha)
+# Hwacha [![Build Status](https://travis-ci.org/sdball/hwacha.png?branch=master)](https://travis-ci.org/sdball/hwacha) [![Gem Version](https://badge.fury.io/rb/hwacha.png)](http://badge.fury.io/rb/hwacha)
 
 Hwacha! Harness the power of Typhoeus to quickly check webpage responses.
 

data/lib/hwacha/config.rb

@@ -20,8 +20,10 @@ class Hwacha
     end
 
     def follow_redirects_option
-      return { :followlocation => false } if follow_redirects.nil?
-      { :followlocation => !!follow_redirects }
+      followlocation = false
+      followlocation = !!ricochet unless ricochet.nil?
+      followlocation = !!follow_redirects unless follow_redirects.nil?
+      { :followlocation => followlocation }
     end
   end
 end

data/lib/hwacha/version.rb

@@ -1,3 +1,3 @@
 class Hwacha
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/lib/hwacha/config_spec.rb

@@ -25,18 +25,38 @@ describe Hwacha::Config do
   end
 
   describe "#request_options" do
-    context "when follow_redirects option is set" do
-      let(:follow_redirects) { true }
-      let(:follow_redirects_option) do
-        { :followlocation => follow_redirects }
+    context "when follow_redirects option is true" do
+      before do
+        subject.follow_redirects = true
       end
 
-      before do
-        subject.follow_redirects = follow_redirects
+      it "exports followlocation as true" do
+        expect(subject.request_options.fetch(:followlocation)).to be_true
+      end
+    end
+
+    context "when follow_redirects option is not set" do
+      it "exports followlocation as false" do
+        expect(subject.request_options.fetch(:followlocation)).to be_false
+      end
+    end
+
+    context "when follow_redirects option is false" do
+      it "exports followlocation as false" do
+        expect(subject.request_options.fetch(:followlocation)).to be_false
+      end
+    end
+
+    context "when ricochet is set" do
+      it "treats ricochet as an alias for follow_redirects" do
+        subject.ricochet = true
+        expect(subject.request_options.fetch(:followlocation)).to be_true
       end
 
-      it "exports as followlocation in a hash" do
-        expect(subject.request_options).to include follow_redirects_option
+      it "has a lower precedence than setting follow_redirects" do
+        subject.ricochet = true
+        subject.follow_redirects = false
+        expect(subject.request_options.fetch(:followlocation)).to be_false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hwacha
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen Ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock