dnsimple 3.0.0.pre.beta1 → 3.0.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6571b9393456ff941623f5001f393bfd819493f3
-  data.tar.gz: bf1878874ee2fa403519e51bcf28e7c1a36afbd9
+  metadata.gz: 7128cb8f75d602974383ef364f17f679420772b2
+  data.tar.gz: a2fa6d2b0434351994f911d2b72bf385b885a8f9
 SHA512:
-  metadata.gz: 2fb5142d55bbc3408be6b2626c67a7c2c41caeb4239ace0a1b3624e870857bfb987e0073e3cea7180eec3fb935c819441d9ff1f6eee3de6c9c38b5de2f184763
-  data.tar.gz: e681b2fc92d3c1c4d6c51bf9407c28c89b3129e73180009ab6a1e2aabf2ebf7579b70af34c638e8e627dd1979724de3313bdd58057e42b68de1361e19878f433
+  metadata.gz: 774ea827afd9b4f40ba487dbf04c8c5a1c32bb3850abd94bae3652e4d75867c124000384d26505186e5963f0873b74a5b117342b8530eeea491e8808b95b3360
+  data.tar.gz: e4debc8a6e08f919d7839d007e58845a58a0f68e0b64d5ecb77623030a585a830f1e2665f7f49f061ee20f89117634df8b501e40bbe6c8e7df913884d44047c6

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
 #### 3.0
 
+##### beta2
+
+- FIXED: `state` and `redirect_uri` are not properly passed in the request to exchang the code for an access token (GH-89, GH-90).
+
+- FIXED: Request body is not properly serialized to JSON, and the "Content-Type" header was omissed (GH-91).
+
 ##### beta1
 
 - CHANGED: Minimum Ruby version >= 2

data/Gemfile

@@ -4,4 +4,3 @@ gemspec
 
 gem 'rake', '< 11'
 gem 'coveralls', require: false
-gem 'rspec-core', '>= 3.4.4'

data/README.md

@@ -18,10 +18,17 @@ This library is currently in beta version, the methods and the implementation sh
 
 ## Installation
 
+During the initial beta period, releases of this gem are flagged as [prerelease](http://guides.rubygems.org/patterns/#prerelease-gems). You will need to append `--pre` in order to install the beta client.
+
 ```
-$ gem install dnsimple
+$ gem install dnsimple --pre
 ```
 
+Also note that Bundler ignores pre-releases by default. To use a pre-release gem, make sure to explicitly add the release version.
+
+```
+gem 'dnsimple', '~> 3.0', '>= 3.0.0.pre.beta1'
+```
 
 ## Usage
 

data/lib/dnsimple/client.rb

@@ -156,9 +156,14 @@ module Dnsimple
     # @param  [Hash] options The query and header params for the request
     # @return [HTTParty::Response]
     def request(method, path, data = nil, options = {})
-      options[:body] = data if data
+      request_options = Extra.deep_merge!(base_options, options)
 
-      HTTParty.send(method, base_url + path, Extra.deep_merge!(base_options, options))
+      if data
+        request_options[:headers]["Content-Type"] = content_type(request_options[:headers])
+        request_options[:body] = content_data(request_options[:headers], data)
+      end
+
+      HTTParty.send(method, base_url + path, request_options)
     end
 
 
@@ -167,7 +172,10 @@ module Dnsimple
     def base_options
       options = {
           format:   :json,
-          headers:  { 'Accept' => 'application/json', 'User-Agent' => user_agent },
+          headers:  {
+            'Accept' => 'application/json',
+            'User-Agent' => user_agent
+          },
       }
 
       if proxy
@@ -188,5 +196,13 @@ module Dnsimple
       options
     end
 
+    def content_type(headers)
+      headers["Content-Type"] || "application/json"
+    end
+
+    def content_data(headers, data)
+      headers["Content-Type"] == "application/json" ? JSON.dump(data) : data
+    end
+
   end
 end

data/lib/dnsimple/client/oauth.rb

@@ -13,6 +13,8 @@ module Dnsimple
       # @return [String] The url to redirect the user to authorize.
       def exchange_authorization_for_token(code, client_id, client_secret, options = {})
         attributes = { code: code, client_id: client_id, client_secret: client_secret, grant_type: "authorization_code" }
+        attributes[:state] = options.delete(:state) if options.has_key?(:state)
+        attributes[:redirect_uri] = options.delete(:redirect_uri) if options.has_key?(:redirect_uri)
         response = client.post(Client.versioned("/oauth/access_token"), attributes, options)
         Struct::OauthToken.new(response)
       end

data/lib/dnsimple/version.rb

@@ -1,3 +1,3 @@
 module Dnsimple
-  VERSION = "3.0.0-beta1"
+  VERSION = "3.0.0-beta2"
 end

data/spec/dnsimple/client/oauth_spec.rb

@@ -31,6 +31,19 @@ describe Dnsimple::Client, ".oauth" do
       expect(result.token_type).to eq("Bearer")
       expect(result.account_id).to eq(1)
     end
+
+    context "when state and redirect_uri are provided" do
+      let(:state) { "super-state" }
+      let(:redirect_uri) { "super-redirect-uri" }
+
+      it "builds the correct request" do
+        subject.exchange_authorization_for_token(code, client_id, client_secret, state:state, redirect_uri: redirect_uri)
+
+        expect(WebMock).to have_requested(:post, "https://api.dnsimple.test/v2/oauth/access_token")
+            .with(body: { client_id: client_id, client_secret: client_secret, code: code, state: state, redirect_uri: redirect_uri, grant_type: "authorization_code" })
+            .with(headers: { 'Accept' => 'application/json' })
+      end
+    end
   end
 
   describe "#authorize_url" do

data/spec/dnsimple/client_spec.rb

@@ -137,19 +137,32 @@ describe Dnsimple::Client do
       subject.request(:get, 'foo')
     end
 
-    it "properly extracts options from data" do
+    it "properly extracts processes options and encodes data" do
       expect(HTTParty).to receive(:put).
                           with("#{subject.base_url}foo",
                                format: :json,
-                               body: { something: "else" },
+                               body: JSON.dump({ something: "else" }),
                                query: { foo: "bar" },
                                basic_auth: { username: "user", password: "pass" },
-                               headers: { 'Accept' => 'application/json', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}", "Custom" => "Header" }
+                               headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/json', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}", "Custom" => "Header" }
                           ).
                           and_return(double('response', code: 200))
 
       subject.request(:put, 'foo', { something: "else" }, { query: { foo: "bar" }, headers: { "Custom" => "Header" } })
     end
+
+    it "handles non application/json content types" do
+      expect(HTTParty).to receive(:post).
+                          with("#{subject.base_url}foo",
+                               format: :json,
+                               body: { something: "else" },
+                               basic_auth: { username: "user", password: "pass" },
+                               headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => "dnsimple-ruby/#{Dnsimple::VERSION}" }
+                          ).
+                          and_return(double('response', code: 200))
+
+      subject.request(:post, 'foo', { something: "else" }, headers: { "Content-Type" => "application/x-www-form-urlencoded" })
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dnsimple
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta1
+  version: 3.0.0.pre.beta2
 platform: ruby
 authors:
 - Anthony Eden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty