evrythng 0.0.5 → 0.1.0

data/lib/evrythng/request.rb

@@ -1,40 +1,40 @@
 module Evrythng
   # Defines HTTP request methods
   module Request
+    # Perform an HTTP DELETE request
+    def delete(path, params={}, options={})
+      request(:delete, path, params, options)
+    end
+
     # Perform an HTTP GET request
-    def get(path, options={}, format=format)
-      request(:get, path, options, format)
+    def get(path, params={}, options={})
+      request(:get, path, params, options)
     end
 
     # Perform an HTTP POST request
-    def post(path, options={}, format=format)
-      request(:post, path, options, format)
+    def post(path, params={}, options={})
+      request(:post, path, params, options)
     end
 
     # Perform an HTTP PUT request
-    def put(path, options={}, format=format)
-      request(:put, path, options, format)
-    end
-
-    # Perform an HTTP DELETE request
-    def delete(path, options={}, format=format)
-      request(:delete, path, options, format)
+    def put(path, params={}, options={})
+      request(:put, path, params, options)
     end
 
     private
 
     # Perform an HTTP request
-    def request(method, path, options, format)
-      response = connection(format).send(method) do |request|
+    def request(method, path, params, options)
+      response = connection(options).send(method) do |request|
         case method.to_sym
-        when :get, :delete
-          request.url(path, options)
+        when :delete, :get
+          request.url(path, params)
         when :post, :put
           request.path = path
-          request.body = options unless options.empty?
+          request.body = params unless params.empty?
         end
       end
-      'raw' == format.to_s.downcase ? response : response.body
+      options[:raw] ? response : response.body
     end
   end
 end

data/lib/evrythng/response/parse_json.rb

@@ -0,0 +1,23 @@
+require 'faraday'
+require 'multi_json'
+
+module Evrythng
+  module Response
+    class ParseJson < Faraday::Response::Middleware
+
+      def parse(body)
+        case body
+        when ''
+          nil
+        when 'true'
+          true
+        when 'false'
+          false
+        else
+          ::MultiJson.decode(body)
+        end
+      end
+
+    end
+  end
+end

data/lib/evrythng/response/raise_client_error.rb

@@ -0,0 +1,49 @@
+require 'faraday'
+require 'evrythng/error/bad_request'
+require 'evrythng/error/enhance_your_calm'
+require 'evrythng/error/forbidden'
+require 'evrythng/error/not_acceptable'
+require 'evrythng/error/not_found'
+require 'evrythng/error/unauthorized'
+
+module Evrythng
+  module Response
+    class RaiseClientError < Faraday::Response::Middleware
+
+      def on_complete(env)
+        case env[:status].to_i
+        when 400
+          raise Evrythng::Error::BadRequest.new(error_body(env[:body]), env[:response_headers])
+        when 401
+          raise Evrythng::Error::Unauthorized.new(error_body(env[:body]), env[:response_headers])
+        when 403
+          raise Evrythng::Error::Forbidden.new(error_body(env[:body]), env[:response_headers])
+        when 404
+          raise Evrythng::Error::NotFound.new(error_body(env[:body]), env[:response_headers])
+        when 406
+          raise Evrythng::Error::NotAcceptable.new(error_body(env[:body]), env[:response_headers])
+        when 420
+          raise Evrythng::Error::EnhanceYourCalm.new(error_body(env[:body]), env[:response_headers])
+        end
+      end
+
+      private
+
+      def error_body(body)
+        if body.nil?
+          ''
+        elsif body['error']
+          body['error']
+        elsif body['errors']
+          first = Array(body['errors']).first
+          if first.kind_of?(Hash)
+            first['message'].chomp
+          else
+            first.chomp
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/evrythng/response/raise_server_error.rb

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

data/lib/evrythng/version.rb

@@ -1,4 +1,3 @@
 module Evrythng
-  # The version of the gem
-  VERSION = '0.0.5'.freeze unless defined?(::Evrythng::VERSION)
+  VERSION = '0.1.0'
 end

data/lib/evrythng.rb

@@ -1,20 +1,18 @@
-require 'evrythng/api'
 require 'evrythng/client'
-require 'evrythng/configuration'
-require 'evrythng/error'
-require 'evrythng/search'
+require 'evrythng/config'
 
 module Evrythng
-  extend Configuration
+  extend Config
+
   class << self
     # Alias for Evrythng::Client.new
     #
     # @return [Evrythng::Client]
