cmtool 0.4.0 → 3.0.0

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

@@ -0,0 +1,31 @@
+.clear
+  clear: both
+
+#sub-navigation-container
+  margin-top: 20px
+  +panel()
+  +clearfix()
+  ul
+    list-style: none
+    margin: 0
+    padding: 0
+    li
+      float: left
+      margin-right: 10px
+#title-container
+  //+linear-gradient(#aaa, #fff)
+  margin-top: 12px
+  padding: 10px
+  border-top-left-radius: 15px
+  border-top-right-radius: 15px
+  box-shadow: 5px 5px 5px #555
+  h1
+    margin: 0
+    padding: 0
+#content-container
+  background-color: white
+  border-bottom-left-radius: 15px
+  border-bottom-right-radius: 15px
+  box-shadow: 5px 5px 5px #555
+  #content
+    padding: 10px

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

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

data/app/controllers/cmtool/application_controller.rb

@@ -1,6 +1,8 @@
 module Cmtool
   class ApplicationController < ::ApplicationController
-    before_filter :authenticate_user!, :authorize_user, :check_environment, :set_locale
+    include Cmtool::ControllerGlue
+    before_action :authorize_user, :check_environment, :set_locale
+    layout 'cmtool/application'
 
     private
 
@@ -8,12 +10,16 @@ module Cmtool
       if respond_to? :cmtool_locale
         I18n.locale = cmtool_locale
       else
-        I18n.locale = :en
+        I18n.locale = Rails.configuration.i18n.default_locale
       end
     end
 
     def authorize_user
-
+      if respond_to? :authorize_cmtool, true
+        authorize_cmtool
+      else
+        render text: 'Please define authorize_cmtool in your application controller. This area needs to be secured!<br/>Visit<a href="https://github.com/bterkuile/cmtool">GitHub</a> for more info', status: 403
+      end
     end
 
     def check_environment

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
 
@@ -43,15 +43,15 @@ module Cmtool
     # POST /contact_forms
     # POST /contact_forms.xml
     def create
-      @contact_form = Cmtool::ContactForm.new(params[:contact_form])
+      @contact_form = Cmtool::ContactForm.new(contact_form_params)
 
       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
@@ -62,12 +62,12 @@ module Cmtool
       @contact_form = Cmtool::ContactForm.find(params[:id])
 
       respond_to do |format|
-        if @contact_form.update_attributes(params[:contact_form])
-          format.html { redirect_to([cmtool, @contact_form], :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::ContactForm.model_name.human)) }
+        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.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
@@ -85,12 +85,18 @@ module Cmtool
     end
 
     def add
-      @contact_form = Cmtool::ContactForm.new(params[:contact_form])
+      @contact_form = Cmtool::ContactForm.new(contact_form_params)
       if @contact_form.save
         redirect_to :back, notice: I18n.t('cmtool.contact_form.submitted')
       else
-        redirect_to :back, alert: I18n.t('cmtool.contact_form.submission_failed', reason: @contact_form.errors.full_messages.join(', '))
+        redirect_to :back, alert: I18n.t('cmtool.contact_form.submission_failed', reason: @contact_form.errors.full_messages.to_sentence )
       end
     end
+
+    private
+
+    def contact_form_params
+      params.require(:contact_form).permit(:gender, :name, :email, :phone, :body)
+    end
   end
 end

data/app/controllers/cmtool/directories_controller.rb

@@ -41,7 +41,7 @@ module Cmtool
     # POST /directories
     # POST /directories.xml
     def create
-      @directory = Cmtool::Directory.new(params[:directory])
+      @directory = Cmtool::Directory.new(directory_params)
 
       respond_to do |format|
         if @directory.save
@@ -60,7 +60,7 @@ module Cmtool
       @directory = Cmtool::Directory.find(params[:id])
 
       respond_to do |format|
-        if @directory.update_attributes(params[:directory])
+        if @directory.update_attributes(directory_params)
           format.html { redirect_to([cmtool, @directory], :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::Directory.model_name.human)) }
           format.xml  { head :ok }
         else
@@ -86,5 +86,9 @@ module Cmtool
       @directory.image = nil
       @directory.save
     end
+
+    def directory_params
+      params.require(:directory).permit(:name, :parent_id)
+    end
   end
 end

data/app/controllers/cmtool/faqs_controller.rb

@@ -41,7 +41,7 @@ module Cmtool
     # POST /faqs
     # POST /faqs.xml
     def create
-      @faq = Cmtool::Faq.new(params[:faq])
+      @faq = Cmtool::Faq.new(faq_params)
 
       respond_to do |format|
         if @faq.save
@@ -60,7 +60,7 @@ module Cmtool
       @faq = Cmtool::Faq.find(params[:id])
 
       respond_to do |format|
-        if @faq.update_attributes(params[:faq])
+        if @faq.update_attributes(faq_params)
           format.html { redirect_to([cmtool, @faq], :notice => I18n.t('cmtool.action.create.successful', :model => Cmtool::Faq.model_name.human)) }
           format.xml  { head :ok }
         else
@@ -81,5 +81,11 @@ module Cmtool
         format.xml  { head :ok }
       end
     end
+
+    private
+
+    def faq_params
+      params.require(:faq).permit(:question, :answer, :active)
+    end
   end
 end

data/app/controllers/cmtool/images_controller.rb

@@ -42,7 +42,7 @@ module Cmtool
     # POST /images
     # POST /images.xml
     def create
-      @image = Cmtool::Image.new(params[:image])
+      @image = Cmtool::Image.new(image_params)
 
       respond_to do |format|
         if @image.save
@@ -61,7 +61,7 @@ module Cmtool
       @image = Cmtool::Image.find(params[:id])
 
       respond_to do |format|
-        if @image.update_attributes(params[:image])
+        if @image.update_attributes(image_params)
           format.html { redirect_to([cmtool, @image], :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::Image.model_name.human)) }
           format.xml  { head :ok }
         else
@@ -75,12 +75,17 @@ module Cmtool
     # DELETE /images/1.xml
     def destroy
       @image = Cmtool::Image.find(params[:id])
+      directory = @image.directory
       @image.destroy
 
       respond_to do |format|
-        format.html { redirect_to(cmtool.images_url) }
+        format.html { redirect_to([cmtool, directory || :images]) }
         format.xml  { head :ok }
       end
     end
+
+    def image_params
+      params.require(:image).permit(:file, :directory_id)
+    end
   end
 end

data/app/controllers/cmtool/keywords_controller.rb

@@ -41,7 +41,7 @@ module Cmtool
     # POST /keywords
     # POST /keywords.xml
     def create
-      @keyword = Cmtool::Keyword.new(params[:keyword])
+      @keyword = Cmtool::Keyword.new(keyword_params)
 
       respond_to do |format|
         if @keyword.save
@@ -60,7 +60,7 @@ module Cmtool
       @keyword = Cmtool::Keyword.find(params[:id])
 
       respond_to do |format|
-        if @keyword.update_attributes(params[:keyword])
+        if @keyword.update_attributes(keyword_params)
           format.html { redirect_to(cmtool.keywords_path, :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::Keyword.model_name.human)) }
           format.xml  { head :ok }
         else
@@ -81,5 +81,11 @@ module Cmtool
         format.xml  { head :ok }
       end
     end
+
+    private
+
+    def keyword_params
+      params.require(:keyword).permit(:name)
+    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
@@ -43,7 +43,7 @@ module Cmtool
     # POST /newsletter_subscriptions
     # POST /newsletter_subscriptions.xml
     def create
-      @newsletter_subscription = Cmtool::NewsletterSubscription.new(params[:newsletter_subscription])
+      @newsletter_subscription = Cmtool::NewsletterSubscription.new(newsletter_subscription_params)
 
       respond_to do |format|
         if @newsletter_subscription.save
@@ -62,7 +62,7 @@ module Cmtool
       @newsletter_subscription = Cmtool::NewsletterSubscription.find(params[:id])
 
       respond_to do |format|
-        if @newsletter_subscription.update_attributes(params[:newsletter_subscription])
+        if @newsletter_subscription.update_attributes(newsletter_subscription_params)
           format.html { redirect_to([cmtool, @newsletter_subscription], :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::NewsletterSubscription.model_name.human)) }
           format.xml  { head :ok }
         else
@@ -85,12 +85,18 @@ module Cmtool
     end
 
     def add
-      @newsletter_subscription = Cmtool::NewsletterSubscription.new(params[:newsletter_subscription])
+      @newsletter_subscription = Cmtool::NewsletterSubscription.new(newsletter_subscription_params)
       if @newsletter_subscription.save
         redirect_to :back, notice: I18n.t('cmtool.newsletter_subscription.subscribed')
       else
         redirect_to :back, alert: I18n.t('cmtool.newsletter_subscription.subscription_failed', reason: @newsletter_subscription.errors.full_messages.join(', '))
       end
     end
+
+    private
+
+    def newsletter_subscription_params
+      params.require(:newsletter_subscription).permit(:email)
+    end
   end
 end

data/app/controllers/cmtool/pages_controller.rb

@@ -41,7 +41,7 @@ module Cmtool
     # POST /pages
     # POST /pages.xml
     def create
-      @page = ::Page.new(params[:page])
+      @page = ::Page.new(page_params)
 
       respond_to do |format|
         if @page.save
@@ -60,7 +60,7 @@ module Cmtool
       @page = ::Page.find(params[:id])
 
       respond_to do |format|
-        if @page.update_attributes(params[:page])
+        if @page.update_attributes(page_params)
           format.html { redirect_to(cmtool.pages_path, :notice => I18n.t('cmtool.action.update.successful', :model => ::Page.model_name.human)) }
           format.xml  { head :ok }
         else
@@ -93,9 +93,20 @@ module Cmtool
     end
 
     def preview
-
+      if request.post?
+        session[:preview_page] = params[:page].to_hash
+        head :ok
+      else
+        @page = ::Page.new session[:preview_page]
+        render "pages/show", layout: @page.layout
+      end
     end
 
+    private
+
+    def page_params
+      params.require(:page).permit!
+    end
 
   end
 end

data/app/controllers/cmtool/sessions_controller.rb

@@ -1,5 +1,6 @@
 module Cmtool
   class SessionsController < ::Devise::SessionsController
+    include Cmtool::ControllerGlue
     layout 'cmtool/devise'
   end
 end

data/app/controllers/cmtool/svg_files_controller.rb

