aptible-rails 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1ce86f107ca7e84482a8448f394e8b135c8c35e
-  data.tar.gz: 3fd7be09ad266238abaab36355f53bfcc222a912
+  metadata.gz: c901ab9e1415711648f097b854423a3949efb7a4
+  data.tar.gz: 329150e1e681f530ab6222290382f8fbd85b54fa
 SHA512:
-  metadata.gz: 75de1a55ddec9d4e12f3c37805965314d9ba41e069c1755474b5dbe0575bbd007281b42d4640103fcaa6fdb611c094cb1d9e1bf9c183906086a6be9f2e6f1668
-  data.tar.gz: 61a2cfe8049a4a6cd0b58420901bcb4bd165e22f316a403942bb4548f9127340a5b19b9093d69f7a6a865dba5f3d5f755211e4b8704c40c5dd5b3a9a615125c2
+  metadata.gz: cca7efae246d50448f00daefbaa8c3ca882564cdf4d5526715584234948e723beac9c0be7db52e651ef8910ed10b11bbb2f45bea8df62547776dec3c15a3519d
+  data.tar.gz: 1ae028627e055174b384b27dc2c9cc1920b6184c5fe7c123a32b213ef06638a2a31ab7345426b2a0cd1b156cc2449413c596409a689d93c33aaf5a814dff37e1

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'pry', github: 'fancyremarker/pry', branch: 'aptible'
+
 # Specify your gem's dependencies in aptible-rails.gemspec
 gemspec

data/lib/aptible/rails/controller.rb

@@ -7,73 +7,36 @@ module Aptible
       extend ActiveSupport::Concern
 
       included do
-        helper_method :auth, :api, :current_aptible_user,
-                      :current_organization, :subscribed?, :has_acccount?,
-                      :email_verified?, :subscribed_and_verified?, :user_url,
+        helper_method :current_user, :current_organization, :user_url,
                       :organization_url
       end
 
-      def auth
-        @auth ||= Aptible::Auth::Agent.new(token: service_token).get
-      end
-
-      def api
-        @api ||= Aptible::Api::Agent.new(token: service_token).get
-      end
-
-      def current_aptible_user
-        @current_user ||= auth.find_by_url(aptible_subject)
-      rescue
+      def current_user
+        return unless current_user_url
+        @current_user ||= Aptible::Auth::User.find_by_url(current_user_url,
+                                                          token: session_token)
+      rescue => e
         clear_session_cookie
+        raise e
       end
 
       def current_organization
-        session[:organization_url] ||= auth.organizations.first.href
+        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
-        false
-      end
-
-      # rubocop:disable PredicateName
-      def has_account?
-        current_organization && current_organization.accounts.any?
-      end
-      # rubocop:enable PredicateName
-
-      def subscribed?
-        @has_subscription ||= has_account? &&
-        current_organization.accounts.any?(&:has_subscription?)
-      end
-
-      def email_verified?
-        current_aptible_user && current_aptible_user.verified?
-      end
-
-      def subscribed_and_verified?
-        has_account? && subscribed? && email_verified?
-      end
-
-      def service_token
-        return unless aptible_token && aptible_token.session
-        @service_token ||= service_token_for(aptible_token)
-      end
-
-      def aptible_login_url
-        Aptible::Rails.configuration.login_url
+        nil
       end
 
-      def aptible_subject
+      def current_user_url
         token_subject || session_subject
       end
 
-      def aptible_token
-        current_token || session_token
-      end
-
       # before_action :authenticate_user
-      def authenticate_aptible_user
-        redirect_to aptible_login_url unless current_aptible_user
+      def authenticate_user
+        redirect_to Aptible::Rails.configuration.login_url unless current_user
       end
 
       # before_action :ensure_service_token
@@ -81,37 +44,56 @@ module Aptible
         redirect_to aptible_login_url unless service_token
       end
 
-      def service_token_for(token)
-        service_token = fetch_service_token(token)
+      # before_action :ensure_auth_key
+      def ensure_auth_key
+        return if Fridge.configuration.public_key
+        Fridge.configure do |config|
+          config.public_key = Aptible::Auth.public_key unless ::Rails.env.test?
+        end
+      end
+
+      def service_token
+        return unless session_token && session_token.session
+        return @service_token if @service_token
+
+        @service_token = cached_service_token(session_token)
         if Fridge::AccessToken.new(service_token).valid?
-          service_token
+          @service_token
         else
-          fetch_service_token(token, force: true)
+          @service_token = cached_service_token(session_token,
+                                                force: true) || session_token
         end
       end
 
-      def fetch_service_token(token, options = {})
-        fail 'Token must be a service token' unless token.session
-        ::Rails.cache.fetch "service_token:#{token.session}", options do
-          swap_session_token(token)
+      def cached_service_token(session_token, options = {})
+        fail 'Token must be a service token' unless session_token.session
+        cache_key = "service_token:#{session_token.session}"
+        ::Rails.cache.fetch(cache_key, options) do
+          swap_session_token(session_token)
         end
       end
 
-      def swap_session_token(token)
+      # rubocop:disable MethodLength
+      def swap_session_token(session_token)
         Aptible::Auth::Token.create(
           client_id: Aptible::Rails.configuration.client_id,
           client_secret: Aptible::Rails.configuration.client_secret,
-          subject: token.serialize
+          subject: session_token.serialize
         ).access_token
-      rescue
-        token.serialize
+      rescue OAuth2::Error => e
+        if e.code == 'unauthorized'
+          nil
+        else
+          raise 'Could not swap session token, check Client#privileged?'
+        end
       end
+      # rubocop:enable MethodLength
 
       def organization_url(id)
         "#{dashboard_url}/organizations/#{id}"
       end
 
-      def user_url(id = current_aptible_user.id)
+      def user_url(id = current_user.id)
         "#{dashboard_url}/users/#{id}"
       end
     end

data/lib/aptible/rails/railtie.rb

@@ -5,21 +5,6 @@ require 'aptible/rails/view_helper'
 module Aptible
   module Rails
     class Railtie < ::Rails::Railtie
-      initializer 'fridge.configure' do
-        require 'fridge'
-        require 'aptible/auth'
-
-        Fridge.configure do |config|
-          begin
-            unless ::Rails.env.test?
-              config.public_key = Aptible::Auth.public_key
-            end
-          rescue
-            raise 'Could not retrieve auth server public key'
-          end
-        end
-      end
-
       initializer 'aptible.rails.controller' do
         ActionController::Base.send :include, Aptible::Rails::Controller
       end

data/lib/aptible/rails/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Rails
-    VERSION = '0.3.3'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: aptible-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: aptible-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: fridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Rails helpers for Aptible service applications
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.md
 - README.md
@@ -154,12 +154,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []