maestrano 1.0.0.pre.RC4 → 1.0.0.pre.RC5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bbd3569f7e1c43bb9aba22ab88c4e6dab4c0313
-  data.tar.gz: 0d04bfbf3ad9d3c059a1d8be39c8da9434975a66
+  metadata.gz: 026f33b3cb669405a068fd77f74860e6767950d8
+  data.tar.gz: 6a04ca35d44ddeb69ba115f09d43157c6cb55b6a
 SHA512:
-  metadata.gz: bc91f23cac0658609f646aca6d92bb1f356afb0dae8c8310e573e2a665ac820ec91255287ffe3df53a5d4dcc224728e032c989efe451e280a0c2b757d88e20cf
-  data.tar.gz: 2e2dbbc2f898e695e96f3aacac967f38c1137fe171659e8df046d5ad0382d9bc1deafcace9dd75fe28c832905986403b1072cafa5050f23463ea9abb8231821b
+  metadata.gz: 83aa95476fd6c663d3a091fe521c6f917fc925dbd16b315663b47cc486ddd301af58b01a987421992feb99714d8aa5b368a62a150e803c657f4210879a6bde06
+  data.tar.gz: a2b69dadf460026c307716e57466225071a34fbd01cd6d98bdc80226ffe481c6b8630eb6def6824b4d372283430f1184711d0289926745026b25261a10502545

data/lib/maestrano.rb

@@ -278,7 +278,7 @@ module Maestrano
         last_prop = props.pop
         obj = props.inject(self,:send)
         obj.send(last_prop)
-      elsif EVT_CONFIG[@environment.to_s].has_key?(real_param.to_s)
+      elsif EVT_CONFIG.has_key?(@environment.to_s) && EVT_CONFIG[@environment.to_s].has_key?(real_param.to_s)
         EVT_CONFIG[@environment.to_s][real_param.to_s]
       else
         raise ArgumentError, "No such configuration parameter: '#{parameter}'"

data/lib/maestrano/sso.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module SSO
     include Preset
-    
+
     # Return the saml_settings based on
     # Maestrano configuration
     def self.saml_settings
@@ -14,75 +14,75 @@ module Maestrano
       settings.name_identifier_format         = Maestrano[preset].param('sso.name_id_format')
       settings
     end
-    
+
     # Build a new SAML Request
     def self.build_request(get_params = {})
       Maestrano::Saml::Request[preset].new(get_params)
     end
-    
+
     # Build a new SAML response
     def self.build_response(saml_post_param)
       Maestrano::Saml::Response[preset].new(saml_post_param)
     end
-    
+
     def self.enabled?
       !!Maestrano[preset].param('sso.enabled')
     end
-    
+
     def self.init_url
       host = Maestrano[preset].param('sso.idm')
       path = Maestrano[preset].param('sso.init_path')
       return "#{host}#{path}"
     end
-    
+
     def self.consume_url
       host = Maestrano[preset].param('sso.idm')
       path = Maestrano[preset].param('sso.consume_path')
       return "#{host}#{path}"
     end
-    
+
     def self.logout_url
-      host = Maestrano[preset].param('api_host')
+      host = Maestrano[preset].param('api.host')
       path = '/app_logout'
       return "#{host}#{path}"
     end
-    
+
     def self.unauthorized_url
-      host = Maestrano[preset].param('api_host')
+      host = Maestrano[preset].param('api.host')
       path = '/app_access_unauthorized'
       return "#{host}#{path}";
     end
-    
+
     def self.idp_url
-      host = Maestrano[preset].param('api_host')
-      api_base = Maestrano[preset].param('api_base')
+      host = Maestrano[preset].param('api.host')
+      api_base = Maestrano[preset].param('api.base')
       endpoint = 'auth/saml'
       return "#{host}#{api_base}#{endpoint}"
     end
-    
-    def self.session_check_url(user_uid,sso_session) 
-      host = Maestrano[preset].param('api_host')
-      api_base = Maestrano[preset].param('api_base')
+
+    def self.session_check_url(user_uid,sso_session)
+      host = Maestrano[preset].param('api.host')
+      api_base = Maestrano[preset].param('api.base')
       endpoint = 'auth/saml'
       return URI.escape("#{host}#{api_base}#{endpoint}/#{user_uid}?session=#{sso_session}")
     end
