leadlight 0.0.5 → 0.0.6

data/spec/leadlight_spec.rb

@@ -10,10 +10,10 @@ describe Leadlight, vcr: true do
     Addressable::Template.new(pattern)
   end
 
-  let(:logger)  { 
+  let(:logger)  {
     logfile = Pathname('../../log/test.log').expand_path(__FILE__)
     logfile.dirname.mkpath
-    Logger.new(logfile) 
+    Logger.new(logfile)
   }
 
   describe 'basic GitHub example' do
@@ -56,7 +56,7 @@ describe Leadlight, vcr: true do
           match_content_type('application/json')
           match_class(Hash)
           match{self['type'] == 'User'}
-          add_link "#{__location__}/followers", 'followers', 'List followers'
+          add_link "./followers", 'followers', 'List followers'
         end
       end
     end
@@ -83,7 +83,7 @@ describe Leadlight, vcr: true do
       end
 
       it 'links to the expected URL' do
-        subject.root.link('user').href.should eq(uri('/users/{login}'))
+        subject.root.link('user').href.path.should eq('/users/{login}')
       end
     end
 
@@ -129,7 +129,7 @@ describe Leadlight, vcr: true do
     describe 'bad links' do
       class MyAwesomeError < StandardError
       end
-      
+
       it 'should raise ResourceNotFound' do
         expect{
           session.root.bad_link
@@ -174,7 +174,7 @@ describe Leadlight, vcr: true do
 
       tint 'organization' do
         match_path(%r{^/orgs/\w+$})
-        add_link "#{__location__}/teams", 'teams'
+        add_link "./teams", 'teams'
 
         extend do
           def team_for_name(name)
@@ -182,9 +182,8 @@ describe Leadlight, vcr: true do
           end
 
           def add_team(name, permission)
-            link('teams').post({}, 
-                               { 'name' => name,
-                                 'permission' => permission}).
+            link('teams').post('name'       => name,
+                               'permission' => permission).
               raise_on_error.
               submit_and_wait do |new_team|
                 return new_team
@@ -195,7 +194,9 @@ describe Leadlight, vcr: true do
       end
 
       tint 'teamlist' do
-        match_path(%r{^/orgs/\w+/teams$})
+        match_template('/orgs/{org_id}/teams')
+
+        add_link '/orgs/{org_id}', 'organization'
 
         add_link_set('child', :get) do
           map{|team|
@@ -206,17 +207,18 @@ describe Leadlight, vcr: true do
 
       tint 'team' do
         match_template('/teams/{id}')
-        
-        add_link "#{__location__}/members", 'members'
-        add_link_template "#{__location__}/members/{id}", 'member'
+
+        add_link "./members", 'members'
+        add_link_template "./members/{id}", 'member'
+        add_link "../..", "root"
 
         extend do
           def add_member(member_name)
-            link('member').put(member_name).submit_and_wait.raise_on_error
+            link('member', member_name).put.submit_and_wait.raise_on_error
           end
 
           def remove_member(member_name)
-            link('member').delete(member_name).submit_and_wait.raise_on_error
+            link('member', member_name).delete.submit_and_wait.raise_on_error
           end
 
           def destroy
@@ -250,7 +252,7 @@ describe Leadlight, vcr: true do
         #
         # 'event.source' is the Leadlight request, which delegates
         # #service_options to the service
-        request.headers['Authorization'] = 
+        request.headers['Authorization'] =
           "Bearer #{event.source.service_options[:oauth2_token]}"
       end
 
@@ -275,10 +277,22 @@ describe Leadlight, vcr: true do
       end
     end
 
+    describe 'team list' do
+      subject { session.root.organization('shiprise').teams }
+
+      it 'should have a link back to the org' do
+        subject.organization['name'].should eq('ShipRise')
+      end
+    end
+
     describe 'test team' do
       subject { session.root.organization('shiprise').team_for_name('Leadlight Test Team') }
-      
+
       it { should be }
+
+      it 'has a root link' do
+        subject.link('root').href.path.should eq('/')
+      end
     end
 
     specify "adding and removing teams" do

data/spec/support/link_matchers.rb

@@ -0,0 +1,59 @@
+module Leadlight
+  module LinkMatchers
+    extend RSpec::Matchers::DSL
+
+    matcher :expand_to do |expected|
+      match{|actual|
+        @failures = []
+        href_matches?(actual, expected) && params_match?(actual, expected)
+      }
+
+      chain(:given) do |params|
+        @params = params
+      end
+
+      chain(:with_params) do |expected_params|
+        @expected_params = expected_params
+      end
+
+      failure_message_for_should do |actual|
+        @failures.join("\n")
+      end
+
+      def expanded
+        CGI.unescape(expanded_link.href.to_s)
+      end
+
+      def expanded_link
+        actual.expand(@params)
+      end
+
+      def subscript_expanded
+        CGI.unescape(actual[@params].href.to_s)
+      end
+
+      def params_match?(actual, expected)
+        if @expected_params
+          @expected_params.each do |key, value|
+            unless expanded_link.params[key] == value
+              @failures << "Expected #{expanded_link.params.inspect} to include "\
+                           "#{key.inspect} => #{value.inspect}"
+              return false
+            end
+          end
+        end
+        return true
+      end
+
+      def href_matches?(actual, expected)
+        if expanded == expected && subscript_expanded == expected
+          true
+        else
+          @failures << "expected #{actual} to expand to #{expected.inspect} given " \
+                       "params #{@params.inspect}, but got #{expanded.inspect}"
+          false
+        end
+      end
+    end
+  end
+end

data/spec/support/misc.rb

@@ -0,0 +1,9 @@
+module MiscSpecHelpers
+  def u(*args)
+    Addressable::URI.parse(*args)
+  end
+end
+
+RSpec.configure do |config|
+  config.include(MiscSpecHelpers)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leadlight
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70328504344440 !ruby/object:Gem::Requirement
+  requirement: &15429720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328504344440
+  version_requirements: *15429720
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70328504343560 !ruby/object:Gem::Requirement
+  requirement: &15428900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70328504343560
+  version_requirements: *15428900
 - !ruby/object:Gem::Dependency
   name: fattr
-  requirement: &70328504343140 !ruby/object:Gem::Requirement
+  requirement: &15427780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328504343140
+  version_requirements: *15427780
 - !ruby/object:Gem::Dependency
   name: link_header
-  requirement: &70328504342460 !ruby/object:Gem::Requirement
+  requirement: &15427080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328504342460
+  version_requirements: *15427080
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70328504341640 !ruby/object:Gem::Requirement
+  requirement: &15426060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70328504341640
+  version_requirements: *15426060
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70328504341000 !ruby/object:Gem::Requirement
+  requirement: &15424700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328504341000
+  version_requirements: *15424700
 - !ruby/object:Gem::Dependency
   name: hookr
-  requirement: &70328504340400 !ruby/object:Gem::Requirement
+  requirement: &15415060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328504340400
+  version_requirements: *15415060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70328504339740 !ruby/object:Gem::Requirement
+  requirement: &15413840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328504339740
+  version_requirements: *15413840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328504339060 !ruby/object:Gem::Requirement
+  requirement: &15411580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,21 +109,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328504339060
+  version_requirements: *15411580
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70328504338520 !ruby/object:Gem::Requirement
+  requirement: &15410480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70328504338520
+  version_requirements: *15410480
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70328504338020 !ruby/object:Gem::Requirement
+  requirement: &15409340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328504338020
+  version_requirements: *15409340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70328504337420 !ruby/object:Gem::Requirement
+  requirement: &15408220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328504337420
+  version_requirements: *15408220
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70328504336840 !ruby/object:Gem::Requirement
+  requirement: &15407180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328504336840
+  version_requirements: *15407180
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70328504336180 !ruby/object:Gem::Requirement
+  requirement: &15406620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328504336180
+  version_requirements: *15406620
 description: Rose colored stained glass windows for HTTP.
 email: avdi@avdi.org
 executables: []
@@ -182,13 +182,22 @@ files:
 - 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
@@ -201,7 +210,9 @@ files:
 - 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
@@ -222,6 +233,8 @@ files:
 - 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
@@ -232,6 +245,8 @@ files:
 - 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
 homepage: https://github.com/avdi/leadlight
 licenses: []
@@ -253,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: leadlight
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: Rose colored stained glass windows for HTTP.