effective_developer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1975bd0775294de65297b619248e266ab88a87
-  data.tar.gz: 34efafaa3dce62af63bcb3571e72383dbb8fd065
+  metadata.gz: f41039ceac09c55fe7ae821452bc2d570bb2279c
+  data.tar.gz: 4078bf19bfc90c29a6e67253ed1cbb3d54cef519
 SHA512:
-  metadata.gz: 3dd047b0be47a0266fc26d71ae6b127dc4e56d363303eb1a0426e36d1a2c69f65018c119f904a3c5525454adddc2df5e417ec6056f0c86ad617688cc280227c6
-  data.tar.gz: 4ad38f81ea47ee63c013932cb6fd23e4d730839b11357d27b9a218ee8fc1a7658a15275635dd97df33f337cacead0dfa13619a48ac63f1a599bed8ef2726f998
+  metadata.gz: e776f703a4753b14d2b507be9c1beb72e7024879241fbfd2016dd0879efce73355f18a779a7fd8b9b782d3eb9ab675f8bcd243eb9e4ef6d6bc71b0c1077e3bc5
+  data.tar.gz: 46fcc829aa004135e7412f919e385335ae5e33a6102551674d3a7034a3ec32fd034ae4944b188e6f191cdd6ec6b6dc1f55ce701f38794f8d1d8de153b4f8e8ca

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/generators/effective/ability_generator.rb

@@ -21,8 +21,7 @@ module Effective
 
       def create_ability
         unless File.exists?('app/models/ability.rb')
-          say_status :skipped, :ability, :yellow
-          return
+          say_status(:skipped, :ability, :yellow) and return
         end
 
         Effective::CodeWriter.new('app/models/ability.rb') do |w|

data/lib/generators/effective/controller_generator.rb

@@ -30,6 +30,15 @@ module Effective
         say_status :invoke, :controller, :white
       end
 
+      # Find if effective_resources is in the app's Gemfile
+      def enable_effective_resources
+        self.class.send(:attr_reader, :use_effective_resources)
+
+        Effective::CodeWriter.new('Gemfile') do |w|
+          @use_effective_resources = w.find { |line| line.include?('effective_resources') }.present?
+        end
+      end
+
       def create_controller
         template 'controllers/controller.rb', resource.controller_file
       end

data/lib/generators/effective/datatable_generator.rb

@@ -28,6 +28,10 @@ module Effective
       end
 
       def create_datatable
+        unless defined?(EffectiveDatatables)
+          say_status(:skipped, :datatable, :yellow) and return
+        end
+
         template 'datatables/datatable.rb', resource.datatable_file
       end
 

data/lib/generators/effective/form_generator.rb

@@ -40,7 +40,7 @@ module Effective
 
         class_eval { attr_accessor :nested_resource }
 
-        resource.nested_resources.each do |_, nested_resource|
+        resource.nested_resources.each do |nested_resource|
           @nested_resource = nested_resource
           template 'forms/tabpanel/_tab_nested_resource.html.haml', resource.view_file("form_#{nested_resource.plural_name}", partial: true)
           template 'forms/fields/_nested_resource_fields.html.haml', File.join('app/views', resource.namespace.to_s, (resource.namespace.present? ? '' : resource.class_path), nested_resource.name.to_s.underscore.pluralize, '_fields.html.haml')
@@ -61,10 +61,10 @@ module Effective
         b = binding
 
         partial = case attribute
-        when ActiveRecord::Reflection::BelongsToReflection
+        when (ActiveRecord::Reflection::BelongsToReflection rescue false)
           b.local_variable_set(:reference, attribute)
           'belongs_to'
-        when ActiveRecord::Reflection::HasManyReflection
+        when (ActiveRecord::Reflection::HasManyReflection rescue false)
           b.local_variable_set(:nested_resource, attribute)
           'nested_resource'
         when Effective::Resource

data/lib/scaffolds/controllers/controller.rb

@@ -1,11 +1,11 @@
 class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.namespace.try(:classify).presence, ApplicationController].compact.join('::') %>
   before_action :authenticate_user! # Devise enforce user is present
 
-<% if defined?(EffectiveResources) -%>
+<% if use_effective_resources -%>
   include Effective::CrudController
 
 <% end -%>
-<% if actions.delete('index') && !defined?(EffectiveResources) -%>
+<% if actions.delete('index') && !use_effective_resources -%>
   def index
     @page_title = '<%= resource.plural_name.titleize %>'
     authorize! :index, <%= resource.class_name %>
@@ -14,7 +14,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
   end
 
 <% end -%>
-<% if actions.delete('new') && !defined?(EffectiveResources) -%>
+<% if actions.delete('new') && !use_effective_resources -%>
   def new
     @<%= resource.name %> = <%= resource.class_name %>.new
 
@@ -23,7 +23,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
   end
 
 <% end -%>
-<% if actions.delete('create') && !defined?(EffectiveResources) -%>
+<% if actions.delete('create') && !use_effective_resources -%>
   def create
     @<%= resource.name %> = <%= resource.class_name %>.new(<%= resource.name %>_params)
 
@@ -40,7 +40,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
   end
 
 <% end -%>
-<% if actions.delete('show') && !defined?(EffectiveResources) -%>
+<% if actions.delete('show') && !use_effective_resources -%>
   def show
     @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
@@ -49,7 +49,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
   end
 
 <% end -%>
-<% if actions.delete('edit') && !defined?(EffectiveResources) -%>
+<% if actions.delete('edit') && !use_effective_resources -%>
   def edit
     @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
@@ -58,7 +58,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
   end
 
 <% end -%>
-<% if actions.delete('update') && !defined?(EffectiveResources) -%>
+<% if actions.delete('update') && !use_effective_resources -%>
   def update
     @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
 
@@ -75,7 +75,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
   end
 
 <% end -%>
-<% if actions.delete('destroy') && !defined?(EffectiveResources) -%>
+<% if actions.delete('destroy') && !use_effective_resources -%>
   def destroy
     @<%= resource.name %> = <%= resource.class_name %>.find(params[:id])
     authorize! :destroy, @<%= resource.name %>
@@ -121,13 +121,14 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
 <% attributes.each_slice(8).with_index do |slice, index| -%>
       <%= slice.map { |att| permitted_param_for(att.name) }.join(', ') %><%= ',' if (((index+1) * 8) < attributes.length || resource.nested_resources.present?) %>
 <% end -%>
-<% resource.nested_resources.each_with_index do |(_, nested_resource), index| -%>
-      <%= nested_resource.name %>_attributes: [:id, :_destroy, <%= (nested_resource.belong_tos_attributes + nested_resource.attributes).map { |att| ':' + att.name.to_s }.join(', ') %>]<%= ',' if index < resource.nested_resources.length-1 %>
+<% resource.nested_resources.each_with_index do |nested_resource, index| -%>
+<% nested = Effective::Resource.new(nested_resource) -%>
+      <%= nested.name %>_attributes: [:id, :_destroy, <%= (nested.belong_tos_attributes + nested.attributes).map { |att| ':' + att.name.to_s }.join(', ') %>]<%= ',' if index < resource.nested_resources.length-1 %>
 <% end -%>
     )
   end
 
-<% if !defined?(EffectiveResources) -%>
+<% if !use_effective_resources -%>
   def redirect_path
     case params[:commit].to_s
     when 'Save'

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

@@ -5,7 +5,7 @@
         %a{'data-toggle': 'tab', role: 'tab', 'aria-controls': '<%= resource.name %>-tab', href: '#<%= resource.name %>-tab'}
           <%= resource.human_name.titleize %>
 
-<% resource.nested_resources.each do |_, nested_resource| -%>
+<% resource.nested_resources.each do |nested_resource| -%>
       %li{role: 'presentation'}
         %a{'data-toggle': 'tab', role: 'tab', 'aria-controls': '<%= nested_resource.plural_name %>-tab', href: '#<%= nested_resource.plural_name %>-tab'}
           <%= nested_resource.plural_name.titleize %>
@@ -15,7 +15,7 @@
     #<%= resource.name %>-tab.tab-pane.active{role: 'tabpanel'}
       = render 'form_<%= resource.name %>', f: f
 
-<% resource.nested_resources.each do |_, nested_resource| -%>
+<% resource.nested_resources.each do |nested_resource| -%>
     #<%= nested_resource.plural_name %>-tab.tab-pane{role: 'tabpanel'}
       = render 'form_<%= nested_resource.plural_name %>', f: f
 <% end -%>

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

@@ -5,8 +5,12 @@
   %p.text-right= link_to 'New <%= resource.human_name %>', <%= resource.new_path %>, class: 'btn btn-primary'
 
 <% end -%>
+<% if defined?(EffectiveDatatables) -%>
 - if @datatable.present?
   = render_datatable_scopes(@datatable)
   = render_datatable(@datatable)
 - else
   %p There are no <%= resource.plural_name %>.
+<% else %>
+  = render @<%= resource.plural_name %>
+<% end %>

data/lib/tasks/validate.rake

@@ -6,7 +6,7 @@ task :validate, [:model] => :environment do |t, args|
   args.with_defaults(:model => 'all')
 
   Rails.application.eager_load!
-  klasses = ActiveRecord::Base.descendants.sort { |a, b| a.name <=> b.name }
+  klasses = ActiveRecord::Base.descendants.reject { |klass| klass.abstract_class? }.sort { |a, b| a.name <=> b.name }
 
   if args.model != 'all'
     klasses.delete_if { |klass| klass.name.downcase != args.model.singularize.downcase }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails