cardboard_cms 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c9ba046a708dba52e5848d89dd284ee9bcec1e
-  data.tar.gz: 5171f5d82832e70ff0ed47c8200a2539837561bd
+  metadata.gz: b6ac8ca5c27e3d52c4f2eaa544763dab9d1d0fa8
+  data.tar.gz: 0df3371e7810c9c5aafccc8a6baf0255c7186aa4
 SHA512:
-  metadata.gz: 7e37d4374060af4c6cddc1ac86988f8bd6822b57213ae7cdbf46e7911ad2fe445fc0842f57c6a1e4f316ba42aaaacaba226fbdc2c2c646a32508151304a44e07
-  data.tar.gz: f368b5dbcc53f777e18498b3c792336bb259b1447c98b4229290a018355cbd693211cacb68c9cbea421b8c1cedf1124550cba3bfd4b6db801fc9927c9c4e67ec
+  metadata.gz: 43fda20aa8dacdfa2b0b5999324d625683c9ca08540b37b2998b8fa9b5cf4881623b022a1b26e49ad6e90246eb62fda99e722ad466c026b57a11e124acd65037
+  data.tar.gz: 1b7f04cd4de2c51666f44cf3d7ac5937ffe31ef25147ccbdc96d25b3b8bbda296d4db58c5aeccf7a52855f168f7174a983afcee15f7710debe9fd636d4a786af

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+  - rbx-2

data/Gemfile

@@ -1,5 +1,4 @@
 source "http://rubygems.org"
-ruby '2.0.0'
 
 # Declare your gem's dependencies in cardboard.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
@@ -25,12 +24,13 @@ gem 'quiet_assets'
 gem 'better_errors'
 gem 'binding_of_caller'
 gem 'pry-rails'
-gem 'pry-debugger'
+gem 'pry-byebug'
 gem 'uglifier'
 
 group :test do
   gem 'turn'
   gem 'simplecov'
+  gem 'rake'
 end
 
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cardboard_cms (0.2.2)
+    cardboard_cms (0.3.1)
       bootstrap-datepicker-rails
       bootstrap-sass (~> 2.2)
-      bootstrap-wysihtml5-rails
+      bootstrap-wysihtml5-rails (~> 0.3.1.24)
       chronic
       cocoon (>= 1.2.0)
       coffee-rails
@@ -14,7 +14,7 @@ PATH
       gon
       inherited_resources (>= 1.4.1)
       jquery-rails
-      jquery-ui-rails
+      jquery-ui-rails (~> 5.0.0)
       kaminari
       kaminari-bootstrap (~> 0.1.3)
       rack-cache
@@ -65,13 +65,16 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-datepicker-rails (1.3.0.1)
+    bootstrap-datepicker-rails (1.3.0.2)
       railties (>= 3.0)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    bootstrap-wysihtml5-rails (0.3.1.23)
+    bootstrap-wysihtml5-rails (0.3.1.24)
       railties (>= 3.0)
     builder (3.1.4)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -79,25 +82,20 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chronic (0.10.2)
-    cocoon (1.2.5)
+    cocoon (1.2.6)
     coderay (1.0.9)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    columnize (0.3.6)
+    coffee-script-source (1.7.1)
+    columnize (0.8.9)
     daemons (1.1.9)
     database_cleaner (1.0.1)
     debug_inspector (0.0.2)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     decorators (1.0.3)
       railties (>= 3.0.19, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.10, != 3.2.1, != 3.2.0, != 3.1.9, != 3.1.8, != 3.1.7, != 3.1.6, != 3.1.5, != 3.1.4, != 3.1.3, != 3.1.2, != 3.1.1, != 3.1.0)
     devise (3.0.2)
@@ -105,7 +103,7 @@ GEM
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
-    dragonfly (1.0.3)
+    dragonfly (1.0.5)
       multi_json (~> 1.0)
       rack
     erubis (2.7.0)
@@ -124,9 +122,11 @@ GEM
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
     formatador (0.2.4)
-    gon (5.0.1)
+    gon (5.1.1)
       actionpack (>= 2.3.0)
       json
+      multi_json
+      request_store (>= 1.0.5)
     guard (1.8.2)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
@@ -141,16 +141,16 @@ GEM
       activesupport (>= 3.2, < 5)
     hike (1.2.3)
     i18n (0.6.4)
-    inherited_resources (1.4.1)
+    inherited_resources (1.5.0)
       has_scope (~> 0.6.0.rc)
