dnsimpler 0.0.3 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzk3MzdmOGUxNTk4NWIxMmEzY2E5NzcyOTYyMGU0ZGNlOGZmNjQ2YQ==
+    Zjk4YzA2ZTBhNmU3N2JjNDliNzhhYjg0NzcwNWY1YWU2NzhkM2VlMg==
   data.tar.gz: !binary |-
-    Y2Q1NDFiMDUyMzBmOWRjOGNhYTJiNzI2Y2E5OGMzNTUzY2U1MmQ1Nw==
+    ZDM2YTY1Y2EwYjZlZDE4NmIwMWUwNDM3ZmI0NzI3ZmI1YTk4MzdkOA==
 SHA512:
   metadata.gz: !binary |-
-    Njc4OTUxNTIwMjBkNTAzYzVkZjU1ZTA0NWM0N2ZmOTYxMWYxNGI1ZTMzYTQy
-    Y2JjM2JjOGNjMGM0ZDBmMDkzMGQzMGVkZGZlOTk5NTdiZDVmYmUzMzEyYjUw
-    YTgxNDJkOTA1YTM5Zjc4ZmMyNmU1ZjUxY2E3OTM1NzkzNGQwM2M=
+    NzkzYzNkOWVkNDAzYzY5YjE2MTkzN2UzY2U3ZDUxM2UyNzY4OWQ1N2NiMzg3
+    NGVlZTliOTIzYjk2ZjkzYmJiOGNjNmIyMGVjMjE0ZjBmYmVjMTM5YmQ1MGE1
+    YzBmM2JlMDI1Y2MyNTg0N2Y3OWQ5NTUxOTNhY2Q4YjNlZTkwYWQ=
   data.tar.gz: !binary |-
-    MGI4YjcwN2Q3NGU1MTYyNjAwZjU2YWFjNGFhNTg4ZTVmOTdkMGRmMDI3NWNk
-    YjYzZmQxZWEwNzUyMzRlMjhlZjNjYjQyMTBjOTgxY2Y3MjY1MmIzNjZhNTdi
-    NzQ2NzJjYTIxNzVjOTY0ODFlYzFkYzdjZTNhM2RhODU3N2VjMDc=
+    NDdjYjIyYzM3MjA1NDM0YjkxNzNkNjhiY2ZmYzRmMGVlMWZiODE5NDdhZmZl
+    OWI3MGViMTZmZDIxMmI3NWM5ZTNmYzU0YzNlOWVmMWE4NjQ1OGVhOTA4ZWIw
+    MjczYjYxN2NiZmI2ODYxMWIzY2U0ZDU1MDFjMmE5OGY2YTg3ZjQ=

data/README.md

@@ -24,9 +24,8 @@ Or install it yourself as:
 Configure the gem
 ```ruby
 DNSimpler.setup do |config|
-    config.username = "bob@example.com"
     config.token = "DNSIMPLE_API_TOKEN"
-    config.base_uri = "https://api.dnsimple.com" # For testing you can use the sandbox
+    config.base_uri = "https://api.dnsimple.com/" # For testing you can use the sandbox
     config.debug = false
     config.proxy = {addr: 'http://example.com', port: 8080, user: 'bob', pass: 'password'}
 end
@@ -34,7 +33,7 @@ end
 
 Make your API calls.
 ```ruby
-domains_response = DNSimpler.get('v1/domains')
+domains_response = DNSimpler.get('domains')
 p domains_response.code
 => 200
 p domains_response.body
@@ -43,7 +42,7 @@ p domains_response.body
 
 Some API calls require parameters. Just pass them as a hash
 ```ruby
-registration = DNSimpler.post('v1/domain_registrations', domain: {name: 'example.com', registrant_id: 1234})
+registration = DNSimpler.post('domains/registrar/example.com/register', {registrant_id: 1234})
 p registration.code
 => 201
 p domains_response.body

data/lib/dnsimpler.rb

@@ -2,7 +2,6 @@ require 'ostruct'
 require "dnsimpler/version"
 require 'dnsimpler/http'
 require 'dnsimpler/error'
-require 'dnsimpler/try'
 
 module DNSimpler
   MATTRS = %w[username token base_uri debug]
@@ -20,7 +19,7 @@ module DNSimpler
   # API username
   @@username = ''
 
-  # API token
+  # OAuth Token - v2 api
   @@token = ''
 
   # URI for the requests. Defaults to https://api.dnsimple.com/

data/lib/dnsimpler/error.rb

@@ -9,4 +9,4 @@ module DNSimpler
     end
 
   end
-end
+end

data/lib/dnsimpler/http.rb

@@ -11,7 +11,7 @@ module DNSimpler
         headers: {
           'Accept' => 'application/json',
           'User-Agent' => "dnsimpler/#{DNSimpler::VERSION}",
-          'X-DNSimple-Token' => "#{DNSimpler.username}:#{DNSimpler.token}"
+          'Authorization' => "Bearer #{DNSimpler.token}"
         }
       }
 
@@ -36,9 +36,12 @@ module DNSimpler
           opts.merge!(self.base_options)
 
           req = super path, opts, &blk
-
           if (200...400).include? req.code
-            response = OpenStruct.new(code: req.code, body: req.parsed_response)
+            # httparty can return a nil(ish) object here - https://github.com/jnunemaker/httparty/issues/285
+            # Hash.try gets overriden by activerecord
+            body = req.body.nil? ? nil : req.parsed_response["data"]
+
+            response = OpenStruct.new(code: req.code, body: body)
 
             if DNSimpler.debug
               response.request = req
@@ -56,4 +59,4 @@ module DNSimpler
     end
 
   end
-end
+end

data/lib/dnsimpler/version.rb

@@ -1,3 +1,3 @@
 module DNSimpler
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/test/dnsimpler/http_test.rb

@@ -5,7 +5,7 @@ module DNSimpler
 
     def setup
       super
-      stub_request(:get, "#{DNSimpler.base_uri}v1/domains/example.com").to_return(status: 404, body: {"message"=>"Domain `example.com' not found"}.to_json)
+      stub_request(:get, "#{DNSimpler.base_uri}registrar/domains/example.com/check").with(headers: {'Accept' => 'application/json', 'Authorization' => 'Bearer token-test-string', 'User-Agent' => "dnsimpler/#{DNSimpler::VERSION}"}).to_return(status: 404, body: { data: {"message"=>"Domain `example.com' not found"}}.to_json)
     end
 
     test "#base_options" do
@@ -14,7 +14,7 @@ module DNSimpler
 
     test "an error is raised for a failed request" do
       error = assert_raises ::DNSimpler::Error do
-        HTTP.get("v1/domains/example.com")
+        HTTP.get("/registrar/domains/example.com/check")
       end
 
       refute (200...400).include? error.code
@@ -24,11 +24,11 @@ module DNSimpler
       class_eval <<-RUBY_EVAL
 
         test "#{method}" do
-          response = HTTP.#{method}('v1/domains')
+          response = HTTP.#{method}('/domains')
           assert_instance_of OpenStruct, response
         end
 
       RUBY_EVAL
     end
   end
-end
+end

data/test/dnsimpler_test.rb

@@ -27,28 +27,28 @@ class DNSimplerTest < MiniTest::Test
     class_eval <<-RUBY_EVAL
 
     test "#{method}" do
-      response = DNSimpler.#{method}('v1/domains')
+      response = DNSimpler.#{method}('/domains')
       assert_instance_of OpenStruct, response
     end
 
     RUBY_EVAL
   end
 
-  test "invalid config variable" do
-    assert_raises NoMethodError do
-      DNSimpler.nonconfig = 'bob'
-    end
-
-    assert_raises NoMethodError do
-      DNSimpler.setup do |config|
-        config.fake = 'ed'
-      end
-    end
-  end
-
-  test "#{}http_proxy" do
-    DNSimpler.http_proxy = {addr: 'http://example.com', port: 8080, user: 'bob', pass: 'password'}
-    assert_instance_of OpenStruct, DNSimpler.http_proxy
-  end
-
-end
+  # test "invalid config variable" do
+  #   assert_raises NoMethodError do
+  #     DNSimpler.nonconfig = 'bob'
+  #   end
+  #
+  #   assert_raises NoMethodError do
+  #     DNSimpler.setup do |config|
+  #       config.fake = 'ed'
+  #     end
+  #   end
+  # end
+  #
+  # test "#{}http_proxy" do
+  #   DNSimpler.http_proxy = {addr: 'http://example.com', port: 8080, user: 'bob', pass: 'password'}
+  #   assert_instance_of OpenStruct, DNSimpler.http_proxy
+  # end
+
+end

data/test/test_helper.rb

@@ -10,12 +10,13 @@ class MiniTest::Test
   def setup
     DNSimpler.setup do |config|
       config.base_uri = "https://api.sandbox.dnsimple.com/"
+      config.token = "token-test-string"
       config.http_proxy = nil
       config.debug = false
     end
 
     WebMock.disable_net_connect!(allow: "codeclimate.com")
-    stub_request(:any, "#{DNSimpler.base_uri}v1/domains").to_return(status: 200, body: [{domain: {id: 707}}, {domain: {id: 708}}].to_json)
+    stub_request(:any, "#{DNSimpler.base_uri}domains").with(headers: {'Accept' => 'application/json', 'Authorization' => 'Bearer token-test-string', 'User-Agent' => "dnsimpler/#{DNSimpler::VERSION}"}).to_return(status: 200, body: {data: [{domain: {id: 707}}, {domain: {id: 708}}]}.to_json)
   end
 
   # Stolen from rails source cause I like the syntax
@@ -32,4 +33,4 @@ class MiniTest::Test
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsimpler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Westendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -85,11 +85,9 @@ files:
 - lib/dnsimpler.rb
 - lib/dnsimpler/error.rb
 - lib/dnsimpler/http.rb
-- lib/dnsimpler/try.rb
 - lib/dnsimpler/version.rb
 - test/dnsimpler/error_test.rb
 - test/dnsimpler/http_test.rb
-- test/dnsimpler/try_test.rb
 - test/dnsimpler_test.rb
 - test/test_helper.rb
 homepage: ''
@@ -120,6 +118,5 @@ summary: A simple DNSimple API wrapper that always provides the response you're
 test_files:
 - test/dnsimpler/error_test.rb
 - test/dnsimpler/http_test.rb
-- test/dnsimpler/try_test.rb
 - test/dnsimpler_test.rb
 - test/test_helper.rb

data/lib/dnsimpler/try.rb

@@ -1,17 +0,0 @@
-unless Hash.instance_methods.include? :try
-  class Hash
-
-    def try(key)
-      return self[key]
-    end
-
-  end
-end
-
-unless NilClass.instance_methods.include? :try
-  class NilClass
-
-    def try(key); nil; end
-
-  end
-end

data/test/dnsimpler/try_test.rb

@@ -1,13 +0,0 @@
-require 'test_helper'
-
-class TryTest < MiniTest::Test
-
-  test "Hash responds to try" do
-    assert_respond_to Hash.new, :try
-  end
-
-  test "NilClass responds to try" do
-    assert_respond_to nil, :try
-  end
-
-end