cambium 1.2.3 → 1.3.0

data/app/controllers/cambium/admin/documents_controller.rb

@@ -0,0 +1,11 @@
+class Cambium::Admin::DocumentsController < Cambium::AdminController
+
+  private
+
+    def create_params
+      obj = admin_model.to_s.gsub(/Cambium::/, '').tableize.singularize.to_sym
+      p = params.require(obj)
+        .permit(admin_form.fields.to_h.keys + [:upload_gravity])
+    end
+
+end

data/app/controllers/cambium/admin/pages_controller.rb

@@ -0,0 +1,15 @@
+class Cambium::Admin::PagesController < Cambium::AdminController
+
+  private
+
+    def create_params
+      obj = admin_model.to_s.gsub(/Cambium::/, '').tableize.singularize.to_sym
+      p = params.require(obj).permit(admin_form.fields.to_h.keys)
+      if params[:page][:template_data].present?
+        data = @object.template_data.merge(params[:page][:template_data])
+        p = p.merge(:template_data => data)
+      end
+      p
+    end
+
+end

data/app/controllers/cambium/admin/settings_controller.rb

@@ -0,0 +1,32 @@
+class Cambium::Admin::SettingsController < Cambium::AdminController
+
+  before_filter :not_found, :except => [:index, :update]
+
+  def index
+    expected_keys = admin_view.form.edit.fields.to_h.stringify_keys.keys
+    current_keys = Cambium::Setting.keys
+    # Add anything that's missing
+    (expected_keys - current_keys).each do |key|
+      Cambium::Setting.create(:key => key)
+    end
+    @collection = admin_model.alpha
+    # Remove anything extra
+    extra_keys = @collection.collect(&:key) - expected_keys
+    if extra_keys.size > 0
+      Cambium::Setting.where(:key => extra_keys).destroy_all
+      @collection = admin_model.alpha
+    end
+    respond_to do |format|
+      format.html
+      format.csv { send_data admin.to_csv(@collection) }
+    end
+  end
+
+  private
+
+    def create_params
+      obj = admin_model.to_s.gsub(/Cambium::/, '').tableize.singularize.to_sym
+      p = params.require(obj).permit(:value)
+    end
+
+end

data/app/controllers/cambium/admin_controller.rb

@@ -10,16 +10,22 @@ class Cambium::AdminController < Cambium::BaseController
   def index
     respond_to do |format|
       scope = admin_table.scope
-      if scope.split('.').size > 1
-        @collection = admin_model
-        scope.split('.').each do |s|
-          @collection = @collection.send(s)
-        end
+      if params[:sort_by]
+        @collection = admin_model.unscoped
+          .order("#{params[:sort_by]} #{params[:order] || 'asc'}")
       else
-        @collection = admin_model.send(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)
+        end
       end
       format.html do
         @collection = @collection.page(params[:page] || 1).per(15)
+        render :layout => false if params[:no_layout]
       end
       format.csv do
         send_data admin.to_csv(@collection)
@@ -39,7 +45,9 @@ class Cambium::AdminController < Cambium::BaseController
   def create
     @object = admin_model.new(create_params)
     if @object.save
-      redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} created!")
+      redirect_to(
+        admin_routes.index,
+        :notice => "#{admin_model.to_s.gsub(/Cambium::/, '')} created!")
     else
       render 'new'
     end
@@ -52,7 +60,9 @@ class Cambium::AdminController < Cambium::BaseController
   def update
     set_object
     if @object.update(update_params)
-      redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} updated!")
+      redirect_to(
+        admin_routes.index,
+        :notice => "#{admin_model.to_s.gsub(/Cambium::/, '')} updated!")
     else
       render 'edit'
     end
@@ -61,7 +71,9 @@ class Cambium::AdminController < Cambium::BaseController
   def destroy
     set_object
     @object.destroy
-    redirect_to(admin_routes.index, :notice => "#{admin_model.to_s} deleted!")
+    redirect_to(
+      admin_routes.index,
+      :notice => "#{admin_model.to_s.gsub(/Cambium::/, '')} deleted!")
   end
 
   private

