cambium 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29da11f3322f226331391271921de5a185c1e038
-  data.tar.gz: bc1726947ccc6aac36768db892bb9916413f4d1c
+  metadata.gz: 367bb1dafa5ce1f34612a0e5092e05a74a1d8121
+  data.tar.gz: d9ec577e4616fadb2fb3ff1b19d861d254731a62
 SHA512:
-  metadata.gz: ebca18b41a35ec1eb921edc0dd0c766417bde5fc0f60b7b63d2ed688c066ce6c20d1ec8137e47abdef88e61f78b1047485ab135da55fbc7a81a0d7f4177cf94b
-  data.tar.gz: 4868fff7264adcb70ab546c3f54f9499a372684a492eba871cd9077302a83a790478eee1d0981c5a50d90d329b9cf8d30c8dba71c1d560c370ccf937787e0d25
+  metadata.gz: 02c0947e578e85183f2768d4c8f697881d979dcdaa4000d831b0dc214558b1b2433ea0c791a9c9b8aa8f84ce86d12b5be4f9134d42e564b9f42ec16837009220
+  data.tar.gz: 9be5055314f591116cc9041efb5b42015549c6139f73a4ced6657b0b7d0c4a3dc5ade4e8ce879640f0f99fc8e2d90fb49086688c1a1ef57f64c37bdf0e136f92

data/app/assets/javascripts/cambium/admin/views/editor.js.coffee

@@ -4,6 +4,7 @@ class App.Views.Editor extends Backbone.View
     for textarea in $('textarea.editor')
       $(textarea).trumbowyg
         fullscreenable: false
