cmtool 2.0.0 → 3.1.0

data/README.md

@@ -34,9 +34,8 @@ Make sure that the locales you want to work with are specified in
 
 This will add some gems you might like anyway, here a list:
 
-*   bourbon
+*   bourbon # NOOOOOO
 *   jquery-rails
-*   tinymce-rails
 *   sass-rails
 *   paperclip
 *   email_validator (validates :email, email: true)
@@ -120,7 +119,7 @@ If you add a method `cmtool_locale` to your application controller Cmtool will
 take this value:
 ```ruby
 class ApplicationController
-  before_filter :set_locale
+  before_action :set_locale
 
   private
 

data/app/assets/javascripts/cmtool/application.js.coffee

@@ -2,12 +2,16 @@
 #= require jquery_ujs
 #= require foundation
 #= require ace/ace
+#= require moment
 #= require ace/theme-monokai
 #= require ace/mode-coffee
 #= require ace/mode-handlebars
+#= require ace/mode-json
 #= require ace/mode-yaml
 #= require ace/mode-haml
-#= require tinymce-jquery
+#= require ace/mode-slim
+# require tinymce-jquery
+# require tinymce
 #= require pickadate/picker
 #= require pickadate/picker.date
 #= require pickadate/picker.time
@@ -36,3 +40,6 @@ $ ->
       iframe.attr 'src', url
       $('#preview-modal').foundation('reveal', 'open')
     false
+
+  $("[data-time]").each ->
+    $(this).text moment($(this).data("time")).format($(this).data("timeFormat") or "dd D MMM HH:mm")

data/app/assets/javascripts/cmtool/html_edit.js.coffee

@@ -2,7 +2,7 @@ class HtmlEdit
   setup: ->
     #ACE
     locale_field = $('#page_locale')
-    $('.html-content').each (i, el)->
+    $('.html-content').each (i, el) ->
       text_field = $(el)
       template_field = $("##{text_field.attr('id')}_template")
       ace_div = $('<div></div>').addClass('ace-div')
@@ -13,9 +13,14 @@ class HtmlEdit
       editor = ace.edit(ace_div.get(0))
       editor.setTheme 'ace/theme/monokai'
       if template_field.length
+        text_field.before '<a href="https://emblemjs.com/" target="_blank">This is a template language. For reference, visit: emblemjs.com</a>'
         editor.setValue template_field.val(), -1
-        editor.getSession().setMode 'ace/mode/haml'
-        console.log "Editing haml"
+        editor.getSession().setMode 'ace/mode/slim'
+        console.log "Editing Emblem using Slim mode for ACE editor"
+      else if data_mode = text_field.data('mode')
+        editor.setValue text_field.val(), -1
+        editor.getSession().setMode "ace/mode/#{data_mode}"
+        console.log "Editing #{data_mode} using ACE editor"
       else
         editor.setValue text_field.val(), -1
         editor.getSession().setMode 'ace/mode/handlebars'
@@ -33,6 +38,9 @@ class HtmlEdit
             result_value = template(template_vars)
             template_field.val value
             text_field.val result_value
+            console.log "Succesfull conversion of template to HTML"
+          catch error
+            console.log error.message
         else
           text_field.val value
       editor.getSession().on 'change', rebuild_html

data/app/assets/javascripts/cmtool/structure.js.coffee.erb

@@ -1,13 +1 @@
 <% cmtool = Cmtool::Engine.routes.url_helpers %>
-$ ->
-  $('textarea.mceEditor, .editor_full').tinymce
-    theme: 'modern'
-    plugins: ['image', 'link', 'table', 'searchreplace', 'code']
-    language: tinymce_language
-    image_list: '<%= cmtool.images_path(format: :js) %>'
-    relative_urls: false
-    removed_menuitems: 'newdocument'
-    apply_source_formatting: true
-  $('.editor_basic').tinymce
-    theme: 'modern'
-    language: tinymce_language

data/app/assets/stylesheets/cmtool/user_info.sass

@@ -1,10 +1,10 @@
-@import bourbon
+// @import bourbon
 #user-info
   float: right
   width: 400px
   height: 22px
   margin-top: -30px
-  @include linear-gradient(#2989d8, #1e5799)
+  // @include linear-gradient(#2989d8, #1e5799)
   color: white
   font-weight: bold
   padding: 4px

data/app/controllers/cmtool/application_controller.rb

@@ -1,7 +1,7 @@
 module Cmtool
   class ApplicationController < ::ApplicationController
     include Cmtool::ControllerGlue
-    before_filter :authorize_user, :check_environment, :set_locale
+    before_action :authorize_user, :check_environment, :set_locale
     layout 'cmtool/application'
 
     private

data/app/controllers/cmtool/contact_forms_controller.rb

@@ -1,6 +1,6 @@
 module Cmtool
   class Cmtool::ContactFormsController < Cmtool::ApplicationController
-    skip_before_filter :authenticate_user!, :authorize_user, only: :add
+    skip_before_action :authorize_user, only: :add
 
     # GET /contact_forms
     # GET /contact_forms.xml
@@ -9,7 +9,7 @@ module Cmtool
 
       respond_to do |format|
         format.html # index.html.erb
-        format.xml  { render :xml => @contact_forms }
+        format.xml  { render xml: @contact_forms }
       end
     end
 
@@ -20,7 +20,7 @@ module Cmtool
 
       respond_to do |format|
         format.html # show.html.erb
-        format.xml  { render :xml => @contact_form }
+        format.xml  { render xml: @contact_form }
       end
     end
 
@@ -31,7 +31,7 @@ module Cmtool
 
       respond_to do |format|
         format.html # new.html.erb
-        format.xml  { render :xml => @contact_form }
+        format.xml  { render xml: @contact_form }
       end
     end
 
@@ -47,11 +47,11 @@ module Cmtool
 
       respond_to do |format|
         if @contact_form.save
-          format.html { redirect_to([cmtool, @contact_form], :notice => I18n.t('cmtool.action.create.successful', :model => Cmtool::ContactForm.model_name.human)) }
-          format.xml  { render :xml => @contact_form, :status => :created, :location => @contact_form }
+          format.html { redirect_to([cmtool, @contact_form], notice: I18n.t('cmtool.action.create.successful', model: Cmtool::ContactForm.model_name.human)) }
+          format.xml  { render xml: @contact_form, status: :created, location: @contact_form }
         else
-          format.html { render :action => "new" }
-          format.xml  { render :xml => @contact_form.errors, :status => :unprocessable_entity }
+          format.html { render action: "new" }
+          format.xml  { render xml: @contact_form.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -63,11 +63,11 @@ module Cmtool
 
       respond_to do |format|
         if @contact_form.update_attributes(contact_form_params)
-          format.html { redirect_to([cmtool, @contact_form], :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::ContactForm.model_name.human)) }
+          format.html { redirect_to([cmtool, @contact_form], notice: I18n.t('cmtool.action.update.successful', model: Cmtool::ContactForm.model_name.human)) }
           format.xml  { head :ok }
         else
-          format.html { render :action => "edit" }
-          format.xml  { render :xml => @contact_form.errors, :status => :unprocessable_entity }
+          format.html { render action: "edit" }
+          format.xml  { render xml: @contact_form.errors, status: :unprocessable_entity }
         end
       end
     end

data/app/controllers/cmtool/newsletter_subscriptions_controller.rb

@@ -1,6 +1,6 @@
 module Cmtool
   class Cmtool::NewsletterSubscriptionsController < Cmtool::ApplicationController
-    skip_before_filter :authenticate_user!, :authorize_user, only: :add
+    skip_before_action :authorize_user, only: :add
 
     # GET /newsletter_subscriptions
     # GET /newsletter_subscriptions.xml

data/app/helpers/cmtool/application_helper.rb

@@ -15,9 +15,9 @@ module Cmtool
     end
 
     # overwrite i18n l, to handle nil values
-    def l(*args)
+    def l(*args, **options)
       return '' unless args.first
-      super(*args)
+      super(*args, **options)
     end
 
     def site_title
@@ -31,7 +31,7 @@ module Cmtool
     # or normal text behaviour:
     #   - title "Home"
     def title(*args)
-      content_for :title do
+      res = content_tag :h1, class: 'page-title' do
         if args.first.is_a?(Symbol) && (args[1].respond_to?(:model_name) || args[1].class.respond_to?(:model_name))
           model = args[1].respond_to?(:model_name) ? args[1] : args[1].class
           if args.first == :index
@@ -40,11 +40,13 @@ module Cmtool
             t("cmtool.action.#{args.first}.title", model: model.model_name.human)
           end
         else
-          raise 'Imporoper title declaration'
           args.first
         end
       end
+      content_for :page_title, res
+      res
     end
+
     def are_you_sure(obj = nil)
       if name = obj && obj.respond_to?(:name) && obj.name.presence
         t('cmtool.general.are_you_sure_with_name', name: name, model: obj.class.model_name.human)
@@ -130,17 +132,29 @@ module Cmtool
       controller.respond_to?(:cmtool_user) ? controller.send(:cmtool_user) :nil
     end
 
-    def edit_td(obj)
+    def edit_td(obj, options = {})
+      path = options[:path] || case obj
+        when Array then edit_polymorphic_path(obj)
+        when SimplyStored::Couch then edit_polymorphic_path([options[:scope] || cmtool, obj])
+        else obj
+      end
       content_tag(
         :td,
-        link_to((content_tag(:span, '', class: [:edit, 'fa fa-lg fa-pencil'])), cmtool.url_for([:edit, obj]), class: 'tiny warning button'),
+        link_to((content_tag(:span, '', class: [:edit, 'fa fa-lg fa-pencil'])), path, class: 'tiny warning button'),
         class: [:action, :edit]
       )
     end
-    def destroy_td(obj)
+
+    def destroy_td(obj, options = {})
+      path = options[:path] || case obj
+        when Array then polymorphic_path(obj)
+        when SimplyStored::Couch then polymorphic_path([options[:scope] || cmtool, obj])
+        else obj
+      end
+
       content_tag(
         :td,
-        link_to(content_tag(:span, '', class: [:destroy, 'fa fa-lg fa-trash']), cmtool.url_for(obj), method: :delete, class: 'tiny alert button', data: {confirm: are_you_sure(obj) }),
+        link_to(content_tag(:span, '', class: [:destroy, 'fa fa-lg fa-trash']), path, method: :delete, class: 'tiny alert button', data: {confirm: are_you_sure(obj) }),
         class: [:action, :destroy]
       )
     end

data/app/models/cmtool/contact_form.rb

@@ -7,5 +7,15 @@ module Cmtool
     property :phone
     property :body
     validates :email, presence: true
+    validate :if_there_are_bad_intentions
+
+    private
+
+    def if_there_are_bad_intentions
+      has_bad_intentions = false
+      has_bad_intentions = true if "#{email}#{body}" =~ /funded\.com/i
+      has_bad_intentions = true if email.to_s =~ /capital|funding|funded/i
+      errors.add(:base, :bad_intentions) if has_bad_intentions
+    end
   end
 end

data/app/models/cmtool/image.rb

@@ -2,10 +2,14 @@ module Cmtool
   class Image
     include SimplyStored::Couch
     include Paperclip::Glue
+    # TODO: Replace Paperclip with SimplyStored::HasAttachment
+    # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
+    # 2. Replace `has_attached_file :file, styles: {...}` with `has_attachment :file, styles: {...}`
+    # 3. Replace `validates_attachment` with standard Rails validations
 
     property :file_file_name
     property :file_content_type
-    property :file_file_size, type: Fixnum
+    property :file_file_size, type: Integer
     property :file_updated_at, type: Time
     has_attached_file :file, styles: { page: '728x10000>', medium: "354x1000>", thumb: "160x1250>" },
       path: ":rails_root/public/system/:attachment/:id/:style.:extension",

data/app/models/cmtool/news.rb

@@ -2,29 +2,32 @@ module Cmtool
   class News
     include SimplyStored::Couch
     include Paperclip::Glue
-  
+    # TODO: Replace Paperclip with SimplyStored::HasAttachment
+    # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
+    # 2. Replace `has_attached_file :image, styles: {...}` with `has_attachment :image, styles: {...}`
+
     property :title
     property :active, type: :boolean, default: true
     property :date, type: Date
     property :body
-  
+
     property :image_file_name
     property :image_content_type
-    property :image_file_size, type: Fixnum
+    property :image_file_size, type: Integer
     property :image_updated_at, type: Time
-  
+
     has_attached_file :image, styles: { :medium => "500x500>", :thumb => "250x250>" }
     has_and_belongs_to_many :keywords, storing_keys: true
     validates :title, presence: true
     validates :date, presence: true
-  
+
     view :all_documents, key: :date, descending: true
     view :by_active, key: [:active, :date], descending: true
-  
+
     def self.active(options = {till: Date.today})
       find_all_by_active(true, options)
     end
-  
+
     def self.find_all_by_active(active, options = {till: Date.today})
       database.view(by_active(startkey: [active, options[:till].strftime('%Y-%m-%d')], endkey: [active], descending: true))
     end

data/app/models/cmtool/quote.rb

@@ -2,29 +2,32 @@ module Cmtool
   class Quote
     include SimplyStored::Couch
     include Paperclip::Glue
+    # TODO: Replace Paperclip with SimplyStored::HasAttachment
+    # 1. Change `include Paperclip::Glue` to `include SimplyStored::HasAttachment`
+    # 2. Replace `has_attached_file :image, styles: {...}` with `has_attachment :image, styles: {...}`
 
     property :owner
     property :function
     property :state
     property :body
-    property :active, :type => :boolean, :default => true
+    property :active, type: :boolean, default: true
     property :locale
 
     property :image_file_name
     property :image_content_type
-    property :image_file_size, :type => Fixnum
-    property :image_updated_at, :type => Time
+    property :image_file_size, type: Integer
+    property :image_updated_at, type: Time
 
-    has_attached_file :image, :styles => {:medium => "300x1000>", :thumb => "137x1250>" }
+    has_attached_file :image, styles: {medium: "300x1000>", thumb: "137x1250>" }
 
-    view :for_sidebar_view, :key => [:state, :created_at], :conditions => %{doc['active']}
+    view :for_sidebar_view, key: [:state, :created_at], conditions: %{doc['active']}
     STATES = %w[page sidebar]
     def self.active(*args)
       database.view(for_sidebar_view(*args))
     end
 
     def self.for_page
-      active(:startkey => ['page'], :endkey => ['page', {}])
+      active(startkey: ['page'], endkey: ['page', {}])
     end
 
     def self.states
@@ -32,7 +35,7 @@ module Cmtool
     end
 
     def self.for_sidebar
-      active(:startkey => ['sidebar'], :endkey => ['sidebar', {}], :limit => 2)
+      active(startkey: ['sidebar'], endkey: ['sidebar', {}], limit: 2)
     end
   end
 end

data/app/views/cmtool/application/_menu.html.slim

@@ -1,12 +1,12 @@
 - user = defined?(cmtool_user) ? cmtool_user : (defined?(current_user) ? current_user : nil)
 .fixed
-  nav.top-bar data-topbar="" role="navigation" 
+  nav.top-bar data-topbar="" role="navigation"
     ul.title-area
       li.name
         h1
           a href=cmtool.root_path = application_title
       li.toggle-topbar.menu-icon
-        a href="#" 
+        a href="#"
           span Menu
     section.top-bar-section
       - if user.present?

data/app/views/cmtool/newsletter_subscriptions/index.html.slim

@@ -6,8 +6,8 @@
         th= Cmtool::NewsletterSubscription.human_attribute_name(:email)
         th= Cmtool::NewsletterSubscription.human_attribute_name(:deactivation_token)
         th= Cmtool::NewsletterSubscription.human_attribute_name(:active)
-        th
-        th
+        th.action-header
+        th.action-header
     tbody
       - @newsletter_subscriptions.each do |newsletter_subscription|
         tr

data/app/views/cmtool/pages/_form.html.slim

@@ -37,6 +37,12 @@ javascript:
     .field
       = f.label :footer
       = f.text_area :footer, rows: 15, cols: 80, class: 'html-content'
+  = collapsible_content 'Page Settings (JSON)' do
+    .field
+      = f.label :page_settings
+      p.help-text JSON configuration for this page. Use Ace editor in JSON mode.
+      = f.text_area :page_settings, rows: 12, cols: 80, class: 'html-content', data: { mode: 'json' },
+        value: (f.object.page_settings.presence || {}).to_json
   .form-row
     .form-label= f.label :parent_id
     .form-field= f.select :parent_id, tree_options_for_select(Page.full_tree(@page.locale || Page.locales.first), exclude: @page.id, selected: @page.parent_id), include_blank: ' -- '

data/app/views/layouts/cmtool/application.html.slim

@@ -8,7 +8,7 @@ html lang="en"
     link href="/favicon.ico" rel="shortcut icon"
     = csrf_meta_tags
     javascript:
-      var tinymce_language = '#{I18n.locale}';
+      var i18n_language = '#{I18n.locale}';
 
     /! Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]
@@ -39,6 +39,8 @@ html lang="en"
             li= link_to 'Wiki', 'https://github.com/bterkuile/cmtool/wiki', target: :_blank
         = yield :sidebar
     footer
-      p © Cmtool 2015
+      p
+        span © Cmtool 
+        span= Date.today.year
       = yield :footer
     #hidden-html.hide= yield :hidden_html

data/app/views/pages/show.html.slim

@@ -1 +1 @@
-=raw @page.body
+== @page.body

data/cmtool.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
-# stub: cmtool 1.0.0 ruby lib
+$:.push File.expand_path("../lib", __FILE__)
+require 'cmtool/version'
 
 Gem::Specification.new do |s|
   s.name = "cmtool"
-  s.version = "2.0.0"
+  s.version = Cmtool::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -18,13 +19,14 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.add_runtime_dependency "email_validator", ">= 0"
-  s.add_runtime_dependency "bourbon", ">= 0"
+  # s.add_runtime_dependency "bourbon", ">= 0"
   s.add_runtime_dependency "slim-rails", ">= 0"
-  s.add_runtime_dependency "tinymce-rails", ">= 0"
+  # s.add_runtime_dependency "tinymce-rails", ">= 0"
   s.add_runtime_dependency "jquery-rails", ">= 0"
   s.add_runtime_dependency "paperclip", ">= 0"
   s.add_runtime_dependency "foundation-rails", ">= 0"
   s.add_runtime_dependency "ace-rails-ap", ">= 0"
   s.add_runtime_dependency "font-awesome-rails", ">= 0"
   s.add_runtime_dependency "pickadate-rails", ">= 0"
+  s.add_runtime_dependency 'momentjs-rails', '>= 0'
 end

data/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w[ cmtool/application.css cmtool/application.js ]

data/config/locales/cmtool.en.yml

@@ -87,3 +87,9 @@ en:
           image: Images
           directory: Directories
           yml_file: Yml files
+    errors:
+      models:
+        cmtool/contact_form:
+          attributes:
+            base:
+              bad_intentions: This message contains unwanted content

data/config/locales/cmtool.nl.yml

@@ -85,3 +85,9 @@ nl:
           newsletter_subscription: Newsletter subscriptions
           image: Images
           directory: Directories
+    errors:
+      models:
+        cmtool/contact_form:
+          attributes:
+            base:
+              bad_intentions: Dit bericht bevat ongewenste inhoud

data/lib/cmtool/engine.rb

@@ -9,19 +9,34 @@ require 'paperclip'
 require 'jquery-rails'
 require 'bourbon'
 =end
-require 'tinymce-rails'
+# require 'tinymce-rails'
 module Cmtool
   class Engine < ::Rails::Engine
     isolate_namespace Cmtool
-    initializer "cmtool.build_menu" do
-      require 'email_validator'
-      require 'bourbon'
-      require 'slim-rails'
-      require 'paperclip'
-      require 'devise'
-      require 'devise_simply_stored'
-      require 'jquery-rails'
-      require 'tinymce-rails'
+    # initializer 'cmtool.build_menu', after: 'load_config_initializers' do |app|
+    #   require 'email_validator'
+    #   #require 'bourbon'
+    #   require 'slim-rails'
+    #   require 'paperclip'
+    #   require 'devise'
+    #   require 'devise_simply_stored'
+    #   require 'jquery-rails'
+    #   # require 'tinymce-rails'
+    #
+    #   require 'page' # app/models/page.rb
+    #   require 'user' # app/models/user.rb
+    #   require 'cmtool/yml_file'
+    #   require 'cmtool/keyword'
+    #   require 'cmtool/news'
+    #   require 'cmtool/faq'
+    #   require 'cmtool/quote'
+    #   require 'cmtool/contact_form'
+    #   require 'cmtool/newsletter_subscription'
+    #   require 'cmtool/image'
+    #   require 'cmtool/directory'
+    # end
+
+    config.after_initialize do
       Cmtool::Menu.register do
         group label: :site do
           title t('cmtool.menu.site.title')

data/lib/cmtool/includes/page.rb

@@ -21,6 +21,13 @@ module Cmtool
         klass.property :active, type: :boolean, default: true
         klass.property :layout
         klass.property :in_menu, type: :boolean, default: true
+        klass.property :page_settings, type: Hash, default: {}
+
+        # JSON string parsing (safety net until couch_potato type: Hash handles this)
+        klass.send(:define_method, :page_settings=) do |val|
+          val = JSON.parse(val) if val.is_a?(String)
+          super(val)
+        end
 
         klass.has_ancestry by_property: :locale
 
@@ -64,9 +71,11 @@ module Cmtool
         def flag_locales
           [:ad, :ae, :af, :ag, :ai, :al, :am, :an, :ao, :aq, :ar, :as, :at, :au, :aw, :az, :ba, :bb, :bd, :be, :bf, :bg, :bh, :bi, :bj, :bm, :bn, :bo, :br, :bs, :bt, :bw, :by, :bz, :ca, :cd, :cf, :cg, :ch, :ci, :ck, :cl, :cm, :cn, :co, :cr, :cu, :cv, :cy, :cz, :de, :dj, :dk, :dm, :do, :dz, :ec, :ee, :eg, :eh, :en, :er, :es, :et, :fi, :fj, :fm, :fo, :fr, :ga, :gb, :gd, :ge, :gg, :gh, :gi, :gl, :gm, :gn, :gp, :gq, :gr, :gt, :gu, :gw, :gy, :hk, :hn, :hr, :ht, :hu, :id, :ie, :il, :im, :in, :iq, :ir, :is, :it, :je, :jm, :jo, :jp, :ke, :kg, :kh, :ki, :km, :kn, :kp, :kr, :kw, :ky, :kz, :la, :lb, :lc, :li, :lk, :lr, :ls, :lt, :lu, :lv, :ly, :ma, :mc, :md, :me, :mg, :mh, :mk, :ml, :mm, :mn, :mo, :mq, :mr, :ms, :mt, :mu, :mv, :mw, :mx, :my, :mz, :na, :nc, :ne, :ng, :ni, :nl, :no, :np, :nr, :nz, :om, :pa, :pe, :pf, :pg, :ph, :pk, :pl, :pr, :ps, :pt, :pw, :py, :qa, :re, :ro, :rs, :ru, :rw, :sa, :sb, :sc, :sd, :se, :sg, :si, :sk, :sl, :sm, :sn, :so, :sr, :st, :sv, :sy, :sz, :tc, :td, :tg, :th, :tj, :tl, :tm, :tn, :to, :tr, :tt, :tv, :tw, :tz, :ua, :ug, :us, :uy, :uz, :va, :vc, :ve, :vg, :vi, :vn, :vu, :ws, :ye, :za, :zm, :zw]
         end
+
         def locales
-          Rails.configuration.i18n.available_locales.presence || []
+          Rails.configuration.i18n.available_locales.presence || [:en]
         end
+
         def default_locale
           :en
         end