aptible-rails 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d401509e9551ecfd52e6baa1459cdeb229d76c0
-  data.tar.gz: 364a1ee40a484f5ecf76e7868749cda18c5084e0
+  metadata.gz: fb7735be8de2d51dec59dff474ba14a797078dcd
+  data.tar.gz: ff6ed6379626b885f565495fe543a225b09f2553
 SHA512:
-  metadata.gz: a9b78056d573b376d41d7520622cc963ca149c9d880097724c797f41ac6604717cfba32301780ea76afee62a0b7122f6adca2f01d47b55a44b1102cbe0a1f2e7
-  data.tar.gz: b282da1e58ef2ebaac4aebc767b452781353d642fe69429e0a4c31ea641630f6a0b041b1261561c17a6f523e7382346f9b853b3632c3179d53fbe64c433f2154
+  metadata.gz: cc2a8e111b3e56240f1d31d13b764ebb5af6159cf592216718670d85e108db56de687f857d4cd48d36ef22e16f59dc121d684aa897d747f1917f972f140165ff
+  data.tar.gz: 934f6a2e28be3b56f40d0bcdcc5c20dd2164001fcfa61b384ac2fafe23c3637195c1e42b3de856b9222dd13f916e25d5e86b149a4426e4d3883df3e5469ea4f8

data/aptible-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aptible-auth', '>= 0.5.0'
   spec.add_dependency 'aptible-api', '>= 0.5.0'
   spec.add_dependency 'aptible-gridiron'
-  spec.add_dependency 'fridge'
+  spec.add_dependency 'fridge', '>= 0.2.3'
   spec.add_dependency 'draper'
   spec.add_dependency 'garner'
 

data/lib/aptible/rails/controller.rb

@@ -22,19 +22,27 @@ module Aptible
       end
 
       def current_organization
-        session[:organization_url] ||= Aptible::Auth::Organization.all(
-          token: session_token
-        ).first.href
-        url = [session[:organization_url], token: service_token]
-        @current_organization ||= Aptible::Auth::Organization.find_by_url(*url)
-      rescue
-        nil
+        return @current_organization if @current_organization
+        url = read_shared_cookie(:organization_url)
+        @current_organization = Aptible::Auth::Organization.find_by_url(
+          url, token: session_token
+        ) if url
+      end
+
+      def current_organization=(organization)
+        write_shared_cookie(:organization_url, organization.href)
       end
 
       def current_user_url
         token_subject || session_subject
       end
 
+      # before_action :set_default_organization
+      def set_default_organization
+        self.current_organization ||=
+          Aptible::Auth::Organization.all(token: session_token).first
+      end
+
       # before_action :authenticate_user
       def authenticate_user
         redirect_to Aptible::Rails.configuration.login_url unless current_user

data/lib/aptible/rails/url_helper.rb

@@ -28,6 +28,8 @@ module Aptible
         register_url :contact_url,
                      aptible_config.marketing_root_url + '/contact'
         register_url :dashboard_url, aptible_config.dashboard_root_url
+        register_url :dashboard_session_url,
+                     aptible_config.dashboard_root_url + '/session'
         register_url :databases_url,
                      aptible_config.dashboard_root_url + '/databases'
         register_url :docs_url, aptible_config.marketing_root_url + '/docs'

data/lib/aptible/rails/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Rails
-    VERSION = '0.4.9'
+    VERSION = '0.4.10'
   end
 end

data/lib/aptible/rails/view_helper.rb

@@ -26,6 +26,19 @@ module Aptible
           redirect_uri: callback
         )
       end
+
+      def return_to_context_url(local_assigns)
+        href = if controller?('apps')
+                 apps_url
+               elsif controller?('databases')
+                 databases_url
+               elsif local_assigns[:compliance_page]
+                 compliance_url
+               else
+                 dashboard_url
+               end
+        URI href
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement