o_cms 0.3.0 → 0.4.0

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

@@ -0,0 +1,17 @@
+<%= render :partial => 'o_cms/templates/navigation' %>
+
+<h2>Edit Template</h2>
+
+<div class="row">
+  <div class="col-md-4">
+    <%= render :partial => 'guidelines' %>
+  </div>
+  <div class="col-md-8">
+    <%= render partial: 'form', locals: { template: @template } %>
+  </div>
+  <div class="col-md-8 offset-md-4">
+    <%= link_to template_path(@template), method: :delete, data: { confirm: 'Are you sure?' }, class:'btn btn-default btn-danger clear-right' do %>
+      <i class="fa fa-delete-variant"></i> Delete
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,28 @@
+<%= render :partial => 'o_cms/templates/navigation' %>
+
+<h2>Templates</h2>
+
+<div class="table-responsive">
+  <table class="table">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Description</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @templates.each do |template| %>
+        <tr>
+          <td><%= template.name %></td>
+          <td><%= template.description %></td>
+          <td>
+            <%= link_to edit_template_path(template), class:'btn btn-info btn-sm' do %>
+              <i class="fa fa-mode-edit"></i> Edit
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -0,0 +1,12 @@
+<%= render :partial => 'o_cms/templates/navigation' %>
+
+<h2>New Template</h2>
+
+<div class="row">
+  <div class="col-md-4">
+    <%= render :partial => 'guidelines' %>
+  </div>
+  <div class="col-md-8">
+    <%= render partial: 'form', locals: { template: @template } %>
+  </div>
+</div>

data/config/routes.rb

@@ -6,4 +6,5 @@ OCms::Engine.routes.draw do
   resources :categories
   resources :pages
   resources :galleries
+  resources :templates
 end

data/db/migrate/20161111160543_create_o_cms_templates.rb

@@ -0,0 +1,11 @@
+class CreateOCmsTemplates < ActiveRecord::Migration
+  def change
+    create_table :o_cms_templates do |t|
+      t.string :name
+      t.text :description
+      t.text :layout
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161202155453_add_slug_to_template.rb

@@ -0,0 +1,5 @@
+class AddSlugToTemplate < ActiveRecord::Migration
+  def change
+    add_column :o_cms_templates, :slug, :string
+  end
+end

data/db/migrate/20161202173341_add_template_to_page.rb

@@ -0,0 +1,5 @@
+class AddTemplateToPage < ActiveRecord::Migration
+  def change
+    add_column :o_cms_pages, :template_id, :integer
+  end
+end

data/lib/o_cms.rb

@@ -5,6 +5,7 @@ require 'rails-assets-tether'
 require 'bootstrap'
 require 'carrierwave'
 require 'trix'
+require "liquid"
 require "o_cms/engine"
 
 module OCms

data/lib/o_cms/engine.rb

@@ -16,6 +16,8 @@ module OCms
       g.helper false
     end
 
+    config.file_storage = :file
+
     config.image_sizes = {
       thumb: { resize: "resize_to_fill", width: 50, height: 50 },
       medium: { resize: "resize_to_fit", width: 200, height: 200 },

data/lib/o_cms/version.rb

@@ -1,3 +1,3 @@
 module OCms
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/controllers/o_cms/templates_controller_spec.rb

@@ -0,0 +1,103 @@
+require 'rails_helper'
+
+module OCms
+  RSpec.describe TemplatesController, type: :controller do
+    routes { OCms::Engine.routes }
+    let(:template) { create(:template) }
+
+    context "admin doing CRUD on a template" do
+      login_admin
+
+      describe "GET new" do
+        it "returns http success" do
+          get :new
+          expect(response).to have_http_status(:success)
+        end
+
+        it "renders the #new view" do
+          get :new
+          expect(response).to render_template :new
+        end
+
+        it "instantiates @template" do
+          get :new
+          expect(assigns(:template)).not_to be_nil
+        end
+      end
+
+      describe "POST create" do
+        it "increases the number of Templates by 1" do
+          expect{ post :create, template: {name: RandomData.random_sentence, description: RandomData.random_paragraph, layout: RandomData.random_paragraph } }.to change(Template,:count).by(1)
+        end
+
+        it "assigns the new template to @template" do
+          post :create, template: {name: RandomData.random_sentence, description: RandomData.random_paragraph, layout: RandomData.random_paragraph }
+          expect(assigns(:template)).to eq Template.last
+        end
+
+        it "redirects to the new template" do
+          post :create, template: {name: RandomData.random_sentence, description: RandomData.random_paragraph, layout: RandomData.random_paragraph }
+          expect(response).to redirect_to edit_template_path(Template.last)
+        end
+      end
+
+      describe "GET edit" do
+        it "returns http success" do
+          get :edit, id: template.id
+          expect(response).to have_http_status(:success)
+        end
+
+        it "renders the #edit view" do
+          get :edit, id: template.id
+          expect(response).to render_template :edit
+        end
+
+        it "assigns template to be updated to @template" do
+          get :edit, id: template.id
+          template_instance = assigns(:template)
+
+          expect(template_instance).to eq template
+        end
+      end
+
+      describe "PUT update" do
+        it "updates template with expected attributes" do
+          new_name = RandomData.random_sentence
+          new_description = RandomData.random_paragraph
+          new_layout = RandomData.random_paragraph
+
+          put :update, id: template.id, template: {name: new_name, description: new_description, layout: new_layout }
+
+          updated_template = assigns(:template)
+          expect(updated_template.id).to eq template.id
+          expect(updated_template.name).to eq new_name
+          expect(updated_template.description).to eq new_description
+          expect(updated_template.layout).to eq new_layout
+        end
+
+        it "redirects to the updated template" do
+          new_name = RandomData.random_sentence
+          new_description = RandomData.random_paragraph
+          new_layout = RandomData.random_paragraph
+
+          put :update, id: template.id, template: {name: new_name, description: new_description, layout: new_layout }
+          expect(response).to redirect_to edit_template_path(template)
+        end
+      end
+
+      describe "DELETE destroy" do
+        it "deletes the template" do
+          delete :destroy, id: template.id
+          count = Template.where({id: template.id}).size
+          expect(count).to eq 0
+        end
+
+        it "redirects to templates index" do
+          delete :destroy, id: template.id
+          expect(response).to redirect_to templates_path
+        end
+      end
+    end
+
+  end
+end

data/spec/dummy/rails-4/Gemfile.lock

@@ -62,11 +62,12 @@ GIT
 PATH
   remote: ..
   specs:
-    o_cms (0.0.1)
+    o_cms (0.3.0)
       bootstrap (= 4.0.0.alpha4)
       carrierwave (>= 1.0.0.beta, < 2.0)
       compass-rails
       jquery-rails
+      liquid
       mini_magick
       rails (>= 4.1.16)
       rails-assets-tether (>= 1.1.0)
@@ -172,6 +173,7 @@ GEM
     json (2.0.2)
     launchy (2.4.3)
       addressable (~> 2.3)
+    liquid (3.0.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)

data/spec/dummy/rails-4/app/helpers/application_helper.rb

@@ -1,4 +1,6 @@
 module ApplicationHelper
+  include OCms::ExistsHelper
+
   def roles_for_select
     Role.not_admin
   end

data/spec/dummy/rails-4/db/schema.rb

@@ -11,31 +11,31 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161105203727) do
+ActiveRecord::Schema.define(version: 20161202155453) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "o_cms_categories", force: :cascade do |t|
-    t.string   "name"
-    t.string   "slug"
-    t.string   "icon"
+  create_table "o_cms_categories", force: true do |t|
+    t.string   "name",             limit: nil
+    t.string   "slug",             limit: nil
+    t.string   "icon",             limit: nil
     t.text     "body"
-    t.string   "meta_title"
-    t.string   "meta_description"
-    t.string   "meta_keywords"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.string   "meta_title",       limit: nil
+    t.string   "meta_description", limit: nil
+    t.string   "meta_keywords",    limit: nil
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
   end
 
-  create_table "o_cms_galleries", force: :cascade do |t|
-    t.string   "name"
+  create_table "o_cms_galleries", force: true do |t|
+    t.string   "name",        limit: nil
     t.text     "description"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
-  create_table "o_cms_image_galleries", id: false, force: :cascade do |t|
+  create_table "o_cms_image_galleries", id: false, force: true do |t|
     t.integer "image_id"
     t.integer "gallery_id"
   end
@@ -43,31 +43,31 @@ ActiveRecord::Schema.define(version: 20161105203727) do
   add_index "o_cms_image_galleries", ["gallery_id"], name: "index_o_cms_image_galleries_on_gallery_id", using: :btree
   add_index "o_cms_image_galleries", ["image_id"], name: "index_o_cms_image_galleries_on_image_id", using: :btree
 
-  create_table "o_cms_images", force: :cascade do |t|
-    t.string   "name"
-    t.string   "file"
+  create_table "o_cms_images", force: true do |t|
+    t.string   "name",        limit: nil
+    t.string   "file",        limit: nil
     t.text     "description"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
-  create_table "o_cms_pages", force: :cascade do |t|
-    t.string   "title"
-    t.string   "slug"
+  create_table "o_cms_pages", force: true do |t|
+    t.string   "title",            limit: nil
+    t.string   "slug",             limit: nil
     t.text     "body"
     t.text     "excerpt"
-    t.string   "featured_image"
-    t.string   "meta_title"
-    t.string   "meta_description"
-    t.string   "meta_keywords"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.string   "featured_image",   limit: nil
+    t.string   "meta_title",       limit: nil
+    t.string   "meta_description", limit: nil
+    t.string   "meta_keywords",    limit: nil
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
     t.datetime "published_at"
     t.integer  "parent_id"
     t.integer  "order"
   end
 
-  create_table "o_cms_post_categories", id: false, force: :cascade do |t|
+  create_table "o_cms_post_categories", id: false, force: true do |t|
     t.integer "post_id"
     t.integer "category_id"
   end
@@ -75,24 +75,33 @@ ActiveRecord::Schema.define(version: 20161105203727) do
   add_index "o_cms_post_categories", ["category_id"], name: "index_o_cms_post_categories_on_category_id", using: :btree
   add_index "o_cms_post_categories", ["post_id"], name: "index_o_cms_post_categories_on_post_id", using: :btree
 
-  create_table "o_cms_posts", force: :cascade do |t|
-    t.string   "title"
-    t.string   "slug"
+  create_table "o_cms_posts", force: true do |t|
+    t.string   "title",            limit: nil
+    t.string   "slug",             limit: nil
     t.text     "body"
     t.text     "excerpt"
-    t.string   "featured_image"
-    t.string   "meta_title"
-    t.string   "meta_description"
-    t.string   "meta_keywords"
-    t.datetime "created_at",       null: false
-    t.datetime "updated_at",       null: false
+    t.string   "featured_image",   limit: nil
+    t.string   "meta_title",       limit: nil
+    t.string   "meta_description", limit: nil
+    t.string   "meta_keywords",    limit: nil
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
     t.datetime "published_at"
   end
 
-  create_table "roles", force: :cascade do |t|
-    t.string   "name"
+  create_table "o_cms_templates", force: true do |t|
+    t.string   "name",        limit: nil
+    t.text     "description"
+    t.text     "layout"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
+    t.string   "slug",        limit: nil
+  end
+
+  create_table "roles", force: true do |t|
+    t.string   "name",          limit: nil
     t.integer  "resource_id"
-    t.string   "resource_type"
+    t.string   "resource_type", limit: nil
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -100,26 +109,26 @@ ActiveRecord::Schema.define(version: 20161105203727) do
   add_index "roles", ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
   add_index "roles", ["name"], name: "index_roles_on_name", using: :btree
 
-  create_table "users", force: :cascade do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+  create_table "users", force: true do |t|
+    t.string   "email",                  limit: nil, default: "", null: false
+    t.string   "encrypted_password",     limit: nil, default: "", null: false
+    t.string   "reset_password_token",   limit: nil
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer  "sign_in_count",                      default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
+    t.string   "current_sign_in_ip",     limit: nil
+    t.string   "last_sign_in_ip",        limit: nil
+    t.datetime "created_at",                                      null: false
+    t.datetime "updated_at",                                      null: false
     t.integer  "role_id"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
-  create_table "users_roles", id: false, force: :cascade do |t|
+  create_table "users_roles", id: false, force: true do |t|
     t.integer "user_id"
     t.integer "role_id"
   end

data/spec/dummy/rails-4/db/seeds.rb

@@ -82,6 +82,18 @@ end
 end
 galleries = OCms::Gallery.all
 
+# Templates
+5.times do
+  OCms::Template.create!(
+    name:         RandomData.random_sentence,
+    slug:             RandomData.random_slug,
+    description:  RandomData.random_paragraph,
+    layout:       RandomData.random_sentence
+  )
+end
+templates = OCms::Template.all
+
+
 # Confirmation
 puts "Seed finished"
 puts "#{Role.count} roles created"
@@ -91,3 +103,4 @@ puts "#{OCms::Post.count} posts created"
 puts "#{OCms::Category.count} categories created"
 puts "#{OCms::Page.count} pages created"
 puts "#{OCms::Gallery.count} galleries created"
+puts "#{OCms::Template.count} templates created"