o_cms 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a425ac410f05dac0bf172caf877c1c732ec78182
-  data.tar.gz: c45d27d36167274da9ff7ab456fc6868788980f3
+  metadata.gz: 2d1bfacfd81ae22c568eb33e1b8325c4a3d21f75
+  data.tar.gz: 5f62ba775e78e04a20fbb688e131d02dbb636d05
 SHA512:
-  metadata.gz: 371d2d9ca589b88fdb29cfb2ad4f1f2041efda9c7e9cbc43408153747b5d51c58dfa1843e9f3aed7491bb8f41cb1c7ea9827f20e62d6f7a670f6603cfac54180
-  data.tar.gz: 84cefe42d4f3c094993bcb9c59533f749802ec6a9ea1713b6621a3bc1c377ef09542c5bcedf7a5d35a5e356cc5d373722549a3eaf675b183c7defb2d0c73b9d9
+  metadata.gz: 362fb6a66a2f4dc1b41ce6f955ae85d3ba58eb1995fcd0e375aaaf097eb8f9ada5fba7653ffd71dc89f78c191ff6f303a50976ec0b8533c3a6c2f07d0e0818e2
+  data.tar.gz: c908f686c37795baff09c61ff020d21f052791ab62e4d01a9d2c32009395b917abaf0b8fab15aa5170280218d2b9fe6e58b0e22ebf0b3be8dbd952047698e2a6

data/README.md

@@ -1,6 +1,6 @@
 # Outside CMS
 
-[![Build Status](https://travis-ci.com/benjaminayres/o_cms.svg?token=SupDfrX15nFZyz6Z1cQz&branch=master)](https://travis-ci.com/benjaminayres/o_cms) [![Gem Version](https://badge.fury.io/rb/o_cms.svg)](https://badge.fury.io/rb/o_cms) [![Code Climate](https://codeclimate.com/repos/582251ca7ec35900650034b0/badges/97c43554c5b2c9a14e5b/gpa.svg)](https://codeclimate.com/repos/582251ca7ec35900650034b0/feed) [![Test Coverage](https://codeclimate.com/repos/582251ca7ec35900650034b0/badges/97c43554c5b2c9a14e5b/coverage.svg)](https://codeclimate.com/repos/582251ca7ec35900650034b0/coverage)
+[![Build Status](https://travis-ci.org/benjaminayres/o_cms.svg?branch=master)](https://travis-ci.org/benjaminayres/o_cms) [![Gem Version](https://badge.fury.io/rb/o_cms.svg)](https://badge.fury.io/rb/o_cms) [![Code Climate](https://codeclimate.com/repos/582251ca7ec35900650034b0/badges/97c43554c5b2c9a14e5b/gpa.svg)](https://codeclimate.com/repos/582251ca7ec35900650034b0/feed) [![Test Coverage](https://codeclimate.com/repos/582251ca7ec35900650034b0/badges/97c43554c5b2c9a14e5b/coverage.svg)](https://codeclimate.com/repos/582251ca7ec35900650034b0/coverage)
 
 ## Open source, easy to extend content management system for Rails
 
@@ -110,11 +110,22 @@ You can easily override these guidelines, if you feel the language is tool simpl
 * ``` /views/o_cms/posts/_guidelines.html.erb ```
 * ``` /views/o_cms/categories/_guidelines.html.erb ```
 
+### Controllers
+
+1. Create your controller
+2. Define the Outside CMS layout in the head of your controller ``` layouts/o_cms/application ```
+3. Override the navigation to include a link to your new controller (explained in 'Navigation' above)
+4. Add controller specific Javascipt and CSS files to your assets directories, in folders following your CMS mount name defined in ``` routes.rb ```.
+
+**E.g** For a ``` courses_controller.rb ``` where your CMS uses the default mount name ``` o_cms```. Add your custom controller javascript & styles to ``` assets/javascripts/o_cms/courses.js``` & ``` assets/stylesheets/o_cms/courses.css```.
+
+ Also supports the file extensions ```.coffee .erb .coffee.erb ``` & ``` .scss .erb .scss.erb ```.
+
 ## Contributing
 
-   1. Fork the project
-   2. Make your changes, including tests that exercise the code
-   4. Make a pull request
+1. Fork the project
+2. Make your changes, including tests that exercise the code
+4. Make a pull request
 
 ## License
 

data/app/controllers/o_cms/application_controller.rb

@@ -1,18 +1,5 @@
 module OCms
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
-    # before_action :authenticate_admin!
-
-    # # Redirects any unauthorised users
-    # def authenticate_admin!
-    #   if user_signed_in?
-    #     unless current_user.has_role? :admin
-    #       flash[:alert] = "Sorry your are not authorized to view this area."
-    #       redirect_to main_app.root_url
-    #     end
-    #    else
-    #     authenticate_user!
-    #    end
-    # end
   end
 end

data/app/controllers/o_cms/dashboard_controller.rb

@@ -2,7 +2,6 @@ require_dependency "o_cms/application_controller"
 
 module OCms
   class DashboardController < ApplicationController
-    # before_action :authenticate_admin!
 
     def index
     end

data/app/controllers/o_cms/pages_controller.rb

@@ -14,6 +14,7 @@ module OCms
     def new
       @page = Page.new
       @pages = Page.all
+      @templates = Template.all
     end
 
     def create
@@ -32,6 +33,7 @@ module OCms
     def edit
       @page = Page.find(params[:id])
       @pages = Page.all_except(@page)
+      @templates = Template.all
     end
 
     def update
@@ -63,7 +65,7 @@ module OCms
     private
 
     def page_params
-      params.require(:page).permit(:title, :slug, :body, :excerpt, :featured_image, :meta_title, :meta_description, :meta_keywords, :status, :published_at, :parent_id, :order)
+      params.require(:page).permit(:title, :slug, :body, :excerpt, :featured_image, :meta_title, :meta_description, :meta_keywords, :status, :published_at, :parent_id, :order, :template_id)
     end
   end
 end

data/app/controllers/o_cms/templates_controller.rb

@@ -0,0 +1,65 @@
+require_dependency "o_cms/application_controller"
+
+module OCms
+  class TemplatesController < ApplicationController
+
+    def index
+      @templates = Template.all
+    end
+
+    def show
+      @template = Template.find(params[:id])
+    end
+
+    def new
+      @template = Template.new
+    end
+
+    def create
+      @template = Template.new(template_params)
+
+      if @template.save
+        flash[:notice] = "Template was saved successfully."
+        redirect_to edit_template_path(@template)
+      else
+        flash.now[:alert] = "Error creating template. Please try again."
+        render :new
+      end
+    end
+
+    def edit
+      @template = Template.find(params[:id])
+    end
+
+    def update
+      @template = Template.find(params[:id])
+      @template.assign_attributes(template_params)
+
+      if @template.save
+        flash[:notice] = "Template was updated successfully."
+        redirect_to edit_template_path(@template)
+      else
+        flash.now[:alert] = "Error saving template. Please try again."
+        render :edit
+      end
+    end
+
+    def destroy
+      @template = Template.find(params[:id])
+
+      if @template.destroy
+        flash[:notice] = "\"#{@template.name}\" was deleted successfully."
+        redirect_to action: :index
+      else
+        flash.now[:alert] = "There was an error deleting the template."
+        render :show
+      end
+    end
+
+    private
+
+    def template_params
+      params.require(:template).permit(:name, :slug, :description, :layout)
+    end
+  end
+end

data/app/helpers/o_cms/exists_helper.rb

@@ -0,0 +1,19 @@
+module OCms
+  module ExistsHelper
+    def stylesheet_exists?(stylesheet)
+      stylesheet = "#{Rails.root}/app/assets/stylesheets/#{stylesheet}.scss"
+      extensions = %w(.scss .erb .scss.erb) + [""]
+      extensions.inject(false) do |truth, extension|
+        truth || File.exists?("#{stylesheet}#{extension}")
+      end
+    end
+
+    def javascript_exists?(script)
+      script = "#{Rails.root}/app/assets/javascripts/#{script}.js"
+      extensions = %w(.coffee .erb .coffee.erb) + [""]
+      extensions.inject(false) do |truth, extension|
+        truth || File.exists?("#{script}#{extension}")
+      end
+    end
+  end
+end

data/app/models/o_cms/category.rb

@@ -5,7 +5,7 @@ module OCms
     has_many :post_category
     has_many :posts, :through => :post_category
 
-    validates :name, length: { minimum: 5 }, presence: true
+    validates :name, length: { minimum: 4 }, presence: true
     validates :body, presence: true
 
     before_validation :create_slug

data/app/models/o_cms/gallery.rb

@@ -1,10 +1,10 @@
 module OCms
   class Gallery < ActiveRecord::Base
     default_scope { order('created_at DESC') }
-    
+
     has_many :image_gallery
     has_many :images, :through => :image_gallery
 
-    validates :name, length: { minimum: 5 }, presence: true
+    validates :name, length: { minimum: 4 }, presence: true
   end
 end

data/app/models/o_cms/image.rb

@@ -7,7 +7,7 @@ module OCms
     has_many :image_gallery
     has_many :galleries, :through => :image_gallery
 
-    validates :name, length: { minimum: 5 }, presence: true
-    validates :file, length: { minimum: 5 }, presence: true
+    validates :name, length: { minimum: 4 }, presence: true
+    validates :file, length: { minimum: 4 }, presence: true
   end
 end

data/app/models/o_cms/page.rb

@@ -4,11 +4,15 @@ module OCms
 
     has_many :subpages, class_name: OCms::Page, foreign_key: 'parent_id'
 
+    belongs_to_opts = { class_name: OCms::Template, foreign_key: 'template_id' }
+    belongs_to_opts[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
+    belongs_to :template, belongs_to_opts
+
     belongs_to_opts = { class_name: OCms::Page, foreign_key: 'parent_id' }
     belongs_to_opts[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
     belongs_to :parent, belongs_to_opts
 
-    validates :title, length: { minimum: 8 }, presence: true
+    validates :title, length: { minimum: 4 }, presence: true
     validates :body, length: { minimum: 15 }, presence: true
 
     before_validation :create_slug

data/app/models/o_cms/post.rb

@@ -1,11 +1,11 @@
 module OCms
   class Post < ActiveRecord::Base
-    default_scope { order('created_at DESC') }
+    default_scope { order('published_at DESC') }
 
     has_many :post_category
     has_many :categories, :through => :post_category
 
-    validates :title, length: { minimum: 8 }, presence: true
+    validates :title, length: { minimum: 4 }, presence: true
     validates :body, length: { minimum: 15 }, presence: true
 
     before_validation :create_slug

data/app/models/o_cms/template.rb

@@ -0,0 +1,15 @@
+module OCms
+  class Template < ActiveRecord::Base
+    default_scope { order('name ASC') }
+
+    has_many :pages
+
+    validates :name, length: { minimum: 5 }, presence: true
+
+    before_validation :create_slug
+
+    def create_slug
+      self.slug = "#{name.parameterize}" if self.slug.blank? && self.name.present?
+    end
+  end
+end

data/app/uploaders/o_cms/image_uploader.rb

@@ -6,8 +6,7 @@ module OCms
     include CarrierWave::MiniMagick
 
     # Choose what kind of storage to use for this uploader:
-    storage :file
-    # storage :fog
+    storage OCms::Engine.config.file_storage
 
     # Override the directory where uploaded files will be stored.
     # This is a sensible default for uploaders that are meant to be mounted:

data/app/views/layouts/o_cms/application.html.erb

@@ -7,7 +7,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <%= stylesheet_link_tag    'o_cms/application', media: 'all' %>
+    <%= stylesheet_link_tag params[:controller], :media => "all"  if stylesheet_exists?(params[:controller]) %>
     <%= javascript_include_tag 'o_cms/application' %>
+    <%= javascript_include_tag params[:controller]  if javascript_exists?(params[:controller]) %>
     <script src="https://use.fortawesome.com/c7e3010e.js"></script>
   </head>
   <body>

data/app/views/o_cms/galleries/_form.html.erb

@@ -24,6 +24,7 @@
         <div class="form-group checkbox-group">
           <%= f.label "Select the images you would like to add to your gallery.", :class => 'control-label' %>
           <div class="gallery-options">
+            <input name="gallery[image_ids][]" value="" type="hidden">
             <% @images.each do |image| %>
               <%= label_tag 'gallery_image_ids_' + image.id.to_s do %>
                 <span>

data/app/views/o_cms/pages/_form.html.erb

@@ -77,6 +77,21 @@
     </div>
   </div>
 
+  <div class="card">
+    <div class="card-header">
+      Template
+    </div>
+    <div class="card-block">
+      <div class="row">
+        <div class="col-sm-12">
+          <div class="form-group">
+            <%= f.collection_select(:template_id, @templates, :id, :name, {:prompt => 'Choose a template', include_blank: true}, { :class => 'form-control' })  %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <div class="card">
     <div class="card-header">
       Publish Options

data/app/views/o_cms/pages/_navigation.html.erb

@@ -3,6 +3,7 @@
   <div class="btn-toolbar">
     <%= link_to 'Add Page', new_page_path, class:'btn btn-secondary' %>
     <%= link_to 'Pages', pages_path, class:'btn btn-secondary' %>
+    <%= link_to 'Templates', templates_path, class:'btn btn-secondary' %>
   </div>
 </div>
 <hr />

data/app/views/o_cms/pages/_page_row.html.erb

@@ -3,7 +3,11 @@
     <% unless type == 'page' %>
       <i class="fa fa-level-down <%= type %>"></i>
     <% end %>
-    <%= page.title %></td>
+    <%= page.title %>
+  </td>
+  <td class="hidden-sm-down">
+    <%= page.template.name if page.template_id.present? %>
+  </td>
   <td>
     <span class="tag tag-<%= page.status %>">
       <%= page.status.capitalize %>

data/app/views/o_cms/pages/index.html.erb

@@ -7,6 +7,7 @@
     <thead>
       <tr>
         <th>Title</th>
+        <th class="hidden-sm-down">Template</th>
         <th>Status</th>
         <th></th>
       </tr>

data/app/views/o_cms/partials/_primary_navigation.html.erb

@@ -10,8 +10,8 @@
   <li class="nav-item <%= 'active' if params[:controller] == 'o_cms/posts' %>">
     <%= link_to o_cms.posts_path, class: 'nav-link' do %>
       <i class="fa fa-pin"></i> Blog</a>
-      <% end %>
-    </li>
+    <% end %>
+  </li>
   <li class="nav-item">
     <li class="nav-item <%= 'active' if params[:controller] == 'o_cms/images' %>">
       <%= link_to o_cms.images_path, class: 'nav-link' do %>

data/app/views/o_cms/posts/_form.html.erb

@@ -62,15 +62,16 @@
       <% if @categories.present? %>
           <div class="form-group checkbox-group">
             <%= f.label "Select the categories you would like to associate with your post.", :class => 'control-label' %>
-              <% @categories.each do |category| %>
-                <span>
-                  <%= check_box_tag 'post[category_ids][]',
-                      category.id,
-                      @post.categories.include?(category),
-                      id: 'post_category_ids_' + category.id.to_s %>
-                  <%= label_tag 'post_category_ids_' + category.id.to_s, category.name %>
-                </span>
-              <% end %>
+            <input name="post[category_ids][]" value="" type="hidden">
+            <% @categories.each do |category| %>
+              <span>
+                <%= check_box_tag 'post[category_ids][]',
+                    category.id,
+                    @post.categories.include?(category),
+                    id: 'post_category_ids_' + category.id.to_s %>
+                <%= label_tag 'post_category_ids_' + category.id.to_s, category.name %>
+              </span>
+            <% end %>
           </div>
         <% end %>
     </div>

data/app/views/o_cms/templates/_form.html.erb

@@ -0,0 +1,36 @@
+<%= form_for @template do |f| %>
+  <% if template.errors.any? %>
+    <div class="alert alert-danger">
+      <h4><%= pluralize(template.errors.count, "error") %>.</h4>
+      <ul>
+        <% template.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= form_group_tag(template.errors[:name]) do %>
+    <%= f.label :name %>
+    <%= f.text_field :name, class: 'form-control form-control-lg', placeholder: "Enter template name" %>
+  <% end %>
+
+  <%= form_group_tag(template.errors[:slug]) do %>
+    <%= f.label :slug %>
+    <%= f.text_field :slug, class: 'form-control', placeholder: "Enter template slug" %>
+  <% end %>
+
+  <%= form_group_tag(template.errors[:description]) do %>
+    <%= f.label :description %>
+    <%= f.text_area :description, rows: 3, class: 'form-control', placeholder: "Enter template description" %>
+  <% end %>
+
+  <%= form_group_tag(template.errors[:layout]) do %>
+    <%= f.label :layout %>
+    <%= f.text_area :layout, rows: 3, class: 'form-control', placeholder: "Enter template layout" %>
+  <% end %>
+
+  <div class="form-group">
+    <%= f.submit "Save", class: 'btn btn-success' %>
+  </div>
+<% end %>

data/app/views/o_cms/templates/_guidelines.html.erb

@@ -0,0 +1,6 @@
+<p>Guidelines for templates</p>
+<ul>
+  <li>Make sure you include a name for your template.</li>
+  <li>Description is optional describing where and how to use the template.</li>
+</ul>
+<hr />

data/app/views/o_cms/templates/_navigation.html.erb

@@ -0,0 +1,8 @@
+<div class="section-header with-navigation">
+  <h1>Templates</h1>
+  <div class="btn-toolbar">
+    <%= link_to 'Add Template', new_template_path, class:'btn btn-secondary' %>
+    <%= link_to 'Templates', templates_path, class:'btn btn-secondary' %>
+  </div>
+</div>
+<hr />