effective_developer 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7cf57c2a6d450e95f10d7b78b614bc4a1b3f6a6
-  data.tar.gz: a9d76503a9e842f76aa89969ef51f17b58e9d01d
+  metadata.gz: cb87b48c7333c45473a85cf18fcc9e131e9b72b1
+  data.tar.gz: 90c2899c904190613ae1910ad569b381b05a1529
 SHA512:
-  metadata.gz: 446d3d327210b316c3b65e707f4ad541921b0b69029c880522469eef72a3c0521e07927613e45140b1b38fb407edd81a3c32258586f7c892474958a251eb8dde
-  data.tar.gz: c16dc301b6e0e62a3dee3a49a6580b8c63252b52ca318261ff71cf22d2e408e96fde4ad576e9f48a2c0bf16852f759ec46ab139d958e15264878544b16ef25c3
+  metadata.gz: 0f896654a9311c5cedb83cb921061a615d754ff739bf6a07527bd512d5979c87b1cf8ce9e0df3243759ddc9527b9c6e24ca080e491a84d1762ce8c714bc39cba
+  data.tar.gz: 5b9132b98cbb27b1a6439ba0dbb2036190b0833e616dc865e345fb919031577d080d0978b022cfb02859f24df4b8e44b2c727ab56b2e221b94b74f8efde6c292

data/lib/effective_developer/version.rb

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

data/lib/generators/effective/datatable_generator.rb

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

data/lib/generators/effective/helpers.rb

@@ -50,8 +50,8 @@ module Effective
         attributes.map { |att| "#{att.name}:#{att.type}" }
       end
 
-      def resource_attributes
-        klass_attributes = resource.klass_attributes
+      def resource_attributes(all: false)
+        klass_attributes = resource.klass_attributes(all: all)
 
         if klass_attributes.blank?
           if ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
@@ -59,7 +59,7 @@ module Effective
             system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
           end
 
-          klass_attributes = resource.klass_attributes
+          klass_attributes = resource.klass_attributes(all: all)
         end
 
         klass_attributes.presence || resource.written_attributes

data/lib/scaffolds/datatables/datatable.rb

@@ -1,19 +1,25 @@
 class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
-<% if resource.scopes.present? -%>
-  filters do<% ([:all] + resource.scopes).uniq.each_with_index do |scope, index| %>
-    scope :<%= scope -%><%= ', default: true' if index == 0 -%>
-<% end %>
-  end
 
-<% end -%>
   datatable do
-    order :<%= (attributes.find { |att| att.name == 'updated_at' } || attributes.first).name -%>, :desc
+    order :<%= (attributes.find { |att| att.name == 'updated_at' } || attributes.first).name %>
 
+<% if attributes.find { |att| att.name == 'updated_at' } -%>
+    col :updated_at, visible: false
+<% end -%>
+<% if attributes.find { |att| att.name == 'created_at' } -%>
+    col :created_at, visible: false
+<% end -%>
+<% if attributes.find { |att| att.name == 'id' } -%>
+    col :id, visible: false
+
+<% end -%>
 <% resource.belong_tos.each do |reference| -%>
     col :<%= reference.name %>
 <% end -%>
-
-<% attributes.each do |attribute| -%>
+<% resource.nested_resources.each do |reference| -%>
+    col :<%= reference.name %>
+<% end -%>
+<% attributes.reject { |att| ['created_at', 'updated_at', 'id'].include?(att.name) }.each do |attribute| -%>
     col :<%= attribute.name %>
 <% end -%>
 
@@ -28,14 +34,8 @@ class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Data
 <% end -%>
   end
 
-<% if resource.scopes.blank? -%>
   collection do
     <%= resource.class_name %>.all
   end
-<% else -%>
-  collection do
-    <%= resource.class_name %>.all
-  end
-<% end -%>
 
 end

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

@@ -0,0 +1 @@
+= f.input :<%= attribute.name %>

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

@@ -11,6 +11,7 @@
           <%= nested_resource.plural_name.titleize %>
 
 <% end -%>
+  %br
   .tab-content
     #<%= resource.name %>-tab.tab-pane.active{role: 'tabpanel'}
       = render 'form_<%= resource.name %>', f: f
@@ -20,6 +21,8 @@
       = render 'form_<%= nested_resource.plural_name %>', f: f
 <% end -%>
 
+  %hr
+
   .form-actions
   <% if defined?(EffectiveResources) -%>
   = simple_form_submit(f)

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

@@ -7,7 +7,8 @@
 <% end -%>
 <% if defined?(EffectiveDatatables) -%>
 - if @datatable.present?
-  = render_datatable_scopes(@datatable)
+  = render_datatable_charts(@datatable)
+  = render_datatable_filters(@datatable)
   = render_datatable(@datatable)
 - else
   %p There are no <%= resource.plural_name %>.

data/lib/tasks/pg_pull.rake

@@ -37,6 +37,11 @@ namespace :pg do
 
     puts "=== Loading #{args.file_name} into local '#{db['database']}' database"
 
+    # bin/rails db:environment:set RAILS_ENV=development
+    if Rails.env != 'production'
+      ENV['DISABLE_DATABASE_ENVIRONMENT_CHECK'] = '1'
+    end
+
     Rake::Task['db:drop'].invoke
     Rake::Task['db:create'].invoke
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,6 +76,7 @@ files:
 - lib/scaffolds/forms/fields/_field_date.html.haml
 - lib/scaffolds/forms/fields/_field_datetime.html.haml
 - lib/scaffolds/forms/fields/_field_decimal.html.haml
+- lib/scaffolds/forms/fields/_field_inet.html.haml
 - lib/scaffolds/forms/fields/_field_integer.html.haml
 - lib/scaffolds/forms/fields/_field_nested_resource.html.haml
 - lib/scaffolds/forms/fields/_field_string.html.haml