callapi 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 666cfc16f86f8bbab5db5e2fbc10b15622111406
-  data.tar.gz: b9e3dec2a83fad0d45a6913b7c2b323bf5c0a1e3
+  metadata.gz: 8f898a143b9e393803f76ee96277c1b1133143f1
+  data.tar.gz: 4f009cafe222f8f87b5c03b70dd7b665d11ba04d
 SHA512:
-  metadata.gz: c7f45e5636ed00b419e69bbeacca4dedea65bca9b0c859d6279fbb9656c47e16e047c8c38e53b3e816d1f04c49ce108e22c5e0f4ae8c8048eb258213ca1749c3
-  data.tar.gz: 86bb3292da0e5732199721b23b98d35aca92e6b0278636434d0444077b344f2504f70eed282ca6ca2b8db88261fbdf3b0722dc7a0a5cb6952d122d4f6077ccf2
+  metadata.gz: dc5515655a1d29aad17444d7f9a48ba638a22170c8ee8c00d3e6ff3ae85e49e3f3494ab1ecce24c3900dfc3b3833d5abdeebf5b092bcabf8d012b3b1e35f8633
+  data.tar.gz: 380dc2706bf5e49092a54bc6aaf023dc80c8f0cfb9b54552d7094bb87494c0de946d6636e39be4c4493ad553c4f34b4fe5212d95c82c56fcde0535067cfe8f4f

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 0.8.4 (next release)
+### 0.9.1 (NEXT RELEASE)
+
+- Remove Memoist dependency
+- Instead of `call.response.data` `call.data` can be used
+
+### 0.9
 
 - Remove activesupport dependency
 - URI pattern can be a `Symbol` (before only `String`s were accepted)
@@ -6,21 +11,21 @@
 - Backward compatibility fix for `#api_path_prefix`
 - Changelog added
 
-## 0.8.3
+### 0.8.3
 
 - API path prefix taken from `Config.api_host` (no need to set `Config.api_path_prefix`)
 - Added Ruby dependency (>= 2.0)
 - Code Climate refactor
 
-## 0.8.2
+### 0.8.2
 
 - Bugfix: Critical issue fix (undefined method `#api_path_prefix`)
 
-## 0.8.1
+### 0.8.1
 
 - Dependencies
 - Documentation update
 
-## 0.8
+### 0.8
 
-- Initial release, after long internal usage
+- Initial release, after long internal usage

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'multi_json'
-gem 'memoist'
 gem 'addressable'
 gem 'addressabler', '>= 0.1'
 gem 'colorize'

data/callapi.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'multi_json', '~> 1.10'
   spec.add_runtime_dependency 'colorize', '~> 0.7'
   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.rb

@@ -1,8 +1,6 @@
 require 'callapi/version'
-require 'memoist'
 require 'forwardable'
 require 'chainy'
-require 'ostruct'
 require_relative 'ext/super_string'
 
 module Callapi

data/lib/callapi/call/base.rb

@@ -7,6 +7,7 @@ class Callapi::Call::Base
   extend Forwardable
 
   def_delegators :request_metadata, :request_method, :request_path
+  def_delegators :response, :data, :body
 
   chain_attr_accessor :params, :headers, hash: true, prefix: 'add'
   chain_attr_accessor :response_parser, :strategy

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

@@ -1,5 +1,4 @@
 class Callapi::Call::Request::Mock < Callapi::Call::Request::Base
-  extend Memoist
   #TODO: should not be hardcoded
   MOCK_FORMAT = '.json'
 

data/lib/callapi/call/request_metadata.rb

@@ -1,6 +1,4 @@
 class Callapi::Call::RequestMetadata < Struct.new(:context)
-  extend Memoist
-
   HTTP_METHODS = %w(GET POST PUT PATCH DELETE)
 
   def request_method
@@ -10,14 +8,15 @@ class Callapi::Call::RequestMetadata < Struct.new(:context)
   end
 
   def request_path
-    request_path = request_path_without_replaced_param_keys
+    return @request_path if @request_path
+
+    @request_path = request_path_without_replaced_param_keys
     param_keys_to_replace.each do |param_key|
-      param_value = context.params[param_key.to_sym] || raise(Callapi::MissingParamError.new(request_path, param_keys_to_replace, missing_keys))
-      request_path.sub!(param_key + '_param', param_value.to_s)
+      param_value = context.params[param_key.to_sym] || raise_missing_param_error
+      @request_path.sub!(param_key + '_param', param_value.to_s)
     end
-    request_path
+    @request_path
   end
-  memoize :request_path
 
   private
 
@@ -26,30 +25,30 @@ class Callapi::Call::RequestMetadata < Struct.new(:context)
   end
 
   def request_path_without_replaced_param_keys
-    '/' + SuperString.underscore(call_name)
-  end
-  memoize :request_path_without_replaced_param_keys
-
-  def missing_keys
-    (param_keys_to_replace.map(&:to_sym) - context.params.keys).map { |key| ":#{key}" }
+    @request_path_without_replaced_param_keys ||= "/#{SuperString.underscore(call_name)}"
   end
 
   def namespaces_after_http_method
     namespaces[namespaces.index(namespace_with_http_method) + 1 .. namespaces.size]
   end
-  memoize :namespaces_after_http_method
 
   def namespace_with_http_method
     namespaces.detect{ |namespace| HTTP_METHODS.include?(namespace.upcase) } || raise(Callapi::UnknownHttpMethodError)
   end
-  memoize :namespace_with_http_method
 
   def call_name
     namespaces_after_http_method.join('::')
   end
 
   def namespaces
-    context.class.to_s.split('::')
+    @namespaces ||= context.class.to_s.split('::')
+  end
+
+  def raise_missing_param_error
+    raise Callapi::MissingParamError.new(@request_path, param_keys_to_replace, missing_keys)
+  end
+
+  def missing_keys
+    (param_keys_to_replace.map(&:to_sym) - context.params.keys).map { |key| ":#{key}" }
   end
-  memoize :namespaces
 end

data/lib/callapi/call/response.rb

@@ -4,7 +4,6 @@ class Callapi::Call::Parser
   require_relative 'response/json'
   require_relative 'response/json/as_object'
 
-  extend Memoist
   extend Forwardable
 
   def_delegators :@response, :body, :code
@@ -14,17 +13,17 @@ class Callapi::Call::Parser
   end
 
   def data
+    return @data if @data
+
     raise_error unless ok?
     return nil if no_content?
 
-    parse
+    @data = parse
   end
-  memoize :data
 
   def status
     code.to_i
   end
-  memoize :status
 
   private
 
@@ -35,13 +34,11 @@ class Callapi::Call::Parser
   def ok?
     status < 300
   end
-  memoize :ok?
 
   def no_content?
     return true if body.nil?
     body.strip.empty?
   end
-  memoize :no_content?
 
   def raise_error
     error_class = Callapi::Errors.error_by_status(status)

data/lib/callapi/call/response/json.rb

@@ -10,7 +10,6 @@ class Callapi::Call::Parser::Json < Callapi::Call::Parser
   def to_hash
     @to_hash ||= MultiJson.load(body)
   end
-  #TODO: remove Memoist
 
   def error_message
     to_hash['error_message'] rescue super

data/lib/callapi/routes/metadata.rb

@@ -1,6 +1,4 @@
 class Callapi::Routes::Metadata
-  extend Memoist
-
   def initialize(http_method_namespace, *args)
     @http_method_namespace = http_method_namespace
     @call_name, @call_options = args.shift.to_s, *args
@@ -37,7 +35,7 @@ class Callapi::Routes::Metadata
   end
 
   def call_name_with_namespaces
