ey_services_api 0.1.3 → 0.2.0

data/lib/ey_services_api/provisioned_service_creation.rb

@@ -16,7 +16,7 @@ module EY
       class App < APIStruct.new(:id, :name)
       end
 
-      class Environment < APIStruct.new(:id, :name, :framework_env)
+      class Environment < APIStruct.new(:id, :name, :framework_env, :aws_region)
       end
 
     end

data/lib/ey_services_api/provisioned_service_response.rb

@@ -1,6 +1,7 @@
 module EY
   module ServicesAPI
     class ProvisionedServiceResponse < APIStruct.new(:configuration_required, :configuration_url, :message, :vars, :url)
+
       def to_hash
         {
           :provisioned_service      => {
@@ -9,9 +10,10 @@ module EY
             :configuration_url      => self.configuration_url,
             :vars                   => self.vars,
           },
-          :message                  => self.message.to_hash,
+          :message                  => self.message && self.message.to_hash,
         }
       end
+
     end
   end
 end

data/lib/ey_services_api/service_account_response.rb

@@ -3,13 +3,13 @@ module EY
     class ServiceAccountResponse < APIStruct.new(:configuration_required, :configuration_url, :message, :provisioned_services_url, :url)
       def to_hash
         {
-          :service_account => {
-            :url => self.url,
-            :configuration_required => self.configuration_required,
-            :configuration_url => self.configuration_url,
+          :service_account            => {
+            :url                      => self.url,
+            :configuration_required   => self.configuration_required,
+            :configuration_url        => self.configuration_url,
             :provisioned_services_url => self.provisioned_services_url
           },
-          :message => self.message.to_hash
+          :message                    => self.message && self.message.to_hash
         }
       end
     end

data/lib/ey_services_api/version.rb

@@ -1,5 +1,5 @@
 module EY
   module ServicesAPI
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/spec/provisioned_service_creation_spec.rb

@@ -3,6 +3,92 @@ require 'sinatra'
 
 describe EY::ServicesAPI::ProvisionedServiceCreation do
 
+  describe "attributes given in service provisioning" do
+    before do
+      class SaveThis
+        class << self
+          attr_accessor :stuff
+        end
+      end
+      EyServicesFake::MockingBirdService.service_provisioning_handler = Proc.new do
+        SaveThis.stuff = EY::ServicesAPI::ProvisionedServiceCreation.from_request(request.body.read)
+        {}.to_json
+      end
+    end
+    it "matches" do
+      @provisioned_service_hash = @tresfiestas.provisioned_service
+      provisioned_service = SaveThis.stuff
+      app_deployment = @provisioned_service_hash[:app_deployment]
+      provisioned_service.environment.id.should eq app_deployment[:environment][:id]
+      provisioned_service.environment.name.should eq app_deployment[:environment][:name]
+      provisioned_service.environment.framework_env.should eq app_deployment[:environment][:framework_env]
+      provisioned_service.environment.aws_region.should eq app_deployment[:environment][:aws_region]
+      provisioned_service.app.id.should eq app_deployment[:app][:id]
+      provisioned_service.app.name.should eq app_deployment[:app][:name]
+      provisioned_service.messages_url.should eq @provisioned_service_hash[:messages_url]
+    end
+  end
+
+  describe "with all possible attributes returned" do
+    before do
+      EyServicesFake::MockingBirdService.service_provisioning_handler = Proc.new do
+        provisioned_service = EY::ServicesAPI::ProvisionedServiceCreation.from_request(request.body.read)
+        EY::ServicesAPI::ProvisionedServiceResponse.new(
+          :url                    => "some url",
+          :vars                   => {'some_key' => "some value"},
+          :configuration_required => true,
+          :configuration_url      => "some configuration url",
+          :message                => EY::ServicesAPI::Message.new(:message_type => "status", :subject => "some provisioned service message or something")
+        ).to_hash.to_json
+      end
+    end
+    it "works" do
+      @pushed_provisioned_service = @tresfiestas.provisioned_service[:pushed_provisioned_service]
+      @pushed_provisioned_service[:url].should eq "some url"
+      @pushed_provisioned_service[:vars].should eq({'some_key' => "some value"})
+      @pushed_provisioned_service[:configuration_required].should eq true
+      @pushed_provisioned_service[:configuration_url].should eq "some configuration url"
+      status_message = @tresfiestas.latest_status_message
+      status_message.should_not be_nil
+      status_message[:subject].should eq "some provisioned service message or something"
+    end
+  end
+
+  describe "with no attributes returned" do
+    before do
+      EyServicesFake::MockingBirdService.service_provisioning_handler = Proc.new do
+        SaveThis.stuff = EY::ServicesAPI::ProvisionedServiceCreation.from_request(request.body.read)
+        EY::ServicesAPI::ProvisionedServiceResponse.new.to_hash.to_json
+      end
+    end
+    it "works" do
+      @pushed_provisioned_service = @tresfiestas.provisioned_service[:pushed_provisioned_service]
+      @pushed_provisioned_service[:url].should be_nil
+      @pushed_provisioned_service[:vars].should be_nil
+      @pushed_provisioned_service[:configuration_required].should be_nil
+      @pushed_provisioned_service[:configuration_url].should be_nil
+    end
+  end
+
+  describe "rejecting the provisioning request gracefully" do
+    before do
+      EyServicesFake::MockingBirdService.service_provisioning_handler = Proc.new do
+        status 400
+        {:error_messages => ["This service is not currently supported in us-west"]}.to_json
+      end
+    end
+    it "works" do
+      raised_error = nil
+      begin
+        @tresfiestas.provisioned_service
+      rescue EY::ApiHMAC::BaseConnection::ValidationError => e
+        raised_error = e
+      end
+      raised_error.should_not be_nil
+      raised_error.error_messages.should eq ["This service is not currently supported in us-west"]
+    end
+  end
+
   describe "with a service account created" do
     before do
       @service_account_hash = @tresfiestas.service_account[:pushed_service_account]

data/spec/service_account_creation_spec.rb

@@ -3,6 +3,89 @@ require 'sinatra'
 
 describe EY::ServicesAPI::ServiceAccountCreation do
 
+  describe "attributes given in service account creation" do
+    before do
+      class SaveThis
+        class << self
+          attr_accessor :stuff
+        end
+      end
+      EyServicesFake::MockingBirdService.service_account_creation_handler = Proc.new do
+        SaveThis.stuff = EY::ServicesAPI::ServiceAccountCreation.from_request(request.body.read)
+        {}.to_json
+      end
+    end
+    it "matches" do
+      @service_account_hash = @tresfiestas.service_account
+      service_account = SaveThis.stuff
+      service_account.name.should eq @service_account_hash[:name]
+      service_account.url.should eq @service_account_hash[:url]
+      service_account.messages_url.should eq @service_account_hash[:messages_url]
+      service_account.invoices_url.should eq @service_account_hash[:invoices_url]
+    end
+  end
+
+  describe "with all possible attributes returned" do
+    before do
+      EyServicesFake::MockingBirdService.service_account_creation_handler = Proc.new do
+        service_account = EY::ServicesAPI::ServiceAccountCreation.from_request(request.body.read)
+        EY::ServicesAPI::ServiceAccountResponse.new(
+          :provisioned_services_url => "some provinioning url",
+          :url                      => "some resource url",
+          :configuration_url        => "some configuration url",
+          :configuration_required   => true,
+          :message                  => EY::ServicesAPI::Message.new(:message_type => "status", :subject => "some message or something")
+        ).to_hash.to_json
+      end
+    end
+    it "works" do
+      @service_account_hash = @tresfiestas.service_account[:pushed_service_account]
+      @service_account_hash[:configuration_required].should eq true
+      @service_account_hash[:configuration_url].should eq "some configuration url"
+      @service_account_hash[:provisioned_services_url].should eq "some provinioning url"
+      @service_account_hash[:url].should eq "some resource url"
+      status_message = @tresfiestas.latest_status_message
+      status_message.should_not be_nil
+      status_message[:subject].should eq "some message or something"
+    end
+  end
+
+  describe "with no attributes returned" do
+    before do
+      EyServicesFake::MockingBirdService.service_account_creation_handler = Proc.new do
+        EY::ServicesAPI::ServiceAccountResponse.new.to_hash.to_json
+      end
+    end
+    it "works" do
+      @service_account_hash = @tresfiestas.service_account[:pushed_service_account]
+      @service_account_hash[:configuration_required].should be_nil
+      @service_account_hash[:configuration_url].should be_nil
+      @service_account_hash[:provisioned_services_url].should be_nil
+      @service_account_hash[:url].should be_nil
+      status_message = @tresfiestas.latest_status_message
+      status_message.should be_nil
+    end
+  end
+
+  describe "rejecting the creation request gracefully" do
+    before do
+      EyServicesFake::MockingBirdService.service_account_creation_handler = Proc.new do
+        status 400
+        {:error_messages => ["This service is not currently supported for trial customers"]}.to_json
+      end
+    end
+    it "works" do
+      raised_error = nil
+      begin
+        @tresfiestas.service_account
+      rescue EY::ApiHMAC::BaseConnection::ValidationError => e
+        raised_error = e
+      end
+      raised_error.should_not be_nil
+      raised_error.error_messages.should eq ["This service is not currently supported for trial customers"]
+    end
+  end
+
   describe "with a service account created" do
     before do
       @service_account_hash = @tresfiestas.service_account[:pushed_service_account]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey_services_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000 Z
+date: 2011-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153193780 !ruby/object:Gem::Requirement
+  requirement: &2154994140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153193780
+  version_requirements: *2154994140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153193160 !ruby/object:Gem::Requirement
+  requirement: &2154993700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153193160
+  version_requirements: *2154993700
 - !ruby/object:Gem::Dependency
   name: ey_api_hmac
-  requirement: &2153192660 !ruby/object:Gem::Requirement
+  requirement: &2154993240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153192660
+  version_requirements: *2154993240
 description: API for Partner Services (talks to services.engineyard.com)
 email:
 - jacob@engineyard.com