scaffold_pico 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6252d7d37ef3137b59bca56ca783c27a189ad02
-  data.tar.gz: c22de7e4559f054972670417c304863612a896d4
+  metadata.gz: 54d6aa9f935ff9204b98ff880dc5a5df4cab415a
+  data.tar.gz: c3fb84df209e9c391a6dc681b680cb49e868c2f6
 SHA512:
-  metadata.gz: cb7107ddd6cf2075ab3ad3942279104aed0c5cd6b6fc922151fd0d42f6fc17d794fe9e530a08eaaf676ca6831340950f05672cd862356118f6670a685ed85722
-  data.tar.gz: 3d91bf047b15ac72f1adb6f5fddc11e31e1eca9cb156ba32943975c43fa06ecd39e3ee9549ebca3c6728aa2e97046e68aa38826ce5e27152a728ed19eddbe329
+  metadata.gz: c9ea4e9a1e107e18d4fdae253ddc2c2a09eae3987482518c67d97d05f22addfa89a1c1376773ebdac7e9ed39c98bf4ef4f285059cd639ce16ab706047d74545e
+  data.tar.gz: 01615efab46b43b4b02955016df7457d4f9e90d32335d2f98bac50828c761f9d4523da2a20faf334fb9191bac0636121c0e49d8f29396ff92090f03cbef48c91

data/lib/scaffold/generators/base_generator.rb

@@ -40,25 +40,20 @@ module Scaffold
       end
 
       def write_with_confirmation(target_file_path, content)
-        unless File.exists?(target_file_path)
+        if !File.exists?(target_file_path) || @rails.choice[:force].present?
           IO.write(target_file_path, content)
           return
         end
 
-        @@aways_ovewrite = 'a' if @rails.choice[:force].present?
-
         answer = if @@aways_ovewrite
-          if @rails.choice[:force].blank?
-            puts "#{target_file_path} exists, overwrite? [yaN] y"
-          end
-          'y'
+          'a'
         else
-           ask("#{target_file_path} exists, overwrite? [yaN]").downcase
+          ask("#{target_file_path} exists, overwrite? [yaN]").downcase
         end
 
-        @@aways_ovewrite = true if answer == 'a'
+        @@aways_ovewrite = answer == 'a'
 
-        IO.write(target_file_path, content) if answer == 'y'
+        IO.write(target_file_path, content) if answer == 'y' || @@aways_ovewrite
       end
 
       def parse_template(content, context_hash)

data/lib/scaffold/services/controller.rb

@@ -7,8 +7,8 @@ module Scaffold
 
       # example: Manage::BooksController
       def class_name
-        if @rails.controller.namespaced?
-          "#{namespaces_as_modules}::#{@rails.resource.class_name.pluralize}Controller"
+        if self.namespaced?
+          "#{self.namespaces_as_modules}::#{@rails.resource.class_name.pluralize}Controller"
         else
           "#{@rails.resource.class_name.pluralize}Controller"
         end

data/lib/templates/pico/controller.rb.erb

@@ -1,7 +1,7 @@
 class <%= @rails.controller.class_name %> < <%= @rails.controller.base_controller %>
 
   protect_from_forgery with: :exception
-                                                                
+
 <% @rails.nested_in_resources.each do |resource| -%>
   def <%= resource.name %>
     <%= resource.instance_name %> ||= <%= resource.class_name_with_modules %>.find(params[:<%= resource.param_name %>])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_pico
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - gudata