flexirest 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f564de9b39812ec29fb0d9076fc88df9d8fc795b
-  data.tar.gz: d9d798138713953c4e3ad3ac10362e032042a860
+  metadata.gz: 67924c36e94f6b5a9ad4cbdf09d7762c20b88ecd
+  data.tar.gz: 2ac29ea6fef0704c66d7af8105d7009bdeb0141b
 SHA512:
-  metadata.gz: 6cd7ff1ddef1a9ded44a59d354de2c4791087b35f272f38174ff8c680d2b398643c064c01fc248b1626be1b52386dba5a7f576bc9d045e5126d8353e39481531
-  data.tar.gz: fa438316661d96aff7e2e57f502f6c38f1695e38fc8ddfe1e035d739a61c8ffe70efc0f9285f71e49d19c3b3029133a12532931cf6b69f6005e1313778d30e62
+  metadata.gz: 682f4f180a66df72de50b82cd3263b5c3e9f6d2fc70c23b3ed49a5cf7e3242d8bf0526f0e4d2834e37f80f48915fe09d9907cf286ca60f7584703703d355d0b2
+  data.tar.gz: cb065db508aaf6ce615d42e353436b8da4b4c5cb17fd9d3f7b07f6dcb5cc7ee5d8e2da9d30efc9dc9ea6fc316c1179c32783160dddbefca589a2ecf129269c80

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.2.16
+
+Feature:
+
+- Replaces URL :keyed parameters for direct requests.
+
+## 1.2.15
+
+Feature:
+
+- Fixing issue when moving from ActiveRestClient to Flexirest - cached responses have the old class in them, so come through as a String
+
 ## 1.2.14
 
 Bugfixes:

data/lib/flexirest/base.rb

@@ -68,12 +68,10 @@ module Flexirest
       Flexirest::LazyLoader.new(prepare_direct_request(request, method), params)
     end
 
-    def self.prepare_direct_request(request, method, options={})
+    def self.prepare_direct_request(request, method = :get, options={})
       unless request.is_a? Flexirest::Request
         options[:plain] ||= false
-        mapped = {url:"DIRECT-CALLED-#{request}", method:method, options:{url:request, plain:options[:plain]}}
-
-        request = Request.new(mapped, self)
+        request = Flexirest::Request.new({ url: request, method: method, options: options }, self)
       end
       request
     end

data/lib/flexirest/request.rb

@@ -305,6 +305,8 @@ module Flexirest
           @base_url = "#{uri.scheme}://#{uri.host}#{":#{uri.port}" if uri.port != 80 && uri.port != 443}"
           @url = "#{base_url}#{@url}".gsub(@base_url, "")
           base_url = @base_url
+        else
+          base_url = parts[0]
         end
         base_url.gsub!(%r{//(.)}, "//#{username}:#{password}@\\1") if username && !base_url[%r{//[^/]*:[^/]*@}]
         connection = Flexirest::ConnectionManager.get_connection(base_url)

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.2.15"
+  VERSION = "1.2.16"
 end

data/spec/lib/base_spec.rb

@@ -323,7 +323,7 @@ describe Flexirest::Base do
         response = "This is a non-JSON string"
         other_response = "This is another non-JSON string"
         allow_any_instance_of(Flexirest::Connection).to receive(:get) do |instance, url, others|
-          if url == "/?test=1"
+          if url["/?test=1"]
             ::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:response))
           else
             ::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:other_response))
@@ -351,6 +351,11 @@ describe Flexirest::Base do
       EmptyExample._request("http://api.example.com/", :post, {id:1234})
     end
 
+    it "should be able to replace parameters in the URL for the call" do
+      expect_any_instance_of(Flexirest::Connection).to receive(:post).with("http://api.example.com/1234", "", any_args).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:"{\"first_name\":\"Billy\"}")))
+      EmptyExample._request("http://api.example.com/:id", :post, {id:1234})
+    end
+
     it "should be able to use mapped methods to create a request to pass in to _lazy_request" do
       expect_any_instance_of(Flexirest::Connection).to receive(:get).with('/find/1', anything).and_return(::FaradayResponseMock.new(OpenStruct.new(status:200, response_headers:{}, body:"{\"first_name\":\"Billy\"}")))
       request = AlteringClientExample._request_for(:find, :id => 1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 1.2.16
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler