aptible-rails 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08d3eed7d67d6f131eb88679743480e7daed6f01
-  data.tar.gz: b67f77afad9a5fb72cb21576c2572b876effd92c
+  metadata.gz: 03af48a4efa5ddec7cc540f0d01a87828f4b420d
+  data.tar.gz: 6868c21741dd2783adc69152b13d234d0428a5c2
 SHA512:
-  metadata.gz: 1a3cc7dcb89fbb5d18c1b70bd92dc2526ed6179492931d039ebc2419219be07f6b1881226e072c45dd43f5ea72b9a44f0ddb60d413878cf4b4eac3f7d8dae8b4
-  data.tar.gz: 70075c4b00f3940554b16bceff2d0b8a4bced77a2754f2c29ec0fc556aaea17ff993d1eb91a7b8f5c8cf3629e43b1fe5879dcd2654c26b262986358f78388ade
+  metadata.gz: d0763d89950f3c8d29a12cd60e34f9790621dc370509a3ee94c3c81b9a5c0eb851f0ff288f5eba746a2efee95cef0161197d0996d223d0286407ecff85d4dd1f
+  data.tar.gz: 538e8ba0e491028c6ed9d52c93ad4a38b722c817ad3e23108568165dd08edf4d707083ce4a0cfa2732aa4e3680eb9fe32cec55bc69dededbc83ef6d269cc7d1f

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

@@ -1,7 +1,7 @@
 class AppDecorator < ResourceDecorator
   def service_summary
     garner.bind(h.controller.session_token).bind(object) do
-      object.services.map(&:process_type).join(', ')
+      object.services.map(&:process_type).sort.join(', ')
     end
   end
 end

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

@@ -2,7 +2,7 @@ class OperationDecorator < ApplicationDecorator
   # TODO: cleanup after manual migration of user data to operations
 
   def past_tense
-    object.type.humanize + (type[-1] == 'e' ? 'd' : 'ed')
+    object.type.humanize + (object.type[-1] == 'e' ? 'd' : 'ed')
   end
 
   def creator_gravatar

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

@@ -2,24 +2,19 @@
 class ResourceDecorator < ApplicationDecorator
   def last_operation_gravatar
     garner.bind(h.controller.session_token).bind(object) do
-      last_operation.decorate.creator_gravatar
+      last_operation.creator_gravatar
     end
   end
 
   def last_operation_summary
     garner.bind(h.controller.session_token).bind(object) do
-      "#{last_operation.decorate.past_tense} " \
+      "#{last_operation.past_tense} " \
       "#{h.time_ago_in_words(last_operation.created_at)} ago"
     end
   end
 
   def last_operation
-    object.operations.last
-  end
-
-  def operation_count
-    garner.bind(h.controller.session_token).bind(object) do
-      object.operations.count
-    end
+    return nil unless object.last_operation
+    @last_operation ||= OperationDecorator.decorate(object.last_operation)
   end
 end

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

@@ -1,6 +1,9 @@
 class UserDecorator < ApplicationDecorator
   def can?(scope, account)
-    return true if object.can_manage?(account.organization)
+    # Attempt to use current_organization context before loading via HTTP
+    organization = context[:current_organization] || account.organization
+
+    return true if object.can_manage?(organization)
     user_scopes = account_permissions(account).map(&:scope)
     user_scopes.include?('manage') || user_scopes.include?(scope)
   end

data/lib/aptible/rails/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Rails
-    VERSION = '0.6.5'
+    VERSION = '0.6.6'
   end
 end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: aptible-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 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.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: aptible-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: aptible-gridiron
   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: fridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: garner
   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
@@ -171,9 +171,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.md
 - README.md
@@ -209,12 +209,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: []