data/app/controllers/cambium/pages_controller.rb

@@ -0,0 +1,17 @@
+class Cambium::PagesController < ApplicationController
+
+  def show
+    @page = Cambium::Page.find_by_page_path(request.path)
+    render :inline => @page.template.content, :layout => 'application'
+  end
+
+  def home
+    @page = Cambium::Page.home
+    if @page.nil?
+      render 'home_missing'
+    else
+      render :inline => @page.template.content, :layout => 'application'
+    end
+  end
+
+end

data/app/helpers/cambium/cambium_helper.rb

@@ -40,7 +40,11 @@ module Cambium
     end
 
     def admin_model
-      @admin_model ||= admin_view.model.constantize
+      @admin_model ||= begin
+        admin_view.model.constantize
+      rescue
+        "Cambium::#{admin_view.model}".constantize
+      end
     end
 
     def cambium_page_title(title)
@@ -49,21 +53,21 @@ module Cambium
         if is_index? && has_new_form?
           o += link_to(
             admin_view.form.new.title,
-            admin_routes.new,
+            cambium_route(:new),
             :class => 'button new'
           )
         end
         if is_index? && admin_view.export.present?
           o += link_to(
             admin_view.export.button || "Export #{admin_table.title}",
-            "#{admin_routes.index}.csv",
+            "#{cambium_route(:index)}.csv",
             :class => 'button export'
           )
         end
         if is_edit? && can_delete?
           o += link_to(
             admin_view.form.buttons.delete,
-            admin_routes.delete,
+            cambium_route(:delete, @object),
             :class => 'button delete',
             :method => :delete,
             :data => { :confirm => 'Are you sure?' }
@@ -81,8 +85,28 @@ module Cambium
             content_tag(:tr) do
               o2 = ''
               columns.to_h.each do |col|
-                obj_methods << col.first.to_s
-                o2 += content_tag(:th, col.last.heading)
+                obj_methods << (col.last.display_method || col.first.to_s)
+                if col.last.sortable
+                  o2 += content_tag(:th) do
+                    path = "admin_#{controller_name}_path"
+                    args = {
+                      :page => params[:page] || 1,
+                      :sort_by => col.first,
+                      :order => (params[:order] == 'asc' &&
+                                 params[:sort_by] == col.first) ? :desc : :asc
+                    }
+                    begin
+                      route = cambium.send(path, args)
+                    rescue
+                      route = main_app.send(path, args)
+                    end
+                    klass  = args[:order].to_s
+                    klass += ' active' if params[:sort_by] == col.first.to_s
+                    link_to(col.last.heading, route, :class => klass)
+                  end
+                else
+                  o2 += content_tag(:th, col.last.heading)
+                end
               end
               o2 += content_tag(:th, nil)
               o2.html_safe
@@ -96,13 +120,8 @@ module Cambium
                 obj_methods.each do |method|
                   o3 += content_tag(:td, obj.send(method))
                 end
-                path = "edit_admin_#{controller_name.singularize}_path"
-                begin
-                  route = cambium.send(path, obj)
-                rescue
-                  route = main_app.send(path, obj)
-                end
-                o3 += content_tag(:td, link_to('', route), :class => 'actions')
+                o3 += content_tag(:td, link_to('', cambium_route(:edit, obj)),
+                                  :class => 'actions')
                 o3.html_safe
               end
             end
@@ -114,7 +133,7 @@ module Cambium
       end
     end
 
-    def cambium_form(obj, fields, url=nil)
+    def cambium_form(obj, fields, url=nil, &block)
       content_tag(:section, :class => 'form') do
         if url.nil?
           case action_name
@@ -125,126 +144,133 @@ module Cambium
           end
         end
         simple_form_for obj, :url => url do |f|
-          cambium_form_fields(f, obj, fields)
+          o  = cambium_form_fields(f, obj, fields)
+          o += capture(f, &block) if block_given?
+          o += f.submit
+          o
         end
       end
     end
 
     def cambium_form_fields(f, obj, fields)
       o = ''
-      fields.to_h.each do |data|
-        attr = data.first.to_s
-        options = data.last
-        readonly = options.readonly || false
-        label = options.label || attr.titleize
-        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 => collection,
-            :label => label,
-            :readonly => readonly
-          )
-        elsif ['date','time'].include?(options.type)
-          if obj.send(attr).present?
-            val = (options.type == 'date') ?
-              obj.send(attr).strftime("%d %B, %Y") :
-              obj.send(attr).strftime("%l:%M %p")
-          end
-          o += f.input(
-            attr.to_sym,
-            :as => :string,
-            :label => label,
-            :input_html => {
-              :class => "picka#{options.type}",
-              :value => val.nil? ? nil : val
-            },
-            :readonly => readonly
-          )
-        elsif options.type == 'datetime'
-          o += content_tag(:div, :class => 'input string pickadatetime') do
-            o2 = content_tag(:label, attr.to_s.humanize.titleize)
-            o2 += content_tag(
-              :input,
-              '',
-              :label => label,
-              :placeholder => 'Date',
-              :type => 'text',
-              :class => 'pickadatetime-date',
-              :value => obj.send(attr).present? ?
-                obj.send(attr).strftime("%d %B, %Y") : '',
-              :readonly => readonly
-            )
-            o2 += content_tag(
-              :input,
-              '',
-              :label => label,
-              :placeholder => 'Time',
-              :type => 'text',
-              :class => 'pickadatetime-time',
-              :value => obj.send(attr).present? ?
-                obj.send(attr).strftime("%l:%M %p") : '',
-              :readonly => readonly
-            )
-            o2 += f.input(
-              attr.to_sym,
-              :as => :hidden,
-              :wrapper => false,
-              :label => false,
-              :input_html => { :class => 'pickadatetime' }
-            )
+      fields.to_h.each do |field|
+        o += cambium_field(f, obj, field)
+      end
+      o.html_safe
+    end
+
+    def cambium_field(f, obj, field)
+      attr = field.first.to_s
+      options = field.last
+      options = options.to_ostruct unless options.class == OpenStruct
+      readonly = options.readonly || false
+      label = options.label || attr.titleize
+      required = options.required || false
+      if options.type == 'heading'
+        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
+        f.input(attr.to_sym, :as => options.type, :collection => collection,
+                :label => label, :readonly => readonly)
+      elsif ['date','time'].include?(options.type)
+        if obj.send(attr).present?
+          val = (options.type == 'date') ?
+            obj.send(attr).strftime("%d %B, %Y") :
+            obj.send(attr).strftime("%l:%M %p")
+        end
+        f.input(attr.to_sym, :as => :string, :label => label,
+                :input_html => {
+                  :class => "picka#{options.type}",
+                  :value => val.nil? ? nil : val
+                }, :readonly => readonly)
+      elsif options.type == 'datetime'
+        content_tag(:div, :class => 'input string pickadatetime') do
+          o2 = content_tag(:label, label)
+          o2 += content_tag(:input, '', :label => label, :placeholder => 'Date',
+                            :type => 'text', :class => 'pickadatetime-date',
+                            :value => obj.send(attr).present? ?
+                              obj.send(attr).strftime("%d %B, %Y") : '',
+                            :readonly => readonly)
+          o2 += content_tag(:input, '', :label => label, :placeholder => 'Time',
+                            :type => 'text', :class => 'pickadatetime-time',
+                            :value => obj.send(attr).present? ?
+                              obj.send(attr).strftime("%l:%M %p") : '',
+                            :readonly => readonly)
+          o2 += f.input(attr.to_sym, :as => :hidden, :wrapper => false,
+                        :label => false,
+                        :input_html => { :class => 'pickadatetime' })
+        end
+      elsif options.type == 'markdown'
+        content_tag(:div, :class => "input text optional #{attr}") do
+          o2  = content_tag(:label, label, :for => attr)
+          o2 += content_tag(:div, f.markdown(attr.to_sym), :class => 'markdown')
+        end
+      elsif options.type == 'wysiwyg'
+        f.input(attr.to_sym, :as => :text, :label => label,
+                :input_html => { :class => 'editor' })
+      elsif options.type == 'media'
+        content_tag(:div, :class => 'input media-picker file') do
+          o2  = content_tag(:label, label)
+          o2 += link_to('Choose File', '#', :class => 'add')
+          o2 += link_to('Remove File', '#',
+            :class => "remove #{'active' unless obj.send(attr).blank? }")
+          unless obj.send(attr).blank?
+            ext = obj.send(attr).upload.ext.downcase
+            if ['jpg','jpeg','gif','png'].include?(ext)
+              o2 += image_tag(obj.send(attr).image_url(400, 400))
+            end
+            o2 += link_to(obj.send(attr).upload.name,
+                          obj.send(attr).upload.url,
+                         :class => 'file', :target => :blank)
           end
