tb_core 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2510a27d312d495c3d4a1163f6aace27f801370e
-  data.tar.gz: ae0a3e6d44d4c30ea885097bf4219e0717564bd5
+  metadata.gz: 119d2b18447e11794e3242645aacd697afa47258
+  data.tar.gz: 90fa0a23e723b28b1a597bed200157783252ed43
 SHA512:
-  metadata.gz: b3a0574fd5d942b756698fb48f5772247335f8d89f2233c943d66089915b8f43520fffcbdcda3919804b316256d3270f1f79e50108da386e4f9e3a526d24f758
-  data.tar.gz: 453bada55663e0c324cb2c3f417933d3bf7635f5f075ec5b8a87c435820ddb712973d8f1e09286db956c955f9290a428483aa171aacedebe393662d60bd42287
+  metadata.gz: 66144e84faacb6b62cb9ee33ea90342b6cb426238a7d41ab75aa09c2b644be8a5e3fe48a0a767d2add4c82fb0b4222127bcce70ed60d7b9cb4e5b671f90def8f
+  data.tar.gz: 3fb79b93110d12782939307eee24776d1bc0f1cd7c424e7a90f2252aeb5bc9bdb345d6760a552afc1d5e086ff19f29af7ec4859d31a5349e6b4e5e4dfe16c5ae

data/app/assets/stylesheets/admin/core/application.scss

@@ -45,7 +45,7 @@ body {
     display:block;
     color:#000;
     padding:10px 10px;
-    text-decoration:none;  
+    text-decoration:none;
   }
   img {
     width: 125px;
@@ -94,6 +94,9 @@ body {
   }
   .data-controls{
     float: right;
+    .btn:not(:first-child) {
+      margin-left: 0.5rem;
+    }
   }
   .pagination{
     margin-bottom: 0;
@@ -142,7 +145,7 @@ p.form-error-base{
 }
 .date-select{
   &.form-control{
-    display: inline-block;  
+    display: inline-block;
   }
   &.year{
     width: 20%
@@ -176,6 +179,9 @@ td.no-wrap{
 td.table-actions{
   white-space: nowrap;
   text-align: right;
+  .btn:not(:first-child) {
+    margin-left: 0.5rem;
+  }
 }
 .table .nesting-spacer{
   display: inline-block;

data/lib/generators/spud/module_generator.rb

@@ -23,13 +23,33 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
     template 'controller.rb.erb', "app/controllers/#{module_name_formatted}_controller.rb"
     template 'assets/module.js.erb', "app/assets/javascripts/#{module_name_formatted}.js"
     template 'assets/admin/module.js.erb', "app/assets/javascripts/admin/#{module_name_formatted}.js"
-    template 'views/admin/index.html.erb', "app/views/admin/#{module_name_formatted}/index.html.erb"
-    template 'views/admin/show.html.erb', "app/views/admin/#{module_name_formatted}/show.html.erb"
-    template 'views/admin/new.html.erb', "app/views/admin/#{module_name_formatted}/new.html.erb"
-    template 'views/admin/edit.html.erb', "app/views/admin/#{module_name_formatted}/edit.html.erb"
-    template 'views/admin/_form.html.erb', "app/views/admin/#{module_name_formatted}/_form.html.erb"
-    template 'views/frontend/index.html.erb', "app/views/#{module_name_formatted}/index.html.erb"
-    template 'views/frontend/show.html.erb', "app/views/#{module_name_formatted}/show.html.erb"
+
+    # Admin views
+    template(*view_template_args('index', true))
+    template(*view_template_args('show', true))
+    template(*view_template_args('new', true))
+    template(*view_template_args('edit', true))
+    template(*view_template_args('_form', true))
+
+    # Front-end views
+    template(*view_template_args('index'))
+    template(*view_template_args('show'))
+  end
+
+  def view_template_args(name, admin=false)
+    template_name = "#{name}.html.#{view_template_ext}"
+    [
+      [
+        'views', (admin ? 'admin' : 'frontend'), template_name
+      ].join('/'),
+      [
+        'app', (admin ? 'views/admin' : 'views'), module_name_formatted, template_name
+      ].join('/')
+    ]
+  end
+
+  def view_template_ext
+    defined?(Slim) ? 'slim' : 'erb'
   end
 
   def install_assets
@@ -87,6 +107,21 @@ RUBY
     end
   end
 
+  def slim_field_for_attribute(type, name)
+    case type
+      when 'integer'
+        "= f.tb_number_field :#{name}"
+      when 'text'
+        "= f.tb_text_area :#{name}, rows: 4"
+      when 'boolean'
+        "= f.tb_check_box :#{name}"
+      when 'date'
+        "= f.tb_date_select :#{name}"
+      else
+        "= f.tb_text_field :#{name}"
+    end
+  end
+
   def application_name
     Rails.application.class.name.split('::').first.underscore
   end

data/lib/generators/spud/templates/views/admin/_form.html.slim

@@ -0,0 +1,12 @@
+= tb_form_for [:admin, @<%=module_name_formatted.singularize%>],
+  remote: true,
+  data: { errors: :inline, success: admin_<%= module_name_formatted %>_path } do |f|
+
+  = tb_form_errors(f.object, :base)
+  <%- attributes.collect{ |att| att.split(':') }.each do |arg_0, arg_1| %>
+  <%= slim_field_for_attribute(arg_1, arg_0) %>
+  <%- end %>
+  = f.tb_save_buttons('<%= module_name_formatted.singularize.humanize.titlecase %>', admin_<%= module_name_formatted %>_path)
+
+javascript:
+  document.addEventListener('DOMContentLoaded', app.admin.<%= module_name_formatted %>.edit);

data/lib/generators/spud/templates/views/admin/edit.html.slim

@@ -0,0 +1 @@
+= render 'form'

data/lib/generators/spud/templates/views/admin/index.html.slim

@@ -0,0 +1,39 @@
+= content_for :data_controls do
+  = render partial: '/layouts/admin/search',
+    locals: { search_path: admin_<%= module_name_formatted %>_path }
+  = link_to 'New <%=module_name_formatted.singularize.humanize.titlecase%>',
+    new_admin_<%=module_name_formatted.singularize%>_path,
+    class: 'btn btn-primary'
+
+= content_for :detail do
+  .table-responsive
+    table.table.table-striped.table-hover
+      thead
+        tr
+          <%- attribute_names.each do |attribute| -%>
+          th <%= attribute.humanize.titlecase %>
+          <%- end -%>
+          th &nbsp;
+      tbody
+        - @<%=module_name_formatted%>.each do |<%=module_name_formatted.singularize%>|
+          tr
+            <%-attribute_names.each do |attribute|-%>
+            td = <%=module_name_formatted.singularize%>.<%=attribute%>
+            <%-end-%>
+            td.table-actions
+              = link_to 'Details',
+                admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>),
+                class: 'btn btn-default btn-sm'
+              = link_to 'Edit',
+                edit_admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>),
+                class: 'btn btn-default btn-sm'
+              = link_to 'Delete',
+                admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>),
+                class: 'btn btn-danger btn-sm',
+                method: :delete,
+                data: { confirm: 'Are you sure?' }
+
+  = will_paginate @<%=module_name_formatted%>, renderer: BootstrapPagination::Rails
+
+  javascript:
+    document.addEventListener('DOMContentLoaded', app.admin.<%= module_name_formatted %>.index);

data/lib/generators/spud/templates/views/admin/new.html.slim

@@ -0,0 +1 @@
+= render 'form'

data/lib/generators/spud/templates/views/admin/show.html.slim

@@ -0,0 +1,16 @@
+= content_for :data_controls do
+  = link_to 'Edit',
+    edit_admin_<%=module_name_formatted.singularize%>_path(@<%=module_name_formatted.singularize%>),
+    class: 'btn btn-default'
+  = link_to 'Back',
+    admin_<%= module_name_formatted %>_path,
+    class: 'btn btn-default'
+
+dl.dl-horizontal
+  <%- attribute_names.each do |attribute| -%>
+  dt <%= attribute.humanize.titlecase %>:
+  dd = @<%= module_name_formatted.singularize %>.<%= attribute %>
+  <%- end -%>
+
+javascript:
+  document.addEventListener('DOMContentLoaded', app.admin.<%= module_name_formatted %>.show);

data/lib/generators/spud/templates/views/frontend/index.html.slim

@@ -0,0 +1,22 @@
+h1 <%= module_name_formatted.pluralize.camelize %>
+
+table.table
+  thead
+    tr
+      <%- attributes.each do |attribute| -%>
+      <%- attribute_args = attribute.split(":") -%>
+      th <%= attribute_args.first.humanize.titlecase %>
+      <%- end %>
+      th &nbsp;
+  tbody
+    - @<%= module_name_formatted %>.each do |<%= module_name_formatted.singularize %>|
+      tr
+        <%- attributes.each do |attribute| -%>
+        <%- attribute_args = attribute.split(":") -%>
+        td = <%= module_name_formatted.singularize %>.<%= attribute_args.first %>
+        <%- end %>
+        td = link_to 'Details', <%= module_name_formatted.singularize %>_path(<%= module_name_formatted.singularize %>)
+= will_paginate @<%= module_name_formatted %>
+
+javascript:
+  document.addEventListener('DOMContentLoaded', app.<%= module_name_formatted %>.index);

data/lib/generators/spud/templates/views/frontend/show.html.slim

@@ -0,0 +1,12 @@
+h1 <%= module_name_formatted.singularize.camelize %>
+
+dl.dl-horizontal
+  <%- attribute_names.each do |attribute| -%>
+  dt <%= attribute.humanize.titlecase %>:
+  dd = @<%= module_name_formatted.singularize %>.<%= attribute %>
+  <%- end -%>
+
+p = link_to 'Back', <%=module_name_formatted.pluralize%>_path
+
+javascript:
+  document.addEventListener('DOMContentLoaded', app.<%= module_name_formatted %>.show);

data/lib/tb_core/spud_core.rb

@@ -1,23 +1,33 @@
-module Spud
-  module Core
-    module ClassMethods
-
-      def method_missing(method_signature, *args, &block)
-        if TbCore.respond_to?(method_signature)
-          ActiveSupport::Deprecation.warn(
-            'The Spud::Core namespace is being replaced by TbCore. Please update your app code accordingly.',
-            caller
-          )
-          TbCore.__send__(method_signature, *args, &block)
-        else
-          super
-        end
-      end
+module SpudDeprecatedNamespace
+  def const_missing(const)
+    ActiveSupport::Deprecation.warn(
+      'The Spud namespace is being replaced by TbCore. Please update your app code accordingly.',
+      caller
+    )
+    TbCore.const_get(const)
+  end
 
-      def respond_to_missing?(method_signature)
-        TbCore.respond_to?(method_signature) || super
-      end
+  def method_missing(method_signature, *args, &block)
+    if TbCore.respond_to?(method_signature)
+      ActiveSupport::Deprecation.warn(
+        'The Spud::Core namespace is being replaced by TbCore. Please update your app code accordingly.',
+        caller
+      )
+      TbCore.__send__(method_signature, *args, &block)
+    else
+      super
     end
-    extend ClassMethods
   end
+
+  def respond_to_missing?(method_signature)
+    TbCore.respond_to?(method_signature) || super
+  end
+end
+
+module Spud
+  extend SpudDeprecatedNamespace
+end
+
+module Spud::Core
+  extend SpudDeprecatedNamespace
 end

data/lib/tb_core/version.rb

@@ -1,3 +1,3 @@
 module TbCore
-  VERSION = '1.4.4'.freeze
+  VERSION = '1.4.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
@@ -396,12 +396,19 @@ files:
 - lib/generators/spud/templates/controller.rb.erb
 - lib/generators/spud/templates/controller_spec.rb.erb
 - lib/generators/spud/templates/views/admin/_form.html.erb
+- lib/generators/spud/templates/views/admin/_form.html.slim
 - lib/generators/spud/templates/views/admin/edit.html.erb
+- lib/generators/spud/templates/views/admin/edit.html.slim
 - lib/generators/spud/templates/views/admin/index.html.erb
+- lib/generators/spud/templates/views/admin/index.html.slim
 - lib/generators/spud/templates/views/admin/new.html.erb
+- lib/generators/spud/templates/views/admin/new.html.slim
 - lib/generators/spud/templates/views/admin/show.html.erb
+- lib/generators/spud/templates/views/admin/show.html.slim
 - lib/generators/spud/templates/views/frontend/index.html.erb
+- lib/generators/spud/templates/views/frontend/index.html.slim
 - lib/generators/spud/templates/views/frontend/show.html.erb
+- lib/generators/spud/templates/views/frontend/show.html.slim
 - lib/generators/spud/templates/views/layouts/application.html.erb
 - lib/generators/spud/templates/views/layouts/error_page.html.erb
 - lib/tasks/spud_core_tasks.rake