-    def new(options={})
+    def new(options = {})
       Evrythng::Client.new(options)
     end
 
-    # Delegate to evrythng::Client
+    # Delegate to Evrythng::Client
     def method_missing(method, *args, &block)
       return super unless new.respond_to?(method)
       new.send(method, *args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evrythng
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,132 +9,102 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70184618669300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: *70184618669300
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70184618668780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: *70184618668780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70184618668220 !ruby/object:Gem::Requirement
+  requirement: &70257168078720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184618668220
+  version_requirements: *70257168078720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184618667680 !ruby/object:Gem::Requirement
+  requirement: &70257168078300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184618667680
+  version_requirements: *70257168078300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70184618667060 !ruby/object:Gem::Requirement
+  requirement: &70257168077880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184618667060
+  version_requirements: *70257168077880
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70184618666540 !ruby/object:Gem::Requirement
+  requirement: &70257168077460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184618666540
+  version_requirements: *70257168077460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70184618665940 !ruby/object:Gem::Requirement
+  requirement: &70257168077040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184618665940
+  version_requirements: *70257168077040
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &70184618665460 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70257168076620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184618665460
+  version_requirements: *70257168076620
 - !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &70184618665000 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70257168076080 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70184618665000
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &70184618664480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: 2.3.9
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70184618664480
+  version_requirements: *70257168076080
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: &70184618664000 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: &70257168075320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70184618664000
+  version_requirements: *70257168075320
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70184618663520 !ruby/object:Gem::Requirement
+  requirement: &70257168074860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,20 +112,8 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70184618663520
-- !ruby/object:Gem::Dependency
-  name: simple_oauth
-  requirement: &70184618662980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70184618662980
-description: A Ruby wrapper for Evrythng API. Just proof of concept, do not consider
-  this as a solid library.
+  version_requirements: *70257168074860
+description: A Ruby wrapper for Evrythng API.
 email: graf.otodrakula@gmail.com
 executables: []
 extensions: []
@@ -167,24 +125,35 @@ files:
 - Rakefile
 - evrythng.gemspec
 - lib/evrythng.rb
-- lib/evrythng/api.rb
-- lib/evrythng/authentication.rb
+- lib/evrythng/authenticatable.rb
 - lib/evrythng/client.rb
 - lib/evrythng/client/collections.rb
+- lib/evrythng/client/properties.rb
+- lib/evrythng/client/search.rb
 - lib/evrythng/client/thngs.rb
-- lib/evrythng/configuration.rb
+- lib/evrythng/config.rb
 - lib/evrythng/connection.rb
+- lib/evrythng/core_ext/hash.rb
 - lib/evrythng/error.rb
+- lib/evrythng/error/bad_gateway.rb
+- lib/evrythng/error/bad_request.rb
+- lib/evrythng/error/client_error.rb
+- lib/evrythng/error/enhance_your_calm.rb
+- lib/evrythng/error/forbidden.rb
+- lib/evrythng/error/internal_server_error.rb
+- lib/evrythng/error/not_acceptable.rb
+- lib/evrythng/error/not_found.rb
+- lib/evrythng/error/server_error.rb
+- lib/evrythng/error/service_unavailable.rb
+- lib/evrythng/error/unauthorized.rb
 - lib/evrythng/request.rb
-- lib/evrythng/search.rb
+- lib/evrythng/request/gateway.rb
+- lib/evrythng/request/token_authentication.rb
+- lib/evrythng/response/parse_json.rb
+- lib/evrythng/response/raise_client_error.rb
+- lib/evrythng/response/raise_server_error.rb
 - lib/evrythng/version.rb
-- lib/faraday/request/basic_authentication.rb
-- lib/faraday/request/evrythng_oauth.rb
-- lib/faraday/request/gateway.rb
-- lib/faraday/request/multipart_with_file.rb
-- lib/faraday/response/raise_http_4xx.rb
-- lib/faraday/response/raise_http_5xx.rb
-homepage: http://github.com/bai/evrythng-ruby
+homepage: http://github.com/bai/evrythng
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -204,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: A Ruby wrapper for Evrythng API
+summary: Evrythng API wrapper
 test_files: []

data/lib/evrythng/api.rb

@@ -1,24 +0,0 @@
-require 'evrythng/authentication'
-require 'evrythng/configuration'
-require 'evrythng/connection'
-require 'evrythng/request'
-
-module Evrythng
-  # @private
-  class API
-    include Connection
-    include Request
-    include Authentication
-
-    # @private
-    attr_accessor *Configuration::VALID_OPTIONS_KEYS
-
-    # Creates a new API
-    def initialize(options={})
-      options = Evrythng.options.merge(options)
-      Configuration::VALID_OPTIONS_KEYS.each do |key|
-        send("#{key}=", options[key])
-      end
-    end
-  end
-end

data/lib/evrythng/authentication.rb

@@ -1,25 +0,0 @@
-module Evrythng
-  # @private
-  module Authentication
-    private
-
-    # Authentication hash
-    #
-    # @return [Hash]
-    def authentication
-      {
-        :consumer_key => consumer_key,
-        :consumer_secret => consumer_secret,
-        :token => oauth_token,
-        :token_secret => oauth_token_secret
-      }
-    end
-
-    # Check whether user is authenticated
-    #
-    # @return [Boolean]
-    def authenticated?
-      authentication.values.all?
-    end
-  end
-end

data/lib/evrythng/configuration.rb

@@ -1,102 +0,0 @@
-require 'faraday'
-require 'evrythng/version'
-
-module Evrythng
-  # Defines constants and methods related to configuration
-  module Configuration
-    # An array of valid keys in the options hash when configuring a {Evrythng::API}
-    VALID_OPTIONS_KEYS = [
-      :adapter,
-      :consumer_key,
-      :consumer_secret,
-      :username,
-      :password,
-      :api_endpoint,
-      :format,
-      :gateway,
-      :oauth_token,
-      :oauth_token_secret,
-      :proxy,
-      :search_endpoint,
-      :user_agent].freeze
-
-    # An array of valid request/response formats
-    VALID_FORMATS = [
-      'vnd.evrythng-v1+json'
-    ].freeze
-
-    # The adapter that will be used to connect if none is set
-    #
-    # @note The default faraday adapter is Net::HTTP.
-    DEFAULT_ADAPTER = Faraday.default_adapter
-
-    # By default, don't set an application key
-    DEFAULT_CONSUMER_KEY = nil
-
-    # By default, don't set an application secret
-    DEFAULT_CONSUMER_SECRET = nil
-
-    # By default, don't set a username
-    DEFAULT_USERNAME = nil
-
-    # By default, don't set password
-    DEFAULT_PASSWORD = nil
-
-    # The endpoint that will be used to connect if none is set
-    DEFAULT_ENDPOINT = 'http://evrythng.net'.freeze
-
-    # The response format appended to the path and sent in the 'Accept' header if none is set
-    DEFAULT_FORMAT = 'vnd.evrythng-v1+json'.freeze
-
-    # By default, don't set a user oauth token
-    DEFAULT_OAUTH_TOKEN = nil
-
-    # By default, don't set a user oauth secret
-    DEFAULT_OAUTH_TOKEN_SECRET = nil
-
-    # By default, don't use a proxy server
-    DEFAULT_PROXY = nil
-
-    # The user agent that will be sent to the API endpoint if none is set
-    DEFAULT_USER_AGENT = "Evrythng Ruby Gem #{Evrythng::VERSION}".freeze
-
-    DEFAULT_GATEWAY = nil
-
-    # @private
-    attr_accessor *VALID_OPTIONS_KEYS
-
-    # When this module is extended, set all configuration options to their default values
-    def self.extended(base)
-      base.reset
-    end
-
-    # Convenience method to allow configuration options to be set in a block
-    def configure
-      yield self
-    end
-
-    # Create a hash of options and their values
-    def options
-      options = {}
-      VALID_OPTIONS_KEYS.each { |k| options[k] = send(k) }
-      options
-    end
-
-    # Reset all configuration options to defaults
-    def reset
-      self.adapter            = DEFAULT_ADAPTER
-      self.consumer_key       = DEFAULT_CONSUMER_KEY
-      self.consumer_secret    = DEFAULT_CONSUMER_SECRET
-      self.username           = DEFAULT_USERNAME
-      self.password           = DEFAULT_PASSWORD
-      self.api_endpoint       = DEFAULT_ENDPOINT
-      self.format             = DEFAULT_FORMAT
-      self.oauth_token        = DEFAULT_OAUTH_TOKEN
-      self.oauth_token_secret = DEFAULT_OAUTH_TOKEN_SECRET
-      self.proxy              = DEFAULT_PROXY
-      self.user_agent         = DEFAULT_USER_AGENT
-      self.gateway            = DEFAULT_GATEWAY
-      self
-    end
-  end
-end