cardboard_cms 0.2.2 → 0.3.1

data/lib/cardboard/constraints/page_constraint.rb

@@ -0,0 +1,7 @@
+class PageConstraint
+  def self.matches?(request)
+    return false unless %w[html json js].include?(request.format.to_s.split("/")[1])
+    return false unless page = Cardboard::Url.urlable_for(request.params[:id])
+    page.class.name == "Cardboard::Page"
+  end
+end

data/lib/cardboard/dynamic_router.rb

@@ -0,0 +1,34 @@
+module Cardboard
+  class DynamicRouter
+
+    def self.load
+      
+      Rails.application.routes.draw  do
+        return unless ActiveRecord::Base.connection.table_exists? :cardboard_urls
+        Cardboard::Url.where("slugs_backup IS NOT NULL").each do |url|
+          for link in url.slugs_backup
+            get link, to: redirect(url.to_s)
+          end
+        end
+
+        return unless ActiveRecord::Base.connection.table_exists? :cardboard_pages
+        routes = @set.named_routes.routes
+        Cardboard::Page.includes(:url_object, :template).each do |page|
+          url = page.url_object
+          template = page.template
+          
+          get url.to_s, :to => template.controller_action || "pages##{template.identifier}", defaults: { identifier: template.identifier }
+
+          if !routes[:root] && page.root?
+            root :to => template.controller_action || "pages##{template.identifier}"
+          end
+        end
+      end
+
+    end
+
+    def self.reload
+      Rails.application.routes_reloader.reload!
+    end
+  end
+end

data/lib/cardboard/engine.rb

@@ -21,7 +21,9 @@ require 'decorators'
 require 'bootstrap-wysihtml5-rails'
 require 'select2-rails'
 require 'jquery-rails'
-
+require 'cardboard/concerns/url_concern'
+require 'cardboard/helpers/content_for_in_controllers'
+require 'cardboard/dynamic_router'
 
 module Cardboard
   class Engine < ::Rails::Engine

data/lib/cardboard/helpers/content_for_in_controllers.rb

@@ -0,0 +1,23 @@
+module Cardboard
+  module ContentForInControllers
+    # https://gist.github.com/hiroshi/985457
+    def view_context
+      super.tap do |view|
+        (@_content_for || {}).each do |name,content|
+          view.content_for name, content
+        end
+      end
+    end
+    def content_for(name, content) # no blocks allowed yet
+      @_content_for ||= {}
+      if @_content_for[name].respond_to?(:<<)
+        @_content_for[name] << content
+      else
+        @_content_for[name] = content
+      end
+    end
+    def content_for?(name)
+      @_content_for[name].present?
+    end  
+  end
+end

data/lib/cardboard/helpers/seed.rb

@@ -5,11 +5,19 @@ module Cardboard
   module Seed
     extend ActiveSupport::Concern
 
+    def self.populate_template(id, template)
+      db_template = Cardboard::Template.where(identifier: id.to_s).first_or_initialize
+      db_template.update_attributes!(name: template[:title] || template[:name] || id.to_s, 
+                                     fields: template[:parts], 
+                                     controller_action: template[:controller_action],
+                                     is_page: template[:is_page]) 
+      db_template
+    end
+
     def self.populate_templates(templates)
       templates ||= {}
       templates.each do |id, template|
-        db_template = Cardboard::Template.where(identifier: id.to_s).first_or_initialize
-        db_template.update_attributes!(name: template[:title] || template[:name] || id.to_s, fields: template[:parts], is_page: false) 
+        db_template = populate_template(id, template.merge(is_page: false))
       end
     end
 
@@ -19,9 +27,8 @@ module Cardboard
       # add the page
       pages.each do |id, page|
         # create the template
-        db_template = Cardboard::Template.where(identifier: id.to_s).first_or_initialize
-        db_template.update_attributes!(name: page[:title] || page[:name] || id.to_s, fields: page[:parts], is_page: true) 
-      
+        db_template = populate_template(id, page.merge(is_page: true))
+        
         db_page = Cardboard::Page.where(identifier: id.to_s).first_or_initialize
         db_page.position_position = page[:position] || :last
         db_page.template = db_template
@@ -69,11 +76,11 @@ module Cardboard
     end
 
     def self.populate_settings(settings)
-      if settings
-        db_settings = Cardboard::Setting.first_or_create
-        db_settings.update_attributes!(template: settings)
-        self.populate_fields(settings, db_settings)
-      end
+      settings ||= {}
+      settings["company_name"] ||= {type: "string", default:  Cardboard.application.site_title}
+      db_settings = Cardboard::Setting.first_or_create
+      db_settings.update_attributes!(template: settings)
+      self.populate_fields(settings, db_settings)
     end
     
   end

data/lib/cardboard/version.rb

@@ -1,3 +1,3 @@
 module Cardboard
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end

data/lib/generators/cardboard/resource/resource_generator.rb

@@ -1,7 +1,7 @@
 module Cardboard
   module Generators
     class ResourceGenerator < Rails::Generators::Base
-      desc "Installs Cardboard in a rails 3 application"
+      desc "Scaffold a Cardboard resource"
       argument :resource_name, :type => :string
       #TODO: option for haml
       class_option  :markup, :type => :string, :default => "slim"
@@ -14,7 +14,7 @@ module Cardboard
         begin
           fields
         rescue Exception => e
-          raise "Model #{singular_table_name.classify} does not exist. Try running `rails g model #{singular_table_name.classify}`"
+          raise "Model #{singular_table_name.classify} does not exist, or there's no database. Try running `rails g model #{singular_table_name.classify}`"
         end
       end
 

data/lib/generators/cardboard/resource/templates/slim/edit.html.slim

@@ -1,4 +1,4 @@
 h1 Editing <%= singular_table_name %>
 
-= simple_form_for @<%= singular_table_name %>, url: cardboard_<%= singular_table_name %>_path(@<%= singular_table_name %>) do |f|
+= simple_form_for @<%= singular_table_name %>, url: cardboard_<%= singular_table_name %>_path(@<%= singular_table_name %>), wrapper: "bootstrap" do |f|
   == render 'fields', f: f

data/lib/generators/cardboard/resource/templates/slim/new.html.slim

@@ -1,4 +1,4 @@
 h1 New <%= singular_table_name.titleize %>
 
-= simple_form_for @<%= singular_table_name %>, url: cardboard_<%= plural_table_name %>_path do |f|
+= simple_form_for @<%= singular_table_name %>, url: cardboard_<%= plural_table_name %>_path, wrapper: "bootstrap" do |f|
   == render 'fields', f: f

data/test/dummy/app/controllers/blog_controller.rb

@@ -0,0 +1,2 @@
+class BlogController < ApplicationController
+end

data/test/dummy/app/views/blog/index.html.slim

@@ -0,0 +1 @@
+h1 Blog index

data/test/dummy/app/views/layouts/application.html.slim

@@ -4,6 +4,7 @@ html
     = stylesheet_link_tag    "application", :media => "all"
     = javascript_include_tag "application"
     = csrf_meta_tags
+    = yield :seo
   body
     - if current_admin_user && @page
       div style="float:right;background:#CCC;padding:8px;"

data/test/dummy/app/views/pages/about_us.html.slim

@@ -0,0 +1 @@
+h1 About Us Template

data/test/dummy/app/views/pages/history.html.slim

@@ -0,0 +1,3 @@
+h1 History Template
+
+= debug current_page

data/test/dummy/config/cardboard.yml

@@ -1,5 +1,4 @@
-
-templates:
+pages:
   #---
   home:
     title: Welcome
@@ -26,6 +25,11 @@ templates:
           description:
             hint: This will be visible on mouse over
             type: string
+  blog:
+    title: ideas
+    controller_action: "blog#index"
+
+templates:
   #---
   about_us:
     title: About us

data/test/dummy/db/migrate/20140312180204_create_cardboard.rb

@@ -0,0 +1,72 @@
+class CreateCardboard < ActiveRecord::Migration
+  def change
+    #Fields
+    create_table :cardboard_fields do |t|
+      t.string :identifier
+      t.string :type
+      t.text :value_uid
+      t.integer :object_with_field_id
+      t.string :object_with_field_type
+
+      t.timestamps
+    end
+    add_index :cardboard_fields, :identifier
+    add_index :cardboard_fields, [:object_with_field_id, :object_with_field_type], :name => 'parent_object'
+
+    #Page Parts
+    create_table :cardboard_page_parts do |t|
+      t.string :identifier
+      t.integer :position
+      t.belongs_to :page
+
+      t.timestamps
+    end
+    add_index :cardboard_page_parts, :page_id
+    add_index :cardboard_page_parts, :identifier
+
+    #Pages
+    create_table :cardboard_pages do |t|
+      t.string :title
+      t.integer :position
+      t.text :meta_seo
+      t.boolean :in_menu, default: true
+      t.string :identifier, unique: true
+      t.belongs_to :template
+
+      t.timestamps
+    end
+    add_index :cardboard_pages, :identifier, :unique => true
+
+    #Settings
+    create_table :cardboard_settings do |t|
+      t.string :name
+      t.text :value
+      t.text :default_value
+      t.text :template
+
+    end
+    add_index :cardboard_settings, :name
+
+    #Templates
+    create_table :cardboard_templates do |t|
+      t.string :name
+      t.text :fields
+      t.string :identifier
+      t.boolean :is_page
+      t.string :controller_action
+      t.timestamps
+    end
+    add_index :cardboard_templates, :identifier, :unique => true
+
+    create_table :cardboard_urls do |t|
+      t.string :slug, index: true
+      t.string :path, index: true
+      t.text :slugs_backup
+      t.text :meta_tags
+      t.references :urlable,  polymorphic: true
+
+      t.timestamps
+    end
+    add_index :cardboard_urls, [:path, :slug], :unique => true
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130417134832) do
+ActiveRecord::Schema.define(version: 20140312180204) do
 
   create_table "admin_users", force: true do |t|
     t.string   "email",                  default: "", null: false
@@ -55,12 +55,9 @@ ActiveRecord::Schema.define(version: 20130417134832) do
 
   create_table "cardboard_pages", force: true do |t|
     t.string   "title"
-    t.string   "path"
-    t.string   "slug"
-    t.text     "slugs_backup"
     t.integer  "position"
     t.text     "meta_seo"
-    t.boolean  "in_menu",      default: true
+    t.boolean  "in_menu",     default: true
     t.string   "identifier"
     t.integer  "template_id"
     t.datetime "created_at"
@@ -68,7 +65,6 @@ ActiveRecord::Schema.define(version: 20130417134832) do
   end
 
   add_index "cardboard_pages", ["identifier"], name: "index_cardboard_pages_on_identifier", unique: true
-  add_index "cardboard_pages", ["path", "slug"], name: "index_cardboard_pages_on_path_and_slug", unique: true
 
   create_table "cardboard_settings", force: true do |t|
     t.string "name"
@@ -83,10 +79,27 @@ ActiveRecord::Schema.define(version: 20130417134832) do
     t.string   "name"
     t.text     "fields"
     t.string   "identifier"
+    t.boolean  "is_page"
+    t.string   "controller_action"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "cardboard_templates", ["identifier"], name: "index_cardboard_templates_on_identifier", unique: true
+
+  create_table "cardboard_urls", force: true do |t|
+    t.string   "slug"
+    t.string   "path"
+    t.text     "slugs_backup"
+    t.text     "meta_tags"
+    t.integer  "urlable_id"
+    t.string   "urlable_type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "cardboard_urls", ["path", "slug"], name: "index_cardboard_urls_on_path_and_slug", unique: true
+
   create_table "pianos", force: true do |t|
     t.string   "name"
     t.string   "image"

data/test/models/url_test.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+describe Url do
+  before do
+    @url = Url.new
+  end
+
+  it "must be valid" do
+    @url.valid?.must_equal true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardboard_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Elfassy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,16 +127,16 @@ dependencies:
   name: bootstrap-wysihtml5-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1.24
 - !ruby/object:Gem::Dependency
   name: kaminari-bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -337,16 +337,16 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -480,8 +480,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .ruby-gemset
-- .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -525,6 +524,7 @@ files:
 - app/controllers/cardboard/settings_controller.rb
 - app/controllers/cardboard/super_user_controller.rb
 - app/controllers/pages_controller.rb
+- app/controllers/url_controller.rb
 - app/decorators/controllers/application_controller_decorator.rb
 - app/decorators/lib/cardboard/user_class_decorator.rb
 - app/helpers/cardboard/application_helper.rb
@@ -550,6 +550,7 @@ files:
 - app/models/cardboard/page_part.rb
 - app/models/cardboard/setting.rb
 - app/models/cardboard/template.rb
+- app/models/cardboard/url.rb
 - app/views/cardboard/dashboard/index.html.slim
 - app/views/cardboard/fields/_base_input.html.slim
 - app/views/cardboard/fields/_boolean.html.slim
@@ -561,15 +562,12 @@ files:
 - app/views/cardboard/fields/_rich_text.html.slim
 - app/views/cardboard/fields/_string.html.slim
 - app/views/cardboard/my_account/edit.html.slim
-- app/views/cardboard/pages/_error.html.slim
 - app/views/cardboard/pages/_part_fields.html.slim
-- app/views/cardboard/pages/_seo.html.slim
 - app/views/cardboard/pages/_sidebar.html.slim
 - app/views/cardboard/pages/_url_field.html.slim
 - app/views/cardboard/pages/edit.html.slim
 - app/views/cardboard/pages/index.html.slim
 - app/views/cardboard/pages/new.html.slim
-- app/views/cardboard/pages/show.html.slim
 - app/views/cardboard/resources/_advanced_search.html.slim
 - app/views/cardboard/resources/_search_button.html.slim
 - app/views/cardboard/resources/_search_helper.html.slim
@@ -673,7 +671,11 @@ files:
 - doc/panel/links.html
 - doc/panel/tree.js
 - lib/cardboard/application.rb
+- lib/cardboard/concerns/url_concern.rb
+- lib/cardboard/constraints/page_constraint.rb
+- lib/cardboard/dynamic_router.rb
 - lib/cardboard/engine.rb
+- lib/cardboard/helpers/content_for_in_controllers.rb
 - lib/cardboard/helpers/seed.rb
 - lib/cardboard/helpers/settings.rb
 - lib/cardboard/version.rb
@@ -713,6 +715,7 @@ files:
 - test/dummy/app/assets/stylesheets/pianos.css.scss
 - test/dummy/app/assets/stylesheets/scaffolds.css.scss
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/blog_controller.rb
 - test/dummy/app/controllers/cardboard/pianos_controller.rb
 - test/dummy/app/controllers/pianos_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -721,6 +724,7 @@ files:
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/piano.rb
+- test/dummy/app/views/blog/index.html.slim
 - test/dummy/app/views/cardboard/pianos/_fields.html.slim
 - test/dummy/app/views/cardboard/pianos/edit.html.slim
 - test/dummy/app/views/cardboard/pianos/index.html.slim
@@ -728,13 +732,14 @@ files:
 - test/dummy/app/views/cardboard/pianos/show.html.slim
 - test/dummy/app/views/layouts/application.html.slim
 - test/dummy/app/views/main/index.html.slim
+- test/dummy/app/views/pages/about_us.html.slim
+- test/dummy/app/views/pages/history.html.slim
+- test/dummy/app/views/pages/home.html.slim
 - test/dummy/app/views/pianos/_form.html.erb
 - test/dummy/app/views/pianos/edit.html.erb
 - test/dummy/app/views/pianos/index.html.erb
 - test/dummy/app/views/pianos/new.html.erb
 - test/dummy/app/views/pianos/show.html.erb
