effective_developer 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dba9b31a7c6e5352ab958ac3a0f1927e5531013
-  data.tar.gz: 4f0127dc920f97aaef72cdad34b09aadac2356fc
+  metadata.gz: 5c9d245ef9985403865d0ff86827272eddb8451a
+  data.tar.gz: 3da5a891679cd2c3abbc30a4feb9a9a3e68f080d
 SHA512:
-  metadata.gz: 447cd0b8ed58bb3bdc2557454795d663ec5a491ee76e7bf967f1aaa7dd37e503ff4603be3217332a0bdf44c5bf018dc9e1e31cd52c94c3df2262b1845f73255c
-  data.tar.gz: 3d7dd836c6fe704dc80082cb4479e56443f77417f17603443a2caec606e5ad20f02c7e9bf5449846f46e53bdfa86401566612bbb54328c51636e05b0ee128840
+  metadata.gz: 960474bc91e9b1ffcfed1daae6db4a2ff64fb54ded9e35574155e9c3e92ab22df7b6e6a8469d622410f71f9a385c102cbfa68d565f1531c57cd536d27df406c9
+  data.tar.gz: cd513a9ee141d261824b2cd536c230cc795f3286d4b1348484c3ed076acb130dd5f05e2bcaed3f9f9ddbd8f3341e57c24c922eb4338a93575c20442bc78661b5

data/app/models/effective/code_writer.rb

@@ -149,7 +149,7 @@ module Effective
       retval
     end
 
-    # Returns an array of indexes for each line where the passed block returnst rue
+    # Returns an array of indexes for each line where the passed block returns true
     def all(from: @from.last, to: @to.last, &block)
       retval = []
 
@@ -163,6 +163,21 @@ module Effective
     end
     alias_method :select, :all
 
+    # Yields each line to a block and returns an array of the results
+    def map(from: @from.last, to: @to.last, indexes: [], &block)
+      retval = []
+
+      each_with_depth do |line, depth, index|
+        next if index < (from || 0)
+        next unless indexes.blank? || indexes.include?(index)
+
+        retval << block.call(line, depth, index)
+        break if to == index
+      end
+
+      retval
+    end
+
     def depth_at(line_index)
       if filename.end_with?('.haml')
         return (lines[line_index].length - lines[line_index].lstrip.length) / indent.length

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.0.10'.freeze
 end

data/lib/generators/effective/datatable_generator.rb

@@ -13,7 +13,7 @@ module Effective
 
       source_root File.expand_path(('../' * 4) + 'lib/scaffolds', __FILE__)
 
-      desc 'Creates an Effective::Datatable in your app/effective/datatables folder.'
+      desc 'Creates an Effective::Datatable in your app/datatables folder.'
 
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
 
@@ -30,7 +30,7 @@ module Effective
       end
 
       def create_datatable
-        template 'datatables/datatable.rb', File.join('app/models/effective/datatables', namespace_path, "#{plural_name}.rb")
+        template 'datatables/datatable.rb', File.join('app/datatables', namespace_path, "#{plural_name}_datatable.rb")
       end
 
     end

data/lib/generators/effective/helpers.rb

@@ -36,7 +36,7 @@ module Effective
         invoked_attributes.present? ? (['--attributes'] + invoked_attributes) : []
       end
 
-      def klass_attributes
+      def klass_attributes(verbose: true)
         klass = class_name.safe_constantize
         return [] unless klass
 
@@ -54,12 +54,19 @@ module Effective
         begin
           attributes = klass.new().attributes
         rescue => e
-          puts "Unable to call #{class_name}.new().attributes. Continuing with empty attributes."
+          puts "Unable to call #{class_name}.new().attributes. Continuing with empty attributes." if verbose
           return []
         end
 
-        (attributes.keys - [klass.primary_key, 'created_at', 'updated_at']).map do |attr|
-          "#{attr}:#{klass.column_for_attribute(attr).type || 'string'}"
+        attribute_names = attributes.keys - [klass.primary_key, 'created_at', 'updated_at']
+        attribute_names -= ['site_id'] if klass.respond_to?(:is_site_specific)
+
+        attribute_names.map do |attr|
+          if klass.respond_to?(:column_for_attribute) # Rails 4+
+            "#{attr}:#{klass.column_for_attribute(attr).try(:type) || 'string'}"
+          else
+            "#{attr}:#{klass.columns_hash[attr].try(:type) || 'string'}"
+          end
         end
       end
 
@@ -94,11 +101,11 @@ module Effective
       end
 
       def index_path
-        [namespace_path.underscore.presence, plural_name].compact.join('_') + '_path'
+        [namespace_path.underscore.presence, plural_name, 'path'].compact.join('_')
       end
 
       def new_path
-        ['new', namespace_path.underscore.presence, singular_name].compact.join('_') + '_path'
+        ['new', namespace_path.underscore.presence, singular_name, 'path'].compact.join('_')
       end
 
       def edit_path
@@ -106,7 +113,7 @@ module Effective
       end
 
       def show_path
-        [namespace_path.underscore.presence, singular_name].compact.join('_') + "_path(@#{singular_name})"
+        [namespace_path.underscore.presence, singular_name, 'path', "(@#{singular_name})"].compact.join('_')
       end
 
     end

data/lib/generators/effective/menu_generator.rb

@@ -12,7 +12,7 @@ module Effective
 
       desc 'Adds a menu link to an existing _navbar.html.haml'
 
-      def invoke_ability
+      def invoke_menu
         say_status :invoke, :menu, :white
       end
 

data/lib/generators/effective/migration_generator.rb

@@ -1,6 +1,6 @@
 # rails generate effective:migration NAME [field[:type] field[:type]] [options]
 
-# TODO - read from model dsl
+# TODO - add default options
 
 # Generates a create_* migration
 # rails generate effective:migration Thing
@@ -22,11 +22,56 @@ module Effective
       end
 
       def create_migration
-        Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invoked_attributes)
+        if invoked_attributes.present?
+          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + (invoked_attributes | timestamps))
+        elsif klass_attributes(verbose: false).present?
+          raise 'klass_attributes already exist.  We cant migrate (yet). Exiting.'
+        elsif written_attributes.present?
+          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + (written_attributes | timestamps))
+        else
+          raise 'You need to specify some attributes or have a model file present'
+        end
       end
 
-      def invoked_attributes
-        super | ['created_at:datetime', 'updated_at:datetime']
+      protected
+
+      # Written attributes include all belong_tos, as well as
+      # any Attributes comments as per our custom 'Attributes' comment block contained in the model file
+
+      # Attributes
+      # name        :string
+      # description :text
+      #
+      # another :string
+
+      def written_attributes
+        @written_attributes ||= (
+          attributes = []
+
+          Effective::CodeWriter.new(File.join('app/models', class_path, "#{file_name}.rb")) do |w|
+            # belong_tos
+            references = w.select { |line| line.start_with?('belongs_to '.freeze) }
+
+            if references.present?
+              attributes += w.map(indexes: references) { |line| [[line.scan(/belongs_to\s+:(\w+)/).flatten.first, 'references']] }
+            end
+
+            # Attributes
+            first = w.find { |line| line == '# Attributes' }
+            break unless first
+
+            last = w.find(from: first) { |line| line.start_with?('#') == false && line.length > 0 }
+            break unless last
+
+            attributes += w.map(from: first+1, to: last-1) { |line| line.scan(/^\W+(\w+)\W+:(\w+)/).presence }
+          end
+
+          attributes.flatten(1).compact.map { |attribute| attribute.join(':') }
+        )
+      end
+
+      def timestamps
+        ['created_at:datetime', 'updated_at:datetime']
       end
 
     end

data/lib/generators/effective/scaffold_controller_generator.rb

@@ -13,10 +13,10 @@ module Effective
 
       source_root File.expand_path(('../' * 4) + 'lib/scaffolds', __FILE__)
 
-      desc 'Creates an Effective Scaffold'
+      desc 'Creates an Effective Scaffold based on an existing model'
 
-      argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
-      class_option :actions, type: :array, default: ['crud'], desc: 'Included actions', banner: 'index show'
+      argument :actions, type: :array, default: ['crud'], banner: 'action action'
+      class_option :attributes, type: :array, default: [], desc: 'Included permitted params, otherwise read from model'
 
       def invoke_controller
         Rails::Generators.invoke('effective:controller', [name] + invoked_actions + invoked_attributes_args)
@@ -35,6 +35,10 @@ module Effective
       end
 
       def invoke_datatable
+        unless invoked_actions.include?('index')
+          say_status(:skipped, :datatable, :yellow) and return
+        end
+
         Rails::Generators.invoke('effective:datatable', [name] + invoked_attributes)
       end
 
@@ -43,6 +47,10 @@ module Effective
       end
 
       def invoke_form
+        unless invoked_actions.include?('new') || invoked_actions.include?('edit')
+          say_status(:skipped, :form, :yellow) and return
+        end
+
         Rails::Generators.invoke('effective:form', [name] + invoked_attributes)
       end
 

data/lib/generators/effective/scaffold_generator.rb

@@ -42,6 +42,10 @@ module Effective
       end
 
       def invoke_datatable
+        unless invoked_actions.include?('index')
+          say_status(:skipped, :datatable, :yellow) and return
+        end
+
         Rails::Generators.invoke('effective:datatable', [name] + invoked_attributes)
       end
 
@@ -50,6 +54,10 @@ module Effective
       end
 
       def invoke_form
+        unless invoked_actions.include?('new') || invoked_actions.include?('edit')
+          say_status(:skipped, :form, :yellow) and return
+        end
+
         Rails::Generators.invoke('effective:form', [name] + invoked_attributes)
       end
 

data/lib/scaffolds/controllers/controller.rb

@@ -6,16 +6,20 @@ require_dependency '<%= namespaced_path %>/application_controller'
 class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.presence, ApplicationController].compact.join('::') %>
   before_action :authenticate_user! # Devise enforce user is present
 
-<% if actions.delete('index') -%>
+<% if defined?(EffectiveResources) -%>
+  include Effective::CrudController
+
+<% end -%>
+<% if actions.delete('index') && !defined?(EffectiveResources) -%>
   def index
     @page_title = '<%= plural_name.titleize %>'
     authorize! :index, <%= class_name %>
 
-    @datatable = Effective::Datatables::<%= namespaced_class_name %>.new(params[:scopes])
+    @datatable = <%= namespaced_class_name %>Datatable.new(params[:scopes])
   end
 
 <% end -%>
-<% if actions.delete('new') -%>
+<% if actions.delete('new') && !defined?(EffectiveResources) -%>
   def new
     @<%= singular_name %> = <%= class_name %>.new
 
@@ -24,9 +28,9 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
   end
 
 <% end -%>
-<% if actions.delete('create') -%>
+<% if actions.delete('create') && !defined?(EffectiveResources) -%>
   def create
-    @<%= singular_name %> = <%= class_name %>.new(permitted_params)
+    @<%= singular_name %> = <%= class_name %>.new(<%= singular_name %>_params)
 
     @page_title = 'New <%= human_name %>'
     authorize! :create, @<%= singular_name %>
@@ -41,7 +45,7 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
   end
 
 <% end -%>
-<% if actions.delete('show') -%>
+<% if actions.delete('show') && !defined?(EffectiveResources) -%>
   def show
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
 
@@ -50,7 +54,7 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
   end
 
 <% end -%>
-<% if actions.delete('edit') -%>
+<% if actions.delete('edit') && !defined?(EffectiveResources) -%>
   def edit
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
 
@@ -59,14 +63,14 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
   end
 
 <% end -%>
-<% if actions.delete('update') -%>
+<% if actions.delete('update') && !defined?(EffectiveResources) -%>
   def update
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
 
     @page_title = "Edit #{@<%= singular_name %>}"
     authorize! :update, @<%= singular_name %>
 
-    if @<%= singular_name %>.update_attributes(permitted_params)
+    if @<%= singular_name %>.update_attributes(<%= singular_name %>_params)
       flash[:success] = 'Successfully updated <%= singular_name %>'
       redirect_to(redirect_path)
     else
@@ -76,7 +80,7 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
   end
 
 <% end -%>
-<% if actions.delete('destroy') -%>
+<% if actions.delete('destroy') && !defined?(EffectiveResources) -%>
   def destroy
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
     authorize! :destroy, @<%= singular_name %>
@@ -84,7 +88,7 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
     if @<%= singular_name %>.destroy
       flash[:success] = 'Successfully deleted <%= singular_name %>'
     else
-      flash.now[:danger] = "Unable to delete <%= singular_name %>: #{@<%= singular_name %>.errors.full_messages.to_sentence}"
+      flash[:danger] = "Unable to delete <%= singular_name %>: #{@<%= singular_name %>.errors.full_messages.to_sentence}"
     end
 
     redirect_to <%= index_path %>
@@ -115,9 +119,9 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
   end
 
 <% end -%>
-  private
+  protected
 
-  def permitted_params
+  def <%= singular_name %>_params
     params.require(:<%= singular_name %>).permit(:id,
 <% attributes_names.each_slice(8).with_index do |slice, index| -%>
       <%= slice.map { |name| permitted_param_for(name) }.join(', ') %><%= ',' if ((index+1) * 8) < attributes.length %>
@@ -125,6 +129,7 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
     )
   end
 
+<% if !defined?(EffectiveResources) -%>
   def redirect_path
     case params[:commit].to_s
     when 'Save'
@@ -138,5 +143,6 @@ class <%= namespaced_class_name %>Controller < <%= [namespace_path.classify.pres
     end
   end
 
+<% end -%>
 end
 <% end -%>

data/lib/scaffolds/datatables/datatable.rb

@@ -1,18 +1,14 @@
-module Effective
-  module Datatables
-    class <%= namespaced_class_name %> < Effective::Datatable
+class <%= namespaced_class_name %>Datatable < Effective::Datatable
 
-      datatable do<% attributes.each do |attribute| %>
-        table_column :<%= attribute.name -%>
+  datatable do<% attributes.each do |attribute| %>
+    table_column :<%= attribute.name -%>
 <% end %>
 
-        actions_column
-      end
-
-      def collection
-        <%= class_name %>.all
-      end
+    actions_column
+  end
 
-    end
+  def collection
+    <%= class_name %>.all
   end
+
 end

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

@@ -3,7 +3,11 @@
   = f.input :<%= attribute.name %>
 <% end -%>
 
+<% if defined?(EffectiveResources) -%>
+  = simple_form_submit(f)
+<% else -%>
   %p.text-right
     = 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 -%>

data/lib/scaffolds/models/model.rb

@@ -3,9 +3,11 @@ class <%= class_name %> < <%= parent_class_name.classify %>
 <% attributes.select(&:reference?).each do |attribute| -%>
   belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
 <% end -%>
+<% if attributes.all? { |attribute| attribute.respond_to?(:token?) } -%>
 <% attributes.select(&:token?).each do |attribute| -%>
   has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
 <% end -%>
+<% end -%>
 <% if attributes.any?(&:password_digest?) -%>
   has_secure_password
 <% end -%>

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

@@ -1,3 +1,3 @@
 %h1= @page_title
 
-= render partial: 'form', locals: { <%= singular_name %>: @<%= singular_name %> }
+= render 'form', <%= singular_name %>: @<%= singular_name %>

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

@@ -1,3 +1,3 @@
 %h1= @page_title
 
-= render partial: 'form', locals: { <%= singular_name %>: @<%= singular_name %> }
+= render 'form', <%= singular_name %>: @<%= singular_name %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails