cookie_cutter 0.3.1 → 0.3.2

data/lib/cookie_cutter/cookie.rb

@@ -4,15 +4,17 @@ module CookieCutter
   module Cookie
     module ClassMethods
       def find(request)
-        new(request.cookie_jar)
+        new(request.cookie_jar, secure_request: request.scheme == 'https')
       end
 
       attr_reader :cookie_name
+
       def store_as(name)
         @cookie_name = name
       end
 
       attr_reader :cookie_domain
+
       def domain(domain_value)
         @cookie_domain = domain_value
         add_handler do |cookie|
@@ -21,6 +23,7 @@ module CookieCutter
       end
 
       attr_reader :cookie_lifetime
+
       def lifetime(seconds)
         @cookie_lifetime = seconds
         add_handler do |cookie|
@@ -36,7 +39,9 @@ module CookieCutter
       def secure_requests_only
         @secure = true
         add_handler do |cookie|
-          cookie[:secure] = true
+          if cookie[:secure_request]
+            cookie[:secure] = true
+          end
         end
       end
 
@@ -50,11 +55,13 @@ module CookieCutter
           cookie[:httponly] = true
         end
       end
+
       alias_method :httponly, :http_only
 
       def http_only?
         @http_only ? true : false
       end
+
       alias_method :httponly?, :http_only?
 
       def has_attribute(attribute_name, options={})
@@ -96,8 +103,13 @@ module CookieCutter
       klass.extend ClassMethods
     end
 
-    def initialize(cookie_jar)
+    def initialize(cookie_jar, options={})
       @cookie_jar = cookie_jar
+      @secure_request = options[:secure_request]
+    end
+
+    def secure_request?
+      @secure_request.nil? ? true : @secure_request
     end
 
     def value
@@ -109,7 +121,7 @@ module CookieCutter
     end
 
     def value=(val)
-      cookie = { value: val }
+      cookie = {value: val, secure_request: secure_request?}
       self.class.add_options(cookie)
       @cookie_jar[cookie_name] = cookie
     end

data/lib/cookie_cutter/version.rb

@@ -1,3 +1,3 @@
 module CookieCutter
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/base_spec.rb

@@ -91,10 +91,23 @@ describe CookieCutter::Base do
         store_as :cwsro
         secure_requests_only
       end
-      cookie = CookieWithSecureRequestsOnly.new(cookie_jar)
+      options = { secure_request: true }
+      cookie = CookieWithSecureRequestsOnly.new(cookie_jar, options)
       cookie.value = "my value"
       cookie_jar.metadata_for(:cwsro)[:secure].should be_true
     end
+
+    it 'ignores secure_requests_only if set from non-secure url scheme' do
+      class CookieWithSecureRequestsOnly < CookieCutter::Base
+        store_as :cwsro
+        secure_requests_only
+      end
+      options = { secure_request: false }
+      cookie = CookieWithSecureRequestsOnly.new(cookie_jar, options)
+      cookie.value = "my value"
+      cookie_jar.metadata_for(:cwsro)[:secure].should be_nil
+    end
+
   end
   describe 'http_only' do
     it 'defaults to being accessible to client scripts (i.e. not http_only)' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookie_cutter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,21 +96,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2629765522304587425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2629765522304587425
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Provides a way to define the structure, lifetime, and other properties of