+        svgPath: TRUMBOWYG_SVG
         btns: ['viewHTML',
           '|', 'formatting',
           '|', 'strong', 'em',

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

@@ -2,7 +2,7 @@ aside#activity {
   background: $color-light-dark;
   border-left: 1px solid $color-light-darker;
   padding: 25px 10px;
-  @include box-sizing(border-box);
+  box-sizing: border-box;;
   article {
     margin: 0 0 30px 0;
     &:last-child {

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

@@ -5,7 +5,7 @@ div.status{
   width: 100%;
   z-index: 99999;
   text-align: center;
-  @include box-sizing(border-box);
+  box-sizing: border-box;;
   p.notice, p.alert {
     margin: 0;
     padding: 25px 0;

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

@@ -37,14 +37,13 @@ section.form {
         & + .image-actions, & + img + .image-actions, .image-actions {
           display: block;
           clear: both;
-          width: 100%;
-          margin: 5px 0 20px;
+          width: 75%;
+          margin: 5px 0 20px 25%;
           font-size: 14px;
           line-height: 14px;
-          text-align: right;
           a {
             display: inline-block;
-            margin-left: 10px;
+            margin-right: 10px;
           }
         }
         & + div.input {
@@ -103,7 +102,7 @@ section.form {
         vertical-align: bottom;
         font-size: 16px;
         border: none;
-        @include box-sizing(border-box);
+        box-sizing: border-box;;
         &[readonly=readonly] {
           background-color: $color-light-dark;
           border-bottom-color: $color-light-dark;
@@ -167,15 +166,23 @@ section.form {
       .trumbowyg-box {
         display: inline-block;
         width: 75%;
+        min-height: 375px;
         margin: 5px 0;
         &.trumbowyg-fullscreen {
           width: 100%;
         }
+        .trumbowyg-button-pane button {
+          margin: 0 0 1px;
+        }
+        textarea {
+          border: none;
+          width: 100%;
+        }
       }
       .trumbowyg-modal {
         // position: fixed;
         .trumbowyg-modal-box {
-          height: 295px;
+          height: 315px;
           form {
             input {
               height: auto;
@@ -198,6 +205,7 @@ section.form {
               width: auto;
               .trumbowyg-input-infos {
                 float: left;
+                margin-top: -24px;
                 span {
                   font-size: 14px;
                   border: none;
@@ -217,7 +225,7 @@ section.form {
       display: block;
       width: 100%;
       margin: 15px 0 0 0;
-      @include box-sizing(border-box);
+      box-sizing: border-box;;
       @include transition(all 0.35s linear);
       font-size: 16px;
       font-weight: 600;

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

@@ -50,7 +50,7 @@ header {
     float: right;
     height: 60px;
     padding: 0;
-    @include box-sizing(border-box);
+    box-sizing: border-box;;
     // border-left: 1px solid $color-5-dark;
     @include transition-all;
     &:hover {

data/app/controllers/cambium/admin_controller.rb

@@ -1,6 +1,8 @@
 class Cambium::AdminController < Cambium::BaseController
 
   before_filter :authenticate_admin!
+
+  before_filter :set_paper_trail_whodunnit
   before_filter :set_activities
 
   layout "admin"

data/app/controllers/cambium/pages_controller.rb

@@ -1,12 +1,18 @@
 class Cambium::PagesController < ApplicationController
 
+  before_filter :set_page, :only => [:show]
+  before_filter :set_home_page, :only => [:home]
+
+  if Cambium.configuration.cache_pages
+    caches_action :show, :cache_path => :page_cache_path.to_proc
+    caches_action :home, :cache_path => :page_cache_path.to_proc
+  end
+
   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
@@ -14,4 +20,22 @@ class Cambium::PagesController < ApplicationController
     end
   end
 
+  protected
+
+    def set_page
+      @page = Cambium::Page.find_by_page_path(request.path)
+    end
+
+    def set_home_page
+      @page = Cambium::Page.home
+    end
+
+    def q_to_s
+      request.query_parameters.to_a.collect { |q| "_#{q[0]}_#{q[1]}"  }.join('')
+    end
+
+    def page_cache_path
+      "_p#{@page.id}#{q_to_s}"
+    end
+
 end

data/app/helpers/cambium/cambium_helper.rb

@@ -162,7 +162,7 @@ module Cambium
 
     def cambium_field(f, obj, field)
       attr = field.first.to_s
-      options = field.last
+      options = field.is_a?(OpenStruct) ? field : field.last
       options = options.to_ostruct unless options.class == OpenStruct
       readonly = options.readonly || false
       label = options.label || attr.titleize
@@ -213,7 +213,7 @@ module Cambium
         end
       elsif options.type == 'wysiwyg'
         f.input(attr.to_sym, :as => :text, :label => label,
-                :input_html => { :class => 'editor' })
+                :input_html => { :class => 'editor' }, :required => required)
       elsif options.type == 'media'
         content_tag(:div, :class => 'input media-picker file') do
           o2  = content_tag(:label, label)
@@ -235,30 +235,52 @@ module Cambium
         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
+          # Dragonfly ...
+          if obj.send(attr).respond_to?(:ext)
+            if %w(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
+          # CarrierWave (assumed, for now)
           else
-            o += link_to(obj.send(attr).name, obj.send(attr).url,
+            if %w(jpg jpeg gif png).include?(obj.send(attr).file.extension.downcase)
+              o += image_tag obj.send(attr).thumb.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).file.filename, 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
           end
         end
         o
       else
         f.input(attr.to_sym, :as => options.type, :label => label,
-                :readonly => readonly)
+                :readonly => readonly, :required => required)
       end
     end
 

data/app/models/cambium/document.rb

@@ -1,6 +1,8 @@
 module Cambium
   class Document < ActiveRecord::Base
 
+    extend Dragonfly::Model
+
     # ------------------------------------------ Plugins
 
     include PgSearch

data/app/models/cambium/page.rb

@@ -22,6 +22,7 @@ module Cambium
 
     after_save :cache_page_path
     after_save :reload_routes!
+    after_save :expire_caches
 
     # ------------------------------------------ Class Methods
 
@@ -53,7 +54,9 @@ module Cambium
 
     def method_missing(method, *arguments, &block)
       if respond_to?(method.to_s)
-        if template.fields[method.to_s]['type'] == 'media'
+        if template.fields[method.to_s.gsub(/\?$/, '')]['type'] == 'boolean'
+          template_data[method.to_s.gsub(/\?$/, '')].to_i == 1
+        elsif template.fields[method.to_s]['type'] == 'media'
           Cambium::Document.find_by_id(template_data[method.to_s].to_i)
         else
           template_data[method.to_s]
@@ -67,6 +70,9 @@ module Cambium
       return true if super
       return false if template.blank?
       return true if template.fields.keys.include?(method.to_s)
+      template.fields.each do |name, attrs|
+        return true if attrs["type"] == 'boolean' && method.to_s == "#{name}?"
+      end
       false
     end
 
@@ -80,5 +86,9 @@ module Cambium
         update_columns(:page_path => "/#{path.collect(&:slug).join('/')}")
       end
 
+      def expire_caches
+        Rails.cache.delete_matched(/\_p#{id}(.*)/)
+      end
+
   end
 end

data/app/views/cambium/admin/_header.html.erb

@@ -14,20 +14,14 @@
     <% end %>
     <div class="dropdown-menu">
       <ul>
-        <%= content_tag(
-          :li,
-          link_to(
-            'Edit Profile',
-            cambium.edit_admin_user_path(current_user)
-          )
-        ) %>
-        <%= content_tag(
-          :li,
-          link_to(
-            'Sign Out',
-            main_app.destroy_user_session_path,
-          )
-        ) %>
+        <li>
+          <%= link_to 'Edit Profile',
+                      cambium.edit_admin_user_path(current_user) %>
+        </li>
+        <li>
+          <%= link_to 'Sign Out', main_app.destroy_user_session_path,
+                      :method => :delete %>
+        </li>
       </ul>
     </div>
   </div>

data/app/views/cambium/admin/edit.html.erb

@@ -1,7 +1,6 @@
 <%= cambium_page_title(admin_form.title) %>
 
-<%= content_tag(
-  :div,
-  cambium_form(@object, admin_form.fields),
-  :id => 'page-content'
-) %>
+<div id="page-content"
+     data-library="<%= cambium.admin_documents_path(:no_layout => true) %>">
+  <%= cambium_form(@object, admin_form.fields) %>
+</div>

data/app/views/cambium/admin/new.html.erb

@@ -1,7 +1,6 @@
 <%= cambium_page_title(admin_form.title) %>
 
-<%= content_tag(
-  :div,
-  cambium_form(@object, admin_form.fields),
-  :id => 'page-content'
-) %>
+<div id="page-content"
+     data-library="<%= cambium.admin_documents_path(:no_layout => true) %>">
+  <%= cambium_form(@object, admin_form.fields) %>
+</div>

data/app/views/cambium/admin/settings/index.html.erb

@@ -4,10 +4,8 @@
   <section class="form settings">
     <% @collection.each do |obj| %>
       <%= simple_form_for [:admin, obj] do |f| %>
-        <%= f.input :value,
-                    :as => admin_view.form.edit.fields.send(obj.key).type,
-                    :label => admin_view.form.edit.fields.send(obj.key).label,
-                    :input_html => { :id => obj.key } %>
+        <% field = [:value, admin_view.form.edit.fields.send(obj.key)] %>
+        <%= cambium_field(f, obj, field) %>
         <%= f.submit "Save #{admin_view.form.edit.fields.send(obj.key).label}" %>
       <% end %>
     <% end %>

data/app/views/layouts/admin.html.erb

@@ -8,6 +8,9 @@
     <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0, initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">
+    <script>
+      TRUMBOWYG_SVG = '<%= image_path('trumbowyg/images/icons.svg') %>';
+    </script>
     <%= stylesheet_link_tag 'cambium/admin/application', :media => 'all' %>
     <%= javascript_include_tag "modernizr" %>
     <%= csrf_meta_tags %>

data/config/routes.rb

@@ -12,8 +12,14 @@ Cambium::Engine.routes.draw do
 
   if ActiveRecord::Base.connection.table_exists?('cambium_pages')
     Cambium::Page.published.each do |page|
+      template = page.template
+      next if template.nil? || page.page_path.blank?
       begin
-        get page.page_path => 'pages#show' unless page.page_path.blank?
+        if template.respond_to?(:controller) && template.respond_to?(:action)
+          get page.page_path => "/#{template.controller}##{template.action}"
+        else
+          get page.page_path => 'pages#show'
+        end
       rescue
       end
     end

data/lib/cambium/configuration.rb

@@ -2,13 +2,15 @@ module Cambium
   class Configuration
 
     attr_accessor :app_title,
+                  :cache_pages,
                   :development_url,
                   :production_url
 
     def initialize
+      @app_title            = 'Cambium'
+      @cache_pages          = false
       @development_url      = 'localhost:3000'
       @production_url       = 'example.com'
-      @app_title            = 'Cambium'
     end
 
   end

data/lib/cambium/version.rb

@@ -1,3 +1,3 @@
 module Cambium
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/generators/cambium/controller_generator.rb

@@ -32,10 +32,10 @@ module Cambium
     # end
 
     def confirm_model
-      @model = model.constantize
-    rescue
-      puts "Can't find the model: #{model}"
-      exit
+      @model = model.classify.singularize.constantize
+    # rescue
+    #   puts "Can't find the model: #{model}"
+    #   exit
     end
 
     def set_model_attrs

data/lib/generators/templates/config/initializers/assets.rb

@@ -1,3 +1,3 @@
 Rails.application.config.assets.precompile += %w(
   modernizr.js trumbowyg/images/icons.png trumbowyg/images/icons-2x.png
-)
+  trumbowyg/images/icons.svg)

data/lib/generators/templates/config/initializers/cambium.rb

@@ -13,4 +13,13 @@ Cambium.configure do |config|
   #
   config.app_title = 'Cambium'
 
+  # -------------------------------------------------- Caching
+
+  # Cambium's Pages come with action caching support. It is disabled by default.
+  # Uncomment the setting below to enable action caching.
+  #
+  # NOTE: You must install the 'actionpack-action_caching' gem for this to work.
+  #
+  # config.cache_pages = true
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cambium
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Sean C Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -254,7 +254,6 @@ files:
 - app/assets/javascripts/cambium/admin/templates/.keep
 - app/assets/javascripts/cambium/admin/templates/image_cropper.jst.ejs
 - app/assets/javascripts/cambium/admin/templates/modal.jst.ejs
-- app/assets/javascripts/cambium/admin/users.js
 - app/assets/javascripts/cambium/admin/views/default_helpers.js.coffee
 - app/assets/javascripts/cambium/admin/views/dropdown_menu.js.coffee
 - app/assets/javascripts/cambium/admin/views/editor.js.coffee

data/app/assets/javascripts/cambium/admin/users.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.