@@ -0,0 +1,91 @@
+module Cmtool
+  class Cmtool::SvgFilesController < Cmtool::ApplicationController
+    # GET /svg_files
+    # GET /svg_files.xml
+    def index
+      @svg_files = Cmtool::SvgFile.all
+
+      respond_to do |format|
+        format.html # index.html.erb
+        format.xml  { render :xml => @svg_files }
+      end
+    end
+
+    # GET /svg_files/1
+    # GET /svg_files/1.xml
+    def show
+      @svg_file = Cmtool::SvgFile.find(params[:id])
+
+      respond_to do |format|
+        format.html # show.html.erb
+        format.xml  { render :xml => @svg_file }
+      end
+    end
+
+    # GET /svg_files/new
+    # GET /svg_files/new.xml
+    def new
+      @svg_file = Cmtool::SvgFile.new
+
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @svg_file }
+      end
+    end
+
+    # GET /svg_files/1/edit
+    def edit
+      @svg_file = Cmtool::SvgFile.find(params[:id])
+    end
+
+    # POST /svg_files
+    # POST /svg_files.xml
+    def create
+      @svg_file = Cmtool::SvgFile.new(svg_file_params)
+
+      respond_to do |format|
+        if @svg_file.save
+          format.html { redirect_to(cmtool.svg_files_path, :notice => I18n.t('cmtool.action.create.successful', :model => Cmtool::SvgFile.model_name.human)) }
+          format.xml  { render :xml => @svg_file, :status => :created, :location => @svg_file }
+        else
+          format.html { render :action => "new" }
+          format.xml  { render :xml => @svg_file.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+
+    # PUT /svg_files/1
+    # PUT /svg_files/1.xml
+    def update
+      @svg_file = Cmtool::SvgFile.find(params[:id])
+
+      respond_to do |format|
+        if @svg_file.update_attributes(svg_file_params)
+          format.html { redirect_to(cmtool.svg_files_path, :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::SvgFile.model_name.human)) }
+          format.xml  { head :ok }
+        else
+          format.html { render :action => "edit" }
+          format.xml  { render :xml => @svg_file.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /svg_files/1
+    # DELETE /svg_files/1.xml
+    def destroy
+      @svg_file = Cmtool::SvgFile.find(params[:id])
+      @svg_file.destroy
+
+      respond_to do |format|
+        format.html { redirect_to(cmtool.svg_files_url, notice: I18n.t('cmtool.action.destroy.successful', model: Cmtool::SvgFile.model_name.human)) }
+        format.xml  { head :ok }
+      end
+    end
+
+    private
+
+    def svg_file_params
+      params.require(:svg_file).permit(:name)
+    end
+  end
+end

data/app/controllers/cmtool/users_controller.rb

@@ -19,7 +19,7 @@ module Cmtool
     end
 
     def create
-      @user = ::User.new(params[:user])
+      @user = ::User.new(user_params)
       if @user.save
         redirect_to cmtool.users_path, :notice => I18n.t('cmtool.action.create.successful', :model => ::User.model_name.human)
       else
@@ -28,17 +28,13 @@ module Cmtool
     end
 
     def update
-      user = params[:user]
+      user = user_params
       unless user['password'].present?
         user.delete('password')
         user.delete('password_confirmation')
       end
       @user = ::User.find(params[:id])
       if @user.update_attributes(user)
-        if user['password']
-          # Sign in after changing current logged in password
-          sign_in(@user, :bypass => true) if @user == current_user
-        end
         redirect_to cmtool.users_path, :notice => I18n.t('cmtool.action.update.successful', :model => ::User.model_name.human)
       else
         render :action => 'edit'
@@ -50,5 +46,11 @@ module Cmtool
       @user.destroy
       redirect_to cmtool.users_path, :notice => I18n.t('cmtool.action.destroy.successful', :model => ::User.model_name.human)
     end
+
+    private
+
+    def user_params
+      params.require(:user).permit!
+    end
   end
 end

data/app/controllers/cmtool/yml_files_controller.rb

@@ -0,0 +1,91 @@
+module Cmtool
+  class Cmtool::YmlFilesController < Cmtool::ApplicationController
+    # GET /yml_files
+    # GET /yml_files.xml
+    def index
+      @yml_files = Cmtool::YmlFile.all
+
+      respond_to do |format|
+        format.html # index.html.erb
+        format.xml  { render :xml => @yml_files }
+      end
+    end
+
+    # GET /yml_files/1
+    # GET /yml_files/1.xml
+    def show
+      @yml_file = Cmtool::YmlFile.find(params[:id])
+
+      respond_to do |format|
+        format.html # show.html.erb
+        format.xml  { render :xml => @yml_file }
+      end
+    end
+
+    # GET /yml_files/new
+    # GET /yml_files/new.xml
+    def new
+      @yml_file = Cmtool::YmlFile.new
+
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @yml_file }
+      end
+    end
+
+    # GET /yml_files/1/edit
+    def edit
+      @yml_file = Cmtool::YmlFile.find(params[:id])
+    end
+
+    # POST /yml_files
+    # POST /yml_files.xml
+    def create
+      @yml_file = Cmtool::YmlFile.new(yml_file_params)
+
+      respond_to do |format|
+        if @yml_file.save
+          format.html { redirect_to(cmtool.yml_files_path, :notice => I18n.t('cmtool.action.create.successful', :model => Cmtool::YmlFile.model_name.human)) }
+          format.xml  { render :xml => @yml_file, :status => :created, :location => @yml_file }
+        else
+          format.html { render :action => "new" }
+          format.xml  { render :xml => @yml_file.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+
+    # PUT /yml_files/1
+    # PUT /yml_files/1.xml
+    def update
+      @yml_file = Cmtool::YmlFile.find(params[:id])
+
+      respond_to do |format|
+        if @yml_file.update_attributes(yml_file_params)
+          format.html { redirect_to(cmtool.yml_files_path, :notice => I18n.t('cmtool.action.update.successful', :model => Cmtool::YmlFile.model_name.human)) }
+          format.xml  { head :ok }
+        else
+          format.html { render :action => "edit" }
+          format.xml  { render :xml => @yml_file.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /yml_files/1
+    # DELETE /yml_files/1.xml
+    def destroy
+      @yml_file = Cmtool::YmlFile.find(params[:id])
+      @yml_file.destroy
+
+      respond_to do |format|
+        format.html { redirect_to(cmtool.yml_files_url, notice: I18n.t('cmtool.action.destroy.successful', model: Cmtool::YmlFile.model_name.human)) }
+        format.xml  { head :ok }
+      end
+    end
+
+    private
+
+    def yml_file_params
+      params.require(:yml_file).permit!
+    end
+  end
+end

data/app/controllers/concerns/cmtool/controller_glue.rb

@@ -0,0 +1,11 @@
+module Cmtool::ControllerGlue
+  extend ActiveSupport::Concern
+  included do
+    helper_method :cmtool_user
+  end
+
+  def cmtool_user
+    defined?(super) ? super : current_user
+  end
+
+end