happi 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 7cbe7a33112d358c16c95b35ec410b82aaf65622
-  data.tar.gz: 65d57b1a2230647d0246290ace7ae9a214667163
+SHA1:
+  metadata.gz: b2bb971c27f9eb12858f5550f78a94552535bfb4
+  data.tar.gz: 61b0559144f1ff61208d18ee2a83e14ffdf7cf67
 SHA512:
-  metadata.gz: 7836ce0c555cbbc9d9e49588dbb6f6b1d875256b98b60e6b2b1e75c62957bad3dde9ef7ed8ec488265c8bac084059d65578a1366e5ba8a431d31fc3b5a351c58
-  data.tar.gz: 8be1620f866422be96752a44e657cea4ef2498a0e66862b89e718ddf1362c97bba613f37f2e5d171648592af7652419e38dc28d1227ae137705ac1f9487ca756
+  metadata.gz: dd301905b6ca4be9caa12f65e81059a59184e4321d8a419b5d499e12b91c59ea60efc990e95a0fe2e2315a8a070d28921f749c650547113c8d489d185f4665e8
+  data.tar.gz: d07674c69955338f41cc91f82ae991446bb887d7f1b190008f013985286a712f13ec5b4f9b1cdf4b5d508285c2de385d9107e9de09d5b703d2ee94a440a7d52d

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+gemfile:
+  - Gemfile.rails41
+  - Gemfile.rails32
+  - Gemfile
+branches:
+  only:
+    - develop
+    - master

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in happi.gemspec
 gemspec
+
+gem 'activesupport'

data/Gemfile.rails32

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activesupport', '~> 3.2'

data/Gemfile.rails41

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activesupport', '~> 4.1'

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
     require 'happi'
 
     Happi::Client.configure do |config|
-      config.base_url = 'http://localhost:3000'
+      config.host = 'http://localhost:3000'
     end
 
     client = Happi::Client.new(
@@ -55,6 +55,18 @@ Or install it yourself as:
 
     puts document[:id]
 
+## Configuration
+
+```ruby
+Happi::Client.configure do |config|
+  config.host = 'http://localhost:8080'
+  config.port = 443
+  config.timeout = 60
+  config.version = 'v1'
+  config.use_json = false
+end
+```
+
 ## Contributing
 
 1. Fork it

data/happi.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
   spec.add_dependency 'faraday_middleware'
-  spec.add_dependency 'activesupport'
   spec.add_dependency 'activemodel'
   spec.add_dependency 'oauth2'
   spec.add_dependency 'mime-types'
@@ -31,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'cane'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rack-test'
 end

data/lib/happi/client.rb

@@ -4,8 +4,7 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash'
 
 class Happi::Client
-
-  delegate :config, to: :class
+  delegate :config, to: self
 
   def self.config
     @config ||= Happi::Configuration.new
@@ -26,6 +25,11 @@ class Happi::Client
         .body.with_indifferent_access
   end
 
+  def delete(resource, params = {})
+    call(:delete, url(resource), param_check(params))
+        .body.with_indifferent_access
+  end
+
   def patch(resource, params = {})
     call(:patch, url(resource), param_check(params))
         .body.with_indifferent_access
@@ -41,7 +45,12 @@ class Happi::Client
   end
 
   def call(method, url, params)
-    logger.info("#{method}, #{url}, #{params}")
+    if config.log_level == :debug
+      logger.debug("Happi: #{method.upcase} #{config.host}#{url}, #{params}")
+    else
+      logger.info("Happi: #{method.upcase} #{config.host}#{url}")
+    end
+
     response = connection.send(method, url, params)
     raise_error(response) if errors[response.status]
     response
@@ -58,7 +67,15 @@ class Happi::Client
   end
 
   def logger
-    @logger ||= Logger.new(STDOUT)
+    @logger ||= default_logger
+  end
+
+  def default_logger
+    if defined?(Rails)
+      Rails.try(:logger) || Logger.new(STDOUT)
+    else
+      Logger.new(STDOUT)
+    end
   end
 
   def param_check(params)
@@ -75,10 +92,18 @@ class Happi::Client
 
   def connection
     @connection ||= Faraday.new(config.host) do |f|
-      f.request :multipart
       f.use FaradayMiddleware::OAuth2, config.oauth_token
       f.use FaradayMiddleware::ParseJson, content_type: 'application/json'
-      f.request :url_encoded
+
+      if self.config.use_json
+        f.use FaradayMiddleware::EncodeJson
+        f.request :json
+        f.response :json
+      else
+        f.request :multipart
+        f.request :url_encoded
+      end
+
       f.adapter :net_http
     end
   end

data/lib/happi/configuration.rb

@@ -4,11 +4,13 @@ class Happi::Configuration
     host: 'http://localhost:8080',
     port: 443,
     timeout: 60,
-    version: 'v1'
+    version: 'v1',
+    use_json: false,
+    log_level: :info
     }
   end
 
-  attr_accessor :oauth_token, :host, :port, :timeout, :version
+  attr_accessor :oauth_token, :host, :port, :timeout, :version, :use_json, :log_level
 
   def initialize(options = {})
     self.class.defaults.merge(options).each do |key, value|

data/lib/happi/error.rb

@@ -1,13 +1,58 @@
 class Happi::Error < Exception
-  class ClientError < self; end
-  class BadRequest < ClientError; end
-  class Unauthorized < ClientError; end
-  class Forbidden < ClientError; end
-  class NotFound < ClientError; end
-  class NotAcceptable < ClientError; end
-  class RequestTimeout < ClientError; end
-  class UnprocessableEntity < ClientError; end
-  class ServerError < self; end
+  class ClientError < self
+    def message
+      "A client error occurred"
+    end
+  end
+
+  class BadRequest < ClientError
+    def message
+      "The request was incorrectly performed"
+    end
+  end
+
+  class Unauthorized < ClientError
+    def message
+      "The request was not authorized"
+    end
+  end
+
+  class Forbidden < ClientError
+    def message
+      "The request was denied"
+    end
+  end
+
+  class NotFound < ClientError
+    def message
+      "The requested resource was not found"
+    end
+  end
+
+  class NotAcceptable < ClientError
+    def message
+      "The requested format was not accepted"
+    end
+  end
+
+  class RequestTimeout < ClientError
+    def message
+      "The request timed out"
+    end
+  end
+
+  class UnprocessableEntity < ClientError
+    def message
+      "The request was not able to be processed"
+    end
+  end
+
+  class ServerError < self
+    def message
+      "A server error occurred"
+    end
+  end
+
   class InternalServerError < ServerError; end
   class BadGateway < ServerError; end
   class TooManyRequests < ServerError; end

data/lib/happi/file.rb

@@ -2,9 +2,16 @@ require 'mime/types'
 
 class Happi::File
   attr_accessor :file_name
+  attr_accessor :mime_type
 
-  def initialize(file_name)
-    @file_name = file_name
+  def initialize(file)
+    if file.is_a?(String)
+      @mime_type = MIME::Types.type_for(file).first.content_type
+      @file_name = file
+    else
+      @mime_type = file.content_type
+      @file_name = file.path
+    end
   end
 
   def exists?
@@ -15,10 +22,6 @@ class Happi::File
     Faraday::UploadIO.new(file_name, mime_type) if exists?
   end
 
-  def mime_type
-    MIME::Types.type_for(file_name).first.content_type
-  end
-
   def encode_file
     Base64.encode64(File.read(file_name))
   end

data/lib/happi/version.rb

@@ -1,3 +1,3 @@
 module Happi
-  VERSION = '0.0.5'
+  VERSION = '0.0.10'
 end

data/spec/configuration_spec.rb

@@ -4,5 +4,10 @@ describe Happi::Configuration do
   describe 'options' do
     specify { expect(Happi::Configuration.new(host: 'http://www.google.com').host).to eql('http://www.google.com') }
     specify { expect(Happi::Configuration.new(port: 80).port).to eql(80) }
+
+    specify do
+      Happi::Client.configure { |config| config.host = 'http://localhost:3000' }
+      expect(Happi::Client.config.host).to eq 'http://localhost:3000'
+    end
   end
 end

data/spec/file_spec.rb

@@ -1,22 +1,46 @@
 require 'spec_helper'
+require 'rack/test'
 
 describe Happi::File do
-  subject { Happi::File.new(__FILE__) }
+  context "with a file name" do
+    subject { Happi::File.new(__FILE__) }
 
-  describe '#encode_file' do
-    encoded = Base64.encode64(File.read(__FILE__))
-    specify { expect(subject.encode_file).to eql(encoded) }
-  end
+    describe '#encode_file' do
+      encoded = Base64.encode64(File.read(__FILE__))
+      specify { expect(subject.encode_file).to eql(encoded) }
+    end
 
-  describe '#mime_type' do
-    specify { expect(subject.mime_type).to eql('application/x-ruby') }
-  end
+    describe '#mime_type' do
+      specify { expect(subject.mime_type).to eql('application/x-ruby') }
+    end
 
-  describe '#multipart' do
-    # specify { expect(subject.multipart).to }
+    describe '#multipart' do
+      # specify { expect(subject.multipart).to }
+    end
+
+    describe '#exists?' do
+      specify { expect(subject.exists?).to eq(true) }
+    end
   end
 
-  describe '#exists?' do
-    specify { expect(subject.exists?).to be_true }
+  context "with an ActionDispatch::Http::UploadedFile" do
+    subject { Happi::File.new(Rack::Test::UploadedFile.new(__FILE__, 'application/x-ruby')) }
+
+    describe '#encode_file' do
+      encoded = Base64.encode64(File.read(__FILE__))
+      specify { expect(subject.encode_file).to eql(encoded) }
+    end
+
+    describe '#mime_type' do
+      specify { expect(subject.mime_type).to eql('application/x-ruby') }
+    end
+
+    describe '#multipart' do
+      # specify { expect(subject.multipart).to }
+    end
+
+    describe '#exists?' do
+      specify { expect(subject.exists?).to eq(true) }
+    end
   end
 end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: happi
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - John D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple faraday client preconfigured
@@ -185,8 +185,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.rails32
+- Gemfile.rails41
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -212,17 +215,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simple faraday client wrapper preconfigured for specific usecase