-    
+
     # Set maestrano attributes in session
     # Takes the BaseUser hash representation and current session
     # in arguments
     def self.set_session(session, auth)
       Maestrano::SSO::Session[preset].from_user_auth_hash(session,auth).save
     end
-    
+
     # Destroy the maestrano session in http session
     def self.clear_session(session)
       session.delete(:maestrano)
       session.delete('maestrano')
     end
-    
+
     # Metaclass definitions
     class << self
       alias_method :unset_session, :clear_session
     end
   end
-end
+end

data/lib/maestrano/version.rb

@@ -1,3 +1,3 @@
 module Maestrano
-  VERSION = '1.0.0.pre.RC4'
+  VERSION = '1.0.0.pre.RC5'
 end

data/test/maestrano/account/recurring_bill_test.rb

@@ -4,7 +4,7 @@ module Maestrano
   module Account
     class RecurringBillTest < Test::Unit::TestCase
       include APITestHelper
-      
+
       should "be listable" do
         @api_mock.expects(:get).once.returns(test_response(test_account_recurring_bill_array))
         c = Maestrano::Account::RecurringBill.all
@@ -31,7 +31,7 @@ module Maestrano
 
       should "successfully create a remote bill when passed correct parameters" do
         @api_mock.expects(:post).with do |url, api_token, params|
-          url == "#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/recurring_bills" && api_token.nil? && 
+          url == "#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/recurring_bills" && api_token.nil? &&
           CGI.parse(params) == {"group_id"=>["cld-1"], "price_cents"=>["23000"], "currency"=>["AUD"], "description"=>["Some recurring bill"], "period"=>["Month"]}
         end.once.returns(test_response(test_account_recurring_bill))
 
@@ -46,4 +46,4 @@ module Maestrano
       end
     end
   end
-end
+end

data/test/maestrano/api/resource_test.rb

@@ -5,7 +5,7 @@ module Maestrano
   module API
     class ResourceTest < Test::Unit::TestCase
       include APITestHelper
-      
+
       should "creating a new Resource should not fetch over the network" do
         @api_mock.expects(:get).never
         Maestrano::Account::Bill.new("someid")
@@ -61,11 +61,11 @@ module Maestrano
             @original_api_key = Maestrano.param('api.key')
             Maestrano.configure { |c| c.api_key = nil }
           end
-          
+
           teardown do
             Maestrano.configure { |c| c.api_key = @original_api_key }
           end
-          
+
           should "use the per-object credential when creating" do
             Maestrano::API::Operation::Base.expects(:execute_request).with do |opts|
               opts[:headers][:authorization] == "Basic #{Base64.strict_encode64('someid:somekey')}"
@@ -103,22 +103,22 @@ module Maestrano
       context "with valid credentials" do
         should "urlencode values in GET params" do
           response = test_response(test_account_bill_array)
-          @api_mock.expects(:get).with("#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills?bill=test%20bill", nil, nil).returns(response)
+          @api_mock.expects(:get).with("#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills?bill=test%20bill", nil, nil).returns(response)
           bills = Maestrano::Account::Bill.all(:bill => 'test bill').data
           assert bills.kind_of? Array
         end
 
         should "construct URL properly with base query parameters" do
           response = test_response(test_account_bill_array)
-          @api_mock.expects(:get).with("#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills?bill=test_account_bill", nil, nil).returns(response)
+          @api_mock.expects(:get).with("#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills?bill=test_account_bill", nil, nil).returns(response)
           bills = Maestrano::Account::Bill.all(:bill => 'test_account_bill')
 
-          
+
         end
-        
+
         should "construct URL properly with multiple query parameters" do
           response = test_response(test_account_bill_array)
-          @api_mock.expects(:get).with("#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills?bill=test_account_bill&paid=true", nil, nil).returns(response)
+          @api_mock.expects(:get).with("#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills?bill=test_account_bill&paid=true", nil, nil).returns(response)
           bills = Maestrano::Account::Bill.all(bill:'test_account_bill', paid: true)
         end
 
@@ -162,15 +162,15 @@ module Maestrano
           @api_mock.expects(:get).with do |url, api_token, params|
             uri = URI(url)
             query = CGI.parse(uri.query)
-            (url =~ %r{^#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills?} &&
+            (url =~ %r{^#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills?} &&
              query.keys.sort == ['offset', 'sad'])
           end.returns(test_response(test_account_bill_array_one))
           Maestrano::Account::Bill.all(:count => nil, :offset => 5, :sad => false)
         end
-        
+
         should "setting a nil value for a param should exclude that param from the POST request" do
           @api_mock.expects(:post).with do |url, api_token, params|
-            url == "#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills" &&
+            url == "#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills" &&
               api_token.nil? &&
               CGI.parse(params) == { 'group_id' => ['cld-1'], 'price_cents' => ['23000'], 'currency' => ['AUD'] }
           end.returns(test_response(test_account_bill))
@@ -184,7 +184,7 @@ module Maestrano
 
         should "requesting with a unicode ID should result in a request" do
           response = test_response(test_missing_id_error, 404)
-          @api_mock.expects(:get).once.with("#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills/%E2%98%83", nil, nil).raises(RestClient::ExceptionWithResponse.new(response, 404))
+          @api_mock.expects(:get).once.with("#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills/%E2%98%83", nil, nil).raises(RestClient::ExceptionWithResponse.new(response, 404))
           c = Maestrano::Account::Bill.new("☃")
           assert_raises(Maestrano::API::Error::InvalidRequestError) { c.refresh }
         end
@@ -196,7 +196,7 @@ module Maestrano
 
         should "making a GET request with parameters should have a query string and no body" do
           params = { :limit => 1 }
-          @api_mock.expects(:get).once.with("#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills?limit=1", nil, nil).returns(test_response(test_account_bill_array_one))
+          @api_mock.expects(:get).once.with("#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills?limit=1", nil, nil).returns(test_response(test_account_bill_array_one))
           Maestrano::Account::Bill.all(params)
         end
 
@@ -210,7 +210,7 @@ module Maestrano
             period_started_at: date
           }
           @api_mock.expects(:post).once.with do |url, get, post|
-            get.nil? && 
+            get.nil? &&
             CGI.parse(post) == {"group_id"=>["cld-1"], "price_cents"=>["23000"], "currency"=>["AUD"], "description"=>["Some bill"], "period_started_at" => ["#{date.iso8601}"]}
           end.returns(test_response(test_account_bill))
           Maestrano::Account::Bill.create(params)
@@ -242,15 +242,15 @@ module Maestrano
 
         should "updating an object should issue a PUT request with only the changed properties" do
           @api_mock.expects(:put).with do |url, api_token, params|
-            url == "#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills/bill-1" && 
+            url == "#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills/bill-1" &&
             api_token.nil? && CGI.parse(params) == {'description' => ['another_mn']}
           end.once.returns(test_response(test_account_bill))
-          
+
           c = Maestrano::Account::Bill.construct_from(test_account_bill[:data])
           class << c
             include Maestrano::API::Operation::Update
           end
-          
+
           c.description = "another_mn"
           c.save
         end
@@ -261,7 +261,7 @@ module Maestrano
           class << c
             include Maestrano::API::Operation::Update
           end
-          
+
           c.description = "another_mn"
           c.save
         end
@@ -269,7 +269,7 @@ module Maestrano
         should "deleting should send no props and result in an object that has no props other deleted" do
           @api_mock.expects(:get).never
           @api_mock.expects(:post).never
-          @api_mock.expects(:delete).with("#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills/bill-1", nil, nil).once.returns(test_response(test_account_bill))
+          @api_mock.expects(:delete).with("#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills/bill-1", nil, nil).once.returns(test_response(test_account_bill))
 
           c = Maestrano::Account::Bill.construct_from(test_account_bill[:data])
           class << c
@@ -295,7 +295,7 @@ module Maestrano
           c = Maestrano::Account::Bill.all.data
           assert c.kind_of? Array
           assert c[0].kind_of? Maestrano::Account::Bill
-          
+
           # No object to test for the moment
           #assert c[0].card.kind_of?(Maestrano::API::Object) && c[0].card.object == 'card'
         end
@@ -335,9 +335,9 @@ module Maestrano
 
             assert_equal true, rescued
           end
-          
+
         end
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.RC4
+  version: 1.0.0.pre.RC5
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client