aptible-rails 0.4.12 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a2e5fb3f7144a4d434f645c1a85a02c387dc56
-  data.tar.gz: fa23b67121c9e933e98d89730c7dab9ba3363647
+  metadata.gz: dc1c1db94972af41d22e03c859b11fe13e6c6074
+  data.tar.gz: fac8a5dca172e1aa46fa6af418e4e9ee70658a0d
 SHA512:
-  metadata.gz: 7ca33fea7206a36d43ea0b9aaa67f5b027736e681bd25fab8c1e817abd8b95bdc7051d379e349c169b729eda18e516816cc8820332cd5f8ac37aba59497bd1fa
-  data.tar.gz: f0aaf57aa9485b7a7006a6ebdc220d84482313a7b677bab50c0b2244bd8967d17cc782d025165456bf384299f966d53123d0091a80cebe074cd993a11c916f49
+  metadata.gz: d292f742fe7e8722fbdfd58d9aee624eea2a0ae00631831a2dddeb050eb0f35212a5e6eee24c661e22743bba813f0fb8ba4b484b34c33fbbaf685da75996d847
+  data.tar.gz: 2d1c48ee5c2b2eece49ca6bdb0ae1294605835df2b9279c406cac2776e2c416b9a13552a342bd009ef004aa9286006f42a799637724e1f3a710a54efcbdd4bdc

data/lib/aptible/rails/decorators/account_decorator.rb

@@ -2,4 +2,16 @@ class AccountDecorator < ApplicationDecorator
   def needs_startup_guide?
     object.apps.count == 0 && object.databases.count == 0
   end
+
+  def cached_permissions
+    garner.bind(h.controller.session_token) do
+      object.permissions
+    end
+  end
+
+  # rubocop:disable PredicateName
+  def has_scope?(scope)
+    cached_permissions.map(&:scope).include? scope
+  end
+  # rubocop:enable PredicateName
 end

data/lib/aptible/rails/decorators/application_decorator.rb

@@ -14,7 +14,8 @@ require_relative 'resource_decorator'
 require_relative 'criterion_decorator'
 require_relative 'account_decorator'
 require_relative 'app_decorator'
-require_relative 'database_decorator'
 require_relative 'operation_decorator'
 require_relative 'organization_decorator'
+require_relative 'role_decorator'
 require_relative 'user_decorator'
+require_relative 'database_decorator'

data/lib/aptible/rails/decorators/operation_decorator.rb

@@ -1,5 +1,18 @@
 class OperationDecorator < ApplicationDecorator
+  # TODO: cleanup after manual migration of user data to operations
+
   def past_tense
     object.type.humanize + (type[-1] == 'e' ? 'd' : 'ed')
   end
+
+  def creator_gravatar
+    return nil if object.user.nil? && object.user_email.nil?
+    email = object.user_email || object.user.email
+    h.gravatar_url(email, 32)
+  end
+
+  def creator_name
+    return nil if object.user.nil? && object.user_name.nil?
+    object.user_name || object.user.name
+  end
 end

data/lib/aptible/rails/decorators/resource_decorator.rb

@@ -2,7 +2,7 @@
 class ResourceDecorator < ApplicationDecorator
   def last_operation_gravatar
     garner.bind(h.controller.session_token).bind(object) do
-      h.gravatar_url(last_operation.user.email, 32)
+      last_operation.decorate.creator_gravatar
     end
   end
 

data/lib/aptible/rails/decorators/role_decorator.rb

@@ -0,0 +1,16 @@
+class RoleDecorator < ApplicationDecorator
+  def can?(scope, account)
+    role_scopes = account_permissions(account).map(&:scope)
+    role_scopes.include?('manage') || role_scopes.include?(scope)
+  end
+
+  def has?(scope, account)
+    account_permissions(account).map(&:scope).include?(scope)
+  end
+
+  def cached_permissions
+    garner.bind(h.controller.session_token) do
+      object.permissions
+    end
+  end
+end

data/lib/aptible/rails/decorators/user_decorator.rb

@@ -1,13 +1,41 @@
 class UserDecorator < ApplicationDecorator
+  def can?(scope, account)
+    return true if object.can_manage?(account.organization)
+    user_scopes = account_permissions(account).map(&:scope)
+    user_scopes.include?('manage') || user_scopes.include?(scope)
+  end
+
   def cached_organizations
+    garner
+      .bind(h.controller.session_token)
+      .bind(h.controller.current_organization) do
+        object.organizations
+      end
+  end
+
+  def organization_count
+    cached_organizations.count
+  end
+
+  def cached_roles
     garner.bind(h.controller.session_token) do
-      object.organizations
+      object.roles
     end
   end
 
-  def organization_count
+  def cached_permissions
     garner.bind(h.controller.session_token) do
-      object.organizations.count
+      permissions = []
+      cached_roles.each do |role|
+        permissions += role.permissions
+      end
+      permissions
+    end
+  end
+
+  def account_permissions(account)
+    cached_permissions.select do |permission|
+      permission.links[:account].href == account.href
     end
   end
 

data/lib/aptible/rails/garner.rb

@@ -1,7 +1,7 @@
 require 'garner'
 
 Garner.configure do |config|
-  config.global_cache_options = { expires_in: 10.minutes }
+  config.expires_in = 10.minutes
   config.binding_key_strategy = Garner::Strategies::Binding::Key::CacheKey
   config.whiny_nils = false
 end

data/lib/aptible/rails/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Rails
-    VERSION = '0.4.12'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -190,6 +190,7 @@ files:
 - lib/aptible/rails/decorators/operation_decorator.rb
 - lib/aptible/rails/decorators/organization_decorator.rb
 - lib/aptible/rails/decorators/resource_decorator.rb
+- lib/aptible/rails/decorators/role_decorator.rb
 - lib/aptible/rails/decorators/user_decorator.rb
 - lib/aptible/rails/draper_extensions.rb
 - lib/aptible/rails/garner.rb
@@ -224,3 +225,4 @@ specification_version: 4
 summary: Rails helpers for Aptible service applications
 test_files:
 - spec/spec_helper.rb
+has_rdoc: