auxiliary_rails 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2dca627a51fe1045de4e00f82cd2ac9dcc96df20816d7de67a8bf818180a06c
-  data.tar.gz: e5ae6c889d8ed752d382d86822410a409daaf9f14b04cbf833938af32adab6e9
+  metadata.gz: 96acec32159316a20cb54c5f2e456fb7c87b6e1f058f6944df4fb1bdeeca2517
+  data.tar.gz: 3ca5ea02af552fb200555f1ab40160b86394b255ecbe2550aebb50e1ac0571b1
 SHA512:
-  metadata.gz: cabb77bb72b361996f1bd9623768d7c1af219c0f1bed3a516781493b0b77b7892bb42a3e4ffbefaabd879862fd7b3f25872a87e814e6b7aa7ec2bfc51e1e93d1
-  data.tar.gz: 07d26c7e442836147af787b33b5d6300f8e3d01c4b60a53fd31cbf0381158a7af5f16f8cb67af8d395ac8df25333cc75de8edaf8d1b0eb01e5cb1f708a1ebc43
+  metadata.gz: b6c230d4ceadb59c9ad3260c575d571ddb6b190ff7bac76e597cf6334fdcec2a033e8a467893336ad9c1dc21efbc9c2c1c17823861ac4f954d51856066465461
+  data.tar.gz: 05c3be9386e85591ed4afbcd6f178d41a460dd20348580fa443393d736196fca7affa1db32a5ee6eca3b33d52f62e27a55e896620c26c14feca7b63799920438

data/.rubocop.yml

@@ -7,6 +7,7 @@ require:
 
 AllCops:
   Exclude:
+    - bin/rubocop
     - lib/generators/auxiliary_rails/templates/**/*
     - vendor/**/* # fix for CI
 
@@ -40,5 +41,14 @@ Style/Documentation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 Style/NegatedIf:
   EnforcedStyle: postfix

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-01-25 02:14:48 +0200 using RuboCop version 0.78.0.
+# on 2020-03-13 22:32:38 +0200 using RuboCop version 0.80.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -15,17 +15,3 @@ Lint/SendWithMixinArgument:
 # Offense count: 1
 RSpec/NestedGroups:
   Max: 4
-
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'auxiliary_rails.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/generators/auxiliary_rails/command_generator.rb'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # AuxiliaryRails Changelog
 
+## [Unreleased]
+
+## v0.3.1
+
+### Added
+- Errorable concern
+
+### Changed
+- Remove validation failed default error #25
+
 ## v0.3.0
 
 ### Added

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    auxiliary_rails (0.3.0)
+    auxiliary_rails (0.3.1)
       dry-core
       dry-initializer
       dry-initializer-rails
+      rails (>= 5.2, < 7)
       thor
 
 GEM
@@ -104,7 +105,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (6.0.2.1)
@@ -135,6 +136,7 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -148,11 +150,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.79.0)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     rubocop-performance (1.5.2)
@@ -174,7 +177,7 @@ GEM
     unicode-display_width (1.6.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     zeitwerk (2.3.0)
 
 PLATFORMS
@@ -184,12 +187,11 @@ DEPENDENCIES
   auxiliary_rails!
   bundler (~> 2.0)
   pry
-  rails (>= 5.2, < 7)
   rake
   rspec (~> 3.8)
-  rubocop (= 0.79)
+  rubocop (~> 0.80)
   rubocop-performance
   rubocop-rspec
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -44,7 +44,7 @@ auxiliary_rails new APP_PATH --develop
 Or use `rails new` command specifying `--template` argument:
 
 ```sh
-rails new APP_PATH --database=postgresql --template=https://raw.githubusercontent.com/ergoserv/auxiliary_rails/develop/templates/rails/elementary.rb --skip-action-cable --skip-coffee --skip-test --skip-webpack-install
+rails new APP_PATH --database=postgresql --template=https://raw.githubusercontent.com/ergoserv/auxiliary_rails/develop/templates/rails/elementary.rb --skip-action-cable --skip-coffee --skip-test
 ```
 
 ### Generators

data/auxiliary_rails.gemspec

@@ -17,13 +17,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/ergoserv/auxiliary_rails'
   spec.license       = 'MIT'
 
-  if spec.respond_to?(:metadata)
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = spec.homepage
-    spec.metadata['changelog_uri'] = "#{spec.homepage}/releases"
-  else
-    raise 'RubyGems 2.0 or newer is required'
-  end
+  raise 'RubyGems 2.0 or newer is required' unless spec.respond_to?(:metadata)
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = "#{spec.homepage}/releases"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -35,15 +33,15 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rails', '>= 5.2', '< 7'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.8'
-  spec.add_development_dependency 'rubocop', '0.79'
+  spec.add_development_dependency 'rubocop', '~> 0.80'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
 
   spec.add_runtime_dependency 'dry-core'
   spec.add_runtime_dependency 'dry-initializer'
   spec.add_runtime_dependency 'dry-initializer-rails'
+  spec.add_runtime_dependency 'rails', '>= 5.2', '< 7'
   spec.add_runtime_dependency 'thor'
 end

data/bin/rubocop

@@ -1,3 +1,29 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-bundle exec rubocop "$@"
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/bitbucket-pipelines.yml

@@ -0,0 +1,35 @@
+image: ruby:2.6.5
+
+definitions:
+  caches:
+    bundler: vendor/bundle
+
+pipelines:
+  default:
+    - step:
+        name: Build
+        caches:
+          - bundler
+        script:
+            - gem install bundler
+            - bundle config set path vendor/bundle
+            - bundle install
+    - parallel:
+      - step:
+          name: RSpec
+          caches:
+            - bundler
+          script:
+            - gem install bundler
+            - bundle config set path vendor/bundle
+            - bundle install
+            - bundle exec rspec
+      - step:
+          name: RuboCop
+          caches:
+            - bundler
+          script:
+            - gem install bundler
+            - bundle config set path vendor/bundle
+            - bundle install
+            - bundle exec rubocop

data/lib/auxiliary_rails/application/query.rb

@@ -1,3 +1,4 @@
+require 'auxiliary_rails/concerns/errorable'
 require 'dry/core/class_attributes'
 require 'dry-initializer'
 
@@ -6,6 +7,7 @@ module AuxiliaryRails
     class Query
       extend Dry::Core::ClassAttributes
       extend Dry::Initializer
+      include AuxiliaryRails::Concerns::Errorable
 
       defines :default_relation
 
@@ -53,15 +55,6 @@ module AuxiliaryRails
       end
       # rubocop:enable Metrics/AbcSize, Style/GuardClause
 
-      def error!(message = nil)
-        raise error_class,
-          "`#{self.class}` #{message || 'Query raised an error.'}"
-      end
-
-      def error_class
-        AuxiliaryRails::Application::Error
-      end
-
       def queriable_object?(object)
         object.is_a?(ActiveRecord::Relation)
       end

data/lib/auxiliary_rails/cli.rb

@@ -30,11 +30,10 @@ module AuxiliaryRails
     def new(app_path)
       run "rails new #{app_path} " \
         "--database=#{options[:database]} " \
-        "--template=#{rails_template_path(options[:template])}" \
+        "--template=#{rails_template_path(options[:template])} " \
         '--skip-action-cable ' \
         '--skip-coffee ' \
-        '--skip-test ' \
-        '--skip-webpack-install'
+        '--skip-test '
     end
 
     private

data/lib/auxiliary_rails/concerns/errorable.rb

@@ -0,0 +1,22 @@
+module AuxiliaryRails
+  module Concerns
+    module Errorable
+      # extend ActiveSupport::Concern
+
+      def error!(message = nil)
+        message ||= "`#{self.class}` raised error."
+        raise error_class, message
+      end
+
+      if defined?(ApplicationError)
+        def error_class
+          ApplicationError
+        end
+      else
+        def error_class
+          AuxiliaryRails::Application::Error
+        end
+      end
+    end
+  end
+end

data/lib/auxiliary_rails/concerns/performable.rb

@@ -1,10 +1,12 @@
 require 'active_support/concern'
+require 'auxiliary_rails/concerns/errorable'
 
 module AuxiliaryRails
   module Concerns
     module Performable
       extend ActiveSupport::Concern
       include ActiveModel::Validations
+      include AuxiliaryRails::Concerns::Errorable
 
       class_methods do
         def call(*args)
@@ -18,7 +20,7 @@ module AuxiliaryRails
         if options[:validate!] == true
           validate!
         elsif options[:validate] != false && invalid?
-          return failure!(:validation_failed)
+          return failure!
         end
 
         perform
@@ -99,21 +101,6 @@ module AuxiliaryRails
         error!("`#{self.class}` was not executed yet.")
       end
 
-      def error!(message = nil)
-        message ||= "`#{self.class}` raised error."
-        raise error_class, message
-      end
-
-      if defined?(ApplicationError)
-        def error_class
-          ApplicationError
-        end
-      else
-        def error_class
-          AuxiliaryRails::Application::Error
-        end
-      end
-
       # Sets command's status to <tt>failure</tt>.
       #
       # @return [self]

data/lib/auxiliary_rails/version.rb

@@ -1,3 +1,3 @@
 module AuxiliaryRails
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/generators/auxiliary_rails/command_generator.rb

@@ -38,7 +38,7 @@ module AuxiliaryRails
     end
 
     def command_spec_path
-      command_file_path.gsub(/^app\//, 'spec/')
+      command_file_path.gsub(%r{^app/}, 'spec/')
     end
   end
 end

data/templates/rails/elementary.rb

@@ -22,13 +22,6 @@ file '.rubocop.yml', <<~FILE
       - config/default.yml
 FILE
 
-file 'bin/rubocop', <<~FILE
-  #!/usr/bin/env bash
-
-  bundle exec rubocop "$@"
-FILE
-chmod 'bin/rubocop', 0o755
-
 run 'touch .env'
 append_file '.gitignore', <<~FILE
   .env*.local
@@ -42,7 +35,6 @@ gem_group :development, :test do
   gem 'dotenv-rails'
   gem 'factory_bot_rails'
   gem 'faker'
-  gem 'pry-byebug'
   gem 'pry-rails'
   gem 'rspec-rails'
   gem 'rubocop-ergoserv',
@@ -58,13 +50,14 @@ end
 after_bundle do
   # ensure using the latest versions of gems
   run 'bundle update'
+  run 'bundle binstubs rubocop'
 
-  generate :controller, 'pages', 'home',
+  generate 'rspec:install'
+
+  generate 'controller', 'pages', 'home',
     '--no-assets',
     '--no-helper',
     '--no-test-framework',
     '--skip-routes'
   route "root to: 'pages#home'"
-
-  generate 'rspec:install'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auxiliary_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmitry Babenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,26 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +71,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +151,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -217,12 +217,14 @@ files:
 - bin/console
 - bin/rubocop
 - bin/setup
+- bitbucket-pipelines.yml
 - lib/auxiliary_rails.rb
 - lib/auxiliary_rails/application/command.rb
 - lib/auxiliary_rails/application/error.rb
 - lib/auxiliary_rails/application/form.rb
 - lib/auxiliary_rails/application/query.rb
 - lib/auxiliary_rails/cli.rb
+- lib/auxiliary_rails/concerns/errorable.rb
 - lib/auxiliary_rails/concerns/performable.rb
 - lib/auxiliary_rails/railtie.rb
 - lib/auxiliary_rails/version.rb