flexirest 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f549201f0bdade7d62e8972d7015cdf04f0f2aaa
-  data.tar.gz: b5ed62790c87fd8253bdb1d18bca02dfcbc8331c
+  metadata.gz: 0848a1654b64ccbc585f5dc619fb7c81611f0d7c
+  data.tar.gz: 8d65facc11bfe9413e2f2f61d79088f7cc7e22c0
 SHA512:
-  metadata.gz: 4b6d0e9794750161edab543b97aec47a956f3bc570fa65e35c5216ed857fa8ed7830c661ce1fbc0092d0743298c68fc0734db9d38932597a9d3470d5164036a9
-  data.tar.gz: 5297d2f938e3777a5264212465270792dbe7202f758d5c4cfa572ad7e6fa32fc244f66931623933e8bbc0cd7a62ac5202051245c2cd4b10fdfffbdf3216e6140
+  metadata.gz: 3793f05bd5e8707a704ad3f12fe5f6d725349d4e21a31d7f1a9701ffc4454cdfd5ce2a3c17985aa3dc50f2edb95ca67a1e2204e7e378acfe02a8e6ce6fe95829
+  data.tar.gz: e4aeb3fd76d09a52ab7f8efab500fb37f73b6824fb118e5ec49f80464379e791df97e9b851130ff7578ab23eb311441ba13ad99ab4b8fab0f17bd7644517cee4

data/lib/flexirest/configuration.rb

@@ -13,11 +13,15 @@ module Flexirest
 
       def base_url(value = nil)
         if value.nil?
-          if @base_url.nil?
+          value = if @base_url.nil?
             @@base_url
           else
             @base_url
           end
+          if value.nil? && superclass.respond_to?(:base_url)
+            value = superclass.base_url
+          end
+          value
         else
           value = value.gsub(/\/$/, '')
           @base_url = value
@@ -32,11 +36,15 @@ module Flexirest
 
       def username(value = nil)
         if value.nil?
-          if @username.nil?
+          value = if @username.nil?
             @@username
           else
             @username
           end
+          if value.nil? && superclass.respond_to?(:username)
+            value = superclass.username
+          end
+          value
         else
           value = CGI::escape(value) if value.present? && !value.include?("%")
           @username = value
@@ -51,11 +59,15 @@ module Flexirest
 
       def password(value = nil)
         if value.nil?
-          if @password.nil?
+          value = if @password.nil?
             @@password
           else
             @password
           end
+          if value.nil? && superclass.respond_to?(:password)
+            value = superclass.password
+          end
+          value
         else
           value = CGI::escape(value) if value.present? && !value.include?("%")
           @password = value
@@ -71,7 +83,11 @@ module Flexirest
       def request_body_type(value = nil)
         if value.nil?
           if @request_body_type.nil?
-            @@request_body_type
+            if value.nil? && superclass.respond_to?(:request_body_type)
+              superclass.request_body_type
+            else
+              @@request_body_type || :form_encoded
+            end
           else
             @request_body_type
           end
@@ -170,7 +186,6 @@ module Flexirest
         @base_url             = nil
         @@base_url            = nil
         @request_body_type    = nil
-        @@request_body_type   = :form_encoded
         @whiny_missing        = nil
         @lazy_load            = false
         @faraday_config       = default_faraday_config

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/lib/configuration_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Flexirest::Configuration do
   before :each do
     Object.send(:remove_const, :ConfigurationExample) if defined?(ConfigurationExample)
+    Object.send(:remove_const, :SubConfigurationExample) if defined?(SubConfigurationExample)
     Flexirest::Base._reset_configuration!
 
     class ConfigurationExample
@@ -13,6 +14,9 @@ describe Flexirest::Configuration do
       request_body_type :json
     end
 
+    class SubConfigurationExample < ConfigurationExample
+    end
+
     class ConfigurationExampleBare
       include Flexirest::Configuration
     end
@@ -39,6 +43,10 @@ describe Flexirest::Configuration do
     expect(ConfigurationExample.base_url).to eq("http://www.example.com")
   end
 
+  it "should remember the set base_url on a class, overriding a general one" do
+    expect(SubConfigurationExample.base_url).to eq("http://www.example.com")
+  end
+
   it "should remove a trailing slash from a globally configured base_url" do
     Flexirest::Base.base_url = "http://general.example.com/"
     expect(ConfigurationExample.base_url).to eq("http://www.example.com")
@@ -69,6 +77,10 @@ describe Flexirest::Configuration do
     Flexirest::Base.username = nil
   end
 
+  it "should remember the set username on a class, overriding a general one" do
+    expect(SubConfigurationExample.username).to eq("john")
+  end
+
   it "should escape the username" do
     Flexirest::Base.username = "bill@example.com"
     expect(Flexirest::Base.username).to eq("bill%40example.com")
@@ -91,6 +103,10 @@ describe Flexirest::Configuration do
     Flexirest::Base.password = nil
   end
 
+  it "should remember the set password on a class, overriding a general one" do
+    expect(SubConfigurationExample.password).to eq("smith")
+  end
+
   it "should escape the password" do
     Flexirest::Base.password = "something@else"
     expect(Flexirest::Base.password).to eq("something%40else")
@@ -111,12 +127,16 @@ describe Flexirest::Configuration do
     expect(ConfigurationExample.request_body_type).to eq(:json)
   end
 
-  it "should remember the set base_url on a class, overriding a general one" do
+  it "should remember the set request_body_type on a class, overriding a general one" do
     Flexirest::Base.request_body_type = :unknown
     expect(Flexirest::Base.request_body_type).to eq(:unknown)
     expect(ConfigurationExample.request_body_type).to eq(:json)
   end
 
+  it "should remember the set username on a class, overriding a general one" do
+    expect(SubConfigurationExample.request_body_type).to eq(:json)
+  end
+
   it "should default to non-lazy loading" do
     class LazyLoadingConfigurationExample1
       include Flexirest::Configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler