fizzy-api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d9309bfa369b94a284a5364c64e014e8b46e9a
-  data.tar.gz: a8bfea6a25221eb9932494150b02786cd90c9ed5
+  metadata.gz: 802f27fc26033f44a46a7fe28743f072dc3dbbb3
+  data.tar.gz: e0ebc607de244a2971dd9e90e227694f3f712f90
 SHA512:
-  metadata.gz: 22f787bdcd75f9d4148bf10a580ed26685f0701bce905ee682473de4ca84b28ec78b20e94a50b754d9f2621b47666ab0e4f216caeebaf274d5e6a747929d7c8c
-  data.tar.gz: 1f8c65590cd845755c37e8b32e578df0968d63f1ef9dc02dc23a060cc33e7321212ed9736af31bf6d4f86716bef31b356687c863492cce5cc6b9ef06c08191a0
+  metadata.gz: c5be9b79ee001ed0e5d2ee387ac6fc0fe9079738f7e33abcfbabba2ba3e5448e9dbdcfe1abb795ed2fcd654b4c5fbcf8b810c141132a53090715b2fb7232589b
+  data.tar.gz: f9cd61d2f011df75f56b585901a9582393bb8d07ec67226061bd33d70e691c187bd7fc7aae5a8e3e4d6b332119d5aa67c9cf3e90f54dc60e6500471888b2c8bc

data/.gitlab-ci.yml

@@ -0,0 +1,23 @@
+image: "roqua/roqua-build-images:ruby-2.3.3-phantomjs-2.1.1-bundler-gemnasium"
+
+variables:
+  POSTGRES_DB: fizzy_api_test
+  POSTGRES_USER: runner
+  POSTGRES_PASSWORD: ""
+  DATABASE_URL: "postgres://runner@postgres:5432/fizzy_api_test"
+  RAILS_ENV: test
+  RACK_ENV: test
+
+before_script:
+  - ruby -v
+  - eval $(ssh-agent -s)
+
+  - bundle-cache
+
+rspec:
+  script:
+    - bundle exec rspec spec
+
+rubocop:
+  script:
+    - bundle exec rubocop -D

data/.rubocop.yml

@@ -1,6 +1,7 @@
 inherit_from: rubocop-todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.3
   Exclude:
     - 'fizzy_api.gemspec'
     - 'tmp/**/*'
@@ -15,11 +16,26 @@ Encoding:
 LineLength:
   Max: 120
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
+Style/MixinUsage:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
 # Avoid methods longer than 10 lines of code
 MethodLength:
   CountComments: false  # count full line comments?
   Max: 20
 
+# Describe specs fail this test
+# Namespaces in rake tasks do too
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+    - '**/*.rake'
+
 ################################################################## DISABLED COPS
 
 # These cops are disabled because we think they are a Bad Idea. If you add one
@@ -33,7 +49,7 @@ Documentation:
   Enabled: false
 
 # Gems typically have one file named the-gem-name.rb which can be autorequired by bundler
-Style/FileName:
+Naming/FileName:
   Exclude:
     - lib/fizzy-api.rb
 

data/Gemfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'rspec'
   gem 'rubocop'
 end

data/Gemfile.lock

@@ -2,31 +2,31 @@ PATH
   remote: .
   specs:
     fizzy-api (0.1.4)
-      active_interaction (~> 3.4.0)
-      httparty (~> 0.12)
+      active_interaction (~> 3.6)
+      httparty (~> 0.15)
       virtus (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_interaction (3.4.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active_interaction (3.6.1)
       activemodel (>= 4, < 6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activesupport (5.0.0.1)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -36,76 +36,81 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
+    builder (3.2.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     equalizer (0.0.11)
-    erubis (2.7.0)
-    factory_girl (4.7.0)
+    erubi (1.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
-    httparty (0.14.0)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    multi_xml (0.5.5)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    parser (2.3.2.0)
-      ast (~> 2.2)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.1)
+    multi_xml (0.6.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     powerpack (0.1.1)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.1.0)
-    rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rainbow (3.0.0)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.45.0)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    ruby-progressbar (1.9.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.3.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -116,12 +121,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.9)
-  factory_girl_rails
+  bundler (~> 1.16)
+  factory_bot_rails
   fizzy-api!
-  rake (~> 11.3)
+  rake (~> 12.3)
   rspec
   rubocop
 
 BUNDLED WITH
-   1.12.5
+   1.16.1

data/circle.yml

@@ -2,7 +2,7 @@ machine:
   timezone:
     Europe/Amsterdam
   ruby:
-    version: 2.2.4
+    version: 2.3.3
 test:
   override:
     - bundle exec rspec spec:

data/fizzy_api.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'httparty',                       '~> 0.12'
-  gem.add_dependency 'active_interaction',             '~> 3.4.0'
+  gem.add_dependency 'httparty',                       '~> 0.15'
+  gem.add_dependency 'active_interaction',             '~> 3.6'
   gem.add_dependency 'virtus',                         '~> 1.0'
 
-  gem.add_development_dependency 'bundler',            '~> 1.9'
-  gem.add_development_dependency 'rake',               '~> 11.3'
-  gem.add_development_dependency 'rspec',              '~> 3.4'
-  gem.add_development_dependency 'factory_girl_rails', '~> 4.6'
+  gem.add_development_dependency 'bundler',            '~> 1.16'
+  gem.add_development_dependency 'rake',               '~> 12.3'
+  gem.add_development_dependency 'rspec',              '~> 3.7'
+  gem.add_development_dependency 'factory_bot_rails', '~> 4.8'
 end

data/lib/fizzy-api.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'fizzy/api'

data/lib/fizzy/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_interaction'
 require 'fizzy/api/version'
 require 'fizzy/api/sessions'

data/lib/fizzy/api/endpoints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fizzy/api/endpoints/endpoint'
 require 'fizzy/api/endpoints/calculate_outcome'
 require 'fizzy/api/endpoints/render_graph'

data/lib/fizzy/api/endpoints/calculate_outcome.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Endpoints

data/lib/fizzy/api/endpoints/endpoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Endpoints

data/lib/fizzy/api/endpoints/render_graph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Endpoints

data/lib/fizzy/api/endpoints/render_graph_synchronous.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Endpoints

data/lib/fizzy/api/endpoints/render_overview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Endpoints

data/lib/fizzy/api/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fizzy/api/errors/graph_not_found_error'
 require 'fizzy/api/errors/outcome_not_available_error'
 require 'fizzy/api/errors/too_few_measurements_error'

data/lib/fizzy/api/errors/graph_not_found_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Errors

data/lib/fizzy/api/errors/method_not_allowed_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Errors

data/lib/fizzy/api/errors/outcome_not_available_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Errors

data/lib/fizzy/api/errors/too_few_measurements_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Errors

data/lib/fizzy/api/errors/unexpected_status_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Errors

data/lib/fizzy/api/sessions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'httparty'
 require 'fizzy/api/sessions/basic_auth_session'
 

data/lib/fizzy/api/sessions/basic_auth_session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Sessions

data/lib/fizzy/api/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
-    VERSION = '0.1.4'.freeze
+    VERSION = '0.1.5'
   end
 end

data/spec/factories/basic_auth_session.rb

@@ -1,4 +1,6 @@
-FactoryGirl.define do
+# frozen_string_literal: true
+
+FactoryBot.define do
   factory :basic_auth_session do
     initialize_with { new(username: 'some_username', password: 'some_password', fizzy_url: 'http://fizzy.dev') }
   end

data/spec/fizzy/api/endpoints/calculate_outcome_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'shared_examples_for_endpoints'
 module Fizzy
@@ -7,7 +9,7 @@ module Fizzy
         let(:dossier_id) { '123' }
         let(:protocol_subscription_id) { 'abc' }
         let(:response) { httparty_response('body') }
-        let(:session)  { FactoryGirl.build :basic_auth_session }
+        let(:session)  { FactoryBot.build :basic_auth_session }
 
         it_behaves_like 'an endpoint'
 

data/spec/fizzy/api/endpoints/render_graph_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'shared_examples_for_endpoints'
 module Fizzy
@@ -9,7 +11,7 @@ module Fizzy
         let(:path) { 'welbevinden.svg' }
         let(:options) { {} }
         let(:response) { httparty_response('<svg>') }
-        let(:session)  { FactoryGirl.build :basic_auth_session }
+        let(:session)  { FactoryBot.build :basic_auth_session }
 
         it_behaves_like 'an endpoint'
 

data/spec/fizzy/api/endpoints/render_graph_synchronous_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'shared_examples_for_endpoints'
 module Fizzy
@@ -9,7 +11,7 @@ module Fizzy
         let(:path) { 'welbevinden.svg' }
         let(:options) { {} }
         let(:response) { httparty_response('<svg>') }
-        let(:session)  { FactoryGirl.build :basic_auth_session }
+        let(:session)  { FactoryBot.build :basic_auth_session }
 
         it_behaves_like 'an endpoint'
 

data/spec/fizzy/api/endpoints/render_overview_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'shared_examples_for_endpoints'
 module Fizzy
@@ -7,7 +9,7 @@ module Fizzy
         let(:dossier_id) { '123' }
         let(:protocol_subscription_id) { 'abc' }
         let(:response) { httparty_response('{}') }
-        let(:session)  { FactoryGirl.build :basic_auth_session }
+        let(:session)  { FactoryBot.build :basic_auth_session }
 
         it_behaves_like 'an endpoint'
 

data/spec/fizzy/api/sessions/basic_auth_session_spec.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
-include Sessions
 
 describe BasicAuthSession do
-  let(:session)  { FactoryGirl.build :basic_auth_session }
+  let(:session)  { FactoryBot.build :basic_auth_session }
   let(:response) { double('response', code: 201, parsed_response: 'some_response') }
 
   describe '#initialize' do
@@ -51,7 +52,7 @@ describe BasicAuthSession do
       expect(HTTParty).to receive(:get).with('http://fizzy.dev/api/v1/some_path',
                                              query: { some: 'param' },
                                              basic_auth: { username: 'some_username', password: 'some_password' })
-        .and_return(response)
+                                       .and_return(response)
       session.get('/some_path', some: 'param')
     end
 

data/spec/fizzy/api/sessions_spec.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

data/spec/shared_examples_for_endpoints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fizzy
   module Api
     module Endpoints

data/spec/spec_helper.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'rspec'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'fizzy-api'
 require 'httparty'
+
 include Fizzy::Api
 include Fizzy::Api::Sessions
 # include Fizzy::Api::Models
 
-Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'support', '*.rb')].each { |f| require f }
-Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'factories', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'support', '*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'factories', '*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
   config.filter_run :focus

data/spec/support/httparty_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def httparty_response(response_data)
   response = double('reponse')
   allow(response).to receive(:body).and_return response_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fizzy-api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Frank Blaauw
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: active_interaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -59,56 +59,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.8'
 description: Provides authenticated access to fizzy utilities
 email:
 - f.j.blaauw@umcg.nl
@@ -118,6 +118,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: API wrapper gem around Fizzy's Graph API