footrest 0.1.3 → 0.2.0

data/lib/footrest.rb

@@ -1,5 +1,4 @@
 require 'footrest/http_error'
-require 'footrest/configuration'
 require 'footrest/client'
 require 'footrest/version'
 

data/lib/footrest/client.rb

@@ -1,17 +1,38 @@
 require 'footrest/connection'
 require 'footrest/request'
-require 'footrest/configuration'
+require 'active_support/configurable'
 
 module Footrest
   class Client
     include Footrest::Connection
     include Footrest::Request
+    include ActiveSupport::Configurable
 
-    attr_reader :config
+    config_accessor :token
+    config_accessor :prefix
+    config_accessor :logging
 
     def initialize(options={}, &block)
-      @config = Footrest.config.merge(options)
-      set_connection(@config, &block)
+      self.config.merge!(options)
+      yield self if block_given?
+      set_connection(config)
+    end
+
+    def connection(&block)
+      @connection.tap do |conn|
+        yield conn if block_given?
+      end
+    end
+
+    def fullpath(path)
+      prefix ? join(prefix, path) : path
+    end
+
+  protected
+    def join(*parts)
+      joined = parts.map{ |p| p.gsub(%r{^/|/$}, '') }.join('/')
+      joined = '/' + joined if parts.first[0] == '/'
+      joined
     end
   end
 end

data/lib/footrest/connection.rb

@@ -7,7 +7,7 @@ module Footrest
 
     attr_reader :connection
 
-    def set_connection(config, &block)
+    def set_connection(config)
       @connection = Faraday.new(url: config[:prefix]) do |faraday|
         faraday.request                     :multipart
         faraday.request                     :url_encoded
@@ -19,7 +19,6 @@ module Footrest
         faraday.headers[:accept]          = "application/json"
         faraday.headers[:authorization]   = "Bearer #{config[:token]}" if config[:token]
         faraday.headers[:user_agent]      = "Footrest"
-        yield faraday if block_given?
       end
     end
 

data/lib/footrest/request.rb

@@ -1,18 +1,8 @@
 module Footrest
   module Request
 
-    def config
-      raise "Config should be overridden"
-    end
-
-    def join(*parts)
-      joined = parts.map{ |p| p.gsub(%r{^/|/$}, '') }.join('/')
-      joined = '/' + joined if parts.first[0] == '/'
-      joined
-    end
-
     def fullpath(path)
-      config[:prefix] ? join(config[:prefix], path) : path
+      raise "fullpath should be overridden"
     end
 
     def delete(path, options={})

data/lib/footrest/version.rb

@@ -1,3 +1,3 @@
 module Footrest
-  VERSION = '0.1.3' unless defined?(Footrest::VERSION)
+  VERSION = '0.2.0' unless defined?(Footrest::VERSION)
 end

data/spec/footrest/client_spec.rb

@@ -3,12 +3,33 @@ require 'helper'
 describe Footrest::Client do
   it "sets the domain" do
     client = Footrest::Client.new(prefix: "http://domain.test")
-    expect(client.config.prefix).to eq("http://domain.test")
+    expect(client.prefix).to eq("http://domain.test")
   end
 
   it "sets the authtoken" do
     client = Footrest::Client.new(token: "test_token")
-    expect(client.config.token).to eq("test_token")
+    expect(client.token).to eq("test_token")
+  end
+
+  context "join" do
+    let(:client) { Footrest::Client.new }
+
+    it "retains initial slash" do
+      expect(client.send(:join, '/test', 'path')).to eq('/test/path')
+    end
+
+    it "combines multiple segments" do
+      expect(client.send(:join, 'test', 'path', 'parts')).to eq('test/path/parts')
+    end
+
+    it "respects http://" do
+      expect(client.send(:join, 'http://', 'path')).to eq('http://path')
+    end
+
+    it "keeps slashes within strings" do
+      expect(client.send(:join, 'http://', 'domain', '/path/to/something')).
+        to eq('http://domain/path/to/something')
+    end
   end
 
   context "Request" do

data/spec/footrest/request_spec.rb

@@ -3,23 +3,5 @@ require 'helper'
 class RequestHarness; include Footrest::Request; end
 
 describe Footrest::Request do
-  let(:request) { RequestHarness.new }
-  context "join" do
-    it "retains initial slash" do
-      expect(request.join('/test', 'path')).to eq('/test/path')
-    end
-
-    it "combines multiple segments" do
-      expect(request.join('test', 'path', 'parts')).to eq('test/path/parts')
-    end
-
-    it "respects http://" do
-      expect(request.join('http://', 'path')).to eq('http://path')
-    end
-
-    it "keeps slashes within strings" do
-      expect(request.join('http://', 'domain', '/path/to/something')).
-        to eq('http://domain/path/to/something')
-    end
-  end
+  # let(:request) { RequestHarness.new }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: footrest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,7 +168,6 @@ files:
 - footrest.gemspec
 - lib/faraday/response/raise_footrest_http_error.rb
 - lib/footrest/client.rb
-- lib/footrest/configuration.rb
 - lib/footrest/connection.rb
 - lib/footrest/http_error.rb
 - lib/footrest/request.rb

data/lib/footrest/configuration.rb

@@ -1,19 +0,0 @@
-require 'faraday'
-require 'active_support/configurable'
-
-module Footrest
-  include ActiveSupport::Configurable
-  config_accessor :token
-  config_accessor :prefix
-  config_accessor :logging
-
-  def configure
-    yield self
-  end
-end
-
-Footrest.configure do |config|
-  config.token = nil
-  config.prefix = nil
-  config.logging = false
-end