auxiliary_rails 0.1.6 → 0.3.1

data/lib/generators/auxiliary_rails/templates/apis/api_resource_template.rb.erb

@@ -12,21 +12,25 @@ module <%= api_module_name %>::Resources
     end
 
     resource :<%= plural_name %> do
-      desc 'Returns resource collection'
+      desc 'Returns a collection of <%= plural_name %>' do
+        success <%= entity_class_name %>
+      end
       get do
-        # TODO: authorize resource, :index?
+        # TODO: authorize <%= class_name %>, :index?
         present collection,
           with: <%= entity_class_name %>
       end
 
-      desc 'Creates a <%= class_name %>'
+      desc 'Creates a <%= class_name %>' do
+        success <%= entity_class_name %>
+      end
       params do
         requires :<%= singular_name %>, type: Hash do
           # TODO: define resource params or remove `params` block
         end
       end
       post do
-        @<%= singular_name %> = <%= class_name %>.new(declared(params)[:<%= singular_name %>])
+        @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
         # TODO: authorize resource, :create?
         resource.save!
         present resource,
@@ -44,14 +48,16 @@ module <%= api_module_name %>::Resources
             with: <%= entity_class_name %>
         end
 
-        desc 'Updates a <%= class_name %>'
+        desc 'Updates a <%= class_name %>' do
+          success <%= entity_class_name %>
+        end
         params do
           requires :<%= singular_name %>, type: Hash do
             # TODO: define resource params or remove `params` block
           end
         end
         put do
-          resource.assign_attributes(declared(params)[:<%= singular_name %>])
+          resource.assign_attributes(params[:<%= singular_name %>])
           # TODO: authorize resource, :update?
           resource.save!
           present resource,

data/lib/generators/auxiliary_rails/templates/application_error_template.rb

@@ -1,2 +1,2 @@
-class ApplicationError < AuxiliaryRails::AbstractError
+class ApplicationError < AuxiliaryRails::Application::Error
 end

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

@@ -0,0 +1,2 @@
+class ApplicationCommand < AuxiliaryRails::Application::Command
+end

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 perform
+    # TODO: implement <%= command_class_name %>.perform method
+    success!
+  end
+end

data/lib/generators/auxiliary_rails/templates/commands/commands.en_template.yml

@@ -0,0 +1,5 @@
+en:
+  commands:
+    errors:
+      messages:
+        validation_failed: validation failed

data/templates/rails/elementary.rb

@@ -3,21 +3,43 @@ gsub_file 'Gemfile', /^\s*#.*$\n/, ''
 gsub_file 'Gemfile', /^.*coffee.*$\n/, ''
 gsub_file 'Gemfile', /^.*jbuilder.*$\n/, ''
 gsub_file 'Gemfile', /^.*tzinfo-data.*$\n/, ''
+gsub_file 'Gemfile', /^group :development, :test do\n.*byebug.*\nend\n\n/, ''
 
-gem 'auxiliary_rails',
-  git: 'https://github.com/ergoserv/auxiliary_rails',
-  branch: 'develop'
+gsub_file '.gitignore', /^\s*#.*$\n/, ''
+gsub_file 'config/routes.rb', /^\s*#.*$\n/, ''
+
+gsub_file 'config/database.yml', /^\s*#.*$\n/, ''
+gsub_file 'config/database.yml', /^\s*pool.*$\n/, <<-FILE
+  host: <%= ENV['DATABASE_HOST'] %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
+FILE
+
+# Create RuboCop files
+file '.rubocop.yml', <<~FILE
+  inherit_gem:
+    rubocop-ergoserv:
+      - config/default.yml
+FILE
+
+run 'touch .env'
+append_file '.gitignore', <<~FILE
+  .env*.local
+FILE
+
+# Gemfile additions
+gem 'auxiliary_rails'
 
 gem_group :development, :test do
+  gem 'byebug'
+  gem 'dotenv-rails'
   gem 'factory_bot_rails'
   gem 'faker'
-  gem 'pry-byebug'
   gem 'pry-rails'
   gem 'rspec-rails'
-  gem 'rubocop'
-  gem 'rubocop-performance'
-  gem 'rubocop-rails'
-  gem 'rubocop-rspec'
+  gem 'rubocop-ergoserv',
+    git: 'https://github.com/ergoserv/rubocop-ergoserv',
+    require: false
 end
 
 gem_group :test do
@@ -28,6 +50,14 @@ end
 after_bundle do
   # ensure using the latest versions of gems
   run 'bundle update'
-  rails_command 'generate auxiliary_rails:install_rubocop --no-specify-gems'
-  rails_command 'generate rspec:install'
+  run 'bundle binstubs rubocop'
+
+  generate 'rspec:install'
+
+  generate 'controller', 'pages', 'home',
+    '--no-assets',
+    '--no-helper',
+    '--no-test-framework',
+    '--skip-routes'
+  route "root to: 'pages#home'"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auxiliary_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmitry Babenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,49 +40,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,19 +110,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-initializer
+  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: 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: 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
@@ -149,11 +197,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -165,27 +215,34 @@ files:
 - auxiliary_rails.gemspec
 - bin/auxiliary_rails
 - bin/console
+- bin/rubocop
 - bin/setup
+- bitbucket-pipelines.yml
 - lib/auxiliary_rails.rb
-- lib/auxiliary_rails/abstract_command.rb
-- lib/auxiliary_rails/abstract_error.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
 - 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
-- lib/generators/auxiliary_rails/install_rubocop_generator.rb
 - lib/generators/auxiliary_rails/templates/apis/api_entity_template.rb.erb
 - 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/rubocop/rubocop_auxiliary_rails_template.yml
-- lib/generators/auxiliary_rails/templates/rubocop/rubocop_template.yml
+- 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/commands/commands.en_template.yml
 - templates/rails/elementary.rb
 homepage: https://github.com/ergoserv/auxiliary_rails
 licenses:
@@ -193,7 +250,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ergoserv/auxiliary_rails
   source_code_uri: https://github.com/ergoserv/auxiliary_rails
-  changelog_uri: https://github.com/ergoserv/auxiliary_rails/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/ergoserv/auxiliary_rails/releases
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/auxiliary_rails/abstract_command.rb

@@ -1,96 +0,0 @@
-require 'active_model'
-
-module AuxiliaryRails
-  class AbstractCommand
-    include ActiveModel::Model
-    include ActiveModel::Attributes
-
-    def self.call(*args)
-      new(*args).call
-    end
-
-    def call
-      raise NotImplementedError
-    end
-
-    def errors
-      @errors ||= ActiveModel::Errors.new(self)
-    end
-
-    def failure?
-      status?(:failure)
-    end
-
-    def status?(value)
-      ensure_execution!
-
-      status == value&.to_sym
-    end
-
-    def success?
-      status?(:success)
-    end
-
-    def transaction(&block)
-      ActiveRecord::Base.transaction(&block) if block_given?
-    end
-
-    # Method for ActiveModel::Errors
-    def read_attribute_for_validation(attr_name)
-      if attr_name == :command
-        self
-      else
-        attribute(attr_name)
-      end
-    end
-
-    # Method for ActiveModel::Translation
-    def self.i18n_scope
-      :commands
-    end
-
-    protected
-
-    attr_accessor :status
-
-    def ensure_empty_errors!
-      return if errors.empty?
-
-      error!("`#{self.class}` contains errors.")
-    end
-
-    def ensure_empty_status!
-      return if status.nil?
-
-      error!("`#{self.class}` was already executed.")
-    end
-
-    def ensure_execution!
-      return if status.present?
-
-      error!("`#{self.class}` was not executed yet.")
-    end
-
-    def error!(message = nil)
-      message ||= "`#{self.class}` raised error."
-      raise ApplicationError, message
-    end
-
-    def failure!(message = nil)
-      ensure_empty_status!
-
-      errors.add(:command, :failed, message: message) unless message.nil?
-
-      self.status = :failure
-      self
-    end
-
-    def success!
-      ensure_empty_errors!
-      ensure_empty_status!
-
-      self.status = :success
-      self
-    end
-  end
-end