atlas-api 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -2,20 +2,24 @@ PATH
   remote: .
   specs:
     atlas-api (0.0.1)
-      faraday (~> 0.8.8)
+      faraday (= 0.6.0)
       hashie (~> 2.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.2.8)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     diff-lcs (1.2.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.6.0)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (>= 1.1.0, < 2)
+      rack (>= 1.1.0, < 2)
     hashie (2.0.5)
-    multipart-post (1.2.0)
+    multipart-post (1.1.5)
+    rack (1.5.2)
     rake (10.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)

data/atlas-api.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "faraday", "~> 0.8.8"
+  gem.add_dependency "faraday", "0.6.0"
   gem.add_dependency "hashie", "~> 2.0.5"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "webmock"

data/lib/atlas-api/client.rb

@@ -15,22 +15,22 @@ module Atlas
       # ------------------------------------------------------------------------
 
       def builds(options = {})
-        get("/builds", options)
+        get("builds", options)
       end
 
       def build(id, options = {})
-        get("/builds/#{id}", options)
+        get("builds/#{id}", options)
       end
 
       def create_build(options)
-        post("/builds", options)
+        post("builds", options)
       end
 
       # Build Formats
       # ------------------------------------------------------------------------
 
       def update_build_format(uuid, options = {})
-        put("/build_formats/#{uuid}", options)
+        put("build_formats/#{uuid}", options)
       end
 
       # HTTP methods
@@ -53,7 +53,8 @@ module Atlas
       end
 
       def agent
-        @agent ||= Faraday.new(@api_endpoint, { params: { auth_token: @auth_token }})
+        @agent ||= Faraday.new(url: @api_endpoint, params: { auth_token: @auth_token })
+        @agent
       end
 
       private

data/lib/atlas-api/version.rb

@@ -1,5 +1,5 @@
 module Atlas
   module Api
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/atlas-api/client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Atlas::Api::Client do
 
   def stub_request_with_token(method, path, body, query = {})
-    stub_request(method, "#{@endpoint}#{path}?auth_token=#{@token}").with(:body => query).to_return(:body => body)
+    stub_request(method, "#{@endpoint}/#{path}?auth_token=#{@token}").with(:body => query).to_return(:body => body)
   end
 
   before(:each) do
@@ -24,13 +24,24 @@ describe Atlas::Api::Client do
     end
 
     it "should use auth_token and api_endpoint in calls and return hashie" do
-      stub = stub_request_with_token(:get, "/fake", @body.to_json)
-      res = @client.get("/fake")
+      stub = stub_request_with_token(:get, "fake", @body.to_json)
+      res = @client.get("fake")
       stub.should have_been_requested
       res.should be_instance_of(Hashie::Mash)
       res.message.should == @body[:message]
     end
 
+    it "should combine paths from endpoint and path" do
+      @endpoint = "http://www.runemadsen.com/api"
+      client = Atlas::Api::Client.new(
+        auth_token: @token,
+        api_endpoint: @endpoint
+      )
+      stub = stub_request_with_token(:get, "fake", @body.to_json)
+      res = client.get("fake")
+      stub.should have_been_requested
+    end
+
   end
 
   describe "Builds" do
@@ -42,19 +53,19 @@ describe Atlas::Api::Client do
         :branch => "master",
         :pingback_url => "http://www.someurl.com"
       }
-      stub = stub_request_with_token(:post, "/builds", @body.to_json, query)
+      stub = stub_request_with_token(:post, "builds", @body.to_json, query)
       @client.create_build(query)
       stub.should have_been_requested
     end
 
     it "#build" do
-      stub = stub_request_with_token(:get, "/builds/1", @body.to_json)
+      stub = stub_request_with_token(:get, "builds/1", @body.to_json)
       @client.build(1)
       stub.should have_been_requested
     end
 
     it "#builds" do
-      stub = stub_request_with_token(:get, "/builds", @body.to_json)
+      stub = stub_request_with_token(:get, "builds", @body.to_json)
       @client.builds
       stub.should have_been_requested
     end
@@ -73,7 +84,7 @@ describe Atlas::Api::Client do
         :download_url => "http://www.someurl.com",
         :status => "success"
       }
-      stub = stub_request_with_token(:put, "/build_formats/#{@uuid}", @body.to_json, query)
+      stub = stub_request_with_token(:put, "build_formats/#{@uuid}", @body.to_json, query)
       @client.update_build_format(@uuid, query)
       stub.should have_been_requested
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atlas-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement