smithycms 0.0.3 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c8d0a9c785b4f6f88d4852f538d4af020eca85df
+  data.tar.gz: c8b09872f45049bd4853bd521c945c920cb459f3
+SHA512:
+  metadata.gz: 2f24d3f4efbb2ccd2c8cba5f87d4d85c3de907fa585aa07dcec4df803edd098fdc9ddc314d80513626180b9405b39bb1dd4a611aea5ff30827e7f11d80089f08
+  data.tar.gz: c1cd515a71a1826b34fd54501fbefc8b11b465b83ba0064312342900d6b5e02e7344e297cf9743b633eb57e912d4eb3ecd6d5e46a309f4068790373aea3980fc

data/README.md

@@ -2,6 +2,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/smithycms.png)](http://badge.fury.io/rb/smithycms)
 [![Code Climate](https://codeclimate.com/github/sterrym/smithy.png)](https://codeclimate.com/github/sterrym/smithy)
+[![Build Status](https://travis-ci.org/sterrym/smithycms.png?branch=master)](https://travis-ci.org/sterrym/smithycms)
+[![Coverage Status](https://coveralls.io/repos/sterrym/smithycms/badge.png)](https://coveralls.io/r/sterrym/smithycms)
+[![Dependency Status](https://gemnasium.com/sterrym/smithycms.png)](https://gemnasium.com/sterrym/smithycms)
 
 ## Templates & Includes
 These are the building blocks of a page. All the markup is written using the Liquid templating engine. This allows anyone to be able to write templates without the dangers of exposing the whole stack to the template editor.
@@ -41,7 +44,7 @@ Now start up your server and go to http://localhost:nnnn/smithy
 
 ## Integrating with third-party authentication
 
-Add this to your routes file (below the `mount Smithy::Engine` line). It will redirect smithy/login|logout (the built-in paths) to your existing authentication paths.
+Add this to your routes file (before the `mount Smithy::Engine` line). It will redirect smithy/login|logout (the built-in paths) to your existing authentication paths.
 
 ```ruby
 scope "/smithy" do

data/Rakefile

@@ -1,27 +1,21 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Smithy'
+  rdoc.title    = 'SampleEngine'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/app/controllers/smithy/assets_controller.rb

@@ -10,12 +10,12 @@ module Smithy
     end
 
     def new
-      @asset = Asset.new(params[:asset])
+      @asset = Asset.new(filtered_params)
       respond_with @asset
     end
 
     def create
-      @asset = Asset.new(params[:asset])
+      @asset = Asset.new(filtered_params)
       @asset.save
       flash.notice = "Your asset was created" if @asset.persisted?
       respond_with @asset do |format|
@@ -30,7 +30,7 @@ module Smithy
 
     def update
       @asset = Asset.find(params[:id])
-      flash.notice = "Your asset was saved" if @asset.update_attributes(params[:asset])
+      flash.notice = "Your asset was saved" if @asset.update_attributes(filtered_params)
       respond_with @asset do |format|
         format.html { redirect_to assets_path }
       end

data/app/controllers/smithy/base_controller.rb

@@ -11,4 +11,13 @@ class Smithy::BaseController < ApplicationController
         redirect_to smithy_login_path
       end
     end
+
+    def filtered_params
+      permitted_params.params_for controller_name.singularize
+    end
+
+    def permitted_params
+      permitted_params ||= PermittedParams.new(params, smithy_current_user)
+    end
+    helper_method :permitted_params
 end

data/app/controllers/smithy/content_blocks_controller.rb

@@ -10,12 +10,12 @@ module Smithy
     end
 
     def new
-      @content_block = ContentBlock.new(params[:content_block])
+      @content_block = ContentBlock.new(filtered_params)
       respond_with @content_block
     end
 
     def create
-      @content_block = ContentBlock.new(params[:content_block])
+      @content_block = ContentBlock.new(filtered_params)
       @content_block.save
       flash.notice = "Your content_block was created" if @content_block.persisted?
       respond_with @content_block do |format|
@@ -30,7 +30,7 @@ module Smithy
 
     def update
       @content_block = ContentBlock.find(params[:id])
-      flash.notice = "Your content_block was saved" if @content_block.update_attributes(params[:content_block])
+      flash.notice = "Your content_block was saved" if @content_block.update_attributes(filtered_params)
       respond_with @content_block do |format|
         format.html { redirect_to [:edit, @content_block] }
       end

data/app/controllers/smithy/content_pieces_controller.rb

@@ -54,6 +54,10 @@ class Smithy::ContentPiecesController < Smithy::BaseController
   end
 
   private
+    def filtered_params
+      permitted_params.params_for klass.name.sub(/^Smithy::/, '').underscore
+    end
+
     def klass
       # override to provide an object for each class
       raise "You must inherit from this Smithy::ContentPiecesController and provide a private #klass method"
@@ -63,12 +67,8 @@ class Smithy::ContentPiecesController < Smithy::BaseController
       @klass_name ||= klass.name.sub(/^Smithy::/, '').titleize
     end
 
-    def klass_params
-      params[klass.name.sub(/^Smithy::/, '').underscore]
-    end
-
     def new_record
-      klass.new(klass_params)
+      klass.new(filtered_params)
     end
 
     def find_record
@@ -84,7 +84,7 @@ class Smithy::ContentPiecesController < Smithy::BaseController
     end
 
     def update_record(record)
-      record.update_attributes(klass_params)
+      record.update_attributes(filtered_params)
     end
 
     def readable_attributes

data/app/controllers/smithy/contents_controller.rb

@@ -10,12 +10,12 @@ module Smithy
     end
 
     def new
-      @content = Smithy::Content.new(params[:content])
+      @content = Smithy::Content.new(filtered_params)
       respond_with @content
     end
 
     def create
-      @content = Smithy::Content.new(params[:content])
+      @content = Smithy::Content.new(filtered_params)
       @content.save
       flash.notice = "Your content was created" if @content.persisted?
       respond_with @content
@@ -28,7 +28,7 @@ module Smithy
 
     def update
       @content = Smithy::Content.find(params[:id])
-      flash.notice = "Your content was saved" if @content.update_attributes(params[:content])
+      flash.notice = "Your content was saved" if @content.update_attributes(filtered_params)
       respond_with @content
     end
 

data/app/controllers/smithy/images_controller.rb

@@ -10,12 +10,12 @@ module Smithy
     end
 
     def new
-      @image = Smithy::Image.new(params[:image])
+      @image = Smithy::Image.new(filtered_params)
       respond_with @image
     end
 
     def create
-      @image = Smithy::Image.new(params[:image])
+      @image = Smithy::Image.new(filtered_params)
       @image.save
       flash.notice = "Your image was created" if @image.persisted?
       respond_with @image
@@ -28,7 +28,7 @@ module Smithy
 
     def update
       @image = Smithy::Image.find(params[:id])
-      flash.notice = "Your image was saved" if @image.update_attributes(params[:image])
+      flash.notice = "Your image was saved" if @image.update_attributes(filtered_params)
       respond_with @image
     end
 

data/app/controllers/smithy/page_contents_controller.rb

@@ -9,7 +9,7 @@ module Smithy
     respond_to :html, :json
 
     def new
-      @page_content = Smithy::PageContent.new(params[:page_content])
+      @page_content = Smithy::PageContent.new(filtered_params)
       @page_content.label = [@page.title, @page_content.container.titleize].join(' - ') unless @page_content.label?
     end
 
@@ -17,8 +17,8 @@ module Smithy
       @page_content = Smithy::PageContent.new
       # we have to ensure that the content_block_type gets added before the content_block_attributes
       # see PageContent#content_block_attributes=
-      @page_content.content_block_type = params[:page_content][:content_block_type]
-      @page_content.attributes = params[:page_content]
+      @page_content.content_block_type = filtered_params[:content_block_type]
+      @page_content.attributes = filtered_params
       @page_content.page = @page
       @page_content.save
       respond_with @page_content do |format|
@@ -32,7 +32,7 @@ module Smithy
 
     def update
       @page_content = Smithy::PageContent.find(params[:id])
-      @saved = @page_content.update_attributes(params[:page_content])
+      @saved = @page_content.update_attributes(filtered_params)
       flash.notice = "Your content was saved" if @saved
       respond_with @page_content do |format|
         format.html { @saved ? redirect_to(edit_page_path(@page.id)) : render(:action => "edit") }

data/app/controllers/smithy/pages_controller.rb

@@ -39,7 +39,7 @@ module Smithy
     end
 
     def update
-      flash.notice = "Your page was saved #{@page.published? ? 'and published' : 'as a draft'}" if @page.update_attributes(params[:page])
+      flash.notice = "Your page was saved #{@page.published? ? 'and published' : 'as a draft'}" if @page.update_attributes(filtered_params)
       respond_with @page do |format|
         format.html { redirect_to edit_page_path(@page.id) }
       end
@@ -67,7 +67,7 @@ module Smithy
 
     private
       def initialize_page
-        @page = Page.new(params[:page])
+        @page = Page.new(filtered_params)
         set_publish
       end
 
@@ -78,7 +78,7 @@ module Smithy
       end
 
       def load_page_from_path
-        @page = Page.find(page_path)
+        @page = Page.friendlfind(page_path)
         redirect_to @page.external_link and return false if @page.external_link?
       end
 

data/app/controllers/smithy/settings_controller.rb

@@ -15,12 +15,12 @@ module Smithy
     end
 
     def new
-      @setting = Setting.new(params[:setting])
+      @setting = Setting.new(filtered_params)
       respond_with @setting
     end
 
     def create
-      @setting = Setting.new(params[:setting])
+      @setting = Setting.new(filtered_params)
       @setting.save
       flash.notice = "Your setting was created" if @setting.persisted?
       respond_with @setting
@@ -33,7 +33,7 @@ module Smithy
 
     def update
       @setting = Setting.find(params[:id])
-      flash.notice = "Your setting was saved" if @setting.update_attributes(params[:setting])
+      flash.notice = "Your setting was saved" if @setting.update_attributes(filtered_params)
       respond_with @setting
     end
 

data/app/controllers/smithy/templates_controller.rb

@@ -11,12 +11,12 @@ module Smithy
     end
 
     def new
-      @template = Template.new(params[:template])
+      @template = Template.new(filtered_params)
       respond_with @template
     end
 
     def create
-      @template = Template.new(params[:template])
+      @template = Template.new(filtered_params)
       @template.save
       flash.notice = "Your template was created" if @template.persisted?
       respond_with @template do |format|
@@ -39,7 +39,7 @@ module Smithy
 
     def update
       @template = Template.find(params[:id])
-      flash.notice = "Your template was saved" if @template.update_attributes(params[:template])
+      flash.notice = "Your template was saved" if @template.update_attributes(filtered_params)
       respond_with @template do |format|
         format.html { redirect_to [:edit, @template] }
       end
@@ -52,12 +52,12 @@ module Smithy
     end
 
     def javascript
-      @javascript = Template.javascripts.find_by_name(params[:javascript].sub(/\.js$/, ''))
+      @javascript = Template.javascripts.find_by(name: params[:javascript].sub(/\.js$/, ''))
       render_asset_template(@javascript, params[:javascript], 'text/javascript')
     end
 
     def stylesheet
-      @stylesheet = Template.stylesheets.find_by_name(params[:stylesheet].sub(/\.css$/, ''))
+      @stylesheet = Template.stylesheets.find_by(name: params[:stylesheet].sub(/\.css$/, ''))
       render_asset_template(@stylesheet, params[:stylesheet], 'text/css')
     end
 

data/app/models/smithy/asset.rb

@@ -1,18 +1,17 @@
 module Smithy
   class Asset < ActiveRecord::Base
-    attr_accessible :name, :file, :file_name, :file_url, :retained_file, :uploaded_file_url
-
     validates_presence_of :file, :name
 
     has_many :images, :dependent => :destroy
 
-    file_accessor :file
-    include Smithy::Dragonfly::AssetHelper
+    extend ::Dragonfly::Model
+    dragonfly_accessor :file
+    include ::Smithy::Dragonfly::AssetHelper
 
     before_validation :set_name
     before_save :set_file_uid_manually
 
-    default_scope order(:name)
+    default_scope -> { order(:name) }
 
     def file
       # check for the jquery uploaded file first, just in case one got past the manual check. Also keeps backwards-compatibility

data/app/models/smithy/content.rb

@@ -2,8 +2,6 @@ module Smithy
   class Content < ActiveRecord::Base
     include Smithy::ContentBlocks::Model
 
-    attr_accessible :content
-
     validates_presence_of :content
 
     before_save :render_markdown_content

data/app/models/smithy/content_block.rb

@@ -1,7 +1,5 @@
 module Smithy
   class ContentBlock < ActiveRecord::Base
-    attr_accessible :name, :templates_attributes
-
     validates_presence_of :name
 
     has_many :templates, :class_name => "ContentBlockTemplate"
@@ -11,7 +9,7 @@ module Smithy
 
     accepts_nested_attributes_for :templates, :reject_if => lambda {|a| a['name'].blank? || a['content'].blank? }, :allow_destroy => true
 
-    default_scope order(:name)
+    default_scope -> { order(:name) }
 
     def description
       klass.content_block_description if klass

data/app/models/smithy/content_block_template.rb

@@ -1,7 +1,5 @@
 module Smithy
   class ContentBlockTemplate < ActiveRecord::Base
-    attr_accessible :content, :name
-
     belongs_to :content_block, :touch => true
     has_many :page_contents
 
@@ -11,7 +9,7 @@ module Smithy
 
     after_save :touch_page_contents
 
-    default_scope order(:name)
+    default_scope -> { order(:name) }
 
     def liquid_template
       @liquid_template ||= ::Liquid::Template.parse(self.content)

data/app/models/smithy/image.rb

@@ -2,8 +2,6 @@ module Smithy
   class Image < ActiveRecord::Base
     include Smithy::ContentBlocks::Model
 
-    attr_accessible :alternate_text, :asset_id, :height, :html_attributes, :image_scaling, :link_url, :width, :content
-
     validates_presence_of :asset
 
     belongs_to :asset

data/app/models/smithy/page.rb

@@ -1,7 +1,5 @@
 module Smithy
   class Page < ActiveRecord::Base
-    attr_accessible :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id
-
     validates_presence_of :template, :title
     validate :validate_one_root
     validate :validate_exclusion_of_reserved_words
@@ -19,7 +17,7 @@ module Smithy
 
     accepts_nested_attributes_for :contents, :reject_if => lambda {|a| a['label'].blank? || a['container'].blank? || a['content_block'].blank? }, :allow_destroy => true
 
-    scope :included_in_navigation, lambda{ where("show_in_navigation=? AND published_at <= ?", true, Time.now) }
+    scope :included_in_navigation, -> { where("show_in_navigation=? AND published_at <= ?", true, Time.now) }
 
     attr_accessor :publish
 
@@ -37,6 +35,10 @@ module Smithy
       [(self.parent.present? && !self.parent.root? ? self.parent.path : nil), value].join('/')
     end
 
+    def should_generate_new_friendly_id?
+      title_changed? || permalink_changed?
+    end
+
     def published?
       self.published_at?
     end

data/app/models/smithy/page_content.rb

@@ -1,7 +1,5 @@
 module Smithy
   class PageContent < ActiveRecord::Base
-    attr_accessible :label, :container, :content_block_type, :content_block_attributes, :content_block_template_id, :position
-
     validates_presence_of :content_block, :content_block_template, :on => :update
     validates_presence_of :content_block_type, :on => :create
     validates_presence_of :label, :container, :page
@@ -14,9 +12,9 @@ module Smithy
 
     accepts_nested_attributes_for :content_block, :allow_destroy => true
 
-    default_scope order(:position).order(:id)
-    scope :for_container, lambda {|container| where(:container => container) }
-    scope :publishable, lambda { where(:publishable => true) }
+    default_scope -> { order(:position).order(:id) }
+    scope :for_container, ->(container) { where(:container => container) }
+    scope :publishable, -> { where(:publishable => true) }
 
     def attributes=(attributes = {})
       self.content_block_type = attributes[:content_block_type]

data/app/models/smithy/page_list.rb

@@ -2,8 +2,6 @@ module Smithy
   class PageList < ActiveRecord::Base
     include Smithy::ContentBlocks::Model
 
-    attr_accessible :count, :page_template_id, :parent_id, :include_children, :sort
-
     validates_presence_of :parent_id
 
     belongs_to :parent, :class_name => "Page"

data/app/models/smithy/permitted_params.rb

@@ -0,0 +1,57 @@
+module Smithy
+  class PermittedParams < Struct.new(:params, :user)
+    def params_for(param)
+      param = param.to_sym
+      attributes = send("#{param.to_s}_attributes".to_sym)
+      if attributes == :all
+        params.fetch(param, {}).permit!
+      else
+        params.fetch(param, {}).permit( *attributes )
+      end
+    end
+
+    def asset_attributes
+      [ :name, :file, :file_name, :file_url, :retained_file, :uploaded_file_url ]
+    end
+
+    def content_attributes
+      [ :content ]
+    end
+
+    def content_block_attributes
+      [ :name, :templates_attributes ]
+    end
+
+    def content_block_template_attributes
+      [ :content, :name ]
+    end
+
+    def image_attributes
+      [ :alternate_text, :asset_id, :height, :html_attributes, :image_scaling, :link_url, :width, :content ]
+    end
+
+    def page_attributes
+      [ :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id ]
+    end
+
+    def page_content_attributes
+      [ :label, :container, :content_block_type, :content_block_attributes, :content_block_template_id, :position ]
+    end
+
+    def page_list_attributes
+      [ :count, :page_template_id, :parent_id, :include_children, :sort ]
+    end
+
+    def setting_attributes
+      [ :name, :value ]
+    end
+
+    def template_attributes
+      [ :name, :content, :template_type ]
+    end
+
+    def template_container_attributes
+      [ :name, :position ]
+    end
+  end
+end

data/app/models/smithy/setting.rb

@@ -1,6 +1,5 @@
 module Smithy
   class Setting < ActiveRecord::Base
-    attr_accessible :name, :value
     validates_presence_of :name, :value
   end
 end

data/app/models/smithy/template.rb

@@ -1,23 +1,21 @@
 module Smithy
   class Template < ActiveRecord::Base
-    attr_accessible :name, :content, :template_type
-
     validates_presence_of :name
     validates_uniqueness_of :name, :scope => :template_type
     validates_presence_of :content, :on => :update
 
     has_many :pages
-    has_many :containers, :class_name => "TemplateContainer"
+    has_many :containers, :class_name => "Smithy::TemplateContainer"
 
     before_save :uncache_liquid_template_if_content_changed
     after_save :load_containers
     after_save :touch_pages
 
-    default_scope order(:name)
-    scope :javascripts, where(:template_type => "javascript")
-    scope :partials, where(:template_type => "include")
-    scope :stylesheets, where(:template_type => "stylesheet")
-    scope :templates, where(:template_type => "template")
+    default_scope -> { order(:name) }
+    scope :javascripts, -> { where(:template_type => "javascript") }
+    scope :partials, -> { where(:template_type => "include") }
+    scope :stylesheets, -> { where(:template_type => "stylesheet") }
+    scope :templates, -> { where(:template_type => "template") }
 
     class << self
       def types
@@ -36,7 +34,6 @@ module Smithy
       def load_containers
         return unless self.template_type == 'template'
         container_names = liquid_template.root.nodelist.select{|n| n.is_a?(::Liquid::Variable) && n.name.match(/^page\.container\.(.*)/) }.map{|n| n.name.match(/^page\.container\.(.*)/)[1] }
-        # self.containers = container_names.map{|container_name| Smithy::TemplateContainer.new(:name => container_name) }
         self.containers = container_names.inject([]) do |containers, container_name|
           containers.push Smithy::TemplateContainer.new(:name => container_name, :position => containers.size)
         end

data/app/models/smithy/template_container.rb

@@ -5,9 +5,7 @@ module Smithy
     belongs_to :template
     has_many :pages, :through => :template
 
-    attr_accessible :name, :position
-
-    default_scope :order => [:position, :name]
+    default_scope -> { order([:position, :name]) }
 
     def display_name
       name.titleize

data/app/views/smithy/assets/edit.html.erb

@@ -1,4 +1,4 @@
-<% content_for :title, "Assets" %>
+<% content_for :title, "Images &amp; Files".html_safe %>
 
 <div class="well">
   <%= render :partial => "form" %>

data/app/views/smithy/assets/new.html.erb

@@ -1,13 +1,7 @@
-<% content_for :title, "Images &amp; Files" %>
+<% content_for :title, "Images &amp; Files".html_safe %>
 
-<%= semantic_form_for @template, :html => { :class => 'form-horizontal' } do |f| %>
-  <%= f.inputs "New #{@template.template_type.capitalize}" do %>
-    <%= f.input :name %>
-    <%= f.input :template_type, :as => :hidden %>
-  <% end %>
-  <%= f.actions :submit %>
-<% end %>
-
-<%= render :partial => "secondary_nav" %>
+<div class="well">
+  <%= render :partial => "form" %>
+</div>
 
 <% content_for :related, nil %>