callapi 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bc23118c163ba3958e49a25c0cfe96cb39fc53
-  data.tar.gz: b89debc1a4a2ab08d51e0417cbc00c800307a412
+  metadata.gz: 666cfc16f86f8bbab5db5e2fbc10b15622111406
+  data.tar.gz: b9e3dec2a83fad0d45a6913b7c2b323bf5c0a1e3
 SHA512:
-  metadata.gz: 4c2c444d6e38be1c9268215bb33a103f1a3cccfa36c42d6965f8ec85ac4f1b107d1d52f17daf1196f55c375f441ccc2cdd3e6049f3f84ed43e4c243d7e8ea0d2
-  data.tar.gz: 2b84398197f954df3a1d222ddcc379856f2c03ad1e048fd43d6ece3ba3e9b2fe1950e5ac1b18b05cabffc2bde93a10391bacf65bf0a1fb53cf3dbee5ffd7802c
+  metadata.gz: c7f45e5636ed00b419e69bbeacca4dedea65bca9b0c859d6279fbb9656c47e16e047c8c38e53b3e816d1f04c49ce108e22c5e0f4ae8c8048eb258213ca1749c3
+  data.tar.gz: 86bb3292da0e5732199721b23b98d35aca92e6b0278636434d0444077b344f2504f70eed282ca6ca2b8db88261fbdf3b0722dc7a0a5cb6952d122d4f6077ccf2

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+## 0.8.4 (next release)
+
+- Remove activesupport dependency
+- URI pattern can be a `Symbol` (before only `String`s were accepted)
+- Bugfix: #1
+- Backward compatibility fix for `#api_path_prefix`
+- Changelog added
+
+## 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
+
+- Bugfix: Critical issue fix (undefined method `#api_path_prefix`)
+
+## 0.8.1
+
+- Dependencies
+- Documentation update
+
+## 0.8
+
+- Initial release, after long internal usage

data/Gemfile

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

data/README.md

@@ -29,7 +29,7 @@ Or install it yourself as:
 require 'callapi'
 
 Callapi::Config.configure do |config|
-  config.api_host = 'http://private-50e9-callapi.apiary-mock.com'
+  config.api_host = 'http://your.api.org/v2'
 end
 ```
   
@@ -53,7 +53,10 @@ get_notes_call.response.data    #=> [{"id"=>1, "title"=>"Jogging in park"}, {"id
 get_notes_call.response.body    #=> '[{"id":1,"title":"Jogging in park"},{"id":2,"title":"Pick-up posters from post-office"}]'
 
 # Request with params:
-post_notes_call({id: 1, title: "Swimming"})
+post_notes_call(id: 1, title: "Swimming").response.data
+
+# Request with params and headers:
+post_notes_call(id: 1, title: "Swimming").add_headers('X-SECRET-TOKEN' => '783hdkfds349').response.data
 ```
 
 <br>
@@ -174,17 +177,13 @@ call.with_response_parser(Callapi::Call::Parser::Plain).response.data
 ##### Config options
 
 - `api_host`
