lolp 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06211ad50dea46a165db75b6366faac072ea603e
-  data.tar.gz: ea05b85aadd33fe4c5b70b1f99e1493032c7649d
+  metadata.gz: 48f64d7c464aa54df35fa07f1fbd58c1aa48a09d
+  data.tar.gz: 520ceff36e7affc10c78a5b3ca98d392b6e5557f
 SHA512:
-  metadata.gz: 04d7c72e65adb59897cce3ec79bce9f4c65505a793d1ef3b2d916fb72a60367130e9df7c5ef31a0c45dfb068e5cbd81b3e542571efb3221dab045cdd1f530e43
-  data.tar.gz: 2999e2153e4667b49ca7cb9e3a0e6e9d6c635e8aee28aa066163d526ba9421b47ca3b20942718459b0c639bec781825a1caf59759d599296be1e8cc9ef3463c3
+  metadata.gz: 8d743865d68e6a667b5e808d580c2bc73e788baaec23e1f9156c3792177bd55fffd7068a72e2198a2dccced2e450fb635fd6438aa846da7037116d1241fd5f76
+  data.tar.gz: e34ba0f0aa017fa03fe3caf33a461148ebd8b1d39dcac4b96500a3fd41dad0338d94c25bd37e076fe73df5f3cc5d11bb82d2a0ceb0811ae0409301e2618ea20b

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.3
+  - 2.5
   - 2.4
   - ruby-head
 

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in lolp.gemspec
 gemspec
+
+group :development do
+  gem 'pry'
+  gem 'awesome_print'
+end

data/Rakefile

@@ -7,4 +7,8 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+task :clean do
+  sh 'rm -rf test/fixtures/vcr_cassettes'
+end
+
 task :default => :test

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'lolp'
+require 'awesome_print'
+require 'pry'
+Pry.start

data/lib/lolp.rb

@@ -11,7 +11,6 @@ module Lolp
       if client.respond_to?(method_name)
         return client.send(method_name, *args, &block)
       end
-
       super
     end
   end

data/lib/lolp/client.rb

@@ -1,14 +1,21 @@
 require 'lolp/connection'
-require 'lolp/project'
 require 'lolp/configuration'
+require 'lolp/client/project'
+require 'lolp/client/authentication'
 
 module Lolp
   class Client
-    include Lolp::Project
     include Lolp::Configuration
+    include Lolp::Connection
+    include Lolp::Client::Project
+    include Lolp::Client::Authentication
 
-    def connection
-      @connection ||= Lolp::Connection.new(config)
+    def initialize(config = {})
+      defaults
+
+      config.each do |k,v|
+        instance_variable_set(:"@#{key}", v)
+      end
     end
   end
 end

data/lib/lolp/client/authentication.rb

@@ -0,0 +1,12 @@
+module Lolp
+  class Client
+    module Authentication
+      def authenticate(username = nil, password = nil)
+        @token = post('v1/authenticate',
+          username: username || @username,
+          password: password || @password)
+      end
+      alias login authenticate
+    end
+  end
+end

data/lib/lolp/client/project.rb

@@ -0,0 +1,29 @@
+module Lolp
+  class Client
+    module Project
+      def projects
+        get('v1/projects')
+      end
+
+      def project(name)
+        get("v1/projects/#{name}")
+      end
+
+      def create_project(type, params = {})
+        post('v1/projects', params.merge(type: type))
+      end
+
+      def delete_project(name)
+        delete("v1/projects/#{name}")
+      end
+
+      def create_custom_domain(domain, custom_domain)
+        post("v1/projects/#{domain}/custom-domains", domain: custom_domain)
+      end
+
+      def delete_custom_domain(domain, custom_domain)
+        delete("v1/projects/#{domain}/custom-domains/#{custom_domain}")
+      end
+    end
+  end
+end

data/lib/lolp/configuration.rb

@@ -1,21 +1,16 @@
 module Lolp
   module Configuration
-    def config
-      @config ||= Config.new
-    end
+    attr_accessor :api_endpoint, :username, :password, :token
 
     def configure
-      yield config
+      yield self
     end
 
-    class Config
-      attr_accessor :api_endpoint, :username, :password
-
-      def initialize
-        @api_endpoint = ENV['LOLIPOP_MC_API_ENDPOINT'] || 'https://mc.lolipop.jp/api'
-        @username = ENV['LOLIPOP_MC_USERNAME']
-        @password = ENV['LOLIPOP_MC_PASSWORD']
-      end
+    def defaults
+      @api_endpoint = ENV['LOLIPOP_MC_API_ENDPOINT'] || 'https://api.mc.lolipop.jp/'
+      @username = ENV['LOLIPOP_MC_USERNAME']
+      @password = ENV['LOLIPOP_MC_PASSWORD']
+      @token = ENV['LOLIPOP_MC_TOKEN']
     end
   end
 end

data/lib/lolp/connection.rb

@@ -1,38 +1,73 @@
 require 'faraday'
+require 'lolp/errors'
 require 'faraday_middleware'
 
 module Lolp
