leadlight 0.0.7 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    leadlight (0.0.7)
+    leadlight (0.1.0)
       addressable (~> 2.2.0)
       faraday (= 0.8.1)
       fattr
@@ -32,7 +32,6 @@ 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)
@@ -40,8 +39,6 @@ GEM
     multi_json (1.0.4)
     multipart-post (1.1.5)
     rake (0.9.2.2)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -71,9 +68,7 @@ DEPENDENCIES
   guard-bundler
   guard-rspec
   leadlight!
-  libnotify
   rake
-  rb-inotify
   rspec
   ruby-debug19
   vcr (~> 2.0)

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.7'
-  s.date              = '2012-08-01'
+  s.version           = '0.1.0'
+  s.date              = '2012-12-28'
   s.rubyforge_project = 'leadlight'
 
   ## Make sure your summary is short. The description may be as long
@@ -75,7 +75,6 @@ Gem::Specification.new do |s|
     Guardfile
     README.md
     Rakefile
-    default.gems
     leadlight.gemspec
     lib/leadlight.rb
     lib/leadlight/basic_converter.rb

data/lib/leadlight.rb

@@ -16,7 +16,7 @@ require 'leadlight/basic_converter'
 
 module Leadlight
 
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 
   def self.build_service(target=Class.new, &block)
     target.tap do

data/lib/leadlight/representation.rb

@@ -29,7 +29,7 @@ module Leadlight
       self
     end
 
-    def exception(message=exception_message)
+    def exception
       return super if defined?(super)
       case __response__.status.to_i
       when 404 then ResourceNotFound

data/lib/leadlight/service.rb

@@ -7,10 +7,11 @@ module Leadlight
   module Service
     extend Forwardable
 
-    attr_reader :service_options
-    fattr(:logger)  { service_options.fetch(:logger) { ::Logger.new($stderr) } }
-    fattr(:tints)   { self.class.tints }
-    fattr(:codec) { service_options.fetch(:codec) { Codec.new } }
+    attr_reader   :service_options
+    attr_accessor :error_handler
+    fattr(:logger)   { service_options.fetch(:logger) { ::Logger.new($stderr) } }
+    fattr(:tints)    { self.class.tints }
+    fattr(:codec)    { service_options.fetch(:codec) { Codec.new } }
     fattr(:type_map) { TypeMap.new }
 
     def_delegators :codec, :encode, :decode
@@ -22,6 +23,11 @@ module Leadlight
       execute_hook(:on_init, self)
     end
 
+    def on_error(&error_handler)
+      self.error_handler = error_handler
+      self
+    end
+
     def root
       get('/') do |r|
         return r
@@ -57,6 +63,7 @@ module Leadlight
 
     def perform_request(url, http_method, body=nil, options={}, &representation_handler)
       req = request_class.new(self, connection, url, http_method, body, options)
+      req.on_error(&error_handler) if error_handler
       if representation_handler
         req.submit_and_wait(&representation_handler)
       end

data/lib/leadlight/tint_helper.rb

@@ -1,3 +1,5 @@
+require 'addressable/template'
+require 'addressable/uri'
 require 'delegate'
 require 'mime/types'
 
@@ -78,7 +80,7 @@ module Leadlight
       patterns.inject([]) {|patterns, pattern|
         case pattern
         when :any
-          pattern << (100..599)
+          patterns << (100..599)
         when :user_error
           patterns << (400..499)
         when :server_error

data/spec/leadlight/request_spec.rb

@@ -251,10 +251,10 @@ module Leadlight
 
       it "yields to the block when response is an error" do
         called = :not_set
-        block = proc{ called = true }
+        block = proc{ called = :set }
         faraday_response.should_receive(:success?).and_return(false)
         submit_and_complete.on_error(&block)
-        called.should be_true
+        called.should eq(:set)
       end
 
       it "does not yield to the block when response is sucess" do

data/spec/leadlight/service_spec.rb

@@ -3,8 +3,8 @@ require 'leadlight/service'
 
 module Leadlight
   describe Service do
-    subject              { klass.new(service_options)                 }
-    let(:klass)          {
+    subject     { klass.new(service_options) }
+    let(:klass) {
       Class.new do
         include Service
 
@@ -12,14 +12,14 @@ module Leadlight
         end
       end
     }
-    let(:connection)     { stub(:connection, get: response)           }
-    let(:representation) { stub(:representation)                      }
-    let(:response)       { stub(:response, env: env)                  }
-    let(:env)            { {leadlight_representation: representation} }
-    let(:service_options)        { {codec: codec}                     }
-    let(:codec)          { stub(:codec)                               }
-    let(:request)        { stub(:request).as_null_object              }
-    let(:request_class)  { stub(:request_class, new: request)         }
+    let(:connection)      { stub(:connection, get: response)           }
+    let(:representation)  { stub(:representation)                      }
+    let(:response)        { stub(:response, env: env)                  }
+    let(:env)             { {leadlight_representation: representation} }
+    let(:service_options) { {codec: codec}                             }
+    let(:codec)           { stub(:codec)                               }
+    let(:request)         { stub(:request).as_null_object              }
+    let(:request_class)   { stub(:request_class, new: request)         }
 
     before do
       subject.stub(connection: connection,
@@ -130,5 +130,19 @@ module Leadlight
           should equal(representation)
       end
     end
+
+    describe '#on_error' do
+      it 'returns itself' do
+        subject.on_error.should eq(subject)
+      end
+
+      it 'adds the handler to requests' do
+        called = :not_set
+        subject.on_error { called = true }
+        request.should_receive(:on_error).with(no_args).and_yield
+        subject.get '/'
+        called.should eq(true)
+      end
+    end
   end
 end

data/spec/leadlight/tint_helper_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper_lite'
+require 'addressable/template'
+require 'addressable/uri'
 require 'leadlight/tint_helper'
 
 module Leadlight
@@ -134,6 +136,14 @@ module Leadlight
           baz
         end
       end
+
+      it 'accepts pattern shortcuts' do
+        object.should_receive(:baz)
+        subject.exec_tint do
+          match_status(:any)
+          baz
+        end
+      end
     end
 
     describe '#match' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leadlight
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &76999980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *76999980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &76999610 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *76999610
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: fattr
-  requirement: &76999300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76999300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: link_header
-  requirement: &76998910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76998910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &76998510 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *76998510
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &76998210 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76998210
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hookr
-  requirement: &76997950 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76997950
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76997690 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76997690
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76997450 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76997450
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &76997150 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +165,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *76997150
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &76996930 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76996930
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &76996580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76996580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &76996130 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76996130
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76995700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +229,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76995700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rose colored stained glass windows for HTTP.
 email: avdi@avdi.org
 executables: []
@@ -176,7 +246,6 @@ files:
 - Guardfile
 - README.md
 - Rakefile
-- default.gems
 - leadlight.gemspec
 - lib/leadlight.rb
 - lib/leadlight/basic_converter.rb
@@ -260,6 +329,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -65573010957843514
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -268,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: leadlight
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Rose colored stained glass windows for HTTP.

data/default.gems

@@ -1 +0,0 @@
-bundler -v1.1.3