tinybucket 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65f9c7b6e4cffe83881f78a6c23c787e1f054402
-  data.tar.gz: 2596b76496b6a201d0dbdf9fc22d434b8d2f29b7
+  metadata.gz: ef69fc38261a66035f6b72b1e767ec749151ef63
+  data.tar.gz: d286e78ed4b5d57e1ab9281e7387b5e3e53b5c8d
 SHA512:
-  metadata.gz: f9133bcb3b6c335495c0b00d678d5bf845a45c58ce476dc6e5e45953f7a9201a565c90e832f0681eafebd75c47bf12fc0c91cad8cf94f5f497404293ccba805c
-  data.tar.gz: cd947d13332ee1ebeafad0f07238e0103905c614ba77fc39f623fcc433701fdd138a35fb08d7bdad941167c7b48f21b7aa463c8658773c004128d759747ac9a7
+  metadata.gz: 56e151d12522b22a2661d46a88d6f63cfaae6d233774e74ecaa79ceb0d5495d1a249b58184d1c678f054791c0e26414199eb946731cbc85b70240214f762f25f
+  data.tar.gz: 565f64d75e6100c5bb87297368dad0fc07da3ad3716885965ed56f118d0c98d5a897a25b1a547441ff8c257c34fb0a403d344ae88e260f1e82cfdf774796cba5

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 before_install:
   - gem install bundler -v 1.10.6
-rvm: 2.2
+rvm: 2.3.1
 addons:
   code_climate:
     repo_token: 58717000233e2eba64f18993364e4689b9c3e862a3e775d14890cd235979a7f9

data/Gemfile

@@ -7,7 +7,7 @@ gem 'rake', '~> 10.4'
 gem 'rspec', '~> 3.4'
 gem 'rspec-mocks', '~> 3.4'
 gem 'webmock', '~> 1.24'
-gem 'rubocop', '~> 0.38'
+gem 'rubocop', '~> 0.41'
 
 gem 'yard', '~> 0.8.7'
 gem 'yardstick', '~> 0.9'

data/lib/faraday_middleware/follow_oauth_redirects.rb

@@ -27,7 +27,7 @@ module FaradayMiddleware
     end
 
     def oauth_signed_request?(env)
-      env[:request].fetch(:oauth, nil).present?
+      env[:request].oauth
     end
 
     def oauth_options(env)

data/lib/tinybucket/client.rb

@@ -24,15 +24,15 @@ module Tinybucket
         public_repos
       when 1
         case args.first
-        when Hash
-          public_repos(args.first)
-        when String, Symbol
-          owners_repos(args.first)
-        else
-          raise ArgumentError
+        when Hash           then public_repos(args.first)
+        when String, Symbol then owners_repos(args.first)
+        else                     raise ArgumentError
         end
       when 2
-        owners_repos(args[0], args[1])
+        case args.first
+        when String, Symbol then owners_repos(args[0], args[1])
+        else                     raise ArgumentError
+        end
       else
         raise ArgumentError
       end

data/lib/tinybucket/connection.rb

@@ -14,7 +14,8 @@ module Tinybucket
 
       # TODO: cache connection for each (options, parser) pairs.
       Faraday.new(
-        conn_options.merge(builder: stack(parser, options)))
+        conn_options.merge(builder: stack(parser, options))
+      )
     end
 
     private

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

@@ -8,16 +8,12 @@ module Tinybucket
           def load
             return true if @_loaded
 
-            @_loaded = \
-              begin
-                self.attributes = load_model.attributes
-                true
-              rescue => e
-                Tinybucket.logger.error e
-                false
-              end
-
-            @_loaded
+            self.attributes = load_model.attributes
+            @_loaded = true
+          rescue => e
+            @_loaded = false
+            Tinybucket.logger.error e
+            raise e
           end
 
           def loaded?
@@ -26,7 +22,9 @@ module Tinybucket
 
           def reload
             @_loaded = false
-            load
+            # rubocop:disable all
+            self.load
+            # rubocop:enable all
           end
 
           private

data/lib/tinybucket/parser/branch_restriction_parser.rb

@@ -2,7 +2,9 @@ module Tinybucket
   module Parser
     class BranchRestrictionParser < BaseParser
       def convert(json)
-        Tinybucket::Model::BranchRestriction.new(json)
+        Tinybucket::Model::BranchRestriction.new(
+          json
+        )
       end
     end
   end

data/lib/tinybucket/parser/branch_restrictions_parser.rb

@@ -3,7 +3,8 @@ module Tinybucket
     class BranchRestrictionsParser < BaseParser
       def convert(json)
         Tinybucket::Model::Page.new(
-          json, Tinybucket::Model::BranchRestriction)
+          json, Tinybucket::Model::BranchRestriction
+        )
       end
     end
   end

data/lib/tinybucket/parser/comments_parser.rb

@@ -3,7 +3,8 @@ module Tinybucket
     class CommentsParser < BaseParser
       def convert(json)
         Tinybucket::Model::Page.new(
-          json, Tinybucket::Model::Comment)
+          json, Tinybucket::Model::Comment
+        )
       end
     end
   end

data/lib/tinybucket/parser/pull_requests_parser.rb

@@ -3,7 +3,8 @@ module Tinybucket
     class PullRequestsParser < BaseParser
       def convert(json)
         Tinybucket::Model::Page.new(
-          json, Tinybucket::Model::PullRequest)
+          json, Tinybucket::Model::PullRequest
+        )
       end
     end
   end

data/lib/tinybucket/parser/repos_parser.rb

@@ -3,7 +3,8 @@ module Tinybucket
     class ReposParser < BaseParser
       def convert(json)
         Tinybucket::Model::Page.new(
-          json, Tinybucket::Model::Repository)
+          json, Tinybucket::Model::Repository
+        )
       end
     end
   end

data/lib/tinybucket/version.rb

@@ -1,3 +1,3 @@
 module Tinybucket
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/spec/lib/tinybucket/client_spec.rb

@@ -29,21 +29,30 @@ RSpec.describe Tinybucket::Client do
 
     context 'when get repositories of the owner' do
       let(:owner) { 'test_owner' }
+      let(:request_path) { "/repositories/#{owner}" }
       before { stub_apiresponse(:get, request_path) }
 
       context 'without options' do
-        let(:request_path) { "/repositories/#{owner}" }
         subject { client.repos(owner) }
         it { expect(subject).to be_instance_of(Tinybucket::Resource::Repos) }
         it { expect(subject.instance_variable_get(:@owner)).to eq(owner) }
       end
       context 'with options' do
-        let(:request_path) { "/repositories/#{owner}" }
+        let(:options) { { page: 1 } }
         subject { client.repos(owner, options) }
-        let(:options) { {} }
         it { expect(subject).to be_instance_of(Tinybucket::Resource::Repos) }
         it { expect(subject.instance_variable_get(:@owner)).to eq(owner) }
       end
+      context 'with invalid options' do
+        subject { client.repos(owner, 'invalid options') }
+        it { expect { subject }.to raise_error(ArgumentError) }
+      end
+      context 'with invalid owner and options' do
+        let(:invalid_owner) { 200 }
+        let(:options) { { page: 1 } }
+        subject { client.repos(invalid_owner, options) }
+        it { expect { subject }.to raise_error(ArgumentError) }
+      end
     end
 
     context 'when invalid argument passed' do

data/spec/support/model_macros.rb

@@ -38,11 +38,19 @@ module ModelMacros
       end
 
       context 'when load failed' do
+        let(:env) do
+          {
+            htt_method: :get,
+            request_url: 'https://localhost/path/to/resource',
+            status_code: 404,
+            response_body: 'not found'
+          }
+        end
         before do
-          allow(@model).to receive(:load_model).and_raise(ArgumentError)
+          @model.stub(:load_model) { raise Tinybucket::Error::NotFound.new(env) }
         end
 
-        it { expect(subject).to be_falsey }
+        it { expect { subject }.to raise_error(Tinybucket::Error::NotFound) }
       end
     end
 
@@ -76,11 +84,19 @@ module ModelMacros
       end
 
       context 'when load failed' do
+        let(:env) do
+          {
+            htt_method: :get,
+            request_url: 'https://localhost/path/to/resource',
+            status_code: 404,
+            response_body: 'not found'
+          }
+        end
         before do
-          allow(@model).to receive(:load_model).and_raise(ArgumentError)
+          @model.stub(:load_model) { raise Tinybucket::Error::NotFound.new(env) }
         end
 
-        it { expect(subject).to be_falsey }
+        it { expect { subject }.to raise_error(Tinybucket::Error::NotFound) }
       end
     end
   end

data/tinybucket.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
   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 'faraday',            ['~> 0.9']
+  spec.add_runtime_dependency 'faraday_middleware', ['~> 0.10']
   spec.add_runtime_dependency 'faraday-http-cache', ['~> 1.2']
-  spec.add_runtime_dependency 'simple_oauth',       ['= 0.2.0']
+  spec.add_runtime_dependency 'simple_oauth',       ['~> 0.3']
 
-  spec.add_development_dependency 'bundler',     '~> 1.10'
+  spec.add_development_dependency 'bundler', '~> 1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinybucket
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - hirakiuc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -42,30 +42,30 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -339,7 +339,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