-      responders (~> 1.0.0.rc)
+      responders (~> 1.0)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.1)
-      railties (>= 3.1.0)
+    jquery-ui-rails (5.0.0)
+      railties (>= 3.2.16)
     json (1.8.0)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kaminari-bootstrap (0.1.3)
@@ -190,16 +190,16 @@ GEM
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     orm_adapter (0.4.0)
-    polyamorous (0.6.4)
+    polyamorous (1.0.0)
       activerecord (>= 3.0)
     polyglot (0.3.3)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
+    pry-byebug (1.3.2)
+      byebug (~> 2.7)
+      pry (~> 0.9.12)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
     quiet_assets (1.0.2)
@@ -223,12 +223,14 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    ranked-model (0.3)
+    ranked-model (0.4.0)
       activerecord (>= 3.1.12)
-    ransack (1.1.0)
+    ransack (1.2.3)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
-      polyamorous (~> 0.6.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.0.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
@@ -236,26 +238,28 @@ GEM
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    responders (1.0.0)
+    request_store (1.0.7)
+    responders (1.1.0)
       railties (>= 3.2, < 5)
-    sass (3.2.14)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    select2-rails (3.5.2)
+    select2-rails (3.5.9)
       thor (~> 0.14)
-    simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
+    simple_form (3.0.2)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slim (2.0.2)
+    slim (2.0.3)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.4.6)
@@ -269,8 +273,8 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.7)
-    stringex (2.2.0)
-    temple (0.6.7)
+    stringex (2.5.2)
+    temple (0.6.8)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -282,7 +286,7 @@ GEM
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.1)
+    turbolinks (2.2.2)
       coffee-rails
     turn (0.9.6)
       ansi
@@ -311,9 +315,10 @@ DEPENDENCIES
   letter_opener
   minitest-rails
   minitest-rails-capybara
-  pry-debugger
+  pry-byebug
   pry-rails
   quiet_assets
+  rake
   rb-fsevent
   sdoc
   simplecov

data/README.md