-  class Connection
-    def initialize(config)
-      @config = config
-      authenticate
-      @connection = connection
-    end
-
-    def get(path)
-      @connection.get(path)
+  module Connection
+    def get(path, params = {})
+      request(:get, path, params)
     end
 
     def post(path, params = {})
-      @connection.post(path, params)
+      request(:post, path, params)
     end
 
     def delete(path, params = {})
-      @connection.delete(path, params)
+      request(:delete, path, params)
     end
 
-    private
+    def authenticated?
+      !!@token
+    end
 
-    def connection
-      Faraday.new(url: @config.api_endpoint, headers: { Authorization: "Bearer #{@token}" }) do |faraday|
-        faraday.request :json
-        faraday.response :json, content_type: /\bjson$/
-        faraday.adapter Faraday.default_adapter
+    def last_response
+      @last_response if defined? @last_response
+    end
+
+    def auto_loginable?(url)
+      !authenticated? && url !~ /\/authenticate/ && @username && @password
+    end
+
+    def request(method, url = nil, data = nil, headers = nil, &block)
+      login if auto_loginable?(url)
+
+      @last_response = if %i(post put patch).include?(method)
+          connection.run_request(method, url, data, headers, &block)
+        else
+          connection.run_request(method, url, nil, headers) { |r|
+            r.params.update(data) if data
+            yield(r) if block_given?
+          }
+        end
+
+      if error = Error.from_response(@last_response)
+        raise error
       end
+      @last_response.body
     end
 
-    def authenticate
-      @token ||= connection.post('login', username: @config.username, password: @config.password).body
+    private
+
+    def connection
+      project_url = 'https://github.com/pepabo/lolp.rb'
+      user_agent = "lolp/#{VERSION} (+#{project_url}; ruby#{RUBY_VERSION})"
+      ssl_verify = true
+
+      args = {
+        url: @api_endpoint,
+        ssl: { verify: ssl_verify },
+        headers: {
+          user_agent: user_agent,
+          content_type: 'application/json'
+        }
+      }
+
+      @connection.authorization(:Bearer, @token) if @connection && authenticated?
+      @connection ||= Faraday.new(args) do |f|
+        f.request :json
+        f.response :json, content_type: /\bjson$/
+        f.adapter Faraday.default_adapter
+      end
     end
   end
 end

data/lib/lolp/errors.rb

@@ -0,0 +1,54 @@
+module Lolp
+  class Error < StandardError
+    class << self
+      def from_response(r)
+        if klass = case r.status.to_i
+            when 400      then BadRequest
+            when 401      then Unauthorized
+            when 402      then PaymentRequired
+            when 403      then Forbidden
+            when 404      then NotFound
+            when 406      then NotAcceptable
+            when 409      then Conflict
+            when 429      then TooManyRequests
+            when 422      then UnprocessableEntity
+            when 400..499 then ClientError
+            when 500      then InternalServerError
+            when 501      then NotImplemented
+            when 502      then BadGateway
+            when 503      then ServiceUnavailable
+            when 500..599 then ServerError
+            end
+          klass.new(build_error_message(r))
+        end
+      end
+
+      def build_error_message(res = nil)
+        return nil if res.nil?
+        message =  "#{res.env.method.to_s.upcase} "
+        message << "#{res.env.url}: "
+        message << "#{res.status} - "
+        message << "#{res.body}" if res.body
+        message
+      end
+    end
+  end
+
+  class BadRequest < Error; end
+  class Unauthorized < Error; end
+  class PaymentRequired < Error; end
+  class Forbidden < Error; end
+  class NotFound < Error; end
+  class NotAcceptable < Error; end
+  class Conflict < Error; end
+  class TooManyRequests; end
+  class UnprocessableEntity < Error; end
+  class ClientError < Error; end
+
+  class InternalServerError < Error; end
+  class NotImplemented < Error; end
+  class BadGateway < Error; end
+  class ServiceUnavailable < Error; end
+  class ServerError < Error; end
+end
+

data/lib/lolp/version.rb

@@ -1,3 +1,3 @@
 module Lolp
-  VERSION = "0.2.1"
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,11 +135,14 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/console
 - lib/lolp.rb
 - lib/lolp/client.rb
+- lib/lolp/client/authentication.rb
+- lib/lolp/client/project.rb
 - lib/lolp/configuration.rb
 - lib/lolp/connection.rb
-- lib/lolp/project.rb
+- lib/lolp/errors.rb
 - lib/lolp/version.rb
 - lolp.gemspec
 homepage: https://lolipop.jp
@@ -161,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: The lolipop! client

data/lib/lolp/project.rb

@@ -1,23 +0,0 @@
-module Lolp
-  module Project
-    def projects
-      connection.get('projects')
-    end
-
-    def create_project(type, params = {})
-      connection.post('projects', params.merge(type: type))
-    end
-
-    def delete_project(name)
-      connection.delete("projects/#{name}")
-    end
-
-    def create_custom_domain(domain, custom_domain)
-      connection.post("projects/#{domain}/custom-domains", domain: custom_domain)
-    end
-
-    def delete_custom_domain(domain, custom_domain)
-      connection.delete("projects/#{domain}/custom-domains/#{custom_domain}")
-    end
-  end
-end