registrar-rails 0.0.13.alpha → 0.1.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfda5870a7c1a99c12972c5aa75a246ae111a3b4
-  data.tar.gz: 3375d6685f8d21aaa9eceb5b68b38131e9b5dedb
+  metadata.gz: 2f36923d9b6c4c211f9793f90b9d0f96c85c6911
+  data.tar.gz: d8cdd0cfb9c99d4094adf1b1b5fb36982a706145
 SHA512:
-  metadata.gz: 998857c562890df19911e071b25599d153fb64689b46599dc4c145f65c73fe6bea7a5f7198778fa1b3f00176230a7cc0e5bfe93cd4d1e2b9e082ced66e095d7e
-  data.tar.gz: 2c59d47e9d3c7a259a86d949c052f58119402310c83664ed5d1c2309c714c8cc052673ccf8f6487cc9e1201b938485d36aa19f35af37303450ba6a32864a3a82
+  metadata.gz: fc76cc7d8000abca939d10f814777e42f8a202f8a2c0221ddba802ee2248039a6e72df122cfcd3aeabe6e9ef55aaa6f26a3c78c61eff0a94d9f9c79221071714
+  data.tar.gz: b5719556812ca6c090dc9fbc75d41736ea6872951d5b7524644d72573513d9f0a9de04001d3ce7d820e8186e19c1cde96ed591ea2a3a3dcab22665993982d7fb

data/lib/registrar/rails/controller_extensions.rb

@@ -7,7 +7,6 @@ module Registrar
 
         klass.class_eval do
           helper_method :current_profile
-          helper_method :reload_current_profile
           helper_method :current_profile?
           helper_method :logout
         end
@@ -23,40 +22,20 @@ module Registrar
           end
         end
 
-        def store_current_profile_uid(registrar_profile)
-          session[CURRENT_PROFILE_UID] = registrar_profile.uid
-        end
-
-        def current_profile_uid
-          session[CURRENT_PROFILE_UID]
-        end
-
         def logout
           session[CURRENT_PROFILE_UID] = nil
         end
 
-        def reload_current_profile
-        end
-
         def current_profile
-          return @current_user if @current_user
+          return @current_profile if @current_profile
 
-          if current_profile_uid
-            @current_user = Registrar::Middleware::config.handler.call(
+          if current_profile_uid_from_session
+            @current_profile = Registrar::Middleware::config.handler.call(
               build_current_profile
             )
           end
 
-          @current_user
-        end
-
-        def build_current_profile
-          {
-            "provider" => {
-              "name" => "session",
-              "uid" =>  current_profile_uid
-            }
-          }
+          @current_profile
         end
 
         def current_profile?
@@ -66,6 +45,25 @@ module Registrar
         def authentication_phase?
           params[:controller] == 'authentication' && params[:action] = 'callback'
         end
+
+        private
+
+        def store_current_profile_uid(registrar_profile)
+          session[CURRENT_PROFILE_UID] = registrar_profile.uid
+        end
+
+        def current_profile_uid_from_session
+          session[CURRENT_PROFILE_UID]
+        end
+
+        def build_current_profile
+          {
+            "provider" => {
+              "name" => "session",
+              "uid" =>  current_profile_uid_from_session
+            }
+          }
+        end
       end
     end
   end

data/lib/registrar/rails/version.rb

@@ -1,5 +1,5 @@
 module Registrar
   module Rails
-    VERSION = "0.0.13.alpha"
+    VERSION = "0.1.0.alpha"
   end
 end

data/test/dummy/log/test.log

@@ -878,3 +878,21 @@ CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliab
 Started GET "/" for 127.0.0.1 at 2015-06-02 11:19:44 +0200
 Processing by SomeController#index as HTML
 Completed 200 OK in 14ms (Views: 0.2ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-06-02 17:21:48 +0200
+Processing by SomeController#index as HTML
+Completed 500 Internal Server Error in 17ms
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-06-02 17:22:04 +0200
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.1ms)
+----------------------------------------------------------------------------------
+CurrentProfileTest: test_exposes_current_profile_if_registrar.profile_is_avaliable
+----------------------------------------------------------------------------------
+Started GET "/" for 127.0.0.1 at 2015-06-02 17:24:43 +0200
+Processing by SomeController#index as HTML
+Completed 200 OK in 14ms (Views: 0.2ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: registrar-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.13.alpha
+  version: 0.1.0.alpha
 platform: ruby
 authors:
 - Jan Owiesniak