tinybucket 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f31ef006e2349c6b675693438c0495738f12f8e
-  data.tar.gz: 8e6936028ede63f3fb2329fee38a642ae24c6977
+  metadata.gz: 71d4192b2e8e49b41049f5b1f55fb6e76eb88aeb
+  data.tar.gz: 6f7140b93b530ffb03bce656742dfbbbb097cffc
 SHA512:
-  metadata.gz: 233c5f18bf339318144d37ddb80ab00ce3867e276ccd2fd0efb39ca105d1453a0b6434e12cab2fababcac270d50d4b1df2de953e7a05c4a1f1ce264aaa75bd53
-  data.tar.gz: d7be4ba5300b87cfe0f18dabc5820564e0fa98f6c4b6515b7f26e19412a8c22575933d80c8add582311a80bc44d6c9c6d1145b46f5a93acf0ac0c4d15588ec04
+  metadata.gz: 15cefdad2130c594419751a8debd493e5362a1d6d4cb0d46b16dd7aea8f4bd86cdd0208052ab8747ea614f5ed428fc1e01eac29ca39700ccce9fac7ae4ccf6b4
+  data.tar.gz: 2439679903d2ae7ea9e7eabf51e02e3a1da7ff37b03de89f36dbc6000182102a57c37692b5e09376fed768217ab6378f2f6f6ee3efb74d5c186ead247fb83480

data/.rubocop.yml

@@ -42,3 +42,6 @@ Style/AlignHash:
 
 Style/RaiseArgs:
   Enabled: false
+
+Metrics/AbcSize:
+  Max: 18

data/.travis.yml

@@ -1,4 +1,7 @@
+sudo: false
 language: ruby
+before_install:
+  - gem install bundler -v 1.10.6
 rvm: 2.1.2
 addons:
   code_climate:

data/Gemfile

@@ -3,6 +3,15 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in bitbucket.gemspec
 gemspec
 
+gem 'rake', '~> 10.4'
+gem 'rspec', '~> 3.4'
+gem 'rspec-mocks', '~> 3.4'
+gem 'webmock', '~> 1.22'
+gem 'rubocop', '~> 0.35'
+
+gem 'yard', '~> 0.8'
+gem 'yardstick', '~> 0.9.9'
+
 group :development, :test do
   gem 'pry'
   gem 'pry-stack_explorer'
@@ -17,6 +26,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'coveralls', require: false
+  gem 'simplecov', '~> 0.11', require: false
+  gem 'coveralls', '~> 0.8', require: false
   gem 'codeclimate-test-reporter', require: nil
 end

data/lib/faraday_middleware/follow_oauth_redirects.rb

@@ -51,12 +51,13 @@ module FaradayMiddleware
 
     def include_body_params?(env)
       # see RFC 5849, section 3.4.1.3.1 for details
-      !(type = env[:request_headers][OAuth::CONTENT_TYPE]) or type == OAuth::TYPE_URLENCODED
+      !(type = env[:request_headers][OAuth::CONTENT_TYPE]) ||
+        type == OAuth::TYPE_URLENCODED
     end
 
     def signature_params(params)
-      params.empty? ? params :
-        params.reject { |_k, v| v.respond_to?(:content_type) }
+      return params if params.empty?
+      params.reject { |_k, v| v.respond_to?(:content_type) }
     end
   end
 

data/lib/tinybucket/api/comments_api.rb

@@ -36,7 +36,7 @@ module Tinybucket
         when Tinybucket::Model::Page
           result.items.map { |m| m.commented_to = commented_to }
         else
-          fail ArgumentError, "Invalid result: #{result.inspect}"
+          raise ArgumentError, "Invalid result: #{result.inspect}"
         end
 
         result

data/lib/tinybucket/api/helper/api_helper.rb

@@ -24,7 +24,7 @@ module Tinybucket
         def urlencode(v, key)
           if v.blank? || (escaped = CGI.escape(v.to_s)).blank?
             msg = "Invalid #{key} parameter. (#{v})"
-            fail ArgumentError, msg
+            raise ArgumentError, msg
           end
 
           escaped

data/lib/tinybucket/api/helper/comments_helper.rb

@@ -22,7 +22,7 @@ module Tinybucket
           when Tinybucket::Model::PullRequest
             base_path_of_pullrequest
           else
-            fail ArgumentError, 'commented_to must be a pull_request or commit'
+            raise ArgumentError, 'commented_to must be a pull_request or commit'
           end
         end
 

data/lib/tinybucket/api_factory.rb

@@ -7,7 +7,7 @@ module Tinybucket
         klass =
           begin
             name = "#{klass_name}Api".intern
-            (Tinybucket::Api).const_get name
+            Tinybucket::Api.const_get name
           rescue => e
             # TODO: log exception
             Tinybucket.logger.error e

data/lib/tinybucket/client.rb

@@ -37,12 +37,12 @@ module Tinybucket
         when String, Symbol
           owners_repos(*args)
         else
-          fail ArgumentError
+          raise ArgumentError
         end
       when 2
         owners_repos(*args)
       else
-        fail ArgumentError
+        raise ArgumentError
       end
     end
 
@@ -71,8 +71,8 @@ module Tinybucket
     private
 
     def public_repos(*args)
-      options = (args.empty?) ? {} : args.first
-      fail ArgumentError unless options.is_a?(Hash)
+      options = args.empty? ? {} : args.first
+      raise ArgumentError unless options.is_a?(Hash)
 
       @repos ||= create_instance('Repos', options)
       @repos.list(options)
@@ -81,7 +81,7 @@ module Tinybucket
     def owners_repos(*args)
       owner = args.first
       options = (args.size == 2) ? args[1] : {}
-      fail ArgumentError unless options.is_a?(Hash)
+      raise ArgumentError unless options.is_a?(Hash)
 
       @user ||= create_instance('User', options)
       @user.username = owner

data/lib/tinybucket/connection.rb

@@ -14,7 +14,7 @@ module Tinybucket
 
       # TODO: cache connection for each (options, parser) pairs.
       Faraday.new(
-        conn_options.merge(builder: stack(options, parser)))
+        conn_options.merge(builder: stack(parser, options)))
     end
 
     private
@@ -49,7 +49,7 @@ module Tinybucket
       end
     end
 
-    def stack(options = {}, parser, &block)
+    def stack(parser, options = {}, &block)
       Faraday::RackBuilder.new(&block) and return if block_given?
 
       # TODO: cache stack for each (options, parser) pairs

data/lib/tinybucket/constants.rb

@@ -1,4 +1,5 @@
 module Tinybucket
   module Constants
+    MISSING_REPOSITORY_KEY = 'This method call require repository keys.'.freeze
   end
 end

data/lib/tinybucket/model/base.rb

@@ -13,7 +13,7 @@ module Tinybucket
       def initialize(json)
         self.attributes = json
         @api_config = {}
-        @_loaded = !(json.empty?)
+        @_loaded = !json.empty?
       end
 
       def attributes=(hash)
@@ -36,7 +36,7 @@ module Tinybucket
 
       protected
 
-      def create_api(api_key, keys,  options)
+      def create_api(api_key, keys, options)
         key = ('@' + api_key.underscore).intern
         api = instance_variable_get(key)
         return api if api.present?

data/lib/tinybucket/model/branch_restriction.rb

@@ -6,11 +6,11 @@ module Tinybucket
       acceptable_attributes :groups, :id, :kind, :links, :pattern, :users, :uuid
 
       def update(_params)
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def destroy
-        fail NotImplementedError
+        raise NotImplementedError
       end
     end
   end

data/lib/tinybucket/model/comment.rb

@@ -5,7 +5,7 @@ module Tinybucket
       include Tinybucket::Model::Concerns::Reloadable
 
       acceptable_attributes \
-        :links, :id, :parent,  :filename, :content, :user, :inline, \
+        :links, :id, :parent, :filename, :content, :user, :inline, \
         :created_on, :updated_on, :uuid
 
       attr_accessor :commented_to
@@ -28,7 +28,7 @@ module Tinybucket
           when Tinybucket::Model::PullRequest
             pull_request_api({})
           else
-            fail ArgumentError, 'commented_to was invalid'
+            raise ArgumentError, 'commented_to was invalid'
           end
 
         api.commented_to = commented_ato

data/lib/tinybucket/model/commit.rb

@@ -3,6 +3,7 @@ module Tinybucket
     class Commit < Base
       include Tinybucket::Model::Concerns::RepositoryKeys
       include Tinybucket::Model::Concerns::Reloadable
+      include Tinybucket::Constants
 
       acceptable_attributes \
         :hash, :links, :repository, :author, :parents, :date,
@@ -19,8 +20,7 @@ module Tinybucket
       private
 
       def comments_api(options)
-        fail ArgumentError,
-             'This method call require repository keys.' unless repo_keys?
+        raise ArgumentError, MISSING_REPOSITORY_KEY unless repo_keys?
 
         api = create_api('Comments', repo_keys, options)
         api.commented_to = self

data/lib/tinybucket/model/concerns/reloadable.rb

@@ -20,14 +20,10 @@ module Tinybucket
             @_loaded
           end
 
-          # rubocop: disable Style/TrivialAccessors
-
           def loaded?
             @_loaded
           end
 
-          # rubocop: enabled Style/TrivialAccessors
-
           def reload
             @_loaded = false
             load
@@ -36,7 +32,7 @@ module Tinybucket
           private
 
           def load_model
-            fail NotImplementedError
+            raise NotImplementedError
           end
         end
       end

data/lib/tinybucket/model/concerns/repository_keys.rb

@@ -26,12 +26,12 @@ module Tinybucket
             case result
             when Tinybucket::Model::Page
               result.items.map do |m|
-                next unless (m.class).concern_included?(:RepositoryKeys)
+                next unless m.class.concern_included?(:RepositoryKeys)
                 m.repo_keys = repo_keys
               end
             when Tinybucket::Model::Base
               result.repo_keys = repo_keys \
-                if (result.class).concern_included?(:RepositoryKeys)
+                if result.class.concern_included?(:RepositoryKeys)
             end
 
             result

data/lib/tinybucket/model/page.rb

@@ -31,7 +31,7 @@ module Tinybucket
             pos = start + i
             yield(m, pos)
 
-            fail StopIteration if \
+            raise StopIteration if \
               (!options[:limit].nil? && pos == (options[:limit] - 1))
           end
 
@@ -51,13 +51,13 @@ module Tinybucket
       end
 
       def load_next
-        fail StopIteration if @attrs[:next].nil? || @next_proc.nil?
+        raise StopIteration if @attrs[:next].nil? || @next_proc.nil?
 
         unescaped_query = URI.unescape(URI.parse(@attrs[:next]).query)
         query = Hash[*unescaped_query.split(/&|=/)]
         list = @next_proc.call(query)
 
-        fail StopIteration if list.items.size == 0
+        raise StopIteration if list.items.empty?
 
         @attrs = list.attrs
         @items = list.items

data/lib/tinybucket/model/pull_request.rb

@@ -3,6 +3,7 @@ module Tinybucket
     class PullRequest < Base
       include Tinybucket::Model::Concerns::RepositoryKeys
       include Tinybucket::Model::Concerns::Reloadable
+      include Tinybucket::Constants
 
       acceptable_attributes \
         :state, :description, :links, :title, :close_source_branch,
@@ -10,11 +11,11 @@ module Tinybucket
         :merge_commit, :closed_by, :reviewers, :participants, :uuid
 
       def create(_params)
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def update(_params)
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def decline(options = {})
@@ -58,8 +59,7 @@ module Tinybucket
       end
 
       def pull_request_api(options)
-        fail ArgumentError,
-             'This method call require repository keys.' unless repo_keys?
+        raise ArgumentError, MISSING_REPOSITORY_KEY unless repo_keys?
 
         create_api('PullRequests', repo_keys, options)
       end

data/lib/tinybucket/model/repository.rb

@@ -10,11 +10,11 @@ module Tinybucket
         :has_issues, :is_private, :full_name, :name, :language
 
       def create(_params)
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def destroy
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def pull_requests(options = {})

data/lib/tinybucket/request.rb

@@ -37,7 +37,7 @@ module Tinybucket
           request.path = path
           request.body = extract_data_from_params(params) unless params.empty?
         else
-          fail ArgumentError, 'unknown http method: ' + method
+          raise ArgumentError, 'unknown http method: ' + method
         end
       end
 

data/lib/tinybucket/response/error_handler.rb

@@ -7,7 +7,7 @@ module Tinybucket
         return if status_code < 400
 
         Tinybucket.logger.error "Invalid response code:#{status_code}"
-        fail Tinybucket::Error::ServiceError.new(env)
+        raise Tinybucket::Error::ServiceError.new(env)
       end
     end
   end

data/lib/tinybucket/version.rb

@@ -1,3 +1,3 @@
 module Tinybucket
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'.freeze
 end

data/tinybucket.gemspec

@@ -18,19 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport',      ['= 4.1.6']
+  spec.add_runtime_dependency 'activemodel',        ['>= 4.1.6']
+  spec.add_runtime_dependency 'activesupport',      ['>= 4.1.6']
   spec.add_runtime_dependency 'faraday',            ['= 0.9.0']
   spec.add_runtime_dependency 'faraday_middleware', ['= 0.9.1']
   spec.add_runtime_dependency 'simple_oauth',       ['= 0.2.0']
-  spec.add_runtime_dependency 'activemodel',        ['= 4.1.6']
 
-  spec.add_development_dependency 'bundler',     ['~> 1.6', '>= 1.6.2']
-  spec.add_development_dependency 'rake',        ['= 10.3.2']
-  spec.add_development_dependency 'rspec',       ['= 3.1.0']
-  spec.add_development_dependency 'rspec-mocks', ['= 3.1.0']
-  spec.add_development_dependency 'webmock',     ['= 1.18.0']
-  spec.add_development_dependency 'rubocop',     ['= 0.26.0']
-  spec.add_development_dependency 'simplecov',   ['= 0.9.0']
-  spec.add_development_dependency 'yard',        ['= 0.8.7.4']
-  spec.add_development_dependency 'yardstick',   ['= 0.9.9']
+  spec.add_development_dependency 'bundler',     '~> 1.10'
 end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: tinybucket
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - hirakiuc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.6
 - !ruby/object:Gem::Dependency
@@ -66,152 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 10.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 10.3.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.18.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.18.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.7.4
-- !ruby/object:Gem::Dependency
-  name: yardstick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '1.10'
 description: ruby wrapper for the Bitbucket REST API (v2) with oauth inspired by vongrippen/bitbucket.
 email:
 - hirakiuc@gmail.com
@@ -385,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ruby wrapper for the Bitbucket REST API (v2) with oauth