cookie_cutter 0.3.2 → 0.3.3

data/cookie_cutter.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'activesupport' #for date helpers
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-mocks'
 end

data/lib/cookie_cutter/cookie.rb

@@ -3,8 +3,9 @@ require 'cookie_cutter/cookie_attribute'
 module CookieCutter
   module Cookie
     module ClassMethods
-      def find(request)
-        new(request.cookie_jar, secure_request: request.scheme == 'https')
+      def find(request, options={})
+        options[:secure_request] = request.scheme == 'https' unless options[:secure_request]
+        new(request.cookie_jar, options)
       end
 
       attr_reader :cookie_name
@@ -106,6 +107,7 @@ module CookieCutter
     def initialize(cookie_jar, options={})
       @cookie_jar = cookie_jar
       @secure_request = options[:secure_request]
+      @cookie_name = options[:cookie_name] || self.class.cookie_name
     end
 
     def secure_request?
@@ -133,7 +135,7 @@ module CookieCutter
     end
 
     def cookie_name
-      self.class.cookie_name
+      @cookie_name
     end
 
     def secure?

data/lib/cookie_cutter/version.rb

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

data/spec/base_spec.rb

@@ -3,6 +3,9 @@ require 'cookie_cutter'
 require 'cookie_cutter/test_support'
 require 'active_support/core_ext'
 
+class EmptyValuedCookie < CookieCutter::Base
+end
+
 class SingleValuedCookie < CookieCutter::Base
   store_as :svc
 end
@@ -22,10 +25,24 @@ end
 
 describe CookieCutter::Base do
   let(:cookie_jar) { CookieCutter::TestSupport::FakeCookieJar.new }
-  it 'should not not update the cookie_jar when no value is set' do
+  it 'should not update the cookie_jar when no value is set' do
     SingleValuedCookie.new(cookie_jar)
     cookie_jar.to_hash.should be_empty
   end
+  describe 'name' do
+    it 'uses defined cookie name' do
+      request = double('http_request', scheme: 'https', cookie_jar: cookie_jar)
+      cookie = SingleValuedCookie.find(request)
+      cookie.cookie_name.should == :svc
+    end
+    legacy_cookie = :getty_cookie
+    let(:legacy_cookie_jar) { CookieCutter::TestSupport::FakeCookieJar.new({cookie_name: legacy_cookie}) }
+    it 'uses cookie name in cookie_jar' do
+      request = double('http_request', scheme: 'https', cookie_jar: legacy_cookie_jar)
+      cookie = EmptyValuedCookie.find(request, {cookie_name: legacy_cookie})
+      cookie.cookie_name.should == legacy_cookie
+    end
+  end
   describe 'domain' do
     it 'does not set domain if not given' do
       class CookieWithNoDomain < CookieCutter::Base
@@ -160,8 +177,8 @@ describe CookieCutter::Base do
       multi_valued_cookie.value2.should == "myval2"
     end
     it "privatizes the singular 'value' getter and setter" do
-      expect { multi_valued_cookie.value = "myval"}.should raise_error(NoMethodError)
-      expect { multi_valued_cookie.value}.should raise_error(NoMethodError)
+      expect { multi_valued_cookie.value = "myval"}.to raise_error(NoMethodError)
+      expect { multi_valued_cookie.value }.to raise_error(NoMethodError)
     end
     it "can override stored attribute name with :store_as option" do
       multi_valued_cookie.value2 = "myval2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookie_cutter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a way to define the structure, lifetime, and other properties
   of a cookie all in one place.
 email:
@@ -111,3 +127,4 @@ summary: Provides a way to define the structure, lifetime, and other properties
   a cookie all in one place.
 test_files:
 - spec/base_spec.rb
+has_rdoc: