aptible-auth 0.5.15 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc0c014308bf64c168ebe65c038aa66856b66928
-  data.tar.gz: f7545453c5366a9343a5fb44c720137b032bd7bd
+  metadata.gz: 3cbb943790b2f247eba3b6dcf76ca588e5bbd28d
+  data.tar.gz: ff2172167641f191244cf8ee19274c74d0bf9b05
 SHA512:
-  metadata.gz: 4f1a2454bde64eb256dc08e19f1e060dd0b39d529e727258915623f3f5f9988ecc317a292e092798d00ae769ee8ed822610d30141d5146478cd4fb702b565bfb
-  data.tar.gz: a952dac04ec1506cd25c531817e054caeade252608ee736634c913e411cbae81d12d49ba5486ce2f58f75b89163d67f8c25e40366e0a841e89c3d62d742c1912
+  metadata.gz: bcf5e325bc82d3030ddfde97ab3d944724f03290eccfbe8ea64b996e8874c8eea4a254150799e437c3453ad3cbc721cbd1fb582d6a66232140c807bffc84141a
+  data.tar.gz: 63d9111dde96c48b47d192f9c12743311c812a5241a2a1db80153ee77ca7b55c1540931ad9319cd5b908e19ba4cc116b6ab147c671ae3919301dba7668bb07fe

data/lib/aptible/auth/organization.rb

@@ -23,24 +23,31 @@ module Aptible
       field :plan
 
       def stripe_customer
-        return if stripe_customer_id.nil?
+        return nil if stripe_customer_id.nil?
         @stripe_customer ||= Stripe::Customer.retrieve(stripe_customer_id)
       end
 
       def can_manage_compliance?
-        # TODO: Refactor once Stripe migration from accounts is complete
-        return false if %w(development platform).include?(plan)
-        accounts.map(&:type).include? 'production'
+        %w(production).include?(plan)
+      end
+
+      def subscription
+        return nil if stripe_subscription_id.nil?
+        subscriptions = stripe_customer.subscriptions
+        @subscription ||= subscriptions.retrieve(stripe_subscription_id)
+      end
+
+      def subscribed?
+        !!stripe_subscription_id
       end
 
       def billing_contact
         return nil unless stripe_customer
         return nil unless stripe_customer.metadata['billing_contact']
 
-        @billing_contact ||=
-        User.find_by_url(
-          stripe_customer.metadata['billing_contact'],
-          token: token)
+        @billing_contact ||= User.find_by_url(
+          stripe_customer.metadata['billing_contact'], token: token
+        )
       end
 
       def security_officer

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.5.15'
+    VERSION = '0.6.0'
   end
 end

data/spec/aptible/auth/organization_spec.rb

@@ -1,24 +1,6 @@
 require 'spec_helper'
 
 describe Aptible::Auth::Organization do
-  describe '#can_manage_compliance?' do
-    let(:production) { double 'Aptible::Auth::Resource' }
-    let(:development) { double 'Aptible::Auth::Resource' }
-
-    before { production.stub(:type) { 'production' } }
-    before { development.stub(:type) { 'development' } }
-
-    it 'should return true with a production account' do
-      subject.stub(:accounts) { [development] }
-      expect(subject.can_manage_compliance?).to eq false
-    end
-
-    it 'should return false without a production account' do
-      subject.stub(:accounts) { [development, production] }
-      expect(subject.can_manage_compliance?).to eq true
-    end
-  end
-
   describe '#security_officer' do
     let(:role) { double 'Aptible::Auth::Role' }
     let(:user) { double 'Aptible::Auth::User' }
@@ -36,4 +18,27 @@ describe Aptible::Auth::Organization do
       expect(subject.security_officer).to be_nil
     end
   end
+
+  describe '#can_manage_compliance?' do
+    it 'should return true with compliance plan' do
+      subject.stub(:plan) { 'production' }
+      expect(subject.can_manage_compliance?).to be_true
+    end
+
+    it 'should return false without compliance plan' do
+      subject.stub(:plan) { 'platform' }
+      expect(subject.can_manage_compliance?).to be_false
+    end
+  end
+
+  describe '#subscribed?' do
+    it 'should return true with valid subscription ID' do
+      subject.stub(:stripe_subscription_id) { 'sub_4YrmiVa3vMpaGA' }
+      expect(subject.subscribed?).to be_true
+    end
+
+    it 'should return false without valid subscription ID' do
+      expect(subject.subscribed?).to be_false
+    end
+  end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.13.0
 - !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: oauth2-aptible
   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.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.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'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 description: Ruby client for auth.aptible.com
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - Procfile
@@ -182,12 +182,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: []