stash-client 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f21fe1aca9ec460ae0f48f9e8d935273df6ab12e
-  data.tar.gz: 76d5ff257df17b8ec7bfad6883df1d055081a787
+  metadata.gz: d0bfb9b31c359e4311307f236d66f7753be9345b
+  data.tar.gz: c10d90b5ad153f73131e690a336ab4da18320fd8
 SHA512:
-  metadata.gz: 92ac8a9115650f4f7a718a0f13033e67ce2b4ddb3c265bf0e1ef27ec7d148422866ebc3dda85edf36b806f83f1df57b9e491c1e22ea3a5238b920422b95f1719
-  data.tar.gz: 0fa261fd2cb0e25496e20bc6d8f403f4d12b62616a2a2f1e45a67c32d58573758376b0584e43cc37b0d0499860fe80d32ce65fc5c8737e87b90e9f79b0e3e2f8
+  metadata.gz: c54a18c9f3743786c8ec168f1b63d403ca1b9ffd22865a140d08592bc1825730e1ea654415795f59c86654be68bc7b391c3d1e3e6aed759a99e80d58903e4819
+  data.tar.gz: 485eaa886757e21005c29902a495a36eba19f2cda35c23dd22e5037124fe6cdadbc090b31afb99f827b4dd8890f6f5ffd93ba173f5afd05a6e6dc0c9181ef44b

data/lib/stash/client.rb

@@ -1,5 +1,5 @@
-require "stash/client/version"
-require "restclient"
+require 'stash/client/version'
+require 'faraday'
 require 'addressable/uri'
 require 'json'
 
@@ -9,19 +9,26 @@ module Stash
     attr_reader :url
 
     def initialize(opts = {})
-      if opts[:host] && opts[:scheme]
-        @url = Addressable::URI.parse(opts[:scheme] + '://' + opts[:host] + '/rest/api/1.0/')
-      elsif opts[:host]
-        @url = Addressable::URI.parse('http://' + opts[:host] + '/rest/api/1.0/')
-      elsif opts[:url]
-        @url = Addressable::URI.parse(opts[:url])
-      elsif opts[:uri] && opts[:uri].kind_of?(Addressable::URI)
-        @url = opts[:uri]
+      if opts[:client]
+        @client = opts[:client]
       else
-        raise ArgumentError, "must provide :url or :host"
+        if opts[:host] && opts[:scheme]
+          @url = Addressable::URI.parse(opts[:scheme] + '://' + opts[:host] + '/rest/api/1.0/')
+        elsif opts[:host]
+          @url = Addressable::URI.parse('http://' + opts[:host] + '/rest/api/1.0/')
+        elsif opts[:url]
+          @url = Addressable::URI.parse(opts[:url])
+        elsif opts[:uri] && opts[:uri].kind_of?(Addressable::URI)
+          @url = opts[:uri]
+        else
+          raise ArgumentError, "must provide :url or :host"
+        end
+
+        @url.userinfo = opts[:credentials] if opts[:credentials]
+
+        @client = Faraday.new(@url.site)
       end
 
-      @url.userinfo = opts[:credentials] if opts[:credentials]
     end
 
     def projects
@@ -115,27 +122,45 @@ module Stash
     end
 
     def fetch(uri)
-      parse(RestClient.get(uri.to_s, :accept => :json))
+      res = @client.get { |req|
+        req.url uri.to_s
+        req.headers['Accept'] = 'application/json'
+      }
+
+      parse(res.body)
     end
 
     def post(uri, data)
-      parse(
-        RestClient.post(
-          uri.to_s, data.to_json, :accept => :json, :content_type => :json
-        )
-      )
+      res = @client.post { |req|
+        req.url uri.to_s
+        req.body = data.to_json
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Accpet']       = 'application/json'
+      }
+
+      parse(res.body)
     end
 
     def put(uri, data)
-      parse(
-        RestClient.put(
-          uri.to_s, data.to_json, :accept => :json, :content_type => :json
-        )
-      )
+      res = @client.put { |req|
+        req.url uri.to_s
+        req.body = data.to_json
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['Accpet']       = 'application/json'
+      }
+
+      parse(res.body)
     end
 
     def delete(uri)
-      RestClient.delete(uri.to_s, :accept => :json)
+      res = @client.delete { |req|
+        req.url uri.to_s
+        req.headers['Accpet']       = 'application/json'
+      }
+
+      res.body
     end
 
     def parse(str)

data/lib/stash/client/version.rb

@@ -1,5 +1,5 @@
 module Stash
   class Client
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/stash-client.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency 'rest-client'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'addressable'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash-client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='