flattr 0.2.3 → 0.3.0

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 coverage/*
+doc/*

data/.rdoc_options

@@ -0,0 +1,16 @@
+--- !ruby/object:RDoc::Options
+encoding: UTF-8
+static_path: []
+rdoc_include:
+- .
+charset: UTF-8
+exclude: !!null 
+hyperlink_all: false
+line_numbers: false
+main_page: !!null 
+markup: tomdoc
+show_hash: false
+tab_width: 8
+title: !!null 
+visibility: :protected
+webcvs: !!null 

data/README.md

@@ -1,14 +1,9 @@
-# Flattr API wrapper
+# The Flattr Ruby Gem [![Build Status](https://secure.travis-ci.org/simon/flattr.png)](http://travis-ci.org/simon/flattr) [![Dependency Status](https://gemnasium.com/simon/flattr.png)](https://gemnasium.com/simon/flattr)
 
 This gem is a wrapper around the Flattr API. With the gem you can search things, add new thing and much more. If you want information about updates follow [@simongate](http://twitter.com/simongate) on twitter.
 
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=smgt&url=https://github.com/simon/flattr&title=Flattr API gem&language=en_GB&tags=github&category=software)
 
-## Build status
-
-[![Build
-Status](https://secure.travis-ci.org/simon/flattr.png)](http://travis-ci.org/simon/flattr)
-
 ## Installation
 
 Installation is easy, just install the gem with.
@@ -17,17 +12,18 @@ Installation is easy, just install the gem with.
 
 ### Dependencies
 
-  * Faraday
-  * multi_json
+  * [Faraday](https://github.com/technoweenie/faraday)
+  * [multi_json](https://github.com/intridea/multi_json)
 
 ## Usage
 
-To talk with all of Flattr API resources you need to [register a application](http://flattr.com/apps). This will give you a *client id* and a *client secret* whom you can exchange for a *access token*. The *access token* is then used to access the resources in the Flattr API that needs authentication. You can find more information about the API in [Flattr developer documents](http://developers.flattr.net/v2).
+To talk with all of Flattr API resources you need to [register a application](http://flattr.com/apps). This will give you a `client id` and a `client secret` whom you can exchange for a `access token`. The `access token` is then used to access the resources in the Flattr API that needs authentication. You can find more information about the API in [Flattr developer documents](http://developers.flattr.net/api).
 
 ### Resources
 
 You can find documentation about available resources in the code.
 
+* [flattrs](https://github.com/simon/flattr/blob/master/lib/flattr/client/flattrs.rb)
 * [things](https://github.com/simon/flattr/blob/master/lib/flattr/client/things.rb)
 * [users](https://github.com/simon/flattr/blob/master/lib/flattr/client/users.rb)
 * [categories](https://github.com/simon/flattr/blob/master/lib/flattr/client/categories.rb)
@@ -67,7 +63,9 @@ print 'code: '
 code = gets
 
 # Use the code and exchange it for a access_token
-flattr.get_access_token code
+access_token = flattr.get_access_token code
+
+puts access_token
 
 # You are now authorized! ;)
 
@@ -83,9 +81,8 @@ If you request a access token without any scopes you won't be able to flattr oth
 
 ## What needs to be done
 
-* Add error reporting
-* More tests are needed, coverage isn't that good
 * Add all the Flattr API resources
+* More tests are needed, coverage isn't that good
 
 ## Supported Ruby Versions
 

data/flattr.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'faraday'
-  s.add_dependency 'multi_json'
+  s.add_dependency 'faraday', '~> 0.7'
+  s.add_dependency 'multi_json', '~> 1.0'
 
   s.add_development_dependency 'json'
   s.add_development_dependency 'rake'

data/lib/flattr/authenticatable.rb

@@ -15,7 +15,13 @@ module Flattr
     #
     # @return [Boolean]
     def credentials?
-      !credentials[:access_token].nil?
+      if credentials[:access_token]
+        true
+      elsif credentials[:client_id] && credentials[:client_secret]
+        true
+      else
+        false
+      end
     end
   end
 end

data/lib/flattr/client.rb

@@ -16,6 +16,7 @@ module Flattr
     require 'flattr/client/things'
     require 'flattr/client/languages'
     require 'flattr/client/categories'
+    require 'flattr/client/flattrs'
 
     include Flattr::Connection
     include Flattr::Request
@@ -27,6 +28,7 @@ module Flattr
     include Flattr::Client::Things
     include Flattr::Client::Languages
     include Flattr::Client::Categories
+    include Flattr::Client::Flattrs
 
     attr_accessor *Config::VALID_OPTIONS_KEYS
 
@@ -45,13 +47,12 @@ module Flattr
     #
     # @return [Flattr::User]
     def current_user
-      @current_user ||= Flattr::User.new(self.verify_credentials)
+      @current_user ||= self.user
     end
 
-    def base64_encode str
+    def self.base64_encode str
       [str].pack("m9999").chomp
     end
 
-
   end
 end

data/lib/flattr/client/flattrs.rb

@@ -0,0 +1,34 @@
+
+module Flattr
+  class Client
+    module Flattrs
+
+      # Public: Flattr a thing
+      #
+      # thing  - The id or URL of the thing you wan't to flattr
+      #
+      # Examples
+      #
+      #   f = Flattr.new
+      #   f.flattr(450287)
+      #   # => true
+      #
+      #   f = Flattr.new
+      #   f.flattr('https://github.com/simon/flattr')
+      #   # => true
+      #
+      # Returns a true if successful
+      # Raises Flattr::Error::Forbidden if your are not allowed to flattr the thing
+      # Raises Flattr::Error::NotFound if no thing were found
+      def flattr(thing)
+        if thing.is_a?(Fixnum) || !thing.match(/^\d+$/).nil?
+          flattr = post("/rest/v2/things/#{thing}/flattr")
+        else
+          flattr = post("/rest/v2/flattr", {:url => thing})
+        end
+        return true
+      end
+
+    end
+  end
+end

data/lib/flattr/client/things.rb

@@ -15,12 +15,27 @@ module Flattr
       #   #=> Flattr::Thing
       #
       # Returns the thing
-      # Raises error on failure
+      # Raises Flattr::Error::NotFound on error
       def thing(id)
-        thing = get("/rest/v2/things/#{id}")
+        thing = get("/rest/v2/things/#{id}?full")
         Flattr::Thing.new(thing)
       end
 
+      # Public: Fetch several things
+      #
+      # ids - a list of thing ids
+      #
+      # Examples
+      #
+      #   f = Flattr.new
+      #   f.things(450287,543896)
+      #   #=> [Flattr::Thing, Flattr::Thing]
+      #
+      # Returns a Array with things
+      def things(*ids)
+        get("/rest/v2/things/#{ids.join(",")}?full").collect { |t| Flattr::Thing.new(t) }
+      end
+
       # Public: Create a thing
       #
       # url - URL you want to submit
@@ -33,10 +48,11 @@ module Flattr
       #        :hidden - boolean toggling if thing should be hidden or not (optional).
       #
       # Returns new thing
-      # Raises error on failure
+      # Raises Flattr::Error::BadRequest on validation error
+      # Raises Flattr::Error::NotFound if thing was not found
       def thing_new(url, opts = {})
         response = post("/rest/v2/things", opts.merge(:url => url))
-        thing = get("/rest/v2/things/#{response[:id]}") 
+        thing = thing(response["id"])
         Flattr::Thing.new(thing)
       end
 
@@ -52,7 +68,8 @@ module Flattr
       #        :hidden - boolean toggling if thing should be hidden or not (optional).
       #
       # Returns updated thing
-      # Raises Error on failure
+      # Raises Flattr::Error::BadRequest on validation error
+      # Raises Flattr::Error::NotFound if thing was not found
       def thing_update(id, opts = {})
         patch("/rest/v2/things/#{id}", opts)
         thing = get("/rest/v2/things/#{id}")
@@ -70,7 +87,7 @@ module Flattr
       #   # => true
       #
       # Returns true if successful
-      # Raises Error on failure
+      # Raises Flattr::Error::NotFound if thing was not found
       def thing_delete(id)
         thing = delete("/rest/v2/things/#{id}")
         if thing.nil? || thing == ""
@@ -80,21 +97,6 @@ module Flattr
         end
       end
 
-      # Public: Flattr a thing
-      #
-      # id - id of the thing you want to flattr
-      #
-      # Example
-      #
-      #   f = Flattr.new
-      #   f.thing_flattr(1)
-      #   # => true
-      #
-      # Returns true
-      def thing_flattr(id)
-        post("/rest/v2/things/#{id}/flattr")
-      end
-
       # Public: Search things
       #
       # params - The Hash options used to configure search (default: {})
@@ -118,6 +120,7 @@ module Flattr
       #
       # Returns Flattr::Search
       def thing_search(params = {})
+        params.merge!({"full" => "full"})
         result = get("/rest/v2/things/search", params)
         Flattr::Search.new(result)
       end
@@ -147,6 +150,21 @@ module Flattr
         end
       end
 
+      # Public: Get flattrs on a thing
+      #
+      # id - id of thing
+      #
+      # Examples
+      #   
+      #   f = Flattr.new
+      #   f.thing_flattrs(450287)
+      #   # => [...]
+      #
+      # Returns a Array with flattrs
+      def thing_flattrs(id,params={})
+        get("/rest/v2/things/#{id}/flattrs",params)
+      end
+
     end
   end
 end

data/lib/flattr/client/users.rb

@@ -15,10 +15,13 @@ module Flattr
       #   # => #<Flattr::User...
       #
       # Returns a Flattr::User if successful
-      # Raises a ERROR on failure
+      # Raises Flattr::Error::NotFound if user not found
       def user(username=nil)
-        user = username || self.current_user.username
-        user = get("/rest/v2/users/#{user}")
+        if username.nil?
+          user = get("/rest/v2/user")
+        else
+          user = get("/rest/v2/users/#{username}")
+        end
         Flattr::User.new(user)
       end
 
@@ -33,7 +36,7 @@ module Flattr
       #   # => [#<Flattr::Thing...
       #
       # Returns a Array with Flattr::User's inside if successful
-      # Raises a ERROR on failure
+      # Raises a Flattr::Error::NotFound if user not found
       def user_things(username=nil, args={})
         user = username || self.current_user.username
         get("/rest/v2/users/#{user}/things", args).map do |thing|
@@ -52,7 +55,7 @@ module Flattr
       #   # => [{"type" => "flattr"....
       #
       # Returns a Array with flattrs if successful
-      # Raises a ERROR on failure
+      # Raises Flattr::Error::NotFound if user not found
       def user_flattrs(username=nil, args={})
         user = username || self.current_user.username
         get("/rest/v2/users/#{user}/flattrs").map do |flattr|

data/lib/flattr/connection.rb

@@ -1,7 +1,9 @@
 require 'faraday'
 require 'flattr/core_ext/hash'
-require 'flattr/response/parse_json'
 require 'flattr/request/oauth2'
+require 'flattr/response/parse_json'
+require 'flattr/response/raise_client_error'
+require 'flattr/response/raise_server_error'
 
 module Flattr
   module Connection
@@ -17,11 +19,14 @@ module Flattr
         :url => endpoint,
       }
       Faraday.new(default_options.deep_merge(connection_options)) do |builder|
-        #builder.use Faraday::Request::Multipart
         builder.use Faraday::Request::JSON
         builder.use Faraday::Request::UrlEncoded
+
         builder.use Flattr::Request::FlattrOAuth2, credentials if credentials?
+        builder.use Flattr::Response::RaiseClientError
         builder.use Flattr::Response::ParseJson unless connection_options[:raw]
+        builder.use Flattr::Response::RaiseServerError
+
         builder.adapter(adapter)
       end
     end

data/lib/flattr/error.rb

@@ -0,0 +1,28 @@
+module Flattr
+  # Custom error class for rescuing from all Flattr errors
+  class Error < StandardError
+    attr_reader :http_headers
+
+    # Private: Initializes a new Error object
+    #
+    # message - Error message
+    # http_headers - Hash with http_headers
+    #
+    # Returns a Flattr::Error
+    def initialize(message, http_headers)
+      @http_headers = Hash[http_headers]
+      super(message)
+    end
+
+    # @return [Integer]
+    def ratelimit_limit
+      @http_headers.values_at('x-ratelimit-limit', 'X-RateLimit-Limit').detect{|value| value}.to_i
+    end
+
+    # @return [Integer]
+    def ratelimit_remaining
+      @http_headers.values_at('x-ratelimit-remaining', 'X-RateLimit-Remaining').detect{|value| value}.to_i
+    end
+
+  end
+end

data/lib/flattr/error/bad_gateway.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/server_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 502
+  class Error::BadGateway < Flattr::Error::ServerError
+  end
+end

data/lib/flattr/error/bad_request.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/client_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 400
+  class Error::BadRequest < Flattr::Error::ClientError
+  end
+end

data/lib/flattr/error/client_error.rb

@@ -0,0 +1,7 @@
+require 'flattr/error'
+
+module Flattr
+  # Raised when Flattr returns a 4xx HTTP status code
+  class Error::ClientError < Flattr::Error
+  end
+end

data/lib/flattr/error/forbidden.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/client_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 403
+  class Error::Forbidden < Flattr::Error::ClientError
+  end
+end

data/lib/flattr/error/internal_server_error.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/server_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 500
+  class Error::InternalServerError < Flattr::Error::ServerError
+  end
+end

data/lib/flattr/error/not_acceptable.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/client_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 406
+  class Error::NotAcceptable <Flattr::Error::ClientError
+  end
+end

data/lib/flattr/error/not_found.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/client_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 404
+  class Error::NotFound < Flattr::Error::ClientError
+  end
+end

data/lib/flattr/error/server_error.rb

@@ -0,0 +1,7 @@
+require 'flattr/error'
+
+module Flattr 
+  # Raised when Flattr returns a 5xx HTTP status code
+  class Error::ServerError < Flattr::Error
+  end
+end

data/lib/flattr/error/unauthorized.rb

@@ -0,0 +1,7 @@
+require 'flattr/error/client_error'
+
+module Flattr
+  # Raised when Flattr returns the HTTP status code 401
+  class Error::Unauthorized < Flattr::Error::ClientError
+  end
+end

data/lib/flattr/oauth2.rb

@@ -4,8 +4,8 @@ module Flattr
     def authorize_url(opts = {})
 
       default_options = {
-        :client_id => client_id,
-        :client_secret => client_secret,
+        :client_id => client_id.strip,
+        :client_secret => client_secret.strip,
         :response_type => "code"
       }
 
@@ -26,11 +26,11 @@ module Flattr
 
     def get_access_token(code)
       response = post(token_endpoint, {
-        :code => code,
+        :code => code.strip,
         :grant_type => 'authorization_code'
       },{
         :headers => {
-          :authorization => "Basic #{base64_encode("#{client_id}:#{client_secret}")}"
+          :authorization => "Basic #{Flattr::Client.base64_encode("#{client_id}:#{client_secret}")}"
         }}
       )
       self.access_token = response['access_token']

data/lib/flattr/request/oauth2.rb

@@ -17,7 +17,7 @@ module Flattr
         if @options[:access_token]
           "Bearer #{@options[:access_token]}"
         elsif @options[:client_id] && @options[:client_secret]
-          "Basic #{base64_encode("#{@options[:client_id]}:#{@options[:client_secret]}")}"
+          "Basic #{Flattr::Client.base64_encode("#{@options[:client_id]}:#{@options[:client_secret]}")}"
         else
           nil
         end

data/lib/flattr/response/parse_json.rb

@@ -14,7 +14,11 @@ module Flattr
         when 'false'
           false
         else
-          ::MultiJson.decode(body)
+          begin
+            ::MultiJson.decode(body)
+          rescue
+            nil
+          end
         end
       end
 

data/lib/flattr/response/raise_client_error.rb

@@ -0,0 +1,39 @@
+require 'faraday'
+require 'flattr/error/bad_request'
+require 'flattr/error/forbidden'
+require 'flattr/error/not_acceptable'
+require 'flattr/error/not_found'
+require 'flattr/error/unauthorized'
+
+module Flattr
+  module Response
+    class RaiseClientError < Faraday::Response::Middleware
+
+      def on_complete(env)
+        case env[:status].to_i
+        when 400
+          raise Flattr::Error::BadRequest.new(error_body(env[:body]), env[:response_headers])
+        when 401
+          raise Flattr::Error::Unauthorized.new(error_body(env[:body]), env[:response_headers])
+        when 403
+          raise Flattr::Error::Forbidden.new(error_body(env[:body]), env[:response_headers])
+        when 404
+          raise Flattr::Error::NotFound.new(error_body(env[:body]), env[:response_headers])
+        when 406
+          raise Flattr::Error::NotAcceptable.new(error_body(env[:body]), env[:response_headers])
+        end
+      end
+
+    private
+
+      def error_body(body)
+        if body.nil?
+          ''
+        elsif body['error']
+          body['error_description']
+        end
+      end
+
+    end
+  end
+end

data/lib/flattr/response/raise_server_error.rb

@@ -0,0 +1,20 @@
+require 'faraday'
+require 'flattr/error/bad_gateway'
+require 'flattr/error/internal_server_error'
+
+module Flattr
+  module Response
+    class RaiseServerError < Faraday::Response::Middleware
+
+      def on_complete(env)
+        case env[:status].to_i
+        when 500
+          raise Flattr::Error::InternalServerError.new("Something is technically wrong.", env[:response_headers])
+        when 502
+          raise Flattr::Error::BadGateway.new("Flattr is down or being upgraded.", env[:response_headers])
+        end
+      end
+
+    end
+  end
+end

data/lib/flattr/thing.rb

@@ -5,10 +5,14 @@ module Flattr
 
     lazy_attr_reader :resource, :link, :id, :url, :language, :category,
       :hidden, :flattred, :tags, :flattrs, :description, :title,
-      :last_flattr_at, :updated_at, :flattrs_current_period, :owner
+      :last_flattr_at, :updated_at, :image, :owner
 
     lazy_attr_writer :tags, :language, :category, :hidden, :description,
       :description, :title
 
+    def initialize(attrs={})
+      attrs['owner'] = Flattr::User.new attrs['owner'] if attrs['owner']
+      super attrs
+    end
    end
 end

data/lib/flattr/version.rb

@@ -8,12 +8,12 @@ module Flattr
 
   # @return [Integer]
   def self.minor
-    2
+    3
   end
 
   # @return [Integer]
   def self.patch
-    3
+    0
   end
 
   # @return [String, NilClass]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flattr
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70335945795100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70335945795100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70335945794620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335945794620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70335945794040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335945794040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335945793560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335945793560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70335945793020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335945793020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335945792400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335945792400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70335945791660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335945791660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70335945790720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +134,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335945790720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - simon@smgt.me
@@ -109,21 +149,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rdoc_options
 - .rspec
 - .travis.yml
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
-- example_app/Gemfile
-- example_app/app.rb
-- example_app/config.ru
-- example_app/local_config.example.yml
-- example_app/local_config.yml
-- example_app/views/index.haml
-- example_app/views/layout.haml
-- example_app/views/open_calls.haml
-- example_app/views/tests.haml
 - flattr.gemspec
 - lib/flattr.rb
 - lib/flattr/authenticatable.rb
@@ -131,17 +163,30 @@ files:
 - lib/flattr/category.rb
 - lib/flattr/client.rb
 - lib/flattr/client/categories.rb
+- lib/flattr/client/flattrs.rb
 - lib/flattr/client/languages.rb
 - lib/flattr/client/things.rb
 - lib/flattr/client/users.rb
 - lib/flattr/config.rb
 - lib/flattr/connection.rb
 - lib/flattr/core_ext/hash.rb
+- lib/flattr/error.rb
+- lib/flattr/error/bad_gateway.rb
+- lib/flattr/error/bad_request.rb
+- lib/flattr/error/client_error.rb
+- lib/flattr/error/forbidden.rb
+- lib/flattr/error/internal_server_error.rb
+- lib/flattr/error/not_acceptable.rb
+- lib/flattr/error/not_found.rb
+- lib/flattr/error/server_error.rb
+- lib/flattr/error/unauthorized.rb
 - lib/flattr/language.rb
 - lib/flattr/oauth2.rb
 - lib/flattr/request.rb
 - lib/flattr/request/oauth2.rb
 - lib/flattr/response/parse_json.rb
+- lib/flattr/response/raise_client_error.rb
+- lib/flattr/response/raise_server_error.rb
 - lib/flattr/search.rb
 - lib/flattr/thing.rb
 - lib/flattr/user.rb
@@ -168,11 +213,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: flattr
-rubygems_version: 1.8.10
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Flattr API wrapper
 test_files:
 - spec/flattr_spec.rb
 - spec/helper.rb
-has_rdoc: 

data/example_app/Gemfile

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-gem 'sinatra'
-gem 'haml'
-
-group :development do
-  gem 'shotgun'
-end

data/example_app/app.rb

@@ -1,41 +0,0 @@
-require 'sinatra'
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'flattr'
-require 'haml'
-
-require 'yaml'
-local_config = YAML.load_file './local_config.yml'
-
-layout :default
-set :session, :enable
-
-before do
-  puts " -- #{request.request_method.upcase} #{request.path_info} --"
-  @flattr_client = Flattr.new(
-    :client_id    => local_config['client_id'],
-    :client_secret => local_config['client_secret'],
-    :authorize_endpoint => local_config['authorize_endpoint'],
-    :token_endpoint => local_config['token_endpoint']
-  )
-end
-get '/' do
-  haml :index
-end
-
-get '/callback' do
-  puts "callback params: #{params.inspect}"
-  token = @flattr_client.get_access_token params["code"]
-  puts "token is : #{token}"
-  redirect '/tests'
-end
-
-get '/open_calls' do
-  @user = @flattr_client.user('smgt')
-  @categories = @flattr_client.categories
-  @languages = @flattr_client.languages
-  haml :open_calls
-end
-
-get '/tests' do
-  haml :tests
-end

data/example_app/config.ru

@@ -1,3 +0,0 @@
-require './app'
-use Rack::Logger
-run Sinatra::Application

data/example_app/local_config.example.yml

@@ -1,4 +0,0 @@
-client_id: your client key
-client_secret: your client secret
-token_endpoint: https://flattr.com/oauth/token
-authorize_endpoint: https://flattr.com/oauth/authorize

data/example_app/local_config.yml

@@ -1,4 +0,0 @@
-client_id: GqKAYw0cR0eBSIQIQDsQGm2cgJ0nVMls3VSRhJUZAZrix7QdB8U7lMasm0G8CRqw
-client_secret: D9dLIYA8NRhaPXdgWXd7AdqM4WKwD0T70WIyL9xoQEowrsCegGcGKsiEeT1IKKFA
-token_endpoint: https://flattr.local/oauth/token
-authorize_endpoint: https://flattr.local/oauth/authorize

data/example_app/views/index.haml

@@ -1,2 +0,0 @@
-hello world, from a template!
-%a{:href => @flattr_client.authorize_path} authenticate

data/example_app/views/layout.haml

@@ -1,10 +0,0 @@
-!!! html5
-%html
-  %head
-    %link{:rel => "favicon", :src=>"/favicon.ico"}
-    %title test app for the flattr gem
-  %body
-    =yield
-
-
-

data/example_app/views/open_calls.haml

@@ -1,12 +0,0 @@
-%p i got a lot of stuff, like
-%h2 user smgt
-%pre
-  =@user.inspect.gsub(",","\n")
-
-%h2 categories
-%pre
-  =@categories.inspect.gsub(",","\n")
-
-%h2 languages
-%pre
-  =@languages.inspect.gsub(",","\n")

data/example_app/views/tests.haml

@@ -1 +0,0 @@
-hej jag är en testfil :)