evrythng 0.0.1 → 0.0.2

data/lib/evrythng/client/collections.rb

@@ -16,6 +16,23 @@ module Evrythng
         response = get('collections', options)
         format.to_s.downcase == 'xml' ? response['collections'] : response
       end
+
+      # Creates a collection
+      #
+      # @format :json, :xml
+      # @authenticated true
+      # @rate_limited false
+      # @param name [String] The name of collection.
+      # @param description [String] The description of collection.
+      # @param options [Hash] A customizable set of options.
+      # @return [Hashie::Rash] The created collection.
+      # @see http://dev.evrythng.net/doc/post/collections
+      # @example Create the authenticating user's collection
+      #   Evrythng.collection_create("This is a new collection!", "Here comes the description.")
+      def collection_create(name, description=nil, options={})
+        response = post('collections', options.merge(:collection => { :name => name, :description => description }))
+        format.to_s.downcase == 'xml' ? response['collection'] : response
+      end
     end
   end
 end

data/lib/evrythng/client/thngs.rb

@@ -0,0 +1,38 @@
+module Evrythng
+  class Client
+    # Defines methods related to thngs
+    module Thngs
+      # Returns a list of thngs
+      #
+      # @format :json, :xml
+      # @authenticated true
+      # @rate_limited true
+      # @param options [Hash] A customizable set of options.
+      # @return [Hashie::Rash] The requested list of thngs.
+      # @see http://developer.evrythng.net/thngs
+      # @example Return the list of thngs
+      #   Evrythng.thngs
+      def thngs(options={})
+        response = get('thngs', options)
+        format.to_s.downcase == 'xml' ? response['thngs'] : response
+      end
+
+      # Creates a thng
+      #
+      # @format :json, :xml
+      # @authenticated true
+      # @rate_limited false
+      # @param identifier [String] The identifier of thng.
+      # @param description [String] The description of thng.
+      # @param options [Hash] A customizable set of options.
+      # @return [Hashie::Rash] The created thng.
+      # @see http://developer.evrythng.net/thngs
+      # @example Create the authenticating user's thng
+      #   Evrythng.thng_create("my.test.thng", "Here comes the description.")
+      def thng_create(identifier, description=nil, options={})
+        response = post('thngs', options.merge(:thng => { :identifier => identifier, :description => description }))
+        format.to_s.downcase == 'xml' ? response['thng'] : response
+      end
+    end
+  end
+end

data/lib/evrythng/client.rb

@@ -4,10 +4,10 @@ module Evrythng
     # Require client method modules after initializing the Client class in
     # order to avoid a superclass mismatch error, allowing those modules to be
     # Client-namespaced.
-    require 'evrythng/client/things'
+    require 'evrythng/client/thngs'
     require 'evrythng/client/collections'
 
-    include Evrythng::Client::Things
+    include Evrythng::Client::Thngs
     include Evrythng::Client::Collections
   end
 end

data/lib/evrythng/configuration.rb

@@ -9,6 +9,8 @@ module Evrythng
       :adapter,
       :consumer_key,
       :consumer_secret,
+      :username,
+      :password,
       :api_endpoint,
       :format,
       :gateway,
@@ -36,8 +38,14 @@ module Evrythng
     # 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/api/v1/'.freeze
+    DEFAULT_ENDPOINT = 'http://api.evrythng.net'.freeze
 
     # The response format appended to the path and sent in the 'Accept' header if none is set
     #
@@ -53,9 +61,6 @@ module Evrythng
     # By default, don't use a proxy server
     DEFAULT_PROXY = nil
 
-    # The search endpoint that will be used to connect if none is set
-    DEFAULT_SEARCH_ENDPOINT = 'http://evrythng.net/api/v1/search'.freeze
-
     # The user agent that will be sent to the API endpoint if none is set
     DEFAULT_USER_AGENT = "Evrythng Ruby Gem #{Evrythng::VERSION}".freeze
 
@@ -86,12 +91,13 @@ module Evrythng
       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.search_endpoint    = DEFAULT_SEARCH_ENDPOINT
       self.user_agent         = DEFAULT_USER_AGENT
       self.gateway            = DEFAULT_GATEWAY
       self

data/lib/evrythng/connection.rb

@@ -2,6 +2,7 @@ require 'faraday_middleware'
 require 'faraday/request/multipart_with_file'
 require 'faraday/request/gateway'
 require 'faraday/request/evrythng_oauth'
+require 'faraday/request/basic_authentication'
 require 'faraday/response/raise_http_4xx'
 require 'faraday/response/raise_http_5xx'
 
@@ -12,7 +13,7 @@ module Evrythng
 
     def connection(raw=false)
       options = {
-        :headers => {'Accept' => "application/#{format}", 'User-Agent' => user_agent},
+        :headers => {'Accept' => "application/vnd.evrythng-v1+json", 'User-Agent' => user_agent},
         :proxy => proxy,
         :ssl => {:verify => false},
         :url => api_endpoint,
@@ -20,8 +21,8 @@ module Evrythng
 
       Faraday.new(options) do |builder|
         builder.use Faraday::Request::MultipartWithFile
-        builder.use Faraday::Request::EvrythngOAuth, authentication if authenticated?
         builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::BasicAuthentication, username, password
         builder.use Faraday::Request::UrlEncoded
         builder.use Faraday::Request::Gateway, gateway if gateway
         builder.use Faraday::Response::RaiseHttp4xx

data/lib/evrythng/request.rb

@@ -28,17 +28,13 @@ module Evrythng
       response = connection(raw).send(method) do |request|
         case method
         when :get, :delete
-          request.url(formatted_path(path), options)
+          request.url(path, options)
         when :post, :put
-          request.path = formatted_path(path)
+          request.path = path
           request.body = options unless options.empty?
         end
       end
       raw ? response : response.body
     end
-
-    def formatted_path(path)
-      [path, format].compact.join('.')
-    end
   end
 end

data/lib/evrythng/version.rb

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

data/lib/faraday/request/basic_authentication.rb

@@ -0,0 +1,15 @@
+require 'base64'
+
+module Faraday
+  class Request::BasicAuthentication < Faraday::Middleware
+    def initialize(app, login, pass)
+      super(app)
+      @header_value = "Basic #{Base64.encode64([login, pass].join(':')).gsub("\n", '')}"
+    end
+
+    def call(env)
+      env[:request_headers]['Authorization'] = @header_value
+      @app.call(env)
+    end
+  end
+end

metadata

@@ -1,114 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: evrythng
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - beawesomeinstead
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70277242139060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hashie
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242139060
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &70277242138440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242138440
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70277242137960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242137960
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &70277242137460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242137460
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70277242137000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: multi_xml
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242137000
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: &70277242136520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rash
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242136520
+- !ruby/object:Gem::Dependency
+  name: rash
+  requirement: &70277242136060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: simple_oauth
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70277242136060
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
+  requirement: &70277242135560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70277242135560
 description: A Ruby wrapper for the Evrythng API.
 email: graf.otodrakula@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - Rakefile
 - evrythng.gemspec
@@ -117,12 +113,13 @@ files:
 - lib/evrythng/authentication.rb
 - lib/evrythng/client.rb
 - lib/evrythng/client/collections.rb
-- lib/evrythng/client/things.rb
+- lib/evrythng/client/thngs.rb
 - lib/evrythng/configuration.rb
 - lib/evrythng/connection.rb
 - lib/evrythng/error.rb
 - lib/evrythng/request.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
@@ -131,30 +128,26 @@ files:
 - lib/faraday/response/raise_http_5xx.rb
 homepage: http://github.com/bai/evrythng
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for the Evrythng API.
 test_files: []
-

data/lib/evrythng/client/things.rb

@@ -1,21 +0,0 @@
-module Evrythng
-  class Client
-    # Defines methods related to things
-    module Things
-      # Returns a list of things
-      #
-      # @format :json, :xml
-      # @authenticated true
-      # @rate_limited true
-      # @param options [Hash] A customizable set of options.
-      # @return [Hashie::Rash] The requested list of things.
-      # @see http://dev.evrythng.net/doc/get/things
-      # @example Return the list of things
-      #   Evrythng.things
-      def things(options={})
-        response = get('things', options)
-        format.to_s.downcase == 'xml' ? response['things'] : response
-      end
-    end
-  end
-end