cookie_monster 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWFiOThjMzI5Y2FjOGUwYjcxOWRiMzU4NzVjYzY2YzM5NTllNmRjYw==
+    NjQ1OThkM2MxYTM3YzA2YWI0NzljYjRjNjgwZjljNzM5N2MwNjRiZg==
   data.tar.gz: !binary |-
-    OGIwZTMwYmMwODg2M2FlYmE3M2IyNzFjYzRjMDBiYjcxZjRlODAyMw==
+    ZWNjYWJkYWQzZGNjYWE2ZDBmZDQ4ZWFlZGYxMWE2OThiYjdjNjUzNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmIwNTVjM2Q3ZWJkZjE1MTFkNmZiNzBlMmViYzMzODJmNTIyOWMxZWE1Y2Fh
-    NjVjZDRlOTBkMGI3NGRhNDk0ODNmMjhkN2I0NTE2YTE1ZTVhYzY5ODA3Y2Nh
-    MjA5ZWU3YTMwODkzMWEyOTU5NTAxYzA2OGE2M2VlY2QyOWZiNjM=
+    MzRiZmU2NTY4NDJhNTQzNTRmMTJmMzgxYWE2YmJmOTkwY2QyNGE5NmI4YWY5
+    YjkzNGI5ZDNlNmY2NmQ5MDM0OTc2NGQzZjlmZTY2MWY3ZjY5NTk0MjA5ZjBj
+    NmUzMTc1Mjk4MWU1YjUxY2RjYmRjNTZlZWUyNGJjNDc5MDU1MzQ=
   data.tar.gz: !binary |-
-    ODU5Y2RiZjk0NmE2Nzg5YzVjYWFlODA4NTY1OWQ3NTg1ODEwMDI1MzI5ZWQ3
-    ZjU0ZTFiMGEyYWEzYjQwMjQ4NzNiNGIwNzJlMzBhMWExZTY0YTBmN2E1NmI0
-    ZGMxNWNmODUwZmRhZTc1M2QxM2EzMDU0MWUxYjhmYWI4NjMyMmE=
+    ZjFjNTg0NGM2MjRiOTBhM2IzNmQwZWZkYTVjNzQ5NGNmYTYxYzI0MzgxMzA2
+    MWQwZDM1YWVmNDI1MjFjMzAwZTQyNWY0NzllMDNlMTg0NzQ4NWVmZmRhMmYz
+    MGQ3NDBjMWJkY2JjMDU2OTRkNzM3MTllMjMwNTQxZGJlYzAxZmY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cookie_monster (0.1.2)
+    cookie_monster (0.1.3)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/cookie_monster/jar.rb

@@ -1,21 +1,14 @@
 module CookieMonster
   class Jar < Base
-    attr_reader :request, :response
+    attr_reader :cookies
 
-    def initialize(options)
-      @request = options.delete(:request)
-      @response = options.delete(:response)
-      @options = options
+    def initialize(cookies)
+      @cookies = cookies
     end
 
     def [](key)
-      response_cookies = @response.respond_to?(:cookies) ? @response.cookies.with_indifferent_access : {}
-      request_cookies = @request.respond_to?(:cookies) ? @request.cookies.with_indifferent_access : {}
-
-      if response_cookies[key]
-        cookie = response_cookies[key]
-      elsif request_cookies[key]
-        cookie = request_cookies[key]
+      if @cookies[key]
+        cookie = @cookies[key]
       else
         return nil
       end
@@ -34,7 +27,7 @@ module CookieMonster
 
       encrypted_value = Encryption.new(value).encrypt
 
-      @response.set_cookie key, {
+      @cookies[key] = {
         :value => encrypted_value,
         :httponly => options[:httponly],
         :expires => options[:expires],

data/lib/cookie_monster/rails.rb

@@ -3,7 +3,7 @@ module CookieMonster
     private
 
     def cookie_monster
-      @cookie_monster ||= CookieMonster::Jar.new(request: request, response: response, expires: 1.day.from_now)
+      @cookie_monster ||= CookieMonster::Jar.new(cookies)
     end
   end
 end

data/lib/cookie_monster/version.rb

@@ -1,3 +1,3 @@
 module CookieMonster
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/test/cookie_monster/test_jar.rb

@@ -1,12 +1,6 @@
 require 'test_helper'
 
-class FakeRequest
-  def cookies
-    { foo: 'a cookie' }
-  end
-end
-
-class FakeResponse
+class FakeCookies
   attr_reader :cookies
   def initialize
     @cookies = {
@@ -14,25 +8,25 @@ class FakeResponse
     }
   end
 
-  def set_cookie key, options
+  def [](key)
+    @cookies[key]
+  end
+
+  def []=(key, options)
     @cookies[key] = options
   end
 end
 
 class JarTest < Test::Unit::TestCase
   def setup
-    @options = {
-      request: FakeRequest.new,
-      response: FakeResponse.new
-    }
-    @jar = CookieMonster::Jar.new(@options)
+    @jar = CookieMonster::Jar.new(FakeCookies.new)
   end
 
   def test_setting_a_cookie
     CookieMonster.configuration.expects(:iv).at_least_once.returns('x' * 16)
     @jar[:hello] = 'testing a cookie'
     assert_equal CookieMonster::Encryption.new('testing a cookie').encrypt,
-      @jar.response.cookies[:hello][:value]
+      @jar.cookies[:hello][:value]
   end
 
   def test_reading_a_cookie_set_in_response_first
@@ -41,11 +35,7 @@ class JarTest < Test::Unit::TestCase
   end
 
   def test_reading_a_cookie_from_request
-    assert_equal 'already set', @jar[:a_cookie]
-  end
-
-  def test_indifferent_access
-    assert_equal @jar[:a_cookie], @jar['a_cookie']
+    assert_equal 'already set', @jar['a_cookie']
   end
 
   def test_setting_a_more_complicated_data_type
@@ -56,6 +46,6 @@ class JarTest < Test::Unit::TestCase
 
   def test_including_other_options
     @jar[:cookie] = 'something', { expires: 'some point in the future' }
-    assert_equal 'some point in the future', @jar.response.cookies[:cookie][:expires]
+    assert_equal 'some point in the future', @jar.cookies[:cookie][:expires]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookie_monster
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dylan Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport