reenhanced_bitbucket_api 0.1.6 → 0.3.0

data/lib/bitbucket_rest_api.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'faraday'
+require 'faraday_middleware'
 require 'bitbucket_rest_api/version'
 require 'bitbucket_rest_api/configuration'
 require 'bitbucket_rest_api/constants'
@@ -7,11 +9,18 @@ require 'bitbucket_rest_api/utils/url'
 require 'bitbucket_rest_api/connection'
 require 'bitbucket_rest_api/deprecation'
 require 'bitbucket_rest_api/core_ext/ordered_hash'
+require 'bitbucket_rest_api/ext/faraday'
+require 'bitbucket_rest_api/middleware'
 
 module BitBucket
-  extend Configuration
+  LIBNAME = 'bitbucket_rest_api'
+
+  LIBDIR = File.expand_path("../#{LIBNAME}", __FILE__)
 
   class << self
+    def included(base)
+      base.extend ClassMethods
+    end
 
     # Handle for the client instance
     attr_accessor :api_client
@@ -20,7 +29,17 @@ module BitBucket
     #
     # @return [BitBucket::Client]
     def new(options = { }, &block)
-      @api_client = BitBucket::Client.new(options, &block)
+      @api_client = Client.new(options, &block)
+    end
+
+    # Default middleware stack that uses default adapter as specified
+    # by configuration setup
+    #
+    # @return [Proc]
+    #
+    # @api private
+    def default_middleware(options = {})
+      Middleware.default(options)
     end
 
     # Delegate to BitBucket::Client
@@ -36,56 +55,82 @@ module BitBucket
 
   end
 
-  module AutoloadHelper
+  module ClassMethods
 
-    def autoload_all(prefix, options)
-      options.each do |const_name, path|
-        autoload const_name, File.join(prefix, path)
+    # Requires internal libraries
+    #
+    # @param [String] prefix
+    #   the relative path prefix
+    # @param [Array[String]] libs
+    #   the array of libraries to require
+    #
+    # @return [self]
+    def require_all(prefix, *libs)
+      libs.each do |lib|
+        require "#{File.join(prefix, lib)}"
       end
     end
 
-    def register_constant(options)
-      options.each do |const_name, value|
-        const_set const_name.upcase.to_s, value
-      end
+    # The client configuration
+    #
+    # @return [Configuration]
+    #
+    # @api public
+    def configuration
+      @configuration ||= Configuration.new
     end
 
-    def lookup_constant(const_name)
-      const_get const_name.upcase.to_s
+    # Configure options
+    #
+    # @example
+    #   BitBucket.configure do |c|
+    #     c.some_option = true
+    #   end
+    #
+    # @yield the configuration block
+    # @yieldparam configuration [BitBucket::Configuration]
+    #   the configuration instance
+    #
+    # @return [nil]
+    #
+    # @api public
+    def configure
+      yield configuration
     end
-
   end
 
-  extend AutoloadHelper
-
-  autoload_all 'bitbucket_rest_api',
-               :API             => 'api',
-               :ApiFactory      => 'api_factory',
-               :Authorization   => 'authorization',
-               :Authorizations  => 'authorizations',
-               :Validations     => 'validations',
-               :ParameterFilter => 'parameter_filter',
-               :Normalizer      => 'normalizer',
-               :Client          => 'client',
-               :CoreExt         => 'core_ext',
-               :Request         => 'request',
-               :Response        => 'response',
-               :Result          => 'result',
-
-               :Repos           => 'repos',
-               #:Error           => 'error',
-               :Issues          => 'issues',
-               :User            => 'user',
-               :Users           => 'users',
-               :Invitations     => 'invitations'
-
-  #:Teams           => 'teams',
-  #:PullRequests    => 'pull_requests',
-  #:Users           => 'users',
-  #:Events          => 'events',
-  #:Search          => 'search',
-  #:PageLinks       => 'page_links',
-  #:PageIterator    => 'page_iterator',
-  #:PagedRequest    => 'paged_request'
+  extend ClassMethods
+
+  require_all LIBDIR,
+    'authorization',
+    'validations',
+    'normalizer',
+    'parameter_filter',
+    'api',
+    'client',
+    'pagination',
+    'request',
+    'response',
+    'response_wrapper',
+    #'result',
+    'error',
+    'page_links',
+    'paged_request',
+    'page_iterator',
+    'params_hash'
+
+    #'repos',
+    #'issues',
+    #'user',
+    #'users',
+    #'invitations',
+    #'page_links',
+    #'paged_request',
+    #'page_iterator'
+
+    #'teams',
+    #'users',
+    #'events',
+    #'search',
 
 end # BitBucket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reenhanced_bitbucket_api
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Mike Cochran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -93,126 +93,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -253,9 +141,31 @@ files:
 - lib/bitbucket_rest_api.rb
 - lib/bitbucket_rest_api/api.rb
 - lib/bitbucket_rest_api/api/actions.rb
-- lib/bitbucket_rest_api/api_factory.rb
+- lib/bitbucket_rest_api/api/arguments.rb
+- lib/bitbucket_rest_api/api/config.rb
+- lib/bitbucket_rest_api/api/config/property.rb
+- lib/bitbucket_rest_api/api/config/property_set.rb
+- lib/bitbucket_rest_api/api/factory.rb
 - lib/bitbucket_rest_api/authorization.rb
 - lib/bitbucket_rest_api/client.rb
+- lib/bitbucket_rest_api/client/invitations.rb
+- lib/bitbucket_rest_api/client/issues.rb
+- lib/bitbucket_rest_api/client/issues/comments.rb
+- lib/bitbucket_rest_api/client/issues/components.rb
+- lib/bitbucket_rest_api/client/issues/milestones.rb
+- lib/bitbucket_rest_api/client/repos.rb
+- lib/bitbucket_rest_api/client/repos/changesets.rb
+- lib/bitbucket_rest_api/client/repos/following.rb
+- lib/bitbucket_rest_api/client/repos/keys.rb
+- lib/bitbucket_rest_api/client/repos/pull_requests.rb
+- lib/bitbucket_rest_api/client/repos/pull_requests/activity.rb
+- lib/bitbucket_rest_api/client/repos/pull_requests/comments.rb
+- lib/bitbucket_rest_api/client/repos/pull_requests/commits.rb
+- lib/bitbucket_rest_api/client/repos/services.rb
+- lib/bitbucket_rest_api/client/repos/sources.rb
+- lib/bitbucket_rest_api/client/user.rb
+- lib/bitbucket_rest_api/client/users.rb
+- lib/bitbucket_rest_api/client/users/account.rb
 - lib/bitbucket_rest_api/compatibility.rb
 - lib/bitbucket_rest_api/configuration.rb
 - lib/bitbucket_rest_api/connection.rb
@@ -278,33 +188,31 @@ files:
 - lib/bitbucket_rest_api/error/unknown_value.rb
 - lib/bitbucket_rest_api/error/unprocessable_entity.rb
 - lib/bitbucket_rest_api/error/validations.rb
-- lib/bitbucket_rest_api/invitations.rb
-- lib/bitbucket_rest_api/issues.rb
-- lib/bitbucket_rest_api/issues/comments.rb
-- lib/bitbucket_rest_api/issues/components.rb
-- lib/bitbucket_rest_api/issues/milestones.rb
+- lib/bitbucket_rest_api/ext/faraday.rb
+- lib/bitbucket_rest_api/middleware.rb
 - lib/bitbucket_rest_api/normalizer.rb
+- lib/bitbucket_rest_api/null_encoder.rb
+- lib/bitbucket_rest_api/page_iterator.rb
+- lib/bitbucket_rest_api/page_links.rb
+- lib/bitbucket_rest_api/paged_request.rb
+- lib/bitbucket_rest_api/pagination.rb
 - lib/bitbucket_rest_api/parameter_filter.rb
-- lib/bitbucket_rest_api/repos.rb
-- lib/bitbucket_rest_api/repos/changesets.rb
-- lib/bitbucket_rest_api/repos/following.rb
-- lib/bitbucket_rest_api/repos/keys.rb
-- lib/bitbucket_rest_api/repos/services.rb
-- lib/bitbucket_rest_api/repos/sources.rb
+- lib/bitbucket_rest_api/params_hash.rb
 - lib/bitbucket_rest_api/request.rb
 - lib/bitbucket_rest_api/request/basic_auth.rb
 - lib/bitbucket_rest_api/request/jsonize.rb
 - lib/bitbucket_rest_api/request/oauth.rb
+- lib/bitbucket_rest_api/request/verbs.rb
 - lib/bitbucket_rest_api/response.rb
+- lib/bitbucket_rest_api/response/header.rb
 - lib/bitbucket_rest_api/response/helpers.rb
 - lib/bitbucket_rest_api/response/jsonize.rb
 - lib/bitbucket_rest_api/response/mashify.rb
 - lib/bitbucket_rest_api/response/raise_error.rb
 - lib/bitbucket_rest_api/response/xmlize.rb
+- lib/bitbucket_rest_api/response_wrapper.rb
 - lib/bitbucket_rest_api/result.rb
-- lib/bitbucket_rest_api/user.rb
 - lib/bitbucket_rest_api/users.rb
-- lib/bitbucket_rest_api/users/account.rb
 - lib/bitbucket_rest_api/utils/url.rb
 - lib/bitbucket_rest_api/validations.rb
 - lib/bitbucket_rest_api/validations/format.rb
@@ -331,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the BitBucket API supporting OAuth and Basic Authentication

data/lib/bitbucket_rest_api/api_factory.rb

@@ -1,30 +0,0 @@
-# encoding: utf-8
-
-require 'bitbucket_rest_api/core_ext/hash'
-
-module BitBucket
-  class ApiFactory
-
-    # Instantiates a new bitbucket api object
-    def self.new(klass, options={})
-      return create_instance(klass, options) if klass
-      raise ArgumentError, 'must provide klass to be instantiated'
-    end
-
-    # Passes configuration options to instantiated class
-    def self.create_instance(klass, options)
-      options.symbolize_keys!
-      instance = convert_to_constant(klass.to_s).new options
-      BitBucket.api_client = instance
-      instance
-    end
-
-    def self.convert_to_constant(classes)
-      constant = BitBucket
-      classes.split('::').each do |klass|
-        constant = constant.const_get klass
-      end
-      return constant
-    end
-  end
-end # BitBucket