leadlight 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    leadlight (0.0.5)
+    leadlight (0.0.6)
       addressable
-      faraday
+      faraday (= 0.8.1)
       fattr
       hookr
       link_header
@@ -13,15 +13,13 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.3.2)
     archive-tar-minitar (0.5.2)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     fail-fast (1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
     fattr (2.2.1)
     ffi (1.0.11)
     guard (1.0.0)
@@ -34,22 +32,24 @@ GEM
       guard (>= 0.10.0)
     hookr (1.1.1)
       fail-fast (= 1.0.0)
+    libnotify (0.7.2)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     link_header (0.0.5)
-    mime-types (1.17.2)
+    mime-types (1.19)
     multi_json (1.0.4)
     multipart-post (1.1.5)
-    rack (1.4.1)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -61,7 +61,7 @@ GEM
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     thor (0.14.6)
-    vcr (2.0.0.rc1)
+    vcr (2.2.4)
 
 PLATFORMS
   ruby
@@ -71,7 +71,9 @@ DEPENDENCIES
   guard-bundler
   guard-rspec
   leadlight!
+  libnotify
   rake
+  rb-inotify
   rspec
   ruby-debug19
-  vcr (~> 2.0.0.rc1)
+  vcr (~> 2.0)

data/default.gems

@@ -1 +1 @@
-bundler -v1.0.21
+bundler -v1.1.3

data/leadlight.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'leadlight'
-  s.version           = '0.0.5'
-  s.date              = '2012-02-15'
+  s.version           = '0.0.6'
+  s.date              = '2012-08-01'
   s.rubyforge_project = 'leadlight'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,12 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   ## s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
   s.add_dependency 'addressable'
-  s.add_dependency 'faraday'
+
+  # This dependency will have to stay fixed until the adapter API
+  # changes in lib_ext (or something like them) get rolled into
+  # Faraday
+  s.add_dependency 'faraday', '= 0.8.1'
+
   s.add_dependency 'fattr'
   s.add_dependency 'link_header'
   s.add_dependency 'multi_json', '~> 1.0.4'
@@ -54,7 +59,7 @@ Gem::Specification.new do |s|
   ## s.add_development_dependency('DEVDEPNAME', [">= 1.1.0", "< 2.0.0"])
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'vcr', '~> 2.0.0.rc1'
+  s.add_development_dependency 'vcr', '~> 2.0'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'guard-bundler'
@@ -76,13 +81,22 @@ Gem::Specification.new do |s|
     lib/leadlight/basic_converter.rb
     lib/leadlight/blank.rb
     lib/leadlight/codec.rb
+    lib/leadlight/connection_builder.rb
     lib/leadlight/entity.rb
     lib/leadlight/enumerable_representation.rb
     lib/leadlight/errors.rb
     lib/leadlight/header_helpers.rb
     lib/leadlight/hyperlinkable.rb
+    lib/leadlight/lib_ext.rb
+    lib/leadlight/lib_ext/faraday/README
+    lib/leadlight/lib_ext/faraday/adapter.rb
+    lib/leadlight/lib_ext/faraday/builder.rb
+    lib/leadlight/lib_ext/faraday/connection.rb
+    lib/leadlight/lib_ext/faraday/middleware.rb
     lib/leadlight/link.rb
     lib/leadlight/link_template.rb
+    lib/leadlight/null_link.rb
+    lib/leadlight/param_hash.rb
     lib/leadlight/representation.rb
     lib/leadlight/request.rb
     lib/leadlight/service.rb
@@ -95,7 +109,9 @@ Gem::Specification.new do |s|
     spec/cassettes/Leadlight/authorized_GitHub_example/_user/indicates_the_expected_oath_scopes.yml
     spec/cassettes/Leadlight/authorized_GitHub_example/adding_and_removing_team_members.yml
     spec/cassettes/Leadlight/authorized_GitHub_example/adding_and_removing_teams.yml
+    spec/cassettes/Leadlight/authorized_GitHub_example/team_list/should_have_a_link_back_to_the_org.yml
     spec/cassettes/Leadlight/authorized_GitHub_example/test_team/.yml
+    spec/cassettes/Leadlight/authorized_GitHub_example/test_team/has_a_root_link.yml
     spec/cassettes/Leadlight/basic_GitHub_example/_root/.yml
     spec/cassettes/Leadlight/basic_GitHub_example/_root/__location__/.yml
     spec/cassettes/Leadlight/basic_GitHub_example/_root/should_be_a_204_no_content.yml
@@ -116,6 +132,8 @@ Gem::Specification.new do |s|
     spec/leadlight/hyperlinkable_spec.rb
     spec/leadlight/link_spec.rb
     spec/leadlight/link_template_spec.rb
+    spec/leadlight/null_link_spec.rb
+    spec/leadlight/param_hash_spec.rb
     spec/leadlight/representation_spec.rb
     spec/leadlight/request_spec.rb
     spec/leadlight/service_middleware_spec.rb
@@ -126,6 +144,8 @@ Gem::Specification.new do |s|
     spec/leadlight_spec.rb
     spec/spec_helper_lite.rb
     spec/support/credentials.rb
+    spec/support/link_matchers.rb
+    spec/support/misc.rb
     spec/support/vcr.rb
   ]
   # = MANIFEST =

data/lib/leadlight.rb

@@ -2,6 +2,7 @@ require 'faraday'
 require 'fattr'
 require 'logger'
 require 'hookr'
+require 'leadlight/lib_ext'
 require 'leadlight/errors'
 require 'leadlight/link'
 require 'leadlight/hyperlinkable'
@@ -16,7 +17,7 @@ require 'leadlight/basic_converter'
 
 module Leadlight
 
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   def self.build_service(target=Class.new, &block)
     target.tap do
@@ -25,7 +26,7 @@ module Leadlight
         include Service
         include HookR::Hooks
         extend SingleForwardable
-        
+
         request_events = request_class.hooks.map(&:name)
         def_delegators :request_class, *request_events
         define_hook :on_init, :service
@@ -39,9 +40,7 @@ module Leadlight
   end
 
   def self.common_connection_stack
-    @common_connection_stack ||= ->(builder) {
-      builder.adapter :net_http
-    }
+    @common_connection_stack ||= ->(builder) {}
   end
 
 

data/lib/leadlight/connection_builder.rb

@@ -0,0 +1,29 @@
+require 'fattr'
+require 'forwardable'
+
+module Leadlight
+  class ConnectionBuilder
+    extend Forwardable
+
+    fattr(:url)
+    fattr(:service)
+    fattr(:common_stack)
+    fattr(:adapter)
+
+    def_delegators :service, :connection_stack, :logger
+
+    def initialize
+      yield self if block_given?
+    end
+
+    def call
+      Faraday.new(url: url.to_s) do |connection|
+        connection.use Leadlight::ServiceMiddleware, service: service
+        connection.use Faraday::Response::Logger, logger
+        service.instance_exec(connection, &connection_stack)
+        service.instance_exec(connection, &common_stack)
+        connection.adapter = adapter
+      end
+    end
+  end
+end

data/lib/leadlight/errors.rb

@@ -6,13 +6,19 @@ module Leadlight
   class HttpError < Error
     extend Forwardable
 
-    attr_reader :response
+    attr_reader :request
 
-    def_delegator :response, :status
+    def_delegators :response, :status, :response
 
-    def initialize(response, message=response.status.to_s)
-      @response = response
-      super(message)
+    def initialize(request, message=response.status.to_s)
+      @request = request
+      super(amplify_message(message))
+    end
+
+    private
+
+    def amplify_message(message)
+      "#{message} (#{request.http_method.upcase} #{request.location})"
     end
   end
   class ClientError < HttpError; end

data/lib/leadlight/hyperlinkable.rb

@@ -23,18 +23,25 @@ module Leadlight
       end
     end
 
-    def link(key, &fallback)
-      result = links.at(key, &fallback)
+    def link(key, *expand_args, &fallback)
+      link = links.at(key, &fallback)
+      link && link.expand(*expand_args)
     end
 
     def add_link(url, rel=nil, title=rel, options={})
-      link = Link.new(__service__, url, rel, title, options)
+      absolute_url = base_url + url
+      template     = LinkTemplate.new(__service__, absolute_url, rel,
+                                      title,       options)
+      link         = template.expand(captures_for_variables(__captures__,
+                                                            template.variables))
       define_link_helper(rel) if rel
       links << link
     end
 
     def add_link_template(template, rel=nil, title=rel, options={})
-      link = LinkTemplate.new(__service__, template, rel, title, options)
+      absolute_url = base_url + template
+      link = LinkTemplate.new(__service__, absolute_url.to_s, rel,
+                              title,       options)
       define_link_helper(rel) if rel
       links << link
     end
@@ -46,10 +53,10 @@ module Leadlight
       yield.each do |link_attributes|
         attributes = default_link_attributes.merge(link_attributes)
         define_link_set_helper(rel, helper_name) if helper_name
-        links << Link.new(__service__, 
-                          attributes[:href], 
-                          attributes[:rel], 
-                          attributes[:title], 
+        links << Link.new(__service__,
+                          attributes[:href],
+                          attributes[:rel],
+                          attributes[:title],
                           attributes)
       end
     end
@@ -69,7 +76,7 @@ module Leadlight
       include Enumerable
       fattr(:links) { Set.new }
 
-      def_delegators :links, :<<, :push, :size, :length, :empty?, :each, 
+      def_delegators :links, :<<, :push, :size, :length, :empty?, :each,
                              :initialize
 
       # Match links on rel or title
@@ -87,7 +94,7 @@ module Leadlight
 
       def link_matcher(key)
         ->(link) {
-          key === link.rel   || 
+          key === link.rel   ||
           key === link.title ||
           link.aliases.any?{|a| key === a}
         }
@@ -122,5 +129,19 @@ module Leadlight
         end
       end
     end
+
+    def captures_for_variables(captures, variables)
+      variables.each_with_object({}) do |key, h|
+        h[key] = captures[key] if captures[key]
+      end
+    end
+
+    def base_url
+      loc = __location__.to_s
+      unless loc[-1] == "/"
+        loc = loc + "/"
+      end
+      Addressable::URI.parse(loc)
+    end
   end
 end

data/lib/leadlight/lib_ext.rb

@@ -0,0 +1,3 @@
+Dir.glob(File.expand_path("../lib_ext/**/*.rb", __FILE__)).each do |file|
+  require file
+end

data/lib/leadlight/lib_ext/faraday/README

@@ -0,0 +1,6 @@
+This directory contains monkeypatches to the Faraday library, on which
+Leadlight is based.
+
+I feel really bad for doing this, and I fully intend to work with
+Mislav to come up with some mutually-agreeable changes to the Faraday
+API which will eliminate the need for this directory to exist. This is strictly an interim measure.

data/lib/leadlight/lib_ext/faraday/adapter.rb

@@ -0,0 +1,7 @@
+module Faraday
+  class Adapter < Middleware
+    def self.adapter?
+      true
+    end
+  end
+end

data/lib/leadlight/lib_ext/faraday/builder.rb

@@ -0,0 +1,47 @@
+module Faraday
+  class Builder
+    class Handler
+      attr_reader :args
+
+      def adapter?
+        klass.respond_to?(:adapter?) && klass.adapter?
+      end
+
+    end
+
+    def build(options = {})
+      raise_if_locked
+      clear unless options[:keep]
+      yield self if block_given?
+    end
+
+    def clear
+      @handlers.clear
+    end
+
+    def adapter(key=nil, *args, &block)
+      if [key, *args, block].none?
+        find_adapter
+      else
+        use_symbol(Faraday::Adapter, key, *args, &block)
+      end
+    end
+
+    def has_adapter?
+      !!find_adapter
+    end
+
+    def adapter=(adapter_args)
+      clear_adapters
+      adapter(*adapter_args)
+    end
+
+    def find_adapter
+      @handlers.detect{|h| h.adapter?}
+    end
+
+    def clear_adapters
+      @handlers.delete_if{|h| h.adapter?}
+    end
+  end
+end

data/lib/leadlight/lib_ext/faraday/connection.rb

@@ -0,0 +1,40 @@
+module Faraday
+  class Connection
+    def initialize(url = nil, options = {})
+      if url.is_a?(Hash)
+        options = url
+        url     = options[:url]
+      end
+      @headers = Utils::Headers.new
+      @params  = Utils::ParamsHash.new
+      @options = options[:request] || {}
+      @ssl     = options[:ssl]     || {}
+      adapter  = options[:adapter]
+
+      @parallel_manager = nil
+      @default_parallel_manager = options[:parallel_manager]
+
+      @builder = options[:builder] || begin
+        # pass an empty block to Builder so it doesn't assume default middleware
+        block = block_given?? Proc.new {|b| } : nil
+        Builder.new(&block)
+      end
+
+      self.url_prefix = url || 'http:/'
+
+      @params.update options[:params]   if options[:params]
+      @headers.update options[:headers] if options[:headers]
+
+      @proxy = nil
+      proxy(options.fetch(:proxy) { ENV['http_proxy'] })
+
+      yield self if block_given?
+
+      if adapter
+        self.adapter = adapter
+      end
+    end
+
+    def_delegators :builder, :adapter=
+  end
+end