openapi 0.9.8 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb04ba9b85bbdf4fa7f67a5408129c713a0ea68
-  data.tar.gz: eb5fe4324ad05f9e6d65970dbda9a798e5f744cd
+  metadata.gz: 64d9861b06ef5838fafa2c28d4d807e54f013469
+  data.tar.gz: 70d6c3028ef631acff79cf6d50f823cc6b85e1e4
 SHA512:
-  metadata.gz: 05242933238bec66761fc91d80b226a5607a8433ba379a245392358aad958e2f908ea1273132a74d94e27e97559f5f2147f2753d563fbf0b3c772fe34d1701a7
-  data.tar.gz: be258263bbef81c6f8555ab82fe9361e27ade683cf794239c269ee3eb77484675d7eb9dba1e4b255bf2fc7f17b869d42e7a92b4878aa8e937386580293569814
+  metadata.gz: 87d5b5f0f03932b351bbb317f6cd58f76360b0baaeb06b4b51e50bf52a2ca05c92d180281c8d0a6e1cb05c1e6fd65452beaf3ca3d756b9dd7b7a306cad3a6124
+  data.tar.gz: 327520510456ba0423a0be6852f12458a676859cb87403533083a73426ac3d864de8e5f3cfe7dfb3283b718d684661aa64ba20a11568dcc9983d264b35325818

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Antoine Legrand
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -1,8 +1,3 @@
-desc 'Run all the tests'
-task :default => :spec
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ['-c', '-f progress', '-r ./spec/spec_helper.rb']
-  t.pattern = 'spec/**/*_spec.rb'
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
+Dir.glob('tasks/*.rake').each { |r| import r }

data/lib/openapi/auth_token.rb

@@ -68,7 +68,7 @@ module OpenAPI
     end
 
     def headers
-      {header => header_format % @token}
+      {header => header_format % token}
     end
 
     def expires_in

data/lib/openapi/client.rb

@@ -16,7 +16,7 @@ module OpenAPI
 
   module ClassMethods
     attr_accessor :application_key, :application_secret, :max_retry,
-    :logger, :request_timeout, :client_id, :site, :auth_token, :api_version, :api_methods, :use_ssl, :cache
+    :logger, :request_timeout, :client_id, :site, :auth_token, :api_methods, :use_ssl, :cache
 
     def api_methods
       @api_methods ||= []
@@ -37,15 +37,15 @@ module OpenAPI
         response = OpenAPI::Response.wrap(response)
         return response
       end
-    rescue Timeout::Error
+    rescue Timeout::Error => e
       unless logger.nil?
-        logger.error "OpenAPI request timed out after #{request_timeout} seconds: [#{request.path} #{request.body}]"
+        logger.error "Request timed out after #{request_timeout} seconds: [#{request.path} #{request.body}]"
       end
-      OpenAPI::Response.wrap(nil, :body => {:error => 'Request timeout'}, :code => '503')
+      raise e
     end
 
     def build_path(path, params=nil)
-      uri = URI("/#{api_v}/#{path.gsub(/:client_id/, client_id)}")
+      uri = URI("/#{path}")
       if params != nil
         uri.query = URI.encode_www_form(params)
       end
@@ -56,19 +56,23 @@ module OpenAPI
       raise NotImplementedError
     end
 
-    def do_request(http_method, path, options = {}, retried=0)
-      path = build_path(path, options[:params])
-
+    def do_request(http_method, path, params: {}, body: nil, headers: {}, options: {})
+      path = build_path(path, params)
       klass = Net::HTTP.const_get(http_method.to_s.capitalize)
       request = klass.new(path.to_s)
-      request.add_field "Content-Type", options[:content_type] || "application/json"
-      if !auth_token.nil? && options[:skip_auth] != true
-        request.add_field "Authorization", (options[:access_token] || auth_token.token)
+      request.add_field "Content-Type", headers["Content-Type"] || "application/json"
+
+      if options[:skip_auth] != true && !auth_token.nil?
+        auth_token.headers.each do |k,v|
+          request.add_field k, v
+        end
+      end
+
+      request.add_field "Accept", headers["Accept"] || "application/json"
+      headers.each do |h,v|
+        request.add_field h, v
       end
-      request.add_field "Accept", options[:accept] || "application/json"
-      #Authorization: Basic dWJ1ZHUtYXBpOmZHWTI4aypOZTh2YzA=
-      #Authorization: Bearer
-      request.body = options[:body] if options[:body]
+      request.body = body if body.present?
       response = call_api(request)
       return response
     end
@@ -83,7 +87,12 @@ module OpenAPI
     end
 
     def http_client
-      Net::HTTP.new(site, 443).tap{|http| http.use_ssl = true}
+      uri = URI(site)
+      client = Net::HTTP.new(uri.hostname, uri.port)
+      if uri.scheme == "https"
+        client.tap{|http| http.use_ssl = true}
+      end
+      return client
     end
 
     def log_request_and_response(request, response, time)
@@ -103,11 +112,7 @@ module OpenAPI
       @request_timeout || 5.0
     end
 
-    def api_v()
-      @api_version || "v1"
-    end
-
-    def logger
+   def logger
       @logger ||= OpenAPI.logger
     end
 
@@ -124,7 +129,6 @@ module OpenAPI
     include ClassMethods
 
     def initialize(options={})
-      @api_version = options[:api_version] || OpenAPI.api_version
       @logger = options[:logger] || OpenAPI.logger
       @application_key = options[:application_key] || OpenAPI.application_key
       @application_secret = options[:application_secret] || OpenAPI.application_secret

data/lib/openapi/handlers/hashie.rb

@@ -0,0 +1,15 @@
+module OpenAPI
+  module Handlers
+    class Hashie < OpenAPI::Handler
+      class << self
+        def hashie(snake_name, response, options)
+          return self.failed(response) if not response.success?
+          klass_name = snake_name.camelize
+          hash = JSON.parse(response.raw)
+          resp = Payplug::Model::Response.new(hash)
+          return OpenAPI::Handlers::Response.wrap(resp, response)
+        end
+      end
+    end
+  end
+end

data/lib/openapi/handlers/raw.rb

@@ -1,10 +1,7 @@
-require 'active_support'
-require File.join(File.dirname(__FILE__), '../models')
 module OpenAPI
   module Handlers
     class Raw < OpenAPI::Handler
       class << self
-
         def text(response, options)
           return self.failed(response) if not response.success?
           return response

data/lib/openapi/handlers.rb

@@ -2,7 +2,7 @@ module OpenAPI
   class Handler
     def self.failed(response)
       #      error =  OpenAPI::Models::Error.new().from_json(response.raw)
-      model =  OpenAPI::Handlers::Response.wrap(response.raw, response)
+      model = OpenAPI::Handlers::Response.wrap(response.raw, response)
       return model
     end
   end

data/lib/openapi/models/response.rb

@@ -0,0 +1,5 @@
+module OpenAPI
+  class Response < ::Hashie::Mash
+
+  end
+end

data/lib/openapi/models.rb

@@ -1,11 +1,7 @@
-require 'simplemodel'
-require 'active_model'
 $:.unshift(File.dirname(__FILE__))
 module OpenAPI
-  module Models
-    class << self
-      attr_accessor :active_record
-    end
-    autoload :Base, "models/base"
+  module Model
+    autoload :Response, "models/response"
+
   end
 end

data/lib/openapi/route.rb

@@ -5,81 +5,29 @@ module OpenAPI
     #   match '/track_coupon/:source/:id' => 'mobile_banner#track_coupon', :as_ => :track_coupon, :defaults => { :format => 'png' }
     module ClassMethods
 
-      def check_params(path, params, model=nil)
-        keys = {}
+      def replace_uri_vars(path, params)
+        new_path = path.clone()
         parts = path.split("/")
         parts.each do |part|
           if part.start_with?(":")
-            keys[part] = true
-            name = part[1..-1].to_sym
-            if !params.has_key?(name)
-              if model.respond_to?(name)
-                params[name] = model.send name
-              else
-                # @todo raise real errors
-                raise "Missing params: set '#{part}' to complete '#{path}' request"
-              end
+            key = part[1..-1].to_sym
+            if params.has_key?(key)
+              new_path.gsub!(Regexp.compile(":" + key.to_s), params[key].to_s)
+            else
+              # @todo raise real errors
+              raise "Missing params: set '#{part}' to complete '#{path}' request"
             end
           end
         end
-        return keys
+        return new_path
       end
 
+      def create_proc(klass, kmethod, urlpath, opts, client=nil)
+        proc = Proc.new() do |params: {}, body: nil, headers: {}, path: nil|
+          client = OpenAPI::Route.get_client() if client.nil?
 
-
-      def create_proc(klass, kmethod, path, options, client=nil)
-        proc = Proc.new() do |arg1=nil, arg2={}, p=nil|
-          if p != nil
-            uri_path = p.clone()
-          else
-            uri_path = path.clone()
-          end
-          if client == nil
-            client = OpenAPI::Route.get_client()
-          end
-          model = nil
-          if options.has_key?(:body) && !arg1.instance_of?(Hash)
-            model = arg1
-            params = arg2
-            if !model.instance_of?(options[:body])
-              raise "Expected #{options[:body]} class, got #{model.class} instead"
-            end
-          elsif arg1.instance_of?(Hash) && options.has_key?(:body) && arg1[:body] == nil
-            raise "No body provided"
-          else
-            if arg1 == nil || arg1.instance_of?(Hash)
-              params = arg1 || {}
-            end
-          end
-
-          if model != nil
-            to_json_options = nil
-            if params.has_key?(:to_json)
-              to_json_options = params[:to_json]
-            elsif options.has_key?(:to_json)
-              to_json_options = options[:to_json]
-            end
-            if to_json_options
-              params[:body] = model.send :to_json, to_json_options
-            else
-              params[:body] = model.to_json
-            end
-          end
-
-          if params.has_key?(:display_help) && params[:display_help]
-            return options
-          end
-
-          parameters = params[:params] || {}
-          params.each do |key,v|
-            if options.has_key?(:params) && options[:params].has_key?(key)
-              parameters[key] = v
-            end
-          end
-          params[:params] = parameters
-
-          if options.has_key?(:extra)
-            options[:extra].each do |k,v|
+          if opts.has_key?(:default)
+            opts[:defaults].each do |k,v|
               if !params.has_key?(k)
                 params[k] = v
               end
@@ -87,21 +35,14 @@ module OpenAPI
           end
 
           OpenAPI.logger.debug params
-          if not params.has_key?(:client_id)
-            params[:client_id] = client.client_id
-          end
-          OpenAPI::Route.check_params(uri_path, params, model)
+
+          path = OpenAPI::Route.replace_uri_vars(path || urlpath, params)
 
           #1. soon.wrap = do_request opts[:body] => postjson
-          new_path = uri_path.clone()
-          params.each do |key, v|
-            r = Regexp.compile(":" + key.to_s)
-            new_path.gsub!(r, v.to_s)
-          end
-          OpenAPI.logger.debug(new_path)
-          response = client.do_request(options[:via], new_path, params)
+          OpenAPI.logger.debug(path)
+          response = client.do_request(opts[:via], path, {params: params, body: body, headers: headers, options: opts[:options] || {}})
           #2. callback
-          return klass.send kmethod.to_s.to_sym, response, params
+          return klass.send kmethod.to_s.to_sym, response, {params: params, body: body, headers: headers, options: opts[:options] || {}}
         end
         return proc
       end

data/lib/openapi/version.rb

@@ -1,3 +1,3 @@
 module OpenAPI
-  VERSION = '0.9.8'
+  VERSION = '0.10.0'
 end

data/lib/openapi.rb

@@ -1,12 +1,11 @@
+require 'hashie'
 require "active_support/core_ext/numeric/time"
 require 'openapi/exceptions'
-require 'openapi/utils'
 require 'openapi/client'
 require 'openapi/response'
 require 'openapi/metaclass'
 require 'openapi/handlers'
 require 'openapi/route'
-require 'openapi/models'
 require 'openapi/auth_token'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.0
 platform: ruby
 authors:
 - Antoine Legrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,17 +39,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: simplemodel
+  name: hashie
   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
@@ -89,7 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Changelog
-- License
+- LICENSE
 - README.md
 - Rakefile
 - lib/openapi.rb
@@ -97,18 +97,14 @@ files:
 - lib/openapi/client.rb
 - lib/openapi/exceptions.rb
 - lib/openapi/handlers.rb
-- lib/openapi/handlers/array.rb
-- lib/openapi/handlers/dummy.rb
-- lib/openapi/handlers/model.rb
+- lib/openapi/handlers/hashie.rb
 - lib/openapi/handlers/raw.rb
 - lib/openapi/handlers/response.rb
 - lib/openapi/metaclass.rb
 - lib/openapi/models.rb
-- lib/openapi/models/base.rb
+- lib/openapi/models/response.rb
 - lib/openapi/response.rb
 - lib/openapi/route.rb
-- lib/openapi/utils.rb
-- lib/openapi/validators.rb
 - lib/openapi/version.rb
 homepage: http://github.com/antlegrand/openapi
 licenses:

data/License

