3scale_api 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff1614a78872c23c9f770ece900b9c9a1bb9963
-  data.tar.gz: 4282f1bba90c89c3a35f6c59c815d62934fe756c
+  metadata.gz: 43110c72d3cb7575f9627365eaf647c6c63dc5bf
+  data.tar.gz: f1faf5f9037b7e37842a884956fbceb902ce4633
 SHA512:
-  metadata.gz: d090343d4890466f9969cf4546d539147a45f34dcc84f0d7364352dfa7e87b5944f9e3d621acff9a95bdb3df383681d996566c8a96c0db532b9c4fd5e0792ad1
-  data.tar.gz: 4acebf3cd1b5ea33875693b3105f9e3f60a7d4384a73362abde06ea421c3f362b4b6856aa6331841d3d35c8ce128265a4dad67edb7ee301424dd1f5a8fc1c0d1
+  metadata.gz: 809defac62f1d20b48fa46794b2f295847892eeba6c5b3a98f75847669be4ff211f6f025a70f76247c3facedf277a72d7d9d585be7dacac12eaf4cebbc18b1b4
+  data.tar.gz: 4259cd37432e8fbb7933347e4c77bad17112bcb18f2621710c791c9b09bea821689251c5ed6f90500f977d10576d927b23ff2d69096ea9c5648fa804c04f0dfe

data/lib/3scale_api/3scale/api.rb

@@ -121,23 +121,50 @@ module Threescale
 
     def signup_express(account_plan_id, application_plan_id, email, org_name, password, service_plan_id, username,
       additional_fields = nil)
-      params = {:provider_key => @provider_key, :username => username,
-                :password => password, :email => email, :org_name => org_name, :account_plan_id => account_plan_id,
-                :service_plan_id => service_plan_id, :application_plan_id => application_plan_id}
+      params = {:provider_key => @provider_key, :username => username, :password => password, :email => email,
+        :org_name => org_name, :account_plan_id => account_plan_id, :service_plan_id => service_plan_id,
+        :application_plan_id => application_plan_id}
       if (additional_fields)
         additional_fields.each do |key, value|
           params[key] = value
         end
       end
       response = @conn.post "/admin/api/signup.xml", params
-      return false if response.status != 201
       xml = Nokogiri::XML(response.body)
+      result = {
+          :success => false
+      }
+      if response.status == 422
+        errors =  xml.xpath("//errors/error").map do |error|
+          error.text
+        end
+        result[:errors] = errors
+      end
+      return result if response.status != 201
+      result[:success] = true
+
       account_id = xml.xpath('//account/id').first.text
       user_id = xml.xpath('//account/users/user/id').text
       self.approve_account account_id
       results = self.get_application_list account_id
       results[0][:user_id] = user_id.to_s
-      results
+      result[:account_info] = results
+    end
+
+    def get_account_plans
+      response = @conn.get "/admin/api/account_plans.xml", {:provider_key => @provider_key}
+      return false if response.status != 200
+      xml = Nokogiri::XML(response.body)
+      account_plans = Array.new
+      xml.xpath("//plans/plan").map do |account_plan|
+        if account_plan.css("state").text == "published"
+          account_plans.push({
+            :name => account_plan.css("name").text,
+            :account_plan_id => account_plan.css("id").text
+          })
+        end
+      end
+      account_plans
     end
 
     def create_user(account_id, email, password, username)

data/lib/3scale_api/version.rb

@@ -1,3 +1,3 @@
 module Threescale
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/3scale_api_spec.rb

@@ -50,6 +50,7 @@ describe "3scaleApi" do
                 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
                 'User-Agent'=>'Faraday v0.9.1'}).
             to_return(:status => 200, :body => "", :headers => {})
+
         @threescale.get_application_keys 'account-id', 'application-id'
       end
     end
@@ -99,7 +100,6 @@ describe "3scaleApi" do
                    'Content-Type'=>'application/x-www-form-urlencoded',
                    'User-Agent'=>'Faraday v0.9.1'})
 
-
         @threescale.generate_application_key 'account-id', 'application-id'
       end
     end
@@ -141,6 +141,7 @@ describe "3scaleApi" do
         stub_request(:get, "http://test-url.test/admin/api/services.xml?provider_key=provider-key").
             with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.1'}).
             to_return(:status => 200, :body => "", :headers => {})
+
         @threescale.get_services
       end
     end
@@ -151,6 +152,7 @@ describe "3scaleApi" do
             with(:body => {"email"=>"email", "password"=>"password", "provider_key"=>"provider-key", "username"=>"username"},
                  :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.9.1'}).
             to_return(:status => 200, :body => "", :headers => {})
+
         @threescale.create_user "account-id", "email", 'password', 'username'
       end
     end
@@ -161,6 +163,7 @@ describe "3scaleApi" do
             with(:body => {"provider_key"=>"provider-key"},
                  :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.9.1'}).
             to_return(:status => 200, :body => "", :headers => {})
+
         @threescale.activate_user "account-id", "user-id"
       end
     end
@@ -171,6 +174,7 @@ describe "3scaleApi" do
             with(:body => {"provider_key"=>"provider-key"},
                  :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.9.1'}).
             to_return(:status => 200, :body => "", :headers => {})
+
         @threescale.change_role_to_admin "account-id", "user-id"
       end
     end
@@ -181,6 +185,7 @@ describe "3scaleApi" do
             with(:body => {"provider_key"=>"provider-key"},
                  :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.9.1'}).
             to_return(:status => 200, :body => "", :headers => {})
+
         @threescale.change_role_to_member "account-id", "user-id"
       end
     end
@@ -207,5 +212,27 @@ describe "3scaleApi" do
         @threescale.approve_account "account_id"
       end
     end
+
+    describe "signup_express" do
+      it "should call admin/api/accounts/account_id/approve.xml" do
+        stub_request(:post, "http://test-url.test/admin/api/signup.xml").
+            with(:body => {"account_plan_id"=>"account-plan-id", "application_plan_id"=>"application-plan-id", "email"=>"email", "optional"=>"optional", "org_name"=>"org-name", "password"=>"password", "provider_key"=>"provider-key", "service_plan_id"=>"service-plan", "username"=>"username"},
+                 :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.9.1'}).
+            to_return(:status => 200, :body => "", :headers => {})
+
+        @threescale.signup_express "account-plan-id", "application-plan-id", "email", "org-name", "password",
+          "service-plan", "username", {:optional => 'optional'}
+      end
+    end
+
+    describe "get_account_plans" do
+      it "should call /admin/api/account_plans.xml" do
+        stub_request(:get, "http://test-url.test/admin/api/account_plans.xml?provider_key=provider-key").
+            with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.1'}).
+            to_return(:status => 200, :body => "", :headers => {})
+
+        @threescale.get_account_plans
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_api
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Robbie Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies: []
 description: This gem is to be used to interact with 3Scale's API.
 email: