interage-request 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e4804dec76967fdc3a51551d2d7bbed163464544acacea44d74adedcb2f9f4
-  data.tar.gz: cf05912afeeef17680c418babf304c47455b22617eca91b4c39759ba7ddfcf97
+  metadata.gz: 15230f74201e69eb0c6bff7855b00da6a604e3b4a67936e86e710aed76d16c24
+  data.tar.gz: 1b7720990fc7eebe2969ae87849b7c104b7f036e6da3762772a5676ec4c1abd4
 SHA512:
-  metadata.gz: 8c28d57ab9fa9c4135fa0020abc8c5afcca732d53a5745f39a2f192fd2d82ea5a1cc7fa34fb4f9922fb6e612c066206da64b86707db7dc7a57ca012454000d7a
-  data.tar.gz: 7fb7f13ed9f00f46ba954b603d399525c149e1515f87da99712aa2562e80dd1cda7322c3cf60d97a9aff4825a30a13391bafe29cfc1462b94d0a73b63d749a99
+  metadata.gz: bc3e902e3885513ee2d108d2c53c8aa661febd3e5a180592cf9566c21bded357a043d0b4cb4871efa8f94a7605e428e9967a89bee1e3233ce8922c7acd91e95e
+  data.tar.gz: 1a0b8b1e2f0292eefe40b50b707c426c50af2f55dd42a9214a2088a2ddebb5a5d6ea14d3cfcfec83812059969141393def99fb496e451bea859e7b9aa9346676

data/CHANGES

@@ -1,3 +1,16 @@
+Version 0.2.0:
+ - Cria binário de publicar gem
+ - Atualiza Documentação
+ - Ajusta binário do CI
+ - Altera url do repositório git
+ - Ajusta README
+ - Atualiza documentação
+ - Ajusta geradores e adiciona form
+ - Adiciona gem empacotadas no gitignore
+ - Refatora a classe ApplicationRequest
+ - Atualiza arquivo de versão
+ - Atualiza dependencias de desenvolvimento
+
 Version 0.1.3:
  - Altera arquivos VERSION e CHANGES para 0.1.3
  - Empacota nova versão da gem

data/Gemfile

@@ -18,5 +18,5 @@ group :development, :test do
   # https://github.com/presidentbeef/brakeman
   gem 'brakeman', '~> 4.8', '>= 4.8.1', require: false
   # https://github.com/rails/rails/tree/master/activesupport#download-and-installation
-  gem 'activesupport', '~> 5.2', '>= 5.2.4.2'
+  gem 'activesupport', '~> 6.0'
 end

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    interage-request (0.2.0)
+    interage-request (0.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
     brakeman (4.8.1)
     coderay (1.1.2)
@@ -20,7 +21,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     method_source (1.0.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     parallel (1.19.1)
     parser (2.7.1.2)
       ast (~> 2.4.0)
@@ -60,12 +61,13 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.2, >= 5.2.4.2)
+  activesupport (~> 6.0)
   brakeman (~> 4.8, >= 4.8.1)
   bundler (~> 2.0)
   interage-request!

data/README.md

@@ -36,16 +36,16 @@ class ApplicationRequest < ::Interage::ApplicationRequest
 end
 ```
 
-And `ApplicationForm`
+And `ApplicationBuilder`
 
 
 ```ruby
-# app/models/application_form.rb
-class ApplicationForm < ::Interage::ApplicationForm
+# app/builders/application_builder.rb
+class ApplicationBuilder < ::Interage::ApplicationBuilder
 end
 ```
 
-To create a request and form classes you also can use a Rails generator:
+To create a request and builder classes you also can use a Rails generator:
 
 
 ```bash
@@ -55,29 +55,52 @@ rails g interage:request:create store/order client_name payment_form
 This will create this classes:
 
 ```ruby
-# app/requests/orders_request.rb
+# app/requests/store/base_request.rb
 module Store
-  class OrdersRequest < ApplicationRequest
+  class BaseRequest < ::ApplicationRequest
     private
 
+    def api_base_url
+      "#{ENV.fetch('STORE_BASE_URL')}/v1/"
+    end
+
+    def headers
+      { 'Authorization-Token': ENV.fetch('STORE_AUTHORIZATION_TOKEN') }
+    end
+  end
+end
+
+# app/requests/store/orders_request.rb
+module Store
+  class OrdersRequest < ::Store::BaseRequest
+    private
+
+    def key_name
+      :order
+    end
+
     def klass
       ::Store::Order
     end
   end
 end
 
-# app/models/order.rb
-class Order < ApplicationForm
-  attr_accessor :client_name, :payment_form
+# app/builders/store/order.rb
+module Store
+  class Order < ApplicationBuilder
+    attr_accessor :client_name,
+                  :payment_form
 
-  def requester
-    @requester ||= ::Store::OrderRequest.new
-  end
+    def requester
+      @requester ||= ::Store::OrdersRequest.new
+    end
 
-  private
+    private
 
-  def changeable_attributes
-    { client_name: client_name, payment_form: payment_form }
+    def changeable_attributes
+      { client_name: client_name,
+        payment_form: payment_form }
+    end
   end
 end
 ```

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/publish

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+source config;
+
+execute bin/ci;
+
+execute release_start;
+
+CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`;
+RELEASE_VERSION=${CURRENT_BRANCH##*/v};
+
+execute gem build interage-request.gemspec;
+
+execute gem push interage-request-${RELEASE_VERSION}.gem;
+
+execute release_finish;

data/lib/generators/interage/request/create/USAGE

@@ -2,7 +2,9 @@ Description:
     Explain the generator
 
 Example:
-    rails g interage:request:create ClientsByDocument Client
+    rails g interage:request:create store/order client_name payment_form
 
     This will create:
-        /app/requests/clients_by_document_request.rb
+        /app/requests/store/base_request.rb
+        /app/requests/store/orders_request.rb
+        /app/builders/order.rb

data/lib/generators/interage/request/create/create_generator.rb

@@ -6,58 +6,119 @@ module Interage
       class CreateGenerator < Rails::Generators::NamedBase
         source_root File.expand_path('templates', __dir__)
 
-        desc 'Generates a request and form.'
+        desc 'Generates a request and builder.'
 
         def initialize(args, *_options)
           super
 
-          @form_filename = args.first
-          first_arg = form_filename.split('/')
-          @modulu = first_arg.shift.camelize if first_arg.size > 1
-          @form_name = first_arg.join('/').camelize
-          @form_fullname = "/#{form_filename}".camelize
-          @request_filename = "#{form_filename}_request"
+          @tab = '  '
+          @arguments = args
+          @request_param = arguments.shift.to_s.underscore
         end
 
         def create_request
-          create_file(new_request_file, sample_request_file)
+          if create_base_request?
+            template('base_request.rb', new_base_request_file)
+          end
 
-          create_file(new_form_file, sample_form_file)
+          template('request.rb', new_request_file)
+
+          template('builder.rb', new_builder_file)
         end
 
         private
 
-        attr_reader :modulu, :form_filename, :form_name, :form_fullname,
-                    :request_filename, :request_name
+        attr_reader :tab, :arguments, :request_param
+
+        def create_base_request?
+          !File.exist?(new_base_request_file) && modulu_exists?
+        end
+
+        def new_base_request_file
+          Rails.root.join("app/requests/#{base_request_path}.rb")
+        end
+
+        def base_request_path
+          "#{main_modulu.underscore}/base_request"
+        end
 
         def new_request_file
-          Rails.root.join("app/requests/#{request_filename}.rb")
+          Rails.root.join("app/requests/#{request_path}.rb")
+        end
+
+        def request_path
+          @request_path ||= begin
+            path =
+              request_param.gsub(prefix_class_name, prefix_class_name.pluralize)
+            "#{path}_request"
+          end
+        end
+
+        def request_class
+          @request_class ||= request_path.split('/').last.camelize
+        end
+
+        def request_full_class
+          (modulus + [request_class]).join('::')
+        end
+
+        def new_builder_file
+          Rails.root.join("app/builders/#{prefix_class_name}.rb")
         end
 
-        def sample_request_file
-          file = modulu.blank? ? 'request' : 'request_namespace'
+        def builder_class
+          @builder_class ||= builder_full_class.split('::').last
+        end
+
+        def builder_full_class
+          @builder_full_class ||= prefix_class_name.camelize
+        end
+
+        def builder_accessors
+          ":#{arguments.join(",\n#{tabs(modulus.count + 8)}:")}"
+        end
+
+        def builder_changeable_attributes
+          arguments.map { |argument| "#{argument}: #{argument}" }
+                   .join(",\n#{tabs(modulus.count + 3)}")
+        end
 
-          File.read(File.expand_path("templates/#{file}.rb", __dir__))
-              .gsub('{{REQUEST_NAME}}', "#{form_name}Request".camelize)
-              .gsub('{{FORM_NAME}}', form_fullname)
-              .gsub('{{MODULU}}', modulu)
+        def request_extend_class
+          modulu_exists? ? base_request_path.camelize : 'ApplicationRequest'
         end
 
-        def new_form_file
-          Rails.root.join("app/forms/#{form_filename}.rb")
+        def modulu_exists?
+          main_modulu.present?
         end
 
-        def sample_form_file
-          file = modulu.blank? ? 'form' : 'form_namespace'
+        def main_modulu
+          modulus.first.to_s
+        end
+
+        def modulus_init
+          0.upto(modulus.count - 1).map do |i|
+            "#{tabs(i)}module #{modulus[i]}"
+          end
+        end
+
+        def modules_end
+          modulus.count.downto(1).map { |i| "#{tabs(i - 1)}end" }
+        end
+
+        def modulus
+          @modulus ||= begin
+            names = builder_full_class.split('::')
+
+            names.take(names.count - 1)
+          end
+        end
 
-          File.read(File.expand_path("templates/#{file}.rb", __dir__))
-              .gsub('{{FORM_ATTRIBUTES}}', form_attributes)
-              .gsub('{{FORM_NAME}}', form_name)
-              .gsub('{{MODULU}}', modulu)
+        def tabs(size = nil)
+          tab * (size || modulus.count).to_i
         end
 
-        def form_attributes
-          ":#{@args.join(', :')}"
+        def prefix_class_name
+          @prefix_class_name ||= request_param.split('_by_').first
         end
       end
     end

data/lib/generators/interage/request/create/templates/base_request.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module <%= main_modulu %>
+  class BaseRequest < ::ApplicationRequest
+    private
+
+    def api_base_url
+      "#{ENV.fetch('<%= main_modulu.upcase %>_BASE_URL')}/v1/"
+    end
+
+    def headers
+      { 'Authorization-Token': ENV.fetch('<%= main_modulu.upcase %>_AUTHORIZATION_TOKEN') }
+    end
+  end
+end

data/lib/generators/interage/request/create/templates/builder.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+<%= "\n#{modulus_init.join("\n")}" if modulu_exists? %>
+<%= tabs %>class <%= builder_class %> < ApplicationBuilder
+<%= tabs %>  attr_accessor <%= builder_accessors %>
+
+<%= tabs %>  def requester
+<%= tabs %>    @requester ||= ::<%= request_full_class %>.new
+<%= tabs %>  end
+
+<%= tabs %>  private
+
+<%= tabs %>  def changeable_attributes
+<%= tabs %>    { <%= builder_changeable_attributes %> }
+<%= tabs %>  end
+<%= tabs %>end<%= "\n#{modules_end.join("\n")}" if modulu_exists? %>

data/lib/generators/interage/request/create/templates/request.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
+<%= "\n#{modulus_init.join("\n")}" if modulu_exists? %>
+<%= tabs %>class <%= request_class %> < ::<%= request_extend_class %>
+<%= tabs %>  private
 
-class {{REQUEST_NAME}} < ApplicationRequest
-  private
+<%= tabs %>  def key_name
+<%= tabs %>    :<%= builder_class.underscore %>
+<%= tabs %>  end
 
-  def klass
-    {{FORM_NAME}}
-  end
-end
+<%= tabs %>  def klass
+<%= tabs %>    ::<%= builder_full_class %>
+<%= tabs %>  end
+<%= tabs %>end<%= "\n#{modules_end.join("\n")}" if modulu_exists? %>

data/lib/generators/interage/request/install/USAGE

@@ -6,3 +6,4 @@ Example:
 
     This will create:
         /app/requests/application_request.rb
+        /app/builders/application_builder.rb

data/lib/generators/interage/request/install/install_generator.rb

@@ -10,7 +10,7 @@ module Interage
       def create_application_request
         copy_file('application_request.rb', application_request_path)
 
-        copy_file('application_form.rb', application_form_path)
+        copy_file('application_builder.rb', application_builder_path)
       end
 
       private
@@ -19,8 +19,8 @@ module Interage
         Rails.root.join('app/requests/application_request.rb')
       end
 
-      def application_form_path
-        Rails.root.join('app/forms/application_form.rb')
+      def application_builder_path
+        Rails.root.join('app/builders/application_builder.rb')
       end
     end
   end

data/lib/generators/interage/request/install/templates/application_builder.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationBuilder < ::Interage::ApplicationBuilder
+end

data/lib/interage/{application_form.rb → application_builder.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Interage
-  class ApplicationForm < ::Interage::Request::Form
+  class ApplicationBuilder < ::Interage::Request::Builder
     def self.paginate(*args)
       new.requester.paginate(*args)
     end

data/lib/interage/request.rb

@@ -9,10 +9,10 @@ module Interage
     end
 
     autoload :Base, 'interage/request/base'
-    autoload :Form, 'interage/request/form'
+    autoload :Builder, 'interage/request/builder'
     autoload :Start, 'interage/request/start'
   end
 
-  autoload :ApplicationForm, 'interage/application_form'
+  autoload :ApplicationBuilder, 'interage/application_builder'
   autoload :ApplicationRequest, 'interage/application_request'
 end

data/lib/interage/request/base.rb

@@ -43,7 +43,7 @@ module Interage
       end
 
       def klass
-        Interage::Request::Form
+        Interage::Request::Builder
       end
 
       def get(*args)

data/lib/interage/request/{form.rb → builder.rb}

@@ -2,7 +2,7 @@
 
 module Interage
   module Request
-    class Form
+    class Builder
       include ActiveModel::Model
 
       attr_accessor :id, :created_at, :updated_at

data/lib/interage/request/start.rb

@@ -18,7 +18,11 @@ module Interage
       end
 
       def perform
-        @response = http.start { |h| h.request(request) }
+        @response = Net::HTTP.start(uri.host, uri.port) do |http|
+          http.use_ssl = true if ssl?
+
+          http.request(request)
+        end
 
         self
       end
@@ -50,10 +54,6 @@ module Interage
 
       alias ssl? ssl
 
-      def http
-        @http ||= Net::HTTP.new(uri.hostname, uri.port, use_ssl: ssl?)
-      end
-
       def request
         @request ||= begin
           request = klass.new(uri)

data/lib/interage/request/version.rb

@@ -2,6 +2,6 @@
 
 module Interage
   module Request
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interage-request
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Walmir Neto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,25 +73,25 @@ files:
 - bin/bundle
 - bin/ci
 - bin/console
+- bin/publish
 - bin/rspec
 - bin/rubocop
 - bin/setup
 - interage-request.gemspec
 - lib/generators/interage/request/create/USAGE
 - lib/generators/interage/request/create/create_generator.rb
-- lib/generators/interage/request/create/templates/form.rb
-- lib/generators/interage/request/create/templates/form_namespace.rb
+- lib/generators/interage/request/create/templates/base_request.rb
+- lib/generators/interage/request/create/templates/builder.rb
 - lib/generators/interage/request/create/templates/request.rb
-- lib/generators/interage/request/create/templates/request_namespace.rb
 - lib/generators/interage/request/install/USAGE
 - lib/generators/interage/request/install/install_generator.rb
-- lib/generators/interage/request/install/templates/application_form.rb
+- lib/generators/interage/request/install/templates/application_builder.rb
 - lib/generators/interage/request/install/templates/application_request.rb
-- lib/interage/application_form.rb
+- lib/interage/application_builder.rb
 - lib/interage/application_request.rb
 - lib/interage/request.rb
 - lib/interage/request/base.rb
-- lib/interage/request/form.rb
+- lib/interage/request/builder.rb
 - lib/interage/request/start.rb
 - lib/interage/request/version.rb
 homepage: https://github.com/InterageASH/application-request
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Application Request for Interage

data/lib/generators/interage/request/create/templates/form.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class {{FORM_NAME}} < ApplicationForm
-  attr_accessor {{FORM_ATTRIBUTES}}
-end

data/lib/generators/interage/request/create/templates/form_namespace.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module {{MODULU}}
-  class {{FORM_NAME}} < ApplicationForm
-    attr_accessor {{FORM_ATTRIBUTES}}
-  end
-end

data/lib/generators/interage/request/create/templates/request_namespace.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module {{MODULU}}
-  class {{REQUEST_NAME}} < ApplicationRequest
-    private
-
-    def klass
-      {{FORM_NAME}}
-    end
-  end
-end

data/lib/generators/interage/request/install/templates/application_form.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationForm < ::Interage::ApplicationForm
-end