-    namespaces.push(@call_name).map do |class_name|
+    @call_name_with_namespaces ||= namespaces.push(@call_name).map do |class_name|
       class_name = if class_name_with_param_key?(class_name)
         class_name_to_class_name_with_param_key(class_name)
       else
@@ -46,17 +44,15 @@ class Callapi::Routes::Metadata
       SuperString.camelize(class_name)
     end
   end
-  memoize :call_name_with_namespaces
 
   def call_name_with_all_namespaces
-    [@http_method_namespace.to_s] + call_name_with_namespaces
+    @call_name_with_all_namespaces ||=
+      [@http_method_namespace.to_s] + call_name_with_namespaces
   end
-  memoize :call_name_with_all_namespaces
 
   def namespaces
-    Callapi::Routes.send(:namespaces).dup
+    @namespaces ||= Callapi::Routes.send(:namespaces).dup
   end
-  memoize :namespaces
 
   def class_name_with_param_key?(class_name)
     class_name[0] == ':' || class_name.match('/:')

data/lib/callapi/version.rb

@@ -1,3 +1,3 @@
 module Callapi
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/ext/deep_struct.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 class DeepStruct < OpenStruct
   def initialize(hash = nil)
     @table = {}

data/spec/unit/call/response_spec.rb

@@ -15,17 +15,17 @@ describe Callapi::Call::Parser do
 
     it 'should not parse response twice unless call is reloaded' do
       cached_response = {'json' => true}
-      expect(@call.response.data).to eql cached_response
+      expect(@call.data).to eql cached_response
       @call.response_parser = Callapi::Call::Parser::Plain
-      expect(@call.response.data).to eql cached_response
+      expect(@call.data).to eql cached_response
       @call.reload
-      expect(@call.response.data).to eql '{"json": true}'
+      expect(@call.data).to eql '{"json": true}'
     end
 
   end
 
   context '#data' do
-    subject { @call.response.data }
+    subject { @call.data }
 
     context 'when API returned 5xx' do
       before do
@@ -56,6 +56,5 @@ describe Callapi::Call::Parser do
         expect{ subject }.to raise_error { Callapi::NotAuthorizedError }
       end
     end
-
   end
 end

data/spec/unit/routes_spec.rb

@@ -5,8 +5,8 @@ describe Callapi::Routes do
     described_class.draw do
       get 'version'
       post 'version'
-      put 'version'
-      delete 'version'
+      put :version
+      delete :version
       patch :version
 
       get 'users', strategy: Callapi::Call::Request::Mock, parser: Callapi::Call::Parser::Plain
@@ -18,6 +18,9 @@ describe Callapi::Routes do
           get 'index'
         end
       end
+
+      get 'orders/:id'
+      get 'orders'
     end
   end
 
@@ -120,4 +123,26 @@ describe Callapi::Routes do
       expect( Callapi::Get::Users::IdParam::Posts::PostIdParam::Details.superclass ).to eql(Callapi::Call::Base)
     end
   end
+
+  context '#get("orders/:id") and get("orders") in this direct order' do
+    context '#get "orders/:id"' do
+      it 'should create Callapi::Get::Orders::IdParam class' do
+        expect( Callapi::Get::Orders::IdParam.superclass ).to eql(Callapi::Call::Base)
+      end
+
+      it 'should create #get_orders_by_id method' do
+        expect( get_orders_by_id_call ).to be_instance_of(Callapi::Get::Orders::IdParam)
+      end
+    end
+
+    context '#get "orders"' do
+      it 'should create Callapi::Get::Orders class' do
+        expect( Callapi::Get::Orders.superclass ).to eql(Callapi::Call::Base)
+      end
+
+      it 'should create #get_orders method' do
+        expect( get_orders_call ).to be_instance_of(Callapi::Get::Orders)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callapi
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Kacper Walanus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: memoist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
 description: Easy API calls
 email:
 - kacper@walanus.com