@@ -16,6 +16,10 @@ Cardboard is a simple CMS Engine for your Rails 4 applications.
 
 ![alt text](https://github.com/smashingboxes/cardboard/wiki/images/2a.jpg "screenshot1")
 
+
+## Updating from 0.2 -> 0.3
+Some changes were made to the database. Before updating make sure to have a look at the [new migration](https://github.com/smashingboxes/cardboard/blob/master/db/migrate/1_create_cardboard.rb)
+
 ## Requirements
 * An authentication solution. For example, [here is what you need to do](https://github.com/plataformatec/devise#getting-started) to get `Devise` installed.
 * `imagemagick` (on mac do `brew install imagemagick`)
@@ -45,7 +49,7 @@ rake cardboard:seed
 
 ## Usage
 ### Get a page
-Add a file in your `app/views/templates` with filename matching the identifier of the page. Inside this file you can access the page with:
+Add a file in your `app/views/pages` (or `app/views/templates`) with filename matching the identifier of the page. Inside this file you can access the page with:
 ```ruby
 current_page
 ```
@@ -104,7 +108,7 @@ pages:
             type: image
             required: true
             default: CrashTest.jpg
-pages:
+templates:
   two_column:
     parts:
       main:
@@ -124,7 +128,10 @@ Key | Type | Default | Definition
 title | string | identifier | name of the page as shown in the nav bar
 position | integer | auto-increment | position of the page on the nav bar (the lowest position is the home page!)
 parent_id | string | nil | identifier of the parent page (used for nested pages)
+controller_action | string | pages#identifier | go to a specific controller example "blog#index". In that case, the page identifier is passed in the params
 
+#### Templates
+Templates are declared exactly like pages. They allow for the creation of pages directly from the admin interface. One key difference between templates and pages is the location of the view files which will be under `app/views/templates`.
 
 #### Parts
 Each part sub-section starts with the name of it's unique identifier. This name is used to reference the part in the code an thus should not change throughout the life of the project.
@@ -173,6 +180,7 @@ Gem | Description
 
 
 ### Menu options
+You can customize the menu for this resource by adding to the controller class:
 ```ruby
   menu  label: "Test", priority: 1
 ```
@@ -182,6 +190,7 @@ You can also choose to remove a resource from the menu
 ```
 
 ### Sorting
+You can customize the sorting for this resource by adding to the controller class:
 ```ruby
   default_order "name DESC" # default: 'updated_at desc'
 ```
@@ -281,6 +290,7 @@ In your controllers you may want to redirect to a specific page. You can do so w
 ```ruby
 page_path("identifier_for_this_page")
 page_url("identifier_for_this_page")
+cardboard.edit_page_path(@page) #link to let your admins edit the page they see
 ```
 
 

data/app/assets/javascripts/cardboard/admin.js

@@ -3,7 +3,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.sortable
+//= require jquery-ui/sortable
 //= require cardboard/jquery.livesearch
 //= require turbolinks
 //= require bootstrap-button

data/app/controllers/pages_controller.rb

@@ -1,35 +1,3 @@
-class PagesController < ApplicationController
-  def show
-    if current_page.nil?
-      flash[:error] = "No root page! Make sure to add a page first"
-      redirect_to cardboard.dashboard_path
-    else
-      if current_page.using_slug_backup?
-        redirect_to current_page.url, status: :moved_permanently
-      else
-        # call controller hook
-        self.send(current_page.identifier) if self.respond_to? current_page.identifier
-
-        render "cardboard/pages/show", layout: @layout || "layouts/application"
-      end
-    end
-  end
-
-private
-
-  # def edit_link
-  #   cardboard.edit_page_path(@page)
-  # end
-  # helper_method :edit_link
-
-  def current_page
-    return @page unless @page.nil?
-    @page = if params[:id].nil?
-      Cardboard::Page.root
-    else
-      Cardboard::Page.find_by_url(params[:id])
-    end
-    @page || raise(ActionController::RoutingError.new("Page not found"))
-  end
-
-end
+class PagesController < UrlController
+  #Main app can overwrite to customize the actions per page
+end

data/app/controllers/url_controller.rb

@@ -0,0 +1,33 @@
+class UrlController < ApplicationController
+  around_filter :apply_some_cardboard_magic
+  include Cardboard::ContentForInControllers
+
+private
+
+  def apply_some_cardboard_magic
+    if current_page.using_slug_backup?
+      redirect_to current_page.url, status: :moved_permanently
+    else
+      render_seo
+      yield
+    end
+  end
+
+  def render_seo
+    title = (current_page.meta_tags.delete("title") || current_page.meta_tags.delete(:title))
+    seo = "" 
+    seo += "<title>#{Cardboard::Setting.company_name}#{" | " + title unless title.blank?}</title>"
+    seo += current_page.meta_tags.map{|key, value| "<meta name='#{key}' content='#{value}' />"}.join
+    content_for :seo, seo.html_safe
+  end
+
+  def current_page
+    return @cardboard_page unless @cardboard_page.nil?
+
+    @cardboard_page = if request.path == "/"
+      Cardboard::Page.root
+    else
+      Cardboard::Url.urlable_for(request.path) 
+    end
+  end
+end

data/app/decorators/controllers/application_controller_decorator.rb

@@ -3,7 +3,9 @@ ApplicationController.class_eval do
   # helper Cardboard::PublicHelper
 
   def current_page
-    nil #this will be overwritten only for cardboard pages
+    #nil default for non cardboard pages
+    #overwritten otherwise by url controller
+    nil 
   end
   helper_method :current_page
 end

data/app/helpers/cardboard/public_helper.rb

@@ -3,7 +3,7 @@ module Cardboard
 
     def dragonfly_image_tag(image, options = {})
       return nil unless image
-      size = options.delete(:size) || '125x125'
+      size = options.delete(:size) || '125x125>'
       image_tag image.thumb(size).url, options
     end
 

data/app/helpers/cardboard/resource_helper.rb

@@ -7,6 +7,12 @@ module Cardboard
       super(val, options)
     end
 
+    def dragonfly_image_tag(image, options = {})
+      return nil unless image
+      size = options.delete(:size) || '125x125>'
+      image_tag image.thumb(size).url, options
+    end
+
     # ActionView::Helpers::FormBuilder.class_eval do
     #   def date_field(conf,opts = {})
     #     options = opts.dup

data/app/models/cardboard/field.rb

@@ -60,7 +60,8 @@ module Cardboard
     end
 
     def required?
-      required = self.object_with_field.template[self.identifier.to_sym][:required]
+      return false if (field_name = self.identifier.to_sym) == :company_name
+      required = self.object_with_field.template[field_name][:required]
       required = true if required.nil?
       required
     end