esp_sdk 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f7250441652b3030ad983a15076317a4f23f514
-  data.tar.gz: 20d7beccfa0aac2dcb56e27c3b636ef4360a4f25
+  metadata.gz: eb2adf95c6d86093eac45d8f35aba16bfc4b92fd
+  data.tar.gz: 866a1a8d25f13d6c948cf2c5763d32733c488706
 SHA512:
-  metadata.gz: 89a03a0391777f8cbde9292ab9a44ed087046e19794caf5e8f8353670da41e5433a9ee14ef17d0853e9e389942ec67ef20dbb782f322d9ac3fc9778987d630fc
-  data.tar.gz: ff17a934abe8abac1a91eaff1e936902d24d69bbcffbce5e4195793bd2e652abd66ac29c3616a488438ac32033007e5dcd8e1c766b5d0d8e451482c2d9ed23a3
+  metadata.gz: 8c956e5ead24371596d4b00c95d2d4a60d385a51c6ffc7fb1df4cfac3b3b73eff6ada2ee93bb36741eb54c12ee4a8c2f75d8c6d5e894b1f6b8291c063302d7e0
+  data.tar.gz: b4bde23260e83f6819e757c86bb10b720a6378895885e2d806058ae9ea68e93519a1ca1d7ff6639d8265717378c3b864268610c5be78c7db877687386f2ee3e2

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## Unreleased
 
-## 2.2.3 - 2016-05-16
+## 2.4.0 - 2016-06-30
+### Added
+- Report relationship to ExternalAccount
+- ExternalAccount relationship to Report
+### Changed
+- Upgrade api-auth to 2.0.
+
+## 2.3.0 - 2016-05-16
 ### Changed
 - Some error messages changed a little bit on the API.  Specifically, on region suppression, signature suppress, and custom signature suppression objects.  Now when a validation trips on the related suppression object, the error message reflects that.  "Reason can't be blank" changed to "Suppression region can't be blank".  The message is built from the attribute which is in error, which changed from "Reason" to "Suppression.reason".  Had to gsub the "." to a space to make it message friendly.
 - Add the teams relation to custom signature, and the custom signatures relation to team.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    esp_sdk (2.3.0)
+    esp_sdk (2.4.0)
       activeresource (~> 4.0.0)
-      api-auth
+      api-auth (~> 2.0.0)
       rack
 
 GEM
@@ -24,7 +24,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     ansi (1.5.0)
-    api-auth (1.3.2)
+    api-auth (2.0.0)
     ast (2.0.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
@@ -167,4 +167,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/esp_sdk.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'aws-sdk'
 
   spec.add_dependency 'activeresource', '~> 4.0.0'
-  spec.add_dependency 'api-auth'
+  spec.add_dependency 'api-auth', '~> 2.0.0'
   spec.add_dependency 'rack'
 end

data/lib/esp/resources/external_account.rb

@@ -12,6 +12,10 @@ module ESP
     # The team the external account belongs to.
     belongs_to :team, class_name: 'ESP::Team'
 
+    ##
+    # The collection of reports that belong to the team.
+    has_many :reports, class_name: 'ESP::Report'
+
     # Helper to generate an external id.
     # Called automatically when creating an ExternalAccount if +external_id+ is not already set.
     def generate_external_id

data/lib/esp/resources/report.rb

@@ -12,6 +12,10 @@ module ESP
     # The team the report belongs to.
     belongs_to :team, class_name: 'ESP::Team'
 
+    ##
+    # The external_account the report belongs to.
+    belongs_to :external_account, class_name: 'ESP::ExternalAccount'
+
     # Not Implemented. You cannot create or update a Report.
     def update
       fail ESP::NotImplementedError

data/lib/esp/version.rb

@@ -1,3 +1,3 @@
 module ESP
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'.freeze
 end

data/test/esp/integration/external_account_integration_test.rb

@@ -33,6 +33,14 @@ module ESP::Integration
           end
         end
 
+        context '#reports' do
+          should 'return an array of reports' do
+            reports = @external_account.reports
+
+            assert_equal ESP::Report, reports.resource_class
+          end
+        end
+
         context '.where' do
           should 'return external_account objects' do
             external_accounts = ESP::ExternalAccount.where(id_eq: @external_account.id)

data/test/esp/integration/report_integration_test.rb

@@ -33,6 +33,14 @@ module ESP::Integration
           end
         end
 
+        context '#external_account' do
+          should 'return a external_account' do
+            external_account = @report.external_account
+
+            assert_equal ESP::ExternalAccount, external_account.class
+          end
+        end
+
         context '#alerts' do
           should 'return an array of alerts' do
             alerts = @report.alerts

data/test/esp/integration/user_integration_test.rb

@@ -26,7 +26,9 @@ module ESP::Integration
             sub_orgs = @user.sub_organizations
 
             assert_equal @user.sub_organization_ids.count, sub_orgs.count
-            assert_equal @user.sub_organization_ids, sub_orgs.map(&:id)
+            sub_orgs.map(&:id).each do |id|
+              assert_contains @user.sub_organization_ids, id
+            end
           end
         end
 

data/test/esp/resources/external_account_test.rb

@@ -36,6 +36,19 @@ module ESP
         end
       end
 
+      context '#reports' do
+        should 'call the api' do
+          external_account = build(:external_account)
+          stub_request(:get, /reports.json*/).to_return(body: json_list(:report, 2))
+
+          external_account.reports
+
+          assert_requested(:get, /reports.json*/) do |req|
+            assert_equal "filter[external_account_id_eq]=#{external_account.id}", URI.unescape(req.uri.query)
+          end
+        end
+      end
+
       context '#scan_intervals' do
         should 'call the api for the external_account and the passed in params' do
           external_account = build(:external_account)

data/test/esp/resources/report_test.rb

@@ -57,6 +57,17 @@ module ESP
         end
       end
 
+      context '#external_account' do
+        should 'call the api' do
+          report = build(:report, external_account_id: 4)
+          stub_external_account = stub_request(:get, %r{external_accounts/#{report.external_account_id}.json*}).to_return(body: json(:external_account))
+
+          report.external_account
+
+          assert_requested(stub_external_account)
+        end
+      end
+
       context '#alerts' do
         should 'call the api for the report and the passed in params' do
           report = build(:report)

data/test/factories/reports.rb

@@ -35,6 +35,15 @@ FactoryGirl.define do
             related: "http://localhost:3000/api/v2/teams/1.json"
           }
         },
+        external_account: {
+          data: {
+            type: "external_accounts",
+            id: "1"
+          },
+          links: {
+            related: "http://localhost:3000/api/v2/external_accounts/1.json"
+          }
+        },
         alerts: {
           data: [
             {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esp_sdk
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Evident.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -266,16 +266,16 @@ dependencies:
   name: api-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement