auxiliary_rails 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55024b258096ba35ea6d1ae4279ee9193d8c127d96186f86c91842b5436e7745
-  data.tar.gz: dccf5c0d9d4de4776af52ef0b55a3ca7b78debf1077019f55483e034df290753
+  metadata.gz: 6270fee8c57097f95277b91cb770228af36551459ebd01fbbe1900ff43a5b4b3
+  data.tar.gz: 6b6e074c5751b729106fe2dcdc1f606474a95f6575eb8df0b1cbd68d54ebbe7b
 SHA512:
-  metadata.gz: 98e16100b8ac8cf42af60dfbd6ee79ef906f2537cce8170c1cd14eff4bda1890757f6b44d14b69140924541c4366b6f85b4d7063d7752add414583bf3134cd3d
-  data.tar.gz: 05e38836a6ed91b0df116239d0f3643c59615dc7ff074f7cfbedc15408a7e774dacc97f877a703ae82f4f6ed41f4b8588e9df6c18c2eef14255e37bdb46a6a16
+  metadata.gz: 77302dee8e26ab571731ee47779f70ade277fc5c476f197259a18d321336c0952f45bb69bba62bcde6d52cba677c979ac00646cc8e8165e7288da023cabb5642
+  data.tar.gz: 450261a1b391e70b1cd7b926bb0cb4985f2f82021713041be5f6f04a403ea0b48eb9b8623ea2178c40a10533d05013067997dd15868def2a686947187af9fccc

data/.rubocop.yml

@@ -20,6 +20,12 @@ Metrics/BlockLength:
   ExcludedMethods:
     - describe
 
+#################### RSpec ################################
+
+
+RSpec/MultipleExpectations:
+  Max: 3
+
 #################### Style ###############################
 
 Style/Documentation:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # AuxiliaryRails Changelog
 
+## v0.2.0
+
+* Commands migration to `dry-initializer`
+* Commands usage examples
+
 ## v0.1.7
 
 * Bundle update (nokogiri 1.10.4, rake 12)
@@ -11,7 +16,7 @@
 
 ## v0.1.5
 
-* Fix Gemfile.lock
+* Fix `Gemfile.lock`
 
 ## v0.1.4
 
@@ -28,7 +33,7 @@
 
 ## v0.1.2
 
-* Fix Gemfile.lock
+* Fix `Gemfile.lock`
 
 ## v0.1.1
 

data/Gemfile.lock

@@ -1,67 +1,85 @@
 PATH
   remote: .
   specs:
-    auxiliary_rails (0.1.8)
+    auxiliary_rails (0.2.0)
+      dry-initializer-rails
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
     ast (2.4.0)
-    builder (3.2.3)
+    builder (3.2.4)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    crass (1.0.5)
     diff-lcs (1.3)
-    erubi (1.8.0)
+    dry-initializer (3.0.2)
+    dry-initializer-rails (3.1.1)
+      dry-initializer (>= 2.4, < 4)
+      rails (> 3.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    loofah (2.2.3)
+    jaro_winkler (1.5.4)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -72,85 +90,88 @@ GEM
     mimemagic (0.3.3)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.4.0)
-    nokogiri (1.10.4)
+    minitest (5.13.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.1)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.78.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
+    rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
-    rubocop-rspec (1.35.0)
-      rubocop (>= 0.60.0)
+    rubocop-rspec (1.37.1)
+      rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -159,8 +180,8 @@ DEPENDENCIES
   auxiliary_rails!
   bundler (~> 2.0)
   pry
-  rails (~> 5.2)
-  rake (~> 12.3)
+  rails (>= 5.2, < 7)
+  rake
   rspec (~> 3.8)
   rubocop
   rubocop-performance

data/README.md

@@ -8,7 +8,7 @@ Collection of classes, configs, scripts, generators for Ruby on Rails helping yo
 
 ## Installation
 
-Add one of these lines to your application's Gemfile:
+Add one of these lines to your application's `Gemfile`:
 
 ```ruby
 # version released to RubyGems
@@ -56,7 +56,10 @@ rails generate auxiliary_rails:install_rubocop
 rails generate auxiliary_rails:install_rubocop --no-specify-gems
 
 # API resource generator
-rails generate auxiliary_rails:api_resource NAME
+rails generate auxiliary_rails:api_resource
+
+# Command generator
+rails generate auxiliary_rails:command
 ```
 
 ### View Helpers

data/auxiliary_rails.gemspec

@@ -35,12 +35,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rails', '~> 5.2'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  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'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
 
+  spec.add_runtime_dependency 'dry-initializer-rails'
   spec.add_runtime_dependency 'thor'
 end

data/lib/auxiliary_rails/abstract_command.rb

@@ -1,9 +1,10 @@
+require 'dry-initializer-rails'
 require 'active_model'
 
 module AuxiliaryRails
   class AbstractCommand
-    include ActiveModel::Model
-    include ActiveModel::Attributes
+    extend Dry::Initializer
+    include ActiveModel::Validations
 
     def self.call(*args)
       new(*args).call
@@ -13,10 +14,6 @@ module AuxiliaryRails
       raise NotImplementedError
     end
 
-    def errors
-      @errors ||= ActiveModel::Errors.new(self)
-    end
-
     def failure?
       status?(:failure)
     end
@@ -31,16 +28,18 @@ module AuxiliaryRails
       status?(:success)
     end
 
+    # Shortcut for `ActiveRecord::Base.transaction`
     def transaction(&block)
       ActiveRecord::Base.transaction(&block) if block_given?
     end
 
     # Method for ActiveModel::Errors
     def read_attribute_for_validation(attr_name)
+      attr_name = attr_name.to_sym
       if attr_name == :command
         self
       else
-        attribute(attr_name)
+        self.class.dry_initializer.attributes(self)[attr_name]
       end
     end
 

data/lib/auxiliary_rails/version.rb

@@ -1,3 +1,3 @@
 module AuxiliaryRails
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/generators/auxiliary_rails/command_generator.rb

@@ -0,0 +1,44 @@
+require 'rails'
+
+module AuxiliaryRails
+  class CommandGenerator < ::Rails::Generators::NamedBase
+    desc 'Stubs out a new Command and spec.'
+
+    source_root File.expand_path('templates/commands', __dir__)
+
+    class_option :path,
+      type: :string,
+      default: 'app/commands',
+      desc: 'Command location'
+
+    def create_command_file
+      FileUtils.mkdir_p(command_file_path)
+      template 'command_template.rb',
+        "#{command_file_path}/#{command_file_name}.rb"
+    end
+
+    def create_command_spec_file
+      FileUtils.mkdir_p(command_spec_path)
+      template 'command_spec_template.rb',
+        "#{command_spec_path}/#{command_file_name}_spec.rb"
+    end
+
+    private
+
+    def command_class_name
+      "#{class_name.gsub(/Command$/, '')}Command"
+    end
+
+    def command_file_name
+      command_class_name.underscore
+    end
+
+    def command_file_path
+      options[:path]
+    end
+
+    def command_spec_path
+      command_file_path.gsub(/^app\//, 'spec/')
+    end
+  end
+end

data/lib/generators/auxiliary_rails/install_commands_generator.rb

@@ -2,7 +2,7 @@ require 'rails'
 
 module AuxiliaryRails
   class InstallCommandsGenerator < ::Rails::Generators::Base
-    source_root File.expand_path('templates', __dir__)
+    source_root File.expand_path('templates/commands', __dir__)
 
     def copy_application_command_file
       copy_file 'application_command_template.rb',

data/lib/generators/auxiliary_rails/templates/commands/command_spec_template.rb

@@ -0,0 +1,11 @@
+require 'rails_helper'
+
+describe <%= command_class_name %> do
+  describe '#call' do
+    it 'succeeds' do
+      # TODO: implement spec for command
+      # expect(described_class.call).to be_success
+      skip
+    end
+  end
+end

data/lib/generators/auxiliary_rails/templates/commands/command_template.rb

@@ -0,0 +1,6 @@
+class <%= command_class_name %> < ApplicationCommand
+  def call
+    # TODO: implement <%= command_class_name %>.call method
+    success!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auxiliary_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Babenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,30 +43,36 @@ dependencies:
   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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +129,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-initializer-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +194,7 @@ files:
 - lib/auxiliary_rails/version.rb
 - lib/auxiliary_rails/view_helpers.rb
 - lib/generators/auxiliary_rails/api_resource_generator.rb
+- lib/generators/auxiliary_rails/command_generator.rb
 - lib/generators/auxiliary_rails/install_commands_generator.rb
 - lib/generators/auxiliary_rails/install_errors_generator.rb
 - lib/generators/auxiliary_rails/install_generator.rb
@@ -182,8 +203,10 @@ files:
 - lib/generators/auxiliary_rails/templates/apis/api_helper_template.rb.erb
 - lib/generators/auxiliary_rails/templates/apis/api_resource_spec_template.rb.erb
 - lib/generators/auxiliary_rails/templates/apis/api_resource_template.rb.erb
-- lib/generators/auxiliary_rails/templates/application_command_template.rb
 - lib/generators/auxiliary_rails/templates/application_error_template.rb
+- lib/generators/auxiliary_rails/templates/commands/application_command_template.rb
+- lib/generators/auxiliary_rails/templates/commands/command_spec_template.rb
+- lib/generators/auxiliary_rails/templates/commands/command_template.rb
 - lib/generators/auxiliary_rails/templates/rubocop/rubocop_auxiliary_rails_template.yml
 - lib/generators/auxiliary_rails/templates/rubocop/rubocop_template.yml
 - templates/rails/elementary.rb