effective_developer 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ecc781b9a3506569610b1a024046d3a4654a162
-  data.tar.gz: 76e8f79b2e3f86f8654b487b0ef0a0c7d9c4a2e3
+  metadata.gz: 50fcd5872915810b6bef79adf4c828cf21ccb7d3
+  data.tar.gz: 66f6ea7b6400d2c04b85d8d28cd395fa8e0eea89
 SHA512:
-  metadata.gz: deb4c61a015920fb4bbd1d32e3f173995c6770309c83364c4134c45e2c16791959ee678f29ee6f3588924e86a5936dafc31a19ec944a45aa05662027f699493b
-  data.tar.gz: 31249bfd2486d576955cb4f4df7a3b696568440b39d63a69df13e72da91930bba2c4c79c62e9252f93f685708b9fbaf22ca798eb81050bee4952b16001deaf7a
+  metadata.gz: 247c959af382160219fbbbabe7e97ba4046f571ad87c7dd91abf770aa082e5bb7c73612b9e50c7e6ce6a40bb8a412530febfe865c7251b715b7281c0117c87b9
+  data.tar.gz: e79c311358851e511701b64d3e2c5d1465dc772a9964fd9c0e2516a715b1f2e91800084182e0f181fc50c280934893ad31e35646d269f540b74c1b2b6bb7bd9c

data/README.md

@@ -131,6 +131,14 @@ A command line script to delete any git branch that has already been merged into
 > gitsweep
 ```
 
+## killpuma
+
+# kill -9 the first running puma process. Bails out of SystemStackError (stack level too deep).
+
+```console
+> killpuma
+```
+
 # Rake scripts
 
 ## csv:export

data/app/models/effective/code_writer.rb

@@ -29,6 +29,14 @@ module Effective
       end
     end
 
+    # Returns true if the insert happened, nil if no insert
+    def insert_into_first(content, &block)
+      index = first(&block)
+      return nil unless index
+
+      insert_raw(content, index, depth_at(index) + 1)
+    end
+
     # Returns true if the insert happened, nil if no insert
     def insert_after_first(content, depth: nil, content_depth: nil, &block)
       index = first(&block)

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

data/lib/generators/effective/ability_generator.rb

@@ -25,29 +25,10 @@ module Effective
         end
 
         Effective::CodeWriter.new('app/models/ability.rb') do |w|
-          if resource.namespaces.blank?
-            if w.find { |line, depth| depth == 2 && line == ability }
-              say_status :identical, ability, :blue
-            else
-              w.insert_after_last(ability) { |line, depth| depth == 2 && line.start_with?('can ') } ||
-              w.insert_before_last(ability) { |line, depth| depth == 2 && line.start_with?('if') } ||
-              w.insert_before_last(ability) { |line, depth| depth == 2 && line == 'end' }
-
-              say_status :ability, ability
-            end
-          end
-
-          resource.namespaces.each do |namespace|
-            w.within("if user.is?(:#{namespace})") do
-              if w.find { |line, depth| depth == 1 && line == ability }
-                say_status :identical, ability, :blue
-              else
-                w.insert_after_last(ability) { |line, depth| depth == 1 && line.start_with?('can ') } ||
-                w.insert_before_last(ability) { |line, depth| depth == 1 && line == 'end' }
-
-                say_status "#{namespace}_ability", ability
-              end
-            end
+          if w.find { |line, depth| depth == 2 && line == ability }
+            say_status :identical, ability, :blue
+          else
+            w.insert_into_first(ability) { |line, depth| line.start_with?('def initialize') }
           end
         end
       end

data/lib/generators/effective/form_generator.rb

@@ -73,7 +73,17 @@ module Effective
 
           b.local_variable_set(:attribute, name)
 
-          if name.include?('price')
+          if datatype == 'string' && (resource.klass || NilClass).const_defined?(name.pluralize.upcase)
+            attribute_constant = "#{resource.klass.name}::#{name.pluralize.upcase}"
+            b.local_variable_set(:attribute_constant, attribute_constant)
+
+            'select_constant'
+          elsif datatype == :string && (resource.klass || NilClass).const_defined?(name.singularize.upcase)
+            attribute_constant = "#{resource.klass.name}::#{name.singularize.upcase}"
+            b.local_variable_set(:attribute_constant, attribute_constant)
+
+            'select_constant'
+          elsif name.include?('price')
             'price'
           elsif name.include?('_url')
             'url'

data/lib/generators/effective/menu_generator.rb

@@ -23,10 +23,10 @@ module Effective
 
         begin
           Effective::CodeWriter.new('app/views/layouts/_navbar.html.haml') do |w|
-            if w.find { |line, _| line == menu_content.last.strip }
+            if w.find { |line, _| line == menu_content.second.strip }
               say_status :identical, menu_path, :blue
             else
-              if (w.insert_after_first(menu_content) { |line, _| line.start_with?('= nav_link_to') })
+              if (w.insert_into_first(menu_content) { |line, _| line.include?('.navbar-nav') })
                 say_status :menu, menu_path, :green
               else
                 say_status(:skipped, :menu, :yellow)
@@ -45,17 +45,14 @@ module Effective
 
         begin
           Effective::CodeWriter.new('app/views/layouts/_navbar_admin.html.haml') do |w|
-            if w.find { |line, _| line == admin_menu_content.last.strip }
+            if w.find { |line, _| line == menu_content.second.strip }
               say_status :identical, menu_path, :blue
             else
-              index = w.last { |line, _| line.start_with?('- if can?') }
-
-              if index.blank?
-                say_status(:skipped, :menu, :yellow) and return
+              if (w.insert_into_first(menu_content) { |line, _| line.include?('.navbar-nav') })
+                say_status :menu, menu_path, :green
+              else
+                say_status(:skipped, :menu, :yellow)
               end
-
-              w.insert_raw(admin_menu_content, index+1, w.depth_at(index))
-              say_status(:menu, menu_path, :green)
             end
           end
         rescue Errno::ENOENT
@@ -67,14 +64,10 @@ module Effective
       private
 
       def menu_content
-        ["= nav_link_to '#{resource.plural_name.titleize}', #{menu_path}"]
-      end
-
-      def admin_menu_content
         [
-          "\n",
-          "- if can? :manage, #{resource.class_name}",
-          "  = nav_link_to '#{resource.plural_name.titleize}', #{menu_path}"
+          "- if can? :index, #{resource.class_name}",
+          "  = nav_link_to '#{resource.plural_name.titleize}', #{menu_path}",
+          "\n"
         ]
       end
 

data/lib/generators/effective/views_generator.rb

@@ -17,7 +17,7 @@ module Effective
       class_option :attributes, type: :array, default: [], desc: 'Included form attributes, otherwise read from model'
 
       def assign_attributes
-        @attributes = invoked_attributes.presence || resource_attributes
+        @attributes = (invoked_attributes.presence || resource_attributes).except(:archived)
         self.class.send(:attr_reader, :attributes)
       end
 

data/lib/scaffolds/datatables/datatable.rb

@@ -22,9 +22,13 @@ class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Data
 <% end -%>
 
 <% end -%>
-<% attributes.except(:created_at, :updated_at, :id).each do |name, _| -%>
+<% attributes.except(:created_at, :updated_at, :id, :archived).each do |name, _| -%>
     col :<%= name %>
 <% end -%>
+<% if attributes.key?(:archived) -%>
+
+    col :archived, search: { value: false }
+<% end -%>
 
     actions_col
   end

data/lib/scaffolds/forms/fields/_field_belongs_to.html.haml

@@ -1 +1 @@
-= f.select :<%= reference.foreign_key.presence || (reference.name.to_s + '_id') %>, <%= reference.name.to_s.classify %>.sorted.all
+= f.select :<%= reference.foreign_key.presence || (reference.name.to_s + '_id') %>, <%= (reference.options[:class_name] || reference.name).to_s.classify %>.sorted.all

data/lib/scaffolds/forms/fields/_field_select_constant.html.haml

@@ -0,0 +1,2 @@
+= f.select :<%= attribute %>, <%= attribute_constant %>
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,7 @@ files:
 - lib/scaffolds/forms/fields/_field_phone.html.haml
 - lib/scaffolds/forms/fields/_field_price.html.haml
 - lib/scaffolds/forms/fields/_field_select.html.haml
+- lib/scaffolds/forms/fields/_field_select_constant.html.haml
 - lib/scaffolds/forms/fields/_field_string.html.haml
 - lib/scaffolds/forms/fields/_field_text.html.haml
 - lib/scaffolds/forms/fields/_nested_resource_fields.html.haml