cambium 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ea6803ff7b5699c765fd57eb79353db74645cc
-  data.tar.gz: 92f9fee301ccb91d0bb9f9755343e39db07f1ff3
+  metadata.gz: dc213f76b0bfb1bc7f89557007412022d32f0c37
+  data.tar.gz: a02c79d2cbf1b519942703e3a57d246ca97f7cb0
 SHA512:
-  metadata.gz: 5284b848c3a7d298fd978b9650f6b64c1ece775801ba615d84f6d2db5a07bff6a035a569f63464cf8b17906bf6cf5658c0fd61c3dd70f0807d1c6b3b7557a2d0
-  data.tar.gz: 8bc1d2704a51bf91d44aa7fe06a63ed9a13a81413aa535100210541991fac0b0eac146d344a9d22c5a9bbbd50049414b5256bad677a75170314a875bb89c31e9
+  metadata.gz: 28daeea78d3becc708ed681e5e933fa6729980382df60d73a51c0d95ce0de5f18f88a42581e4be2fb55a877e42607abbffbca2d6a4dc1c76ce2a176a694cbc53
+  data.tar.gz: 431257c6a35b8f5c630c717697af2fc168f139c0215e0bd9d1db2c4a6d669253630c7c4ac4b04ac641d0fb441e03711ca57138ef6241728a866921c5969aac80

data/README.md

@@ -224,6 +224,8 @@ export:
     email:
       label: Email
 form:
+  buttons:
+    delete: Delete User
   new: &new
     title: New User
     fields:
@@ -265,6 +267,9 @@ Every setting plays a role. Let's step through each one.
 * `export:columns:[column]:output`: An optional method you can pass to each
   object to help with display.
 * `form`: Settings for the form.
+* `form:buttons:delete`: Label for the delete button. If you remove `delete`
+  entirely, then no delete button will exist (though you'd have to manually
+  remove the route from your routes file).
 * `form:[new/edit]`: New is the defaut, and most of the time Edit will inherit
   from new (the `<<: *new` is what handles that). But you can optionally
   override new values for your edit form.

data/app/assets/javascripts/cambium/admin/application.js.coffee

@@ -1,6 +1,6 @@
 #= require jquery
 #= require jquery_ujs
-#= require mark_it_zero/mark_it_zero
+#= require mark_it_zero
 #= require pickadate/picker
 #= require pickadate/picker.date
 #= require pickadate/picker.time

data/app/assets/stylesheets/cambium/admin/partials/components.scss

@@ -38,7 +38,7 @@ div.status{
 }
 
 a {
-  &.new, &.export, &.file {
+  &.new, &.export, &.file, &.delete {
     &:before {
       font-family: 'icomoon';
       font-size: inherit;
@@ -48,6 +48,7 @@ a {
   }
   &.new:before { content: "\e702"; }
   &.export:before { content: "\e65e"; }
+  &.delete:before { content: "\e6a7"; }
   &.file:before { content: "\e622"; }
 }
 

data/app/assets/stylesheets/cambium/admin/partials/forms.scss

@@ -112,6 +112,12 @@ section.form {
           color: $color-dark;
         }
       }
+      .error {
+        display: block;
+        font-weight: 600;
+        color: $color-danger;
+        text-transform: uppercase;
+      }
     }
 
     input[type=submit] {

data/app/assets/stylesheets/cambium/admin/partials/page_title.scss

@@ -24,7 +24,7 @@
     font-weight: 400;
     color: $color-dark;
     vertical-align: top;
-    &.new, &.export {
+    &.new, &.export, &.delete {
       margin: 12px 0 0 10px;
       padding: 3px 8px;
       font-size: 13px;
@@ -35,7 +35,11 @@
     &.new {
       background: $color-2;
     }
-    &.export {
+    &.delete {
+      background: $color-danger;
+      color: $color-light;
+    }
+    &.export, &.delete {
       float: right;
     }
   }

data/app/controllers/cambium/admin_controller.rb

@@ -9,12 +9,19 @@ class Cambium::AdminController < Cambium::BaseController
 
   def index
     respond_to do |format|
-      format.html do
+      scope = admin_table.scope
+      if scope.split('.').size > 1
+        @collection = admin_model
+        scope.split('.').each do |s|
+          @collection = @collection.send(s)
+        end
+      else
         @collection = admin_model.send(admin_table.scope)
-          .page(params[:page] || 1).per(15)
+      end
+      format.html do
+        @collection = @collection.page(params[:page] || 1).per(15)
       end
       format.csv do
-        @collection = admin_model.send(admin_table.scope)
         send_data admin.to_csv(@collection)
       end
     end
@@ -30,7 +37,6 @@ class Cambium::AdminController < Cambium::BaseController
   end
 
   def create
-    set_object
     @object = admin_model.new(create_params)
     if @object.save
       redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} created!")
@@ -52,6 +58,12 @@ class Cambium::AdminController < Cambium::BaseController
     end
   end
 
+  def destroy
+    set_object
+    @object.destroy
+    redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} deleted!")
+  end
+
   private
 
     def set_object
@@ -62,6 +74,7 @@ class Cambium::AdminController < Cambium::BaseController
         id = params[:"#{admin_model.to_s.underscore}_id"] || params[:id]
         @object = admin_model.find_by_id(id.to_i)
       end
+      not_found if @object.nil?
       @obj = @object
     end
 

data/app/helpers/cambium/cambium_helper.rb

@@ -60,6 +60,15 @@ module Cambium
             :class => 'button export'
           )
         end
+        if is_edit? && can_delete?
+          o += link_to(
+            admin_view.form.buttons.delete,
+            admin_routes.delete,
+            :class => 'button delete',
+            :method => :delete,
+            :data => { :confirm => 'Are you sure?' }
+          )
+        end
         o.html_safe
       end
     end
@@ -131,10 +140,16 @@ module Cambium
         if options.type == 'heading'
           o += content_tag(:h2, options.label || attr.titleize)
         elsif ['select','check_boxes','radio_buttons'].include?(options.type)
+          parts = options.options.split('.')
+          if parts.size > 1
+            collection = parts[0].constantize.send(parts[1])
+          else
+            collection = options.options
+          end
           o += f.input(
             attr.to_sym,
             :as => options.type,
-            :collection => options.options,
+            :collection => collection,
             :label => label,
             :readonly => readonly
           )
@@ -189,7 +204,7 @@ module Cambium
           end
         elsif options.type == 'markdown'
           o += content_tag(:div, :class => "input text optional #{attr}") do
-            o2  = content_tag(:label, attr.titleize, :for => attr)
+            o2  = content_tag(:label, label, :for => attr)
             o2 += content_tag(
               :div,
               f.markdown(attr.to_sym),
@@ -250,9 +265,18 @@ module Cambium
       action_name == 'index'
     end
 
+    def is_edit?
+      ['edit','update'].include?(action_name)
+    end
+
     def has_new_form?
       admin_view.form.present? && admin_view.form.new.present?
     end
 
+    def can_delete?
+      admin_view.form.present? && admin_view.form.buttons.present? &&
+        admin_view.form.buttons.delete.present?
+    end
+
   end
 end

data/app/presenters/cambium/admin_presenter.rb

@@ -66,6 +66,7 @@ module Cambium
           "admin_#{@view.controller_name.singularize}_path",
           object
         )
+        r[:delete] = r[:show]
       end
       r.to_ostruct
     end

data/lib/cambium/version.rb

@@ -1,3 +1,3 @@
 module Cambium
-  VERSION = "1.1.6"
+  VERSION = "1.2.0"
 end

data/lib/generators/templates/config/admin/controller.yml.erb

@@ -13,6 +13,8 @@ export:
     <%= "#{col.name}:" %>
       label: <%= "#{col.name.titleize}" %><% end %>
 form:
+  buttons:
+    delete: Delete <%= @model.to_s %>
   new: &new
     title: New <%= @model.to_s %>
     fields:<% @columns.each do |col| %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cambium
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Sean C Davis