-- `api_path_prefix`
 - `default_response_parser`
 - `log_level`
 
 ```ruby
 Callapi::Config.configure do |config|
-  config.api_host = 'http://your.api.org'
-  
-  # request will be send to http://your.api.org/api/
-  config.api_path_prefix = 'api'
-  
+  config.api_host = 'http://your.api.org/v2'
+
   # see Parsers section
   config.default_response_parser = Callapi::Call::Parser::Json::AsObject
   

data/callapi.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'addressabler', '~> 0.1'
   spec.add_runtime_dependency 'multi_json', '~> 1.10'
   spec.add_runtime_dependency 'colorize', '~> 0.7'
-  spec.add_runtime_dependency 'activesupport', '~> 4.2'
   spec.add_runtime_dependency 'chainy', '~> 0.0.5'
   spec.add_runtime_dependency 'memoist', '~> 0.11'
 

data/lib/callapi.rb

@@ -3,6 +3,7 @@ require 'memoist'
 require 'forwardable'
 require 'chainy'
 require 'ostruct'
+require_relative 'ext/super_string'
 
 module Callapi
   require 'callapi/config'

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

@@ -10,7 +10,7 @@ class Callapi::Call::Request::Api < Callapi::Call::Request::Http
   end
 
   def api_path_prefix
-    Callapi::Config.api_path_prefix if Callapi::Config.api_path_prefix  # backward compatibility
+    return 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_metadata.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string/inflections'
-
 class Callapi::Call::RequestMetadata < Struct.new(:context)
   extend Memoist
 
@@ -28,7 +26,7 @@ class Callapi::Call::RequestMetadata < Struct.new(:context)
   end
 
   def request_path_without_replaced_param_keys
-    '/' + call_name.underscore
+    '/' + SuperString.underscore(call_name)
   end
   memoize :request_path_without_replaced_param_keys
 

data/lib/callapi/config.rb

@@ -14,7 +14,7 @@ class Callapi::Config
     end
 
     def default_request_strategy
-      @default_request_strategy ||= DEFAULT_REQUEST_STRATEGY.constantize
+      @default_request_strategy ||= Kernel.const_get DEFAULT_REQUEST_STRATEGY
     end
 
     def api_path_prefix
@@ -22,7 +22,7 @@ class Callapi::Config
     end
 
     def default_response_parser
-      @default_response_parser ||= DEFAULT_RESPONSE_PARSER.constantize
+      @default_response_parser ||= Kernel.const_get DEFAULT_RESPONSE_PARSER
     end
 
     def mocks_directory=(mocks_directory)

data/lib/callapi/errors.rb

@@ -14,7 +14,7 @@ class Callapi::Errors < StandardError
           'ServerError'
       end
     end
-    "Callapi::#{error_class_name}".constantize
+    Kernel.const_get "Callapi::#{error_class_name}"
   end
 end
 

data/lib/callapi/routes.rb

@@ -1,7 +1,6 @@
-require 'active_support/core_ext/string'
-
 class Callapi::Routes
   require_relative 'routes/metadata'
+  require_relative 'routes/helper_method_creator'
 
   class << self
     def draw(&block)
@@ -10,6 +9,7 @@ class Callapi::Routes
       instance_eval &block
 
       create_classes
+      create_helper_methods
     end
 
     def get(*args)
@@ -52,7 +52,9 @@ class Callapi::Routes
           if namespace.constants.include?(class_name.to_sym)
             namespace.const_get(class_name)
           else
-            create_class(namespace, class_name, class_metadata)
+            create_class(namespace, class_name, class_metadata).tap do |klass|
+              created_call_classes << klass
+            end
           end
         end
       end
@@ -75,7 +77,6 @@ class Callapi::Routes
     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
 
@@ -83,25 +84,12 @@ class Callapi::Routes
       namespace.const_set(new_namespace, Class.new)
     end
 
-    def create_helper_method(klass, class_metadata)
-      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
+    def create_helper_methods
+      created_call_classes.each(&method(:create_helper_method))
     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('/', '_')
+    def create_helper_method(klass)
+      Callapi::Routes::HelperMethodCreator.new(klass).create
     end
 
     def set_call_class_options(klass, options)
@@ -123,7 +111,8 @@ class Callapi::Routes
 
     def build_http_method_namespaces
       @build_http_method_namespaces ||= http_methods.each do |http_method|
-        Callapi.const_set(http_method.to_s.camelize, Module.new)
+        camelized_http_method = SuperString.camelize(http_method.to_s)
+        Callapi.const_set(camelized_http_method, Module.new)
       end
     end
 
@@ -148,5 +137,9 @@ class Callapi::Routes
     def call_classes_names
       @call_classes_names ||= call_classes_metadata.map(&:class_name).uniq
     end
+
+    def created_call_classes
+      @created_call_classes ||= []
+    end
   end
 end

data/lib/callapi/routes/helper_method_creator.rb

@@ -0,0 +1,28 @@
+class Callapi::Routes::HelperMethodCreator
+  POSTFIX = '_call'
+
+  def initialize(call_class)
+    @call_class = call_class
+    @call_class_name = call_class.to_s
+  end
+
+  def create
+    call_class = @call_class
+    Object.send(:define_method, helper_method_name) do |*args|
+      call_class.new(*args)
+    end
+  end
+
+  def helper_method_base_name
+    class_name = @call_class_name.dup
+    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
+
+  def helper_method_name
+    SuperString.underscore(helper_method_base_name).gsub('/', '_').gsub('callapi_', '') + POSTFIX
+  end
+end

data/lib/callapi/routes/metadata.rb

@@ -3,7 +3,7 @@ class Callapi::Routes::Metadata
 
   def initialize(http_method_namespace, *args)
     @http_method_namespace = http_method_namespace
-    @call_name, @call_options = args.shift, *args
+    @call_name, @call_options = args.shift.to_s, *args
 
     call_name_with_all_namespaces.size.times do |i|
       metadata = create_metadata(i)
@@ -38,11 +38,12 @@ class Callapi::Routes::Metadata
 
   def call_name_with_namespaces
     namespaces.push(@call_name).map do |class_name|
-      if class_name_with_param_key?(class_name)
+      class_name = if class_name_with_param_key?(class_name)
         class_name_to_class_name_with_param_key(class_name)
       else
         class_name
-      end.camelize
+      end
+      SuperString.camelize(class_name)
     end
   end
   memoize :call_name_with_namespaces

data/lib/callapi/version.rb

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

data/lib/ext/super_string.rb

@@ -0,0 +1,19 @@
+class SuperString
+  class << self
+    def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+      if first_letter_in_uppercase
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      else
+        lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
+      end
+    end
+
+    def underscore(string)
+      string.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+  end
+end

data/spec/unit/routes_spec.rb

@@ -7,7 +7,7 @@ describe Callapi::Routes do
       post 'version'
       put 'version'
       delete 'version'
-      patch 'version'
+      patch :version
 
       get 'users', strategy: Callapi::Call::Request::Mock, parser: Callapi::Call::Parser::Plain
       get 'users/:id'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callapi
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Kacper Walanus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: chainy
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -166,9 +153,11 @@ files:
 - lib/callapi/config.rb
 - lib/callapi/errors.rb
 - lib/callapi/routes.rb
+- lib/callapi/routes/helper_method_creator.rb
 - lib/callapi/routes/metadata.rb
 - lib/callapi/version.rb
 - lib/ext/deep_struct.rb
+- lib/ext/super_string.rb
 - spec/spec_helper.rb
 - spec/unit/call/base_spec.rb
 - spec/unit/call/request/api_spec.rb