Merge cbbbf5f into 619dde7

cvut · May 16, 2015 · 4ad27d2 · 4ad27d2
2 parents 619dde7 + cbbbf5f
commit 4ad27d2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/kosapi_client.gemspec b/kosapi_client.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'oauth2'
   spec.add_runtime_dependency 'faraday', '~> 0.8.9' # VCR does not work with newer versions yet
-  spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'corefines', '~> 1.6'
   spec.add_runtime_dependency 'escape_utils' unless RUBY_PLATFORM == 'java' # used for uri_template
   spec.add_runtime_dependency 'uri_template'
   spec.add_runtime_dependency 'ox' # required for correct XML namespace handling (MultiXML, oauth2)

diff --git a/lib/kosapi_client.rb b/lib/kosapi_client.rb
@@ -1,6 +1,4 @@
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/inflector'
+require 'corefines'
 require 'uri_template'
 require 'escape_utils'
 

diff --git a/lib/kosapi_client/api_client.rb b/lib/kosapi_client/api_client.rb
@@ -1,3 +1,5 @@
+using Corefines::String::camelcase
+
 module KOSapiClient
 
   class ApiClient
@@ -20,9 +22,9 @@ def initialize(config = Configuration.new)
     end
 
     def create_builder(resource_name)
-      builder_name = "#{resource_name}_builder".camelize.to_sym
+      builder_name = "#{resource_name}_builder".camelcase(:upper).to_sym
       builder_class = find_builder_class(builder_name)
-      builder_class.new(resource_name.to_s.camelize(:lower), @http_client)
+      builder_class.new(resource_name.to_s.camelcase(:lower), @http_client)
     end
 
     private

diff --git a/lib/kosapi_client/entity/data_mappings.rb b/lib/kosapi_client/entity/data_mappings.rb
@@ -36,7 +36,7 @@ def attr_mappings
           if self.superclass.respond_to? :attr_mappings
             parent_mappings = self.superclass.attr_mappings
           end
-          @data_mappings.reverse_merge(parent_mappings || {})
+          (parent_mappings || {}).merge(@data_mappings)
         end
 
         # Parses composed domain type from hash response structure.

diff --git a/lib/kosapi_client/response_converter.rb b/lib/kosapi_client/response_converter.rb
@@ -1,3 +1,5 @@
+using Corefines::String::camelcase
+
 module KOSapiClient
 
   # This class converts parsed response in hash format
@@ -46,7 +48,7 @@ def detect_type(hash)
     end
 
     def extract_type(type_str)
-      type_name = type_str.camelize
+      type_name = type_str.camelcase(:upper)
       begin
         entity_type = Entity.const_get(type_name)
       rescue

diff --git a/lib/kosapi_client/response_preprocessor.rb b/lib/kosapi_client/response_preprocessor.rb
@@ -1,3 +1,5 @@
+using Corefines::String::snake_case
+
 module KOSapiClient
   class ResponsePreprocessor
 
@@ -18,7 +20,7 @@ def extract_parsed(result)
     end
 
     def stringify_keys(response)
-      HashUtils.deep_transform_hash_keys(response) { |key| key.underscore.sub(':', '_').to_sym rescue key }
+      HashUtils.deep_transform_hash_keys(response) { |key| key.snake_case.sub(':', '_').to_sym rescue key }
     end
 
     def entries_to_array(hash)