@@ -1,20 +0,0 @@
-Copyright (c) 2013 Antoine Legrand (ant.legrand@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/openapi/handlers/array.rb

@@ -1,44 +0,0 @@
-require 'active_support'
-require File.join(File.dirname(__FILE__), '../models')
-module OpenAPI
-  module Handlers
-    class Array < OpenAPI::Handler
-      class << self
-
-
-        def method_missing(method_symbol, *arguments) #:nodoc:
-          method_name = method_symbol.to_s
-          if method_name =~ /^(\w+)_array$/
-            return self.send :construct_array, $1, *arguments
-          else
-            super
-          end
-        end
-
-        def raw_array(response, options)
-          array = []
-          response.each do |model_attr|
-            array << model_attr
-          end
-          array = OpenAPI::Handlers::Response.wrap(array, response)
-          return array
-        end
-
-        private
-
-        def construct_array(snake_name, response, options)
-          return self.failed(response) if not response.success?
-          array = []
-          klass_name = ActiveSupport::Inflector.camelize(snake_name, true)
-          klass = OpenAPI::Models.const_get(klass_name)
-          response.each do |model_attr|
-            array << klass.new.from_json(model_attr.to_json)
-          end
-          array = OpenAPI::Handlers::Response.wrap(array, response)
-          return array
-        end
-
-      end
-    end
-  end
-end

data/lib/openapi/handlers/dummy.rb

@@ -1,31 +0,0 @@
-require File.join(File.dirname(__FILE__), '../handlers')
-
-module OpenAPI
-  module Handlers
-
-    class Dummy < OpenAPI::Handler
-      class << self
-        def titi(id, name)
-          puts "id:#{id.to_s[0..10]}, name:#{name}"
-        end
-      end
-    end
-
-    class Campaigns < OpenAPI::Handler
-      class << self
-        def stats(response, options)
-          return response, options
-        end
-      end
-    end
-
-    class Offers < OpenAPI::Handler
-      class << self
-        def index(response, options)
-          return response, options
-        end
-      end
-    end
-
-  end
-end

data/lib/openapi/handlers/model.rb

@@ -1,30 +0,0 @@
-require 'active_support'
-require File.join(File.dirname(__FILE__), '../models')
-module OpenAPI
-  module Handlers
-    class Model < OpenAPI::Handler
-      class << self
-        def method_missing(method_symbol, *arguments) #:nodoc:
-          method_name = method_symbol.to_s
-          if method_name =~ /^(\w+)_model$/
-            return self.send :construct_model, $1, *arguments
-          else
-            super
-          end
-        end
-
-        private
-
-        def construct_model(snake_name, response, options)
-          return self.failed(response) if not response.success?
-          klass_name = ActiveSupport::Inflector.camelize(snake_name, true)
-          klass = OpenAPI::Models.const_get(klass_name)
-          model = klass.new.from_json(response.raw)
-          model = OpenAPI::Handlers::Response.wrap(model, response)
-          return model
-        end
-
-      end
-    end
-  end
-end

data/lib/openapi/models/base.rb

@@ -1,16 +0,0 @@
-require 'simplemodel'
-module OpenAPI
-  module Models
-    class Base < SimpleModel::Base
-      include SimpleModel::Association
-
-      attr_accessor :raw_json
-
-      def initialize(opts={})
-        super(opts)
-      end
-
-
-    end
-  end
-end

data/lib/openapi/utils.rb

@@ -1,52 +0,0 @@
-require 'securerandom'
-
-module OpenAPI
-  module Utils
-    class Random
-      class << self
-        def hex(n=16)
-          SecureRandom.hex(n)
-        end
-      end
-    end
-
-    class Date
-      class << self
-
-        def format(date)
-          date.strftime("%Y%m%d")
-        end
-
-        def now()
-          format(Time.now.utc())
-        end
-      end
-
-      def to_s()
-        @date_str
-      end
-
-      def date()
-        @date
-      end
-
-      def inititialize(t = nil)
-        if t == nil
-          t = Time.now.utc()
-        end
-        @date_str = OpenAPI::Utils::Date.format(t)
-        @date = t.dup()
-      end
-    end
-  end
-end
-
-module ActiveRecord
-  module SecureRandom
-    class << self
-      def hex(n=16)
-        OpenAPI::Utils::Random.hex(n)
-      end
-    end
-  end
-end

data/lib/openapi/validators.rb

@@ -1,19 +0,0 @@
-module OpenAPI
-  module Models
-    module Validation
-      class UrlValidator < ActiveModel::EachValidator
-        def validate_each(record, attribute, value)
-          begin
-            uri = URI.parse(value)
-            resp = uri.kind_of?(URI::HTTP)
-          rescue URI::InvalidURIError
-            resp = false
-          end
-          unless resp == true
-            record.errors[attribute] << (options[:message] || "is not an url")
-          end
-        end
-      end
-    end
-  end
-end