arstotzka 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f520b5c22013f3c900e0a89109e817cbab2b274df08162d3759e02141f56de17
-  data.tar.gz: ffb858a6d0e8c3256f6bd08454bee2d6990b9b0222c11676a192003dc81fc3d5
+  metadata.gz: 3821d878e7f40912c328b3bfb6529d718264f6e3f6067087ac28e91e4e7e30b8
+  data.tar.gz: 2f027fe2670701cd6724e117acfccc576fac5ab15080cf3d9ed583009dcdf34c
 SHA512:
-  metadata.gz: 50a60125621d7512905a788f477f40d0eca7c5d8aa1640153498c9e4838e2ecf5afbf56fb728587483d2beb9a7d47563ff174c2be074697f139ebfddcfc50148
-  data.tar.gz: 4ff99c27757f48240bd0ab3b13acb8a5741fb35a7dd6b1a3c1945ec054653cce9a1db5a97a9f5ac9e169696ccde6be2a2d9aa5cdb5cb0b18034b6d356a0d6740
+  metadata.gz: 2df223a18047011324b177a1abee1f965badf8b898237f7c07964cf703425241b7f40636ed29e21c5a13b2a90e0cf584c0654067eb75091017015ea2557c8fbb
+  data.tar.gz: 19efad2d61ceac43e634a2d27aedd3243b923824dfb8cdab7e5507b6ccea3e70f08a078a71affd7d70af37a5fb901820bcc6e7726db2e0919bd657b4e091fb46

data/.circleci/config.yml

@@ -1,8 +1,24 @@
 version: 2
+workflows:
+  version: 2
+  test-and-build:
+    jobs:
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - build-and-release:
+          requires: [test]
+          filters:
+            tags:
+              only: /\d+\.\d+\.\d+/
+            branches:
+              only:
+                - master
 jobs:
-  build:
+  test:
     docker:
-      - image: darthjee/circleci_ruby_gems:0.2.3
+      - image: darthjee/circleci_ruby_gems:0.5.3
         environment:
           PROJECT: arstotzka
     steps:
@@ -34,3 +50,22 @@ jobs:
       - run:
           name: Check unit tests
           command: check_specs
+  build-and-release:
+    docker:
+      - image: darthjee/circleci_ruby_gems:0.5.3
+        environment:
+          PROJECT: arstotzka
+    steps:
+      - checkout
+      - run:
+          name: Bundle Install
+          command: bundle install
+      - run:
+          name: Signin
+          command: build_gem.sh signin
+      - run:
+          name: Build Gem
+          command: build_gem.sh build
+      - run:
+          name: Push Gem
+          command: build_gem.sh push

data/.rubocop.yml

@@ -18,7 +18,7 @@ Style/ClassVars:
   Exclude:
     - spec/support/models/arstotzka/fetcher/class_variable.rb
 
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedColonStyle: table
 
 Metrics/BlockLength:
@@ -26,3 +26,12 @@ Metrics/BlockLength:
     - 'spec/**/*_spec.rb'
     - 'spec/support/**/*.rb'
     - '*.gemspec'
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/Dockerfile

@@ -1,5 +1,5 @@
-FROM darthjee/ruby_gems:0.2.3 as base
-FROM darthjee/scripts:0.1.2 as scripts
+FROM darthjee/rails_gems:0.5.3 as base
+FROM darthjee/scripts:0.1.8 as scripts
 
 ######################################
 
@@ -16,15 +16,9 @@ RUN bundle_builder.sh
 FROM base
 RUN mkdir lib/arstotzka -p
 
-USER root
-
-COPY --chown=app:app --from=builder /home/app/bundle/gems /usr/local/bundle/gems
-COPY --chown=app:app --from=builder /home/app/bundle/cache /usr/local/bundle/cache
-COPY --chown=app:app --from=builder /home/app/bundle/specifications /usr/local/bundle/specifications
-COPY --chown=app:app --from=builder /home/app/bundle/bin /usr/local/bundle/bin
-COPY --chown=app:app --from=builder /home/app/bundle/extensions /usr/local/bundle/extensions
+COPY --chown=app:app --from=builder /home/app/bundle/ /usr/local/bundle/
 
 COPY --chown=app ./*.gemspec ./Gemfile /home/app/app/
 COPY --chown=app ./lib/arstotzka/version.rb /home/app/app/lib/arstotzka/
-USER app
+
 RUN bundle install

data/README.md

@@ -6,7 +6,6 @@ Arstotzka
 [![Issue Count](https://codeclimate.com/github/darthjee/arstotzka/badges/issue_count.svg)](https://codeclimate.com/github/darthjee/arstotzka)
 [![Gem Version](https://badge.fury.io/rb/arstotzka.svg)](https://badge.fury.io/rb/arstotzka)
 [![Inline docs](http://inch-ci.org/github/darthjee/arstotzka.svg)](http://inch-ci.org/github/darthjee/arstotzka)
-[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 ![arstotzka](https://raw.githubusercontent.com/darthjee/arstotzka/master/arstotzka.jpg)
 
@@ -22,7 +21,7 @@ JSON keys)
 
 Yard Documentation
 -------------------
-[https://www.rubydoc.info/gems/arstotzka/1.4.4](https://www.rubydoc.info/gems/arstotzka/1.4.4)
+[https://www.rubydoc.info/gems/arstotzka/1.5.0](https://www.rubydoc.info/gems/arstotzka/1.5.0)
 
 Instalation
 ---------------

data/arstotzka.gemspec

@@ -19,24 +19,24 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'activesupport', '~> 5.x'
-  gem.add_runtime_dependency 'sinclair',      '>= 1.4.1'
+  gem.add_runtime_dependency 'activesupport', '~> 5.2.0'
+  gem.add_runtime_dependency 'sinclair',      '>= 1.6.5'
 
-  gem.add_development_dependency 'bundler',            '~> 1.16.1'
+  gem.add_development_dependency 'bundler',            '1.16.1'
   gem.add_development_dependency 'pry',                '0.12.2'
   gem.add_development_dependency 'pry-nav',            '0.3.0'
-  gem.add_development_dependency 'rake',               '12.3.3'
-  gem.add_development_dependency 'reek',               '5.4.0'
-  gem.add_development_dependency 'rspec',              '3.8.0'
-  gem.add_development_dependency 'rspec-core',         '3.8.0'
-  gem.add_development_dependency 'rspec-expectations', '3.8.3'
-  gem.add_development_dependency 'rspec-mocks',        '3.8.0'
-  gem.add_development_dependency 'rspec-support',      '3.8.0'
-  gem.add_development_dependency 'rubocop',            '0.73.0'
-  gem.add_development_dependency 'rubocop-rspec',      '1.33.0'
-  gem.add_development_dependency 'rubycritic',         '4.1.0'
-  gem.add_development_dependency 'simplecov',          '0.17.0'
-  gem.add_development_dependency 'yard',               '0.9.20'
+  gem.add_development_dependency 'rake',               '13.0.1'
+  gem.add_development_dependency 'reek',               '5.6.0'
+  gem.add_development_dependency 'rspec',              '3.9.0'
+  gem.add_development_dependency 'rspec-core',         '3.9.1'
+  gem.add_development_dependency 'rspec-expectations', '3.9.1'
+  gem.add_development_dependency 'rspec-mocks',        '3.9.1'
+  gem.add_development_dependency 'rspec-support',      '3.9.2'
+  gem.add_development_dependency 'rubocop',            '0.80.1'
+  gem.add_development_dependency 'rubocop-rspec',      '1.38.1'
+  gem.add_development_dependency 'rubycritic',         '4.4.1'
+  gem.add_development_dependency 'simplecov',          '0.17.1'
+  gem.add_development_dependency 'yard',               '0.9.24'
   gem.add_development_dependency 'yardstick',          '0.9.9'
 
   gem.add_development_dependency 'safe_attribute_assignment'

data/lib/arstotzka/options.rb

@@ -243,7 +243,9 @@ module Arstotzka
   #                      #   Danny LJ Robert Richard
   #                      #   Linda Ariel
   #                      # ]
-  class Options < ::OpenStruct
+  class Options < Sinclair::Options
+    with_options Config::DEFAULT_CONFIGS
+    with_options :full_path, :key, :instance, :path
     # Creates a new instance of Options
     #
     # @param options_hash [Hash] options hash

data/lib/arstotzka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arstotzka
-  VERSION = '1.4.4'
+  VERSION = '1.5.0'
 end

data/spec/integration/yard/arstotzka/config_spec.rb

@@ -55,7 +55,11 @@ describe Arstotzka::Config do
           flatten:    false,
           json:       :json,
           klass:      Person,
-          type:       :none
+          type:       :none,
+          full_path:  nil,
+          key:        nil,
+          instance:   nil,
+          path:       nil
         }
       end
 

data/spec/integration/yard/arstotzka/options_spec.rb

@@ -49,6 +49,7 @@ describe Arstotzka::Options do
         ]
       end
 
+      # rubocop:disable RSpec/LeakyConstantDeclaration
       before do
         module Arstotzka::TypeCast
           def to_symbolized_hash(value)
@@ -56,12 +57,14 @@ describe Arstotzka::Options do
           end
         end
       end
+      # rubocop:enable RSpec/LeakyConstantDeclaration
 
       it 'returns inflated drinks' do
         expect(instance.drinks).to eq(expected)
       end
     end
 
+    # rubocop:disable RSpec/SubjectStub
     describe 'Using cached, compact, after and full_path' do
       let(:clazz) { Application }
 
@@ -85,9 +88,7 @@ describe Arstotzka::Options do
       end
 
       before do
-        # rubocop:disable RSpec/SubjectStub
         allow(instance).to receive(:warn)
-        # rubocop:enable RSpec/SubjectStub
       end
 
       it 'Returns created users' do
@@ -100,6 +101,7 @@ describe Arstotzka::Options do
         expect(instance).to have_received(:warn).exactly(3).times
       end
     end
+    # rubocop:enable RSpec/SubjectStub
 
     describe 'working with snake case hash' do
       let(:clazz) { JobSeeker }

data/spec/integration/yard/arstotzka/wrapper_spec.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: truie
+# frozen_string_literal: true
 
 describe Arstotzka::Wrapper do
   subject(:wrapper) { described_class.new(klass: klass, type: type) }

data/spec/lib/arstotzka/config_spec.rb

@@ -10,13 +10,22 @@ describe Arstotzka::Config do
   end
 
   describe '#options' do
+    let(:expected_options_hash) do
+      described_class::DEFAULT_CONFIGS.merge(
+        full_path: nil,
+        key:       nil,
+        instance:  nil,
+        path:      nil
+      )
+    end
+
     it do
       expect(config.options).to be_a(Arstotzka::Options)
     end
 
     it 'generates options with default values' do
       expect(config.options.to_h)
-        .to eq(described_class::DEFAULT_CONFIGS)
+        .to eq(expected_options_hash)
     end
 
     context 'when configuring it' do
@@ -31,7 +40,11 @@ describe Arstotzka::Config do
           flatten:    true,
           json:       :@hash,
           klass:      Account,
-          type:       :string
+          type:       :string,
+          full_path:  nil,
+          key:        nil,
+          instance:   nil,
+          path:       nil
         }
       end
 
@@ -72,7 +85,11 @@ describe Arstotzka::Config do
           flatten:    true,
           json:       :@hash,
           klass:      Account,
-          type:       :string
+          type:       :string,
+          full_path:  nil,
+          key:        nil,
+          instance:   nil,
+          path:       nil
         }
       end
 

data/spec/lib/arstotzka/fetcher_spec.rb

@@ -163,7 +163,7 @@ describe Arstotzka::Fetcher do
       end
     end
 
-    context 'when json is an instance variable' do
+    context 'when json is an class variable' do
       let(:instance)     { described_class::ClassVariable.new }
       let(:hash)         { { name: 'John Doe' } }
       let(:options_hash) { { key: :name, json: :@@json } }

data/spec/lib/arstotzka/options_spec.rb

@@ -159,13 +159,13 @@ describe Arstotzka::Options do
     end
   end
 
+  # rubocop:disable RSpec/SubjectStub
+  # rubocop:disable RSpec/AnyInstance
   describe '#klass' do
-    # rubocop:disable RSpec/AnyInstance
     before do
       allow_any_instance_of(described_class)
         .to receive(:warn)
     end
-    # rubocop:enable RSpec/AnyInstance
 
     context 'when initializing with old class key' do
       let(:options_hash) { { class: Star } }
@@ -191,6 +191,8 @@ describe Arstotzka::Options do
       end
     end
   end
+  # rubocop:enable RSpec/AnyInstance
+  # rubocop:enable RSpec/SubjectStub
 
   describe '#merge' do
     let(:options_hash) { { json: :hash, default: 10 } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arstotzka
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.x
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.x
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: sinclair
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.16.1
 - !ruby/object:Gem::Dependency
@@ -86,168 +86,168 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 0.80.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.73.0
+        version: 0.80.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.38.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: 1.38.1
 - !ruby/object:Gem::Dependency
   name: rubycritic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: 0.9.24
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: 0.9.24
 - !ruby/object:Gem::Dependency
   name: yardstick
   requirement: !ruby/object:Gem::Requirement