protocool 0.0.3 → 0.1.0

data/lib/protocool.rb

@@ -13,8 +13,9 @@ module Protocool
   private
 
   def use_ssl?
-    # *Possibly* add "test environment" as an exception as well.
-    # But staging and production must really have SSL!
-    !Rails.env.development?
+    # Let the Rails config decide
+    return true if Rails.application.config.force_ssl
+    # Otherwise use default
+    !Rails.env.development? && !Rails.env.test?
   end
 end

data/lib/protocool/version.rb

@@ -1,8 +1,8 @@
 module Protocool
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 3
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/spec/lib/protocool_spec.rb

@@ -2,40 +2,84 @@ require 'spec_helper'
 
 describe Protocool do
 
-  let(:dev_env)     { mock(:environment, development?: true) }
-  let(:another_env) { mock(:environment, development?: false) }
-  let(:protocool)   { Protocool }
+  let(:protocool) { Protocool }
 
-  before do
-    Rails.stub!(:env).and_return another_env
-  end
+  context 'if force_ssl is set' do
+    before do
+      Rails.stub_chain(:application, :config, :force_ssl).and_return true
+    end
 
-  describe '.https' do
-    it 'uses HTTPS by default' do
-      protocool.https.should == 'https'
+    describe '.https' do
+      it 'uses TLS' do
+        protocool.https.should == 'https'
+      end
     end
-  end
 
-  describe '.protocol' do
-    it 'is the HTTPS protocol' do
-      protocool.protocol.should == 'https://'
+    describe '.protocol' do
+      it 'uses TLS' do
+        protocool.protocol.should == 'https://'
+      end
     end
   end
 
-  context 'in development environment' do
-    before { Rails.stub!(:env).and_return dev_env }
+  context 'if force_ssl is not set' do
+    before do
+      Rails.stub_chain(:application, :config, :force_ssl).and_return false
+    end
 
-    describe '.https' do
-      it 'uses HTTP' do
-        protocool.https.should == 'http'
+    context 'in development mode' do
+      before do
+        Rails.stub!(:env).and_return mock(:environment, development?: true)
+      end
+
+      describe '.https' do
+        it 'does not use TLS' do
+          protocool.https.should == 'http'
+        end
+      end
+
+      describe '.protocol' do
+        it 'does not use TLS' do
+          protocool.protocol.should == 'http://'
+        end
       end
     end
 
-    describe '.protocol' do
-      it 'is the HTTP protocol' do
-        protocool.protocol.should == 'http://'
+    context 'in test mode' do
+      before do
+        Rails.stub!(:env).and_return mock(:environment, development?: false, test?: true)
+      end
+
+      describe '.https' do
+        it 'does not use TLS' do
+          protocool.https.should == 'http'
+        end
+      end
+
+      describe '.protocol' do
+        it 'does not use TLS' do
+          protocool.protocol.should == 'http://'
+        end
       end
     end
-  end
 
+    context 'in non-dev and non-test mode' do
+      before do
+        Rails.stub!(:env).and_return mock(:environment, development?: false, test?: false)
+      end
+
+      describe '.https' do
+        it 'uses TLS' do
+          protocool.https.should == 'https'
+        end
+      end
+
+      describe '.protocol' do
+        it 'uses TLS' do
+          protocool.protocol.should == 'https://'
+        end
+      end
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocool
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec