next_rails_scaffold 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c927e1fa3e4aedbe0f200329d7940ad2762339b18a40cab4c9ab96e5d3ccf37
-  data.tar.gz: 48aef6d4c24f14d83ac02b762e27f74f1536051daf101d2eabc23ee064d13cbb
+  metadata.gz: 61a007475e3652a12c1485ca409d7e3d3ac1ebe4e3bc14b77b2bd3846e70da4b
+  data.tar.gz: c440c329a0c6eae1568ad570dcd3bb26f80a8959a7af16d8b9dea666b877e108
 SHA512:
-  metadata.gz: ad57f6aaddc7318aaa6d6fe1a64001475813e267207a287c2645cd0345690f512d7987801f54102b95005aa9f9b47072f170d83718e72b548ae36b02187a9be8
-  data.tar.gz: 93bf210d3f8a2f9fa7387f1f3fc64bd3dba00aae2df3c7710ce3700145222f97e3687820011506c9e852dcf21fb3dbe55f208da4714f55ba0e18a3daa62f41ac
+  metadata.gz: ff1383e807e8b2587b2aaa49001d1a362bc57b774122d5e9bf83644da4f7fbaeab2b5e943a4ee51480f9e9e5149f66c25d5676c6612acdf4e3ebe359eee298ef
+  data.tar.gz: b894860a96dec1fdbe8792700749c9fd1a58c741d39ec4ed13a7e898011c8f59c63e618af0d894864a3f53278e1fb2798676906da70440ad578cfb62037e4cdb

data/lib/generators/rails/next_rails/next_rails_generator.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Rails
-  include NextRails::Actions
-
   class NextRailsGenerator < Rails::Generators::NamedBase
+    include ::NextRails::Actions
+
     source_root File.expand_path("templates", __dir__)
 
     NODE_REQUIRED_VERSION = ">= 18.17.0"

data/lib/next_rails/actions.rb

@@ -1,41 +1,43 @@
 # frozen_string_literal: true
 
 module NextRails
-  # Make an entry in Rails routing file <tt>config/routes.rb</tt>
-  #
-  #   route "root 'welcome#index'"
-  #   route "root 'admin#index'", namespace: :admin
-  #   route "root 'admin#index'", namespace: :admin, scope: '/api'
-  def route(routing_code, namespace: nil, scope: nil)
-    namespace = Array(namespace)
-    namespace_pattern = route_namespace_pattern(namespace)
-    routing_code = namespace.reverse.reduce(routing_code) do |code, name|
-      "namespace :#{name} do\n#{rebase_indentation(code, 2)}end"
-    end
+  module Actions
+    # Make an entry in Rails routing file <tt>config/routes.rb</tt>
+    #
+    #   route "root 'welcome#index'"
+    #   route "root 'admin#index'", namespace: :admin
+    #   route "root 'admin#index'", namespace: :admin, scope: '/api'
+    def route(routing_code, namespace: nil, scope: nil)
+      namespace = Array(namespace)
+      namespace_pattern = route_namespace_pattern(namespace)
+      routing_code = namespace.reverse.reduce(routing_code) do |code, name|
+        "namespace :#{name} do\n#{rebase_indentation(code, 2)}end"
+      end
 
-    scope = Array(scope)
-    routing_code = scope.reverse.reduce(routing_code) do |code, name|
-      "scope '#{name}' do\n#{rebase_indentation(code, 2)}end"
-    end
+      scope = Array(scope)
+      routing_code = scope.reverse.reduce(routing_code) do |code, name|
+        "scope '#{name}' do\n#{rebase_indentation(code, 2)}end"
+      end
 
-    log :route, routing_code
+      log :route, routing_code
 
-    in_root do
-      if (namespace_match = match_file("config/routes.rb", namespace_pattern))
-        base_indent, *, existing_block_indent = namespace_match.captures.compact.map(&:length)
-        existing_line_pattern = /^ {,#{existing_block_indent}}\S.+\n?/
-        routing_code = rebase_indentation(routing_code, base_indent + 2).gsub(existing_line_pattern, "")
-        namespace_pattern = /#{Regexp.escape namespace_match.to_s}/
-      end
+      in_root do
+        if (namespace_match = match_file("config/routes.rb", namespace_pattern))
+          base_indent, *, existing_block_indent = namespace_match.captures.compact.map(&:length)
+          existing_line_pattern = /^ {,#{existing_block_indent}}\S.+\n?/
+          routing_code = rebase_indentation(routing_code, base_indent + 2).gsub(existing_line_pattern, "")
+          namespace_pattern = /#{Regexp.escape namespace_match.to_s}/
+        end
 
-      inject_into_file "config/routes.rb", routing_code, after: namespace_pattern, verbose: false, force: false
+        inject_into_file "config/routes.rb", routing_code, after: namespace_pattern, verbose: false, force: false
 
-      if behavior == :revoke && namespace.any? && namespace_match
-        empty_block_pattern = /(#{namespace_pattern})((?:\s*end\n){1,#{namespace.size}})/
-        gsub_file "config/routes.rb", empty_block_pattern, verbose: false, force: true do |matched|
-          beginning, ending = empty_block_pattern.match(matched).captures
-          ending.sub!(/\A\s*end\n/, "") while !ending.empty? && beginning.sub!(/^ *namespace .+ do\n\s*\z/, "")
-          beginning + ending
+        if behavior == :revoke && namespace.any? && namespace_match
+          empty_block_pattern = /(#{namespace_pattern})((?:\s*end\n){1,#{namespace.size}})/
+          gsub_file "config/routes.rb", empty_block_pattern, verbose: false, force: true do |matched|
+            beginning, ending = empty_block_pattern.match(matched).captures
+            ending.sub!(/\A\s*end\n/, "") while !ending.empty? && beginning.sub!(/^ *namespace .+ do\n\s*\z/, "")
+            beginning + ending
+          end
         end
       end
     end

data/lib/next_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NextRails
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/next_rails.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "next_rails/actions"
 require_relative "next_rails/version"
 
 module NextRails
@@ -7,7 +8,7 @@ module NextRails
 
   @@configured = false
 
-  def self.configured? #:nodoc:
+  def self.configured? # :nodoc:
     @@configured
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: next_rails_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Raphael Araújo