-- test/dummy/app/views/templates/about-us.html.slim
-- test/dummy/app/views/templates/home.html.slim
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -757,6 +762,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20130403142235_create_pianos.rb
 - test/dummy/db/migrate/20130417134832_add_devise_to_admin_users.rb
+- test/dummy/db/migrate/20140312180204_create_cardboard.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/lib/assets/.gitkeep
@@ -820,16 +826,13 @@ files:
 - test/dummy/public/system/dragonfly/development/2013/04/19/09_54_45_450_hall3.jpg
 - test/dummy/public/system/dragonfly/development/2013/04/19/09_54_45_450_hall3.jpg.meta
 - test/dummy/script/rails
-- test/dummy/test/fixtures/admins.yml
-- test/dummy/test/functional/admins_controller_test.rb
-- test/dummy/test/unit/admin_test.rb
-- test/dummy/test/unit/helpers/admins_helper_test.rb
 - test/factories.rb
 - test/integration/page_editing_test.rb
 - test/integration/seeding_test.rb
 - test/models/field_test.rb
 - test/models/page_test.rb
 - test/models/template_test.rb
+- test/models/url_test.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/cardboard/bootstrap-select.js
 - vendor/assets/javascripts/cardboard/jquery.livesearch.js
@@ -848,7 +851,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -882,6 +885,7 @@ test_files:
 - test/dummy/app/assets/stylesheets/pianos.css.scss
 - test/dummy/app/assets/stylesheets/scaffolds.css.scss
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/blog_controller.rb
 - test/dummy/app/controllers/cardboard/pianos_controller.rb
 - test/dummy/app/controllers/pianos_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -890,6 +894,7 @@ test_files:
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/piano.rb
+- test/dummy/app/views/blog/index.html.slim
 - test/dummy/app/views/cardboard/pianos/_fields.html.slim
 - test/dummy/app/views/cardboard/pianos/edit.html.slim
 - test/dummy/app/views/cardboard/pianos/index.html.slim
@@ -897,13 +902,14 @@ test_files:
 - test/dummy/app/views/cardboard/pianos/show.html.slim
 - test/dummy/app/views/layouts/application.html.slim
 - test/dummy/app/views/main/index.html.slim
+- test/dummy/app/views/pages/about_us.html.slim
+- test/dummy/app/views/pages/history.html.slim
+- test/dummy/app/views/pages/home.html.slim
 - test/dummy/app/views/pianos/_form.html.erb
 - test/dummy/app/views/pianos/edit.html.erb
 - test/dummy/app/views/pianos/index.html.erb
 - test/dummy/app/views/pianos/new.html.erb
 - test/dummy/app/views/pianos/show.html.erb
-- test/dummy/app/views/templates/about-us.html.slim
-- test/dummy/app/views/templates/home.html.slim
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -926,6 +932,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20130403142235_create_pianos.rb
 - test/dummy/db/migrate/20130417134832_add_devise_to_admin_users.rb
+- test/dummy/db/migrate/20140312180204_create_cardboard.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/lib/assets/.gitkeep
@@ -989,14 +996,11 @@ test_files:
 - test/dummy/public/system/dragonfly/development/2013/04/19/09_54_45_450_hall3.jpg
 - test/dummy/public/system/dragonfly/development/2013/04/19/09_54_45_450_hall3.jpg.meta
 - test/dummy/script/rails
-- test/dummy/test/fixtures/admins.yml
-- test/dummy/test/functional/admins_controller_test.rb
-- test/dummy/test/unit/admin_test.rb
-- test/dummy/test/unit/helpers/admins_helper_test.rb
 - test/factories.rb
 - test/integration/page_editing_test.rb
 - test/integration/seeding_test.rb
 - test/models/field_test.rb
 - test/models/page_test.rb
 - test/models/template_test.rb
+- test/models/url_test.rb
 - test/test_helper.rb