effective_developer 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41039ceac09c55fe7ae821452bc2d570bb2279c
-  data.tar.gz: 4078bf19bfc90c29a6e67253ed1cbb3d54cef519
+  metadata.gz: a7cf57c2a6d450e95f10d7b78b614bc4a1b3f6a6
+  data.tar.gz: a9d76503a9e842f76aa89969ef51f17b58e9d01d
 SHA512:
-  metadata.gz: e776f703a4753b14d2b507be9c1beb72e7024879241fbfd2016dd0879efce73355f18a779a7fd8b9b782d3eb9ab675f8bcd243eb9e4ef6d6bc71b0c1077e3bc5
-  data.tar.gz: 46fcc829aa004135e7412f919e385335ae5e33a6102551674d3a7034a3ec32fd034ae4944b188e6f191cdd6ec6b6dc1f55ce701f38794f8d1d8de153b4f8e8ca
+  metadata.gz: 446d3d327210b316c3b65e707f4ad541921b0b69029c880522469eef72a3c0521e07927613e45140b1b38fb407edd81a3c32258586f7c892474958a251eb8dde
+  data.tar.gz: c16dc301b6e0e62a3dee3a49a6580b8c63252b52ca318261ff71cf22d2e408e96fde4ad576e9f48a2c0bf16852f759ec46ab139d958e15264878544b16ef25c3

data/lib/effective_developer/version.rb

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

data/lib/generators/effective/form_generator.rb

@@ -43,6 +43,8 @@ module Effective
         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)
+
+          @nested_resource = Effective::Resource.new(nested_resource)
           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')
         end
       end

data/lib/scaffolds/controllers/controller.rb

@@ -10,7 +10,7 @@ class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.
     @page_title = '<%= resource.plural_name.titleize %>'
     authorize! :index, <%= resource.class_name %>
 
-    @datatable = <%= resource.namespaced_class_name.pluralize %>Datatable.new(params[:scopes])
+    @datatable = <%= resource.namespaced_class_name.pluralize %>Datatable.new(self)
   end
 
 <% end -%>

data/lib/scaffolds/datatables/datatable.rb

@@ -1,42 +1,40 @@
 class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
 <% if resource.scopes.present? -%>
-  scopes do<% ([:all] + resource.scopes).uniq.each_with_index do |scope, index| %>
+  filters do<% ([:all] + resource.scopes).uniq.each_with_index do |scope, index| %>
     scope :<%= scope -%><%= ', default: true' if index == 0 -%>
 <% end %>
   end
 
 <% end -%>
   datatable do
-    default_order :<%= (attributes.find { |att| att.name == 'updated_at' } || attributes.first).name -%>, :desc
+    order :<%= (attributes.find { |att| att.name == 'updated_at' } || attributes.first).name -%>, :desc
 
 <% resource.belong_tos.each do |reference| -%>
-    table_column :<%= reference.name %>
+    col :<%= reference.name %>
 <% end -%>
 
 <% attributes.each do |attribute| -%>
-    table_column :<%= attribute.name %>
+    col :<%= attribute.name %>
 <% end -%>
 
 <% if non_crud_actions.present? -%>
-    actions_column do |<%= singular_name %>|
+    actions_col do |<%= singular_name %>|
 <% non_crud_actions.each_with_index do |action, index| -%>
       glyphicon_to('ok', <%= resource.action_path_helper(action, at: false) %>, title: '<%= action.titleize %>')<%= ' +' if (index+1) < (invoked_actions - crud_actions).length %>
 <% end -%>
     end
 <% else -%>
-    actions_column
+    actions_col
 <% end -%>
   end
 
 <% if resource.scopes.blank? -%>
-  def collection
+  collection do
     <%= resource.class_name %>.all
   end
 <% else -%>
-  def collection
-    col = <%= resource.class_name %>.all
-    col = col.send(current_scope) if current_scope
-    col
+  collection do
+    <%= resource.class_name %>.all
   end
 <% end -%>
 

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

@@ -10,7 +10,7 @@
   <% if defined?(EffectiveResources) -%>
   = simple_form_submit(f)
   <% else -%>
-  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...' }
+  = 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/forms/fields/_field_nested_resource.html.haml

@@ -8,4 +8,4 @@
       = link_to_add_association(f, :<%= nested_resource.plural_name %>, partial: '<%= [resource.namespace.presence, nested_resource.plural_name].compact.join('/') %>/fields') do
         %button.btn.btn-success
           %span.glyphicon.glyphicon-plus-sign
-          Add another <%= nested_resource.name.titleize.downcase %>
+          Add another <%= nested_resource.name.to_s.titleize.downcase %>

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

@@ -1,3 +1,3 @@
-%p There are #{pluralize(f.object.<%= nested_resource.plural_name %>.length, '<%= nested_resource.name.titleize.downcase %>')}.
+%p There are #{pluralize(f.object.<%= nested_resource.plural_name %>.length, '<%= nested_resource.name.to_s.titleize.downcase %>')}.
 
 <%= render_field(nested_resource) %>

metadata

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