grape_session 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa3622c45f6e4d00d07b087463cb1f7aebeebd5
-  data.tar.gz: 921d5c6600ca7b2e94b8b09fac15bda648dd2e54
+  metadata.gz: 7e7d06bb6b8284a27df8bfb896abe49a456f64f2
+  data.tar.gz: f27a92fcce4b9c191133a033da00186d08d32b50
 SHA512:
-  metadata.gz: f1a01a0ff99ae715987831c523403436f194fd4e0a37e102a9d742000b458e3fc8d6efe2c96048c2ce5471ca7f7e9d1deb81e8687550d97cee4ae34f966231d5
-  data.tar.gz: dd14f93559867f81c70209fb61123d9132926cc85d1967dffd7a204d298fc58c13846b07281fe11e10b97a353ffe6937667bbef8798a86181959c7478c0006c0
+  metadata.gz: 1b3ec0ef90c5cf13f77a262b87904b9857b4587add4dd5a59626e7ebb9b87b7252c34b4787ce88a4aeb0acd41ee2875aa2fb39b00e98a1f8be0c8d439e2bd701
+  data.tar.gz: c04593f25a502070d6773cd3f5f4ad183c276b20fb0967662e58215583be24ad8eb328c575a4054a84c8b8269fc01c9728b22a5c9caa0e5b7f93ff4044200d8f

data/README.md

@@ -1,4 +1,4 @@
-# GrapeSession
+# GrapeSession (Project-State: Proposal)
 
 Make Rails session and cookie handling available for grape. `cookies` method 
 will return an `ActionDispatch::Cookies::CookieJar` instead of `Grape::Cookie`.
@@ -40,6 +40,19 @@ class API < Grape::API
      secret_token: 'secret_token',
      secret_key_base: 'secret base',
      cookies_serializer: :json
+     
+     session_options: { 
+       # Rails specific ActionDispatch::Compatibility
+       key: '_grape_session_id' 
+       # Rack::Session::Abstract::ID specific
+       domain: 'foo.com',
+       path:  '/',
+       expire_after: 2592000,
+       secure: false,
+       httponly: true,
+       defer: false,
+       renew: false,
+     }
   }
   
   

data/lib/grape_session/ext/api.rb

@@ -10,7 +10,7 @@ module GrapeSession
 
         use GrapeSession::Middleware::EnvSetup
         use ActionDispatch::Cookies
-        use ActionDispatch::Session::CookieStore
+        use ActionDispatch::Session::CookieStore, GrapeSession::Middleware::EnvSetup.settings[:session_options]
 
       end
 

data/lib/grape_session/ext/cookie_jar.rb

@@ -12,9 +12,6 @@ module GrapeSession
       def read(*)
       end
 
-      def write(*)
-      end
-
       module ClassMethods
       end
     end

data/lib/grape_session/middleware/env_setup.rb

@@ -8,14 +8,19 @@ module GrapeSession
           encrypted_signed_cookie_salt: 'signed encrypted cookie',
           secret_token: 'secret_token',
           secret_key_base: 'secret base',
-          cookies_serializer: :json
+          cookies_serializer: :json,
+          session_options: { key: '_grape_session_id' }
         }.freeze
       end
 
-      def self.settings(new_settings)
-        @settings_for_env = nil
-        @caching_key_generator = nil
-        @settings = default_settings.merge new_settings
+      def self.settings(new_settings = nil)
+        if new_settings
+          @settings_for_env = nil
+          @caching_key_generator = nil
+          @settings = default_settings.merge new_settings
+        else
+          @settings ||= default_settings
+        end
       end
 
       def self.key_generator
@@ -26,16 +31,14 @@ module GrapeSession
       end
 
       def self.settings_for_env
-        @settings ||= default_settings
-
         @settings_for_env ||= {
           ActionDispatch::Cookies::GENERATOR_KEY => key_generator,
-          ActionDispatch::Cookies::SIGNED_COOKIE_SALT => @settings[:signed_cookie_salt],
-          ActionDispatch::Cookies::ENCRYPTED_COOKIE_SALT => @settings[:encrypted_cookie_salt],
-          ActionDispatch::Cookies::ENCRYPTED_SIGNED_COOKIE_SALT => @settings[:encrypted_signed_cookie_salt],
-          ActionDispatch::Cookies::SECRET_TOKEN => @settings[:secret_token],
-          ActionDispatch::Cookies::SECRET_KEY_BASE => @settings[:secret_key_base],
-          ActionDispatch::Cookies::COOKIES_SERIALIZER => @settings[:cookies_serializer]
+          ActionDispatch::Cookies::SIGNED_COOKIE_SALT => settings[:signed_cookie_salt],
+          ActionDispatch::Cookies::ENCRYPTED_COOKIE_SALT => settings[:encrypted_cookie_salt],
+          ActionDispatch::Cookies::ENCRYPTED_SIGNED_COOKIE_SALT => settings[:encrypted_signed_cookie_salt],
+          ActionDispatch::Cookies::SECRET_TOKEN => settings[:secret_token],
+          ActionDispatch::Cookies::SECRET_KEY_BASE => settings[:secret_key_base],
+          ActionDispatch::Cookies::COOKIES_SERIALIZER => settings[:cookies_serializer]
         }.freeze
       end
 

data/lib/grape_session/version.rb

@@ -1,3 +1,3 @@
 module GrapeSession
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/grape_session.rb

@@ -18,4 +18,6 @@ Grape::Endpoint.send(:include, GrapeSession::Ext::Endpoint)
 Grape::Request.send(:include, GrapeSession::Ext::Request)
 # Grape::API.send(:include, GrapeSession::Ext::API)
 
-ActionDispatch::Cookies::CookieJar.send(:include, GrapeSession::Ext::CookieJar)
+unless ActionDispatch::Cookies::CookieJar.instance_methods.include? :read
+  ActionDispatch::Cookies::CookieJar.send(:include, GrapeSession::Ext::CookieJar)
+end

data/spec/acceptance/session_spec.rb

@@ -44,7 +44,7 @@ feature 'Use an encrypted session' do
 
     expect(last_response.status).to eq 200
 
-    expect(decryptor.decrypt_and_verify response_cookies['_session_id']).to include('session_test' => 'session_test_value')
+    expect(decryptor.decrypt_and_verify response_cookies['_grape_session_id']).to include('session_test' => 'session_test_value')
   end
 
   scenario 'Get session' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape_session
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dieter Späth