-        elsif options.type == 'markdown'
-          o += content_tag(:div, :class => "input text optional #{attr}") do
-            o2  = content_tag(:label, label, :for => attr)
-            o2 += content_tag(
-              :div,
-              f.markdown(attr.to_sym),
-              :class => 'markdown'
-            )
+          o2 += f.input(attr.to_sym, :as => :hidden, :wrapper => false)
+        end
+      elsif options.type == 'file'
+        o = f.input(attr.to_sym, :as => options.type, :label => label,
+                :readonly => readonly, :required => required)
+        unless obj.send(attr).blank?
+          if ['jpg','jpeg','gif','png'].include?(obj.send(attr).ext.downcase)
+            o += image_tag obj.send(attr)
+                              .thumb("200x200##{obj.send("#{attr}_gravity")}")
+                              .url
+            o += content_tag(:div, :class => 'image-actions') do
+              o2  = ''.html_safe
+              o2 += link_to('Crop Image', '#', :class => 'crop',
+                            :target => :blank, :data => {
+                            :url => obj.send(attr).url,
+                            :width => obj.send(attr).width,
+                            :height => obj.send(attr).height }) if options.crop
+              o2 += link_to(obj.send(attr).name, obj.send(attr).url,
+                       :class => 'file', :target => :blank)
+              o2 += f.input :"#{attr}_gravity", :as => :hidden
+            end
+          else
+            o += link_to(obj.send(attr).name, obj.send(attr).url,
+                         :class => 'file', :target => :blank)
           end
-        elsif options.type == 'file'
-          o += f.input(
-            attr.to_sym,
-            :as => options.type,
-            :label => label,
-            :readonly => readonly
-          )
-          o += link_to(
-            obj.send(attr).name,
-            obj.send(attr).url,
-            :class => 'file',
-            :target => :blank
-          ) unless obj.send(attr).blank?
-        else
-          o += f.input(
-            attr.to_sym,
-            :as => options.type,
-            :label => label,
-            :readonly => readonly
-          )
         end
+        o
+      else
+        f.input(attr.to_sym, :as => options.type, :label => label,
+                :readonly => readonly)
       end
-      o += f.submit
-      o.html_safe
     end
 
     def cambium_route(action, obj = nil)
+      c_name = controller_name.singularize
       case action
       when :index
         begin
           main_app
-            .polymorphic_path [:admin, obj.class.to_s.tableize.pluralize.to_sym]
+            .polymorphic_path [:admin, controller_name.to_sym]
         rescue
-          cambium.polymorphic_path [:admin, obj.class.to_s.tableize.pluralize.to_sym]
+          cambium.polymorphic_path [:admin, controller_name.to_sym]
         end
       when :edit
         begin
@@ -252,6 +278,12 @@ module Cambium
         rescue
           cambium.polymorphic_path [:edit, :admin, obj]
         end
+      when :new
+        begin
+          main_app.polymorphic_path [:new, :admin, c_name.to_sym]
+        rescue
+          cambium.polymorphic_path [:new, :admin, c_name.to_sym]
+        end
       else
         begin
           main_app.polymorphic_path [:admin, obj]