3scale_api 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d586bd62eb74e45a90dca8fca52e29db2a5de9
-  data.tar.gz: c411e405465bf9d4898c6c833152fadec4168c20
+  metadata.gz: 8e7cfb891b2ed35e525ece7bcd749ea3bd55422d
+  data.tar.gz: 054ed669994171561b4d569d3c04939bdacd1cc6
 SHA512:
-  metadata.gz: 71afd9b2e268e0ead676872c957418e2b8a1a6a292ce19d8be73f67e0b97fc6f4d86aa7c7109aa59e3d5c864826a12252a07a0852d31ea8a6cd424d2a08dfa50
-  data.tar.gz: 7056564f7ea3b3fd1084cd8e4bcbdab9974f518dae8aef99389cbe20a305b9ebdf91ad405afb2a53ad41d4759b76fb32c5559a8276609a7a5a0317807588cc7b
+  metadata.gz: 93f41fb6b4cc5c9386c6cc01c5838662f8b2f7c48098b273d11908a646908902ed060b381b6a4b24688710994dc09e048d33af4465b1a5ee7b2f23d5d51bcd54
+  data.tar.gz: 8528ba81265e3ae4b495dff44795257c417c13a767450e2cc4ae6a656a358c71e2e1edaacecad189e54c3eced2e5e0fc1744a97529bb04a31eba3de5eb80cbaf

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

@@ -81,7 +81,9 @@ module Threescale
         :id => application.css('id').text,
         :name => application.css('name').text,
         :application_id => application.css('application_id').text,
-        :plan_type => application.css('plan name').text})
+        :plan_type => application.css('plan name').text,
+        :service_id => application.css('service_id').first.text
+        })
       end
       results
     end
@@ -119,11 +121,9 @@ module Threescale
       response.status == 201
     end
 
-    def signup_express(account_plan_id, application_plan_id, email, org_name, password, service_plan_id, username,
-      additional_fields = nil)
+    def signup_express( email, org_name, password, 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}
+        :org_name => org_name}
       if (additional_fields)
         additional_fields.each do |key, value|
           params[key] = value

data/lib/3scale_api/version.rb

@@ -1,3 +1,3 @@
 module Threescale
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

data/spec/3scale_api_spec.rb

@@ -190,18 +190,6 @@ describe "3scaleApi" do
       end
     end
 
-    describe "change_role_to_member" do
-      it "should call /admin/api/signup.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"=>"emailorg_name", "org_name"=>"password", "password"=>"service_plan_id", "provider_key"=>"provider-key", "service_plan_id"=>"username", "username"=>{"first_field"=>"first-field"}},
-                 :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_id", "username", {:first_field => 'first-field'}
-      end
-    end
-
     describe "approve_account" do
       it "should call /admin/api/accounts/{account_id}/users/{user_id}/member.xml" do
         stub_request(:put, "http://test-url.test/admin/api/accounts/account_id/approve.xml").
@@ -216,12 +204,11 @@ describe "3scaleApi" do
     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"},
+            with(:body => {"email"=>"email", "optional"=>"optional", "org_name"=>"org-name", "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.signup_express "account-plan-id", "application-plan-id", "email", "org-name", "password",
-          "service-plan", "username", {:optional => 'optional'}
+        @threescale.signup_express  "email", "org-name", "password", "username", {:optional => 'optional'}
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_api
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Robbie Holmes