effective_developer 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c950de342d073c07427aa516389a9271a7c4c44
-  data.tar.gz: d95f82b1f7219b99bf542576b96f17a9d507118b
+  metadata.gz: 869a0360b0421b9efd42f297cb23a6869b8eaa76
+  data.tar.gz: 98d76ce74f926a3600702680a558c0f9204a2559
 SHA512:
-  metadata.gz: f0e19413a78e4902b85702ad599b69c40c4f47904e587061f9087ab6f96f1ecd95d7c25415760746205cf61cda317491e9885e3d42da4582934f472e21894c01
-  data.tar.gz: a5cfae5b14be51933f1d03b7c5890a855aadd506d4b8e8e2798c53296d6d19d6bbd4b01e3b0ae9a1a1eb0912b00aab9bdb3eba2403848066f160de74332b464c
+  metadata.gz: 18ae8153ee5d8abfed4df8d8b39cc61b9c2e57d57a6943b7e7d72839564164505da644c07ecc6f8b386005dfd37cfff46cfe11c0e9916e2eac31bac380a09779
+  data.tar.gz: e1404d7301a08146a85fdefc08c1238b9794156ee40749ed0bcd9f661632f5d8cb0e12ca780cba848811e3d17b82a6eeb071cd5a277e84648fbef67f71e7c55a

data/README.md

@@ -162,13 +162,13 @@ rake csv:import:foos
 Scaffolds an `Effective::CSVImporter` file for each .csv file in `/lib/csv_importers/data/*.csv`
 
 ```ruby
-rake csv:import:scaffold
+rake csv:scaffold
 ```
 
 or
 
 ```ruby
-rake csv:import:scaffold[users]
+rake csv:scaffold[users]
 ```
 
 ## rename_class

data/app/models/effective/csv_importer.rb

@@ -148,7 +148,19 @@ module Effective
         @current_row = row
 
         begin
-          yield
+          exception = false
+
+          ActiveRecord::Base.transaction do
+            begin
+              yield
+            rescue => e
+              exception = e
+              raise ActiveRecord::Rollback
+            end
+          end
+
+          raise exception if exception
+
           print colorize('.', :green)
         rescue => e
           error(e.message)

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.2.10'.freeze
+  VERSION = '0.2.11'.freeze
 end

data/lib/generators/effective/menu_generator.rb

@@ -20,7 +20,7 @@ module Effective
         begin
           Effective::CodeWriter.new((['app/views'] + resource.namespaces + ['_navbar.html.haml']).join('/')) do |w|
             if w.find { |line, _| line == menu_content.last.strip }
-              say_status :identical, resource.index_path, :blue
+              say_status :identical, resource.action_path(:index), :blue
             else
               index = w.last { |line, _| line.start_with?('- if can?') }
 
@@ -29,7 +29,7 @@ module Effective
               end
 
               w.insert_raw(menu_content, index+1, w.depth_at(index))
-              say_status :menu, resource.index_path, :green
+              say_status :menu, resource.action_path(:index), :green
             end
           end
         rescue Errno::ENOENT
@@ -42,7 +42,7 @@ module Effective
         begin
           Effective::CodeWriter.new('lib/tasks/generate/effective_menus.rake') do |w|
             if w.find { |line, _| line == effective_menus_content }
-              say_status :identical, resource.index_path, :blue
+              say_status :identical, resource.action_path(:index), :blue
             else
               index = w.first { |line, _| line.start_with?('item') }
 
@@ -65,12 +65,12 @@ module Effective
         [
           "\n",
           "- if can? :manage, #{resource.class_name}",
-          "  %li= link_to '#{resource.plural_name.titleize}', #{resource.index_path}"
+          "  %li= link_to '#{resource.plural_name.titleize}', #{resource.action_path(:index)}"
         ]
       end
 
       def effective_menus_content
-        "item '#{resource.plural_name.titleize}', :#{resource.index_path}"
+        "item '#{resource.plural_name.titleize}', :#{resource.action_path(:index)}"
       end
 
     end

data/lib/generators/effective/scaffold_controller_generator.rb

@@ -30,9 +30,9 @@ module Effective
         Rails::Generators.invoke('effective:ability', [name] + invoked_actions)
       end
 
-      def invoke_menu
-        Rails::Generators.invoke('effective:menu', [name])
-      end
+      # def invoke_menu
+      #   Rails::Generators.invoke('effective:menu', [name])
+      # end
 
       def invoke_datatable
         unless invoked_actions.include?('index')

data/lib/generators/effective/scaffold_generator.rb

@@ -41,9 +41,9 @@ module Effective
         Rails::Generators.invoke('effective:ability', [name] + invoked_actions)
       end
 
-      def invoke_menu
-        Rails::Generators.invoke('effective:menu', [name])
-      end
+      # def invoke_menu
+      #   Rails::Generators.invoke('effective:menu', [name])
+      # end
 
       def invoke_datatable
         unless invoked_actions.include?('index')

data/lib/generators/effective/views_generator.rb

@@ -38,7 +38,11 @@ module Effective
       private
 
       def available_actions
-        %w(index new show edit)
+        if defined?(EffectiveResources) # We don't need any views!
+          []
+        else
+          %w(index new show edit)
+        end
       end
 
     end

data/lib/scaffolds/controllers/controller.rb

@@ -134,9 +134,9 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
     when 'Save'
       <%= resource.edit_path_helper %>
     when 'Save and Continue'
-      <%= resource.index_path %>
+      <%= resource.index_path_helper %>
     when 'Save and Add New'
-      <%= resource.new_path %>
+      <%= resource.new_path_helper %>
     else
       raise 'Unexpected redirect path'
     end

data/lib/scaffolds/forms/default/_form.html.haml

@@ -6,11 +6,11 @@
 <%= render_field(attribute, depth: 1) %>
 <% end -%>
 
-  <% if defined?(EffectiveResources) -%>
+<% if defined?(EffectiveResources) -%>
   = simple_form_submit(f)
-  <% else -%>
+<% else -%>
   .form-actions
     = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
     = f.button :submit, 'Save and Continue', data: { disable_with: 'Saving...' }
     = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
-  <% end -%>
+<% end -%>

data/lib/scaffolds/views/index.html.haml

@@ -2,7 +2,7 @@
 
 <% if actions.include?('new') -%>
 - if can?(:new, <%= resource.class_name %>)
-  %p.text-right= link_to 'New <%= resource.human_name %>', <%= resource.new_path %>, class: 'btn btn-primary'
+  %p.text-right= link_to 'New <%= resource.human_name %>', <%= resource.action_path(:new) %>, class: 'btn btn-primary'
 
 <% end -%>
 <% if defined?(EffectiveDatatables) -%>

data/lib/tasks/effective_csv_importer.rake

@@ -10,8 +10,8 @@
 
 # rake csv:import:posts (one task created per model)
 # rake csv:import:all
-# rake csv:import:scaffold
-# rake csv:import:scaffold[users]
+# rake csv:scaffold
+# rake csv:scaffold[users]
 # rake csv:export
 
 namespace :csv do
@@ -47,30 +47,32 @@ namespace :csv do
         Rake::Task["csv:import:#{importer}"].invoke
       end
     end
+  end
 
-    # rake csv:scaffold
-    # rake csv:scaffold[users]
-    desc 'Scaffold an Effective::CSVImporter for each /lib/csv_importers/data/*.csv file'
+  # rake csv:scaffold
+  # rake csv:scaffold[users]
+  desc 'Scaffold an Effective::CSVImporter for each /lib/csv_importers/data/*.csv file, defaults to all'
 
-    task :scaffold, [:file_name] => :environment do |t, args|
-      args.with_defaults(file_name: 'all')
+  task :scaffold, [:file_name] => :environment do |t, args|
+    args.with_defaults(file_name: 'all')
 
-      require 'csv'
+    require 'csv'
 
-      generator = ERB.new(File.read(File.dirname(__FILE__) + '/../scaffolds/importers/csv_importer.rb'))
-      letters = ('A'..'AT').to_a
+    generator = ERB.new(File.read(File.dirname(__FILE__) + '/../scaffolds/importers/csv_importer.rb'))
+    letters = ('A'..'AT').to_a
 
-      Dir['lib/csv_importers/data/*.csv'].each do |file|
-        csv_file = file.split('/').last.gsub('.csv', '')
+    Dir['lib/csv_importers/data/*.csv'].each do |file|
+      csv_file = file.split('/').last.gsub('.csv', '')
 
-        next if (Array(args.file_name) != ['all'] && Array(args.file_name).include?(csv_file) == false)
+      next if (Array(args.file_name) != ['all'] && Array(args.file_name).include?(csv_file) == false)
+      next if args.file_name == 'all' && File.exists?("#{Rails.root}/lib/csv_importers/#{csv_file}_importer.rb")
 
-        klass = csv_file.classify.pluralize
-        columns = CSV.open(file, 'r') { |csv| csv.first }
+      klass = csv_file.classify.pluralize
+      columns = CSV.open(file, 'r') { |csv| csv.first }
 
-        File.open("#{Rails.root}/lib/csv_importers/#{csv_file}_importer.rb", 'w') do |file|
-          file.write generator.result(binding)
-        end
+      File.open("#{Rails.root}/lib/csv_importers/#{csv_file}_importer.rb", 'w') do |file|
+        file.write generator.result(binding)
+        puts "created lib/csv_importers/#{csv_file}_importer.rb"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails