callapi 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15bf280c079ecd6b54dc85083778c56bcbd82a0
-  data.tar.gz: bdcea789ec933c02f7117e604028b2ceac584a21
+  metadata.gz: 02bc23118c163ba3958e49a25c0cfe96cb39fc53
+  data.tar.gz: b89debc1a4a2ab08d51e0417cbc00c800307a412
 SHA512:
-  metadata.gz: 665df982cab57bd4c6303076ebbe0fbb375ec18cdc3ec7e1ce39809a760d1ca4d1179543e5767893934d8c684e953d23deced6c50869b6374e4f5724d658b055
-  data.tar.gz: b03a2dfe9299bb84337d9420fe0b69ffd1533e969f3a1eed8927dbad023e80a1bce3205a7a8cf5fa15987bc48224d02c87352ac72f530c1b9e614d1ae060ae6b
+  metadata.gz: 4c2c444d6e38be1c9268215bb33a103f1a3cccfa36c42d6965f8ec85ac4f1b107d1d52f17daf1196f55c375f441ccc2cdd3e6049f3f84ed43e4c243d7e8ea0d2
+  data.tar.gz: 2b84398197f954df3a1d222ddcc379856f2c03ad1e048fd43d6ece3ba3e9b2fe1950e5ac1b18b05cabffc2bde93a10391bacf65bf0a1fb53cf3dbee5ffd7802c

data/README.md

@@ -1,4 +1,5 @@
-# Callapi
+# Callapi [![Gem Version](https://badge.fury.io/rb/callapi.svg)](http://badge.fury.io/rb/callapi) [![Code Climate](https://codeclimate.com/github/kv109/Callapi/badges/gpa.svg)](https://codeclimate.com/github/kv109/Callapi)
+
 
 Easy API calls
 

data/callapi.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
 
+  #TODO: Use better dependencies pattern
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'addressabler', '~> 0.1'
   spec.add_runtime_dependency 'multi_json', '~> 1.10'
@@ -28,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 4.2'
   spec.add_runtime_dependency 'chainy', '~> 0.0.5'
   spec.add_runtime_dependency 'memoist', '~> 0.11'
+
+  spec.required_ruby_version = '>= 2.0'
 end

data/lib/callapi/call/base.rb

@@ -5,7 +5,6 @@ class Callapi::Call::Base
   require_relative 'response'
 
   extend Forwardable
-  extend Memoist
 
   def_delegators :request_metadata, :request_method, :request_path
 
@@ -24,11 +23,6 @@ class Callapi::Call::Base
     @strategy ||= (self.class.strategy || Callapi::Config.default_request_strategy)
   end
 
-  def request_metadata
-    Callapi::Call::RequestMetadata.new(self)
-  end
-  memoize :request_metadata
-
   def response_parser
     @response_parser ||= (self.class.response_parser || Callapi::Config.default_response_parser)
   end
@@ -63,4 +57,8 @@ class Callapi::Call::Base
   def request_class
     Callapi::Call::Request
   end
+
+  def request_metadata
+    @request_metadata ||= Callapi::Call::RequestMetadata.new(self)
+  end
 end

data/lib/callapi/call/request/api.rb

@@ -3,7 +3,14 @@ class Callapi::Call::Request::Api < Callapi::Call::Request::Http
     Callapi::Config.api_host || raise(Callapi::ApiHostNotSetError)
   end
 
+  def uri
+    @uri ||= super.tap do |uri|
+      uri.path = api_path_prefix + request_path
+    end
+  end
+
   def api_path_prefix
-    Callapi::Config.api_path_prefix
+    Callapi::Config.api_path_prefix if Callapi::Config.api_path_prefix  # backward compatibility
+    URI(Callapi::Config.api_host).path
   end
 end

data/lib/callapi/call/request/http.rb

@@ -5,7 +5,6 @@ require 'addressabler'
 class Callapi::Call::Request::Http < Callapi::Call::Request::Base
   require_relative 'http/log_helper'
 
-  extend Memoist
   include Callapi::Call::Request::Http::LogHelper
 
   HTTP_METHOD_TO_REQUEST_CLASS = {
@@ -29,6 +28,7 @@ class Callapi::Call::Request::Http < Callapi::Call::Request::Base
   end
 
   def http
+    #TODO: Use HTTParty
     Net::HTTP.new(uri.host, uri.port)
   end
 
@@ -43,18 +43,13 @@ class Callapi::Call::Request::Http < Callapi::Call::Request::Base
   end
 
   def uri
-    Addressable::URI.parse(host).tap do |uri|
-      uri.path = api_path_prefix + request_path
+    @uri ||= Addressable::URI.parse(host).tap do |uri|
+      uri.path = request_path
       uri.query_hash = params unless put_params_in_request_body?
     end
   end
-  memoize :uri
 
   def put_params_in_request_body?
     [:post, :patch, :put].include? request_method
   end
-
-  def api_path_prefix
-    ''
-  end
 end

data/lib/callapi/call/request/http/log_helper.rb

@@ -4,38 +4,62 @@ module Callapi::Call::Request::Http::LogHelper
   def with_logging
     return yield if Callapi::Config.log_level == :none
 
-    t0 = Time.now
+    start_time = Time.now
+
+    add_api_host_log
+    add_request_path_log
+    add_request_headers_log
+    add_request_params_log
+
+    yield.tap do |response|
+      add_response_log(response)
+      add_response_summary_log(start_time)
+    end
+  rescue StandardError => e
+    puts 'Exception occured, skipping logs'.center(80, '-').colorize(:red).on_yellow
+    raise e
+  end
+
+  def add_api_host_log
     string = ''
     string << uri.host
     string << ":#{uri.port}" if uri.port
 
     puts "Sending request to #{string}".center(80, '-').colorize(:white).on_blue
+  end
+
+  def add_request_path_log
     'PATH:    '.tap do |string|
       string << "#{request_method.to_s.upcase} "
       string << "#{uri.path}"
       puts string.colorize(:magenta)
     end
+  end
+
+  def add_request_headers_log
     'HEADERS: '.tap do |string|
       string << "#{headers}"
       puts string.colorize(:cyan)
     end
+  end
+
+  def add_request_params_log
     'PARAMS:  '.tap do |string|
       string << "#{params}"
       puts string.colorize(:green)
     end
+  end
 
-    response = yield
-
+  def add_response_log(response)
     response.tap do |response|
       "RESPONSE: [#{response.code}]\n".tap do |string|
         string << (response.body.nil? ? '[EMPTY BODY]' : response.body)
         puts string.colorize(:light_blue)
       end
-
-      puts "request send (#{(Time.now - t0).round(3)} sec)".center(80, '-').colorize(:white).on_blue
     end
-  rescue StandardError => e
-    puts "Exception occured, skipping logs".center(80, '-').colorize(:red).on_yellow
-    raise e
+  end
+
+  def add_response_summary_log(start_time)
+    puts "request send (#{(Time.now - start_time).round(3)} sec)".center(80, '-').colorize(:white).on_blue
   end
 end

data/lib/callapi/config.rb

@@ -2,7 +2,7 @@ class Callapi::Config
   DEFAULT_REQUEST_STRATEGY = 'Callapi::Call::Request::Api'
   DEFAULT_RESPONSE_PARSER  = 'Callapi::Call::Parser::Json'
   DEFAULT_MOCKS_DIRECTORY  = 'mocked_calls'
-  DEFAULT_PATH_PREFIX = ''
+  DEFAULT_PATH_PREFIX = nil
 
   class << self
     attr_reader :mocks_directory

data/lib/callapi/routes.rb

@@ -46,41 +46,62 @@ class Callapi::Routes
 
     def create_classes
       classes_metadata.each do |class_metadata|
-        classes = class_metadata.class_name.split('::')
-        classes = classes[2..classes.size]
+        classes = classes_without_http_namespace(class_metadata)
 
         classes.inject(class_metadata.http_method_namespace) do |namespace, class_name|
           if namespace.constants.include?(class_name.to_sym)
             namespace.const_get(class_name)
           else
-            full_class_name = "#{namespace}::#{class_name}"
-            if call_classes_names.include?(full_class_name)
-              namespace.const_set(class_name, Class.new(Callapi::Call::Base)).tap do |klass|
-                set_call_class_options(klass, class_metadata.class_options) if class_metadata.class_options
-                create_helper_method(klass, class_metadata)
-              end
-            else
-              namespace.const_set(class_name, Class.new)
-            end
+            create_class(namespace, class_name, class_metadata)
           end
         end
       end
     end
 
+    def classes_without_http_namespace(class_metadata)
+      classes = class_metadata.class_name.split('::')
+      classes[2..classes.size]
+    end
+
+    def create_class(namespace, class_name, class_metadata)
+      full_class_name = "#{namespace}::#{class_name}"
+      if call_classes_names.include?(full_class_name)
+        create_call_class(namespace, class_name, class_metadata)
+      else
+        create_call_namespace(namespace, class_name)
+      end
+    end
+
+    def create_call_class(namespace, class_name, class_metadata)
+      namespace.const_set(class_name, Class.new(Callapi::Call::Base)).tap do |klass|
+        set_call_class_options(klass, class_metadata.class_options) if class_metadata.class_options
+        create_helper_method(klass, class_metadata)
+      end
+    end
+
+    def create_call_namespace(namespace, new_namespace)
+      namespace.const_set(new_namespace, Class.new)
+    end
+
     def create_helper_method(klass, class_metadata)
-      http_method = class_metadata.http_method_namespace.to_s.split('::').last
-      call_name_with_namespaces = class_metadata.call_name_with_namespaces.map do |class_name|
+      Object.send(:define_method, helper_method_name(class_metadata)) do |*args|
+        klass.new(*args)
+      end
+    end
+
+    def helper_method_base_name(class_metadata)
+      class_metadata.call_name_with_namespaces.map do |class_name|
         class_name.scan(/(::)?((\w)+)Param/).map { |matched_groups| matched_groups[1] }.compact.each do |pattern|
           class_name.sub!(pattern, "By#{pattern}")
           class_name.sub!('Param', '')
         end
         class_name
       end
-      method_name = [http_method, call_name_with_namespaces, 'call'].join('_')
-      method_name = method_name.underscore.gsub('/', '_')
-      Object.send(:define_method, method_name) do |*args|
-        klass.new(*args)
-      end
+    end
+
+    def helper_method_name(class_metadata)
+      method_name = [class_metadata.http_method, helper_method_base_name(class_metadata), 'call'].join('_')
+      method_name.underscore.gsub('/', '_')
     end
 
     def set_call_class_options(klass, options)

data/lib/callapi/routes/metadata.rb

@@ -24,6 +24,7 @@ class Callapi::Routes::Metadata
       data.class_name = full_class_name(i)
       data.call_class = is_call_class
       data.http_method_namespace = @http_method_namespace
+      data.http_method = @http_method_namespace.to_s.split('::').last
       if is_call_class
         data.class_options = @call_options
         data.call_name_with_namespaces = call_name_with_namespaces

data/lib/callapi/version.rb

@@ -1,3 +1,3 @@
 module Callapi
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ RSpec.configure do |config|
     Get::Users = Class.new(Callapi::Call::Base)
 
     Callapi::Config.configure do |config|
-      config.log_level = :off
+      config.log_level = :none
     end
   end
 end

data/spec/unit/call/request/api_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe Callapi::Call::Request::Api do
+  let(:config) { Callapi::Config }
+
   context '#host' do
     subject { described_class.new(nil).host }
-    let(:config) { Callapi::Config }
 
     context 'when API host is not set' do
       it 'should raise ApiHostNotSet error' do
@@ -20,9 +21,17 @@ describe Callapi::Call::Request::Api do
     end
   end
 
+  context '#api_path_prefix' do
+    subject { described_class.new(nil).api_path_prefix }
+
+    it 'should take API path prefix from API host' do
+      allow(config).to receive(:api_host).and_return('http://api.org/api/v1')
+      expect( subject ).to eql '/api/v1'
+    end
+  end
+
   context '#response' do
     before do
-      config = Callapi::Config
       allow(config).to receive(:request_strategy).and_return(described_class)
       allow(config).to receive(:api_host).and_return('http://api.org')
       stub_request(:get, 'http://api.org/users').to_return(status: 200, body: '')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callapi
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Kacper Walanus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="