api_recipes 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgxODFjMzU4NzQwMjdkMWEyYTBlMmY1NWFjZTFkNmUwMTZhZDY5MQ==
+    NzgxYTlmYWEyYzMyNmYyZTY1YWIwNTgxMDhjZDdkNDZmMTgzYzRjZQ==
   data.tar.gz: !binary |-
-    MzljOTgzNWUxNDYyOTZhYjljMGYzM2FkZWY5YzI0NjQwYTU2ZWI5OQ==
+    NjkwYjAyNmI5MjU4YzQ1MTI1NjNkYWRmOGQxNmFmMzBiYzk4OTNhNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZThhMzdmYTY0YWNmZDU3NDVmN2M4ZTQ1YzhkYTQ5MTA0MWU4OGY2ZGFlM2Nj
-    Y2JmN2Y3MmIwNDM2YjY3MTc0NWEyYzc1ODVlZWYzNDk4NDI5YmI5OGIxOTRm
-    ZmIzYmViNWI1YzU4MjA1YmZkMjE5NzFlYmJiMjQxY2EzMGM5MjU=
+    Y2EzMWViY2NmNzQ5MmNmNmU0MWJiNWI2Mzk3M2ZiNWU0YjhhYzlhYjFiOTlh
+    M2RjOTNjMDBlZjIzOTlmMDQ3MzUzZDkwMjk5ODg4NDA0NWY5NTQxYTQ2Mzk1
+    NDk1ZmJlYjZiMDE5OTljMmIzZWVhMzM3MGQ5NDdjNGFmMWNjZWM=
   data.tar.gz: !binary |-
-    Mjc0Y2MyNzFkNTY4Y2FjZjJmNWIwOTNjYmI0MmNmMWNhN2E0NjY3ZDUwNzU1
-    YjRhZmZmNjExZTZkNzg0N2Y0NzdkZjVjMzhhMGJkNzUzNGY0OWFkNDlmMDlk
-    YTg4ZTNlMGM5Zjg3MmRhZmM1YTE4NTgwMTI5NDExOTc3NDM2MmM=
+    MDVlMjViMjc2NzJiMGJhODdmMzMxNDk4NWMyMDEyNGU0YTYwZWViNjBjZWE3
+    NjA0MTNmYmI0ODFkNGZkMDNkNTBjOTYxZjkzYmUzOTJiODUzMDdkNmNjOTQz
+    MjgwYTkxOTAzMzgyNmQ2MTA3MGRjZjdiNDBhZmFiZmJjYzE1M2Q=

data/api_recipes.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'oj', '~> 2.13.0'
   spec.add_dependency 'oj_mimic_json', '~> 1.0.1'
-  spec.add_dependency 'http', '~> 0.9.0'
-  spec.add_dependency 'activesupport', '>= 4.0.0'
+  spec.add_dependency 'http', '~> 1.0.0'
 end

data/examples/simple_usage.rb

@@ -10,10 +10,6 @@ end
 # Let's create a simple class that uses ApiRecipes
 class MyFancyClass
   include ApiRecipes
-
-  # Declare the endpoints that we're going to use
-  # Add some custom configs
-  endpoint :github
 end
 
 
@@ -22,6 +18,7 @@ end
 
 # Get user's usernames from Github's Apis (https://github.com)
 usernames = nil
+
 MyFancyClass.github.users.list do |users|
   usernames = users.collect{ |user| user['login'] }
 end

data/lib/api_recipes/endpoint.rb

@@ -1,22 +1,23 @@
 module ApiRecipes
   class Endpoint
 
-    attr_accessor :name, :settings, :authorization, :basic_auth
+    attr_accessor :name, :configs, :authorization, :basic_auth
     attr_reader :resources
 
-    def initialize(name, config)
+    def initialize(name, configs)
       @name = name
-      @config = config
-      @settings = ApiRecipes::Settings::DEFAULT.merge config.endpoints_configs[name]
+      @configs = ApiRecipes::Settings::DEFAULT.merge configs
 
       # Generate   some_endpoint.some_resource  methods
       # e.g.  github.users
       @resources = [] unless @resources
-      @settings[:routes].each do |resource, routes|
+      @configs[:routes].each do |resource, routes|
         @resources << resource
         res = Resource.new resource, self, routes
-        define_singleton_method resource do
-          res
+        unless respond_to? resource
+          define_singleton_method resource do
+            res
+          end
         end
       end
     end

data/lib/api_recipes/resource.rb

@@ -139,7 +139,7 @@ module ApiRecipes
     end
 
     def settings
-      @endpoint.settings
+      @endpoint.configs
     end
 
     def start_request(route, route_attributes, *pars)

data/lib/api_recipes/settings.rb

@@ -15,7 +15,7 @@ module ApiRecipes
     }
 
     DEFAULT_ROUTE_ATTRIBUTES = {
-      method: :get
+        method: :get
     }
 
     AVAILABLE_PARAMS_ENCODINGS = %w(form params json body)

data/lib/api_recipes/utils.rb

@@ -0,0 +1,185 @@
+class Hash
+  # Returns a new hash with all keys converted using the block operation.
+  #
+  #  hash = { name: 'Rob', age: '28' }
+  #
+  #  hash.transform_keys{ |key| key.to_s.upcase }
+  #  # => {"NAME"=>"Rob", "AGE"=>"28"}
+  def transform_keys
+    return enum_for(:transform_keys) unless block_given?
+    result = self.class.new
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end
+
+  # Destructively convert all keys using the block operations.
+  # Same as transform_keys but modifies +self+.
+  def transform_keys!
+    return enum_for(:transform_keys!) unless block_given?
+    keys.each do |key|
+      self[yield(key)] = delete(key)
+    end
+    self
+  end
+
+  # Returns a new hash with all keys converted to strings.
+  #
+  #   hash = { name: 'Rob', age: '28' }
+  #
+  #   hash.stringify_keys
+  #   # => {"name"=>"Rob", "age"=>"28"}
+  def stringify_keys
+    transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings. Same as
+  # +stringify_keys+, but modifies +self+.
+  def stringify_keys!
+    transform_keys!{ |key| key.to_s }
+  end
+
+  # Returns a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  #
+  #   hash = { 'name' => 'Rob', 'age' => '28' }
+  #
+  #   hash.symbolize_keys
+  #   # => {:name=>"Rob", :age=>"28"}
+  def symbolize_keys
+    transform_keys{ |key| key.to_sym rescue key }
+  end
+  alias_method :to_options,  :symbolize_keys
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. Same as +symbolize_keys+, but modifies +self+.
+  def symbolize_keys!
+    transform_keys!{ |key| key.to_sym rescue key }
+  end
+  alias_method :to_options!, :symbolize_keys!
+
+  # Validate all keys in a hash match <tt>*valid_keys</tt>, raising
+  # ArgumentError on a mismatch.
+  #
+  # Note that keys are treated differently than HashWithIndifferentAccess,
+  # meaning that string and symbol keys will not match.
+  #
+  #   { name: 'Rob', years: '28' }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: :years. Valid keys are: :name, :age"
+  #   { name: 'Rob', age: '28' }.assert_valid_keys('name', 'age') # => raises "ArgumentError: Unknown key: :name. Valid keys are: 'name', 'age'"
+  #   { name: 'Rob', age: '28' }.assert_valid_keys(:name, :age)   # => passes, raises nothing
+  def assert_valid_keys(*valid_keys)
+    valid_keys.flatten!
+    each_key do |k|
+      unless valid_keys.include?(k)
+        raise ArgumentError.new("Unknown key: #{k.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}")
+      end
+    end
+  end
+
+  # Returns a new hash with all keys converted by the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #  hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #  hash.deep_transform_keys{ |key| key.to_s.upcase }
+  #  # => {"PERSON"=>{"NAME"=>"Rob", "AGE"=>"28"}}
+  def deep_transform_keys(&block)
+    _deep_transform_keys_in_object(self, &block)
+  end
+
+  # Destructively convert all keys by using the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_transform_keys!(&block)
+    _deep_transform_keys_in_object!(self, &block)
+  end
+
+  # Returns a new hash with all keys converted to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #   hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #   hash.deep_stringify_keys
+  #   # => {"person"=>{"name"=>"Rob", "age"=>"28"}}
+  def deep_stringify_keys
+    deep_transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_stringify_keys!
+    deep_transform_keys!{ |key| key.to_s }
+  end
+
+  # Returns a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+. This includes the keys from the root hash
+  # and from all nested hashes and arrays.
+  #
+  #   hash = { 'person' => { 'name' => 'Rob', 'age' => '28' } }
+  #
+  #   hash.deep_symbolize_keys
+  #   # => {:person=>{:name=>"Rob", :age=>"28"}}
+  def deep_symbolize_keys
+    deep_transform_keys{ |key| key.to_sym rescue key }
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_symbolize_keys!
+    deep_transform_keys!{ |key| key.to_sym rescue key }
+  end
+
+  private
+  # support methods for deep transforming nested hashes and arrays
+  def _deep_transform_keys_in_object(object, &block)
+    case object
+      when Hash
+        object.each_with_object({}) do |(key, value), result|
+          result[yield(key)] = _deep_transform_keys_in_object(value, &block)
+        end
+      when Array
+        object.map {|e| _deep_transform_keys_in_object(e, &block) }
+      else
+        object
+    end
+  end
+
+  def _deep_transform_keys_in_object!(object, &block)
+    case object
+      when Hash
+        object.keys.each do |key|
+          value = object.delete(key)
+          object[yield(key)] = _deep_transform_keys_in_object!(value, &block)
+        end
+        object
+      when Array
+        object.map! {|e| _deep_transform_keys_in_object!(e, &block)}
+      else
+        object
+    end
+  end
+end
+
+class Array
+  # Extracts options from a set of arguments. Removes and returns the last
+  # element in the array if it's a hash, otherwise returns a blank hash.
+  #
+  #   def options(*args)
+  #     args.extract_options!
+  #   end
+  #
+  #   options(1, 2)        # => {}
+  #   options(1, 2, a: :b) # => {:a=>:b}
+  def extract_options!
+    if last.is_a?(Hash)
+      pop
+    else
+      {}
+    end
+  end
+end

data/lib/api_recipes/version.rb

@@ -1,3 +1,3 @@
 module ApiRecipes
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/api_recipes.rb

@@ -1,26 +1,41 @@
 require 'http'
 require 'oj'
 require 'oj_mimic_json'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/array/extract_options'
 
+require 'api_recipes/utils'
 require 'api_recipes/exceptions'
 require 'api_recipes/configuration'
 require 'api_recipes/resource'
 require 'api_recipes/endpoint'
 require 'api_recipes/settings'
 
+HTTP.inspect
+
 module ApiRecipes
 
   def self.included(base)
-    base.send :include, InstanceAndClassMethods
-    base.extend ClassMethods
-    base.extend InstanceAndClassMethods
-  end
 
-  class << self
-    attr_accessor :configuration
+    def base.endpoint(endpoint_name, configs, obj = nil)
+      overwrite = false
+      # If no obj has given, do not overwrite the EP (i.e. use the one created on configuration phase)
+      # Else ff an obj has given, overwrite the EP with a new EP with new configs.
+      # This EP will be accessible by this obj only (both class and instance)
+      unless obj
+        obj = self
+        overwrite = true
+      end
+      configs = ApiRecipes._aprcps_merge_endpoints_configs(endpoint_name, configs.deep_symbolize_keys)
+      endpoint_name = endpoint_name.to_sym
+
+      # Define 'endpoint_name' method for the class
+      ApiRecipes._aprcps_define_class_endpoint endpoint_name, configs, obj, overwrite
+      # Define 'endpoint_name' method for the class' instances
+      ApiRecipes._aprcps_define_instance_endpoint endpoint_name, obj
+    end
+
+    configuration.endpoints_configs.each do |endpoint_name, endpoint_configs|
+      base.endpoint endpoint_name, endpoint_configs, base
+    end
   end
 
   def self.configuration
@@ -33,58 +48,63 @@ module ApiRecipes
   def self.configure
     if block_given?
       yield(configuration)
+      _aprcps_define_global_endpoints
     else
       configuration
     end
   end
 
-  module ClassMethods
-    def endpoint(name, configs = {})
-      configs = configs.deep_symbolize_keys
-      name = name.to_sym
-
-      ep = Endpoint.new(name, merge_endpoints_configs(name, configs))
-      # Define 'name' method for the class
-      define_class_endpoint ep
-      # Define 'name' method for the class' instances
-      define_instance_endpoint ep
+  def self._aprcps_define_global_endpoints
+    configuration.endpoints_configs.each do |endpoint_name, endpoint_configs|
+      unless method_defined? endpoint_name
+        unless _aprcps_storage[endpoint_name]
+          _aprcps_storage[endpoint_name] = Endpoint.new endpoint_name, endpoint_configs
+        end
+        define_singleton_method endpoint_name do
+          _aprcps_storage[endpoint_name]
+        end
+      end
     end
+  end
 
-    private
+  def self._aprcps_storage
+    unless Thread.current[:api_recipes]
+      Thread.current[:api_recipes] = {}
+    end
+    Thread.current[:api_recipes]
+  end
 
-    def define_class_endpoint(ep)
-      name = ep.name
-      unless method_defined? name
-        Thread.current[name] = ep
 
-        define_singleton_method name do
-          Thread.current[name]
-        end
+  def self._aprcps_define_class_endpoint(ep_name, configs, obj, overwrite)
+    unless obj.method_defined? ep_name
+      if overwrite
+        ep = Endpoint.new(ep_name, configs)
+      else
+        ep = _aprcps_storage[ep_name]
+      end
+      obj.define_singleton_method ep_name do
+        ep
       end
     end
+  end
 
-    def define_instance_endpoint(ep)
-      name = ep.name
-      send :define_method, name do
-        Thread.current[name].clone
+  def self._aprcps_define_instance_endpoint(ep_name, obj)
+    obj.instance_eval do
+      unless obj.method_defined? ep_name
+        define_method ep_name do
+          self.class.send ep_name
+        end
       end
     end
   end
 
-  module InstanceAndClassMethods
-
-    private
-
-    def merge_endpoints_configs(endpoint, configs)
-      if configs && !configs.is_a?(Hash)
-        raise EndpointConfigIsNotAnHash.new(endpoint)
-      end
-      unless ApiRecipes.configuration.endpoints_configs[endpoint]
-        ApiRecipes.configuration.endpoints_configs[endpoint] = {}
-      end
-      ApiRecipes.configuration.endpoints_configs[endpoint].merge! configs
-      ApiRecipes.configuration
+  def self._aprcps_merge_endpoints_configs(endpoint_name, configs)
+    if configs && !configs.is_a?(Hash)
+      raise ApiRecipes::EndpointConfigIsNotAnHash.new(endpoint_name)
+    end
+    unless ApiRecipes.configuration.endpoints_configs[endpoint_name]
+      ApiRecipes.configuration.endpoints_configs[endpoint_name] = {}
     end
+    ApiRecipes.configuration.endpoints_configs[endpoint_name].merge configs
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alessandro Verlato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 1.0.0
 description: 
 email:
 - averlato@gmail.com
@@ -100,6 +86,7 @@ files:
 - lib/api_recipes/exceptions.rb
 - lib/api_recipes/resource.rb
 - lib/api_recipes/settings.rb
+- lib/api_recipes/utils.rb
 - lib/api_recipes/version.rb
 homepage: https://github.com/madAle/api_recipes
 licenses: