smithycms 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ab8b11085718311aa429107facbda10a9d5a06
-  data.tar.gz: 369a6bd0dfa66abb8ba69428354736db59551a0d
+  metadata.gz: 1f6c0427e4a30c1d753bcd02f46771123d83b945
+  data.tar.gz: 229c35d059afad3e7586d7d28cd9a34b52340288
 SHA512:
-  metadata.gz: 6ce6ccd39153e2f66c7710d221570d25c42d815503ebee6aeee3bf04232261580f5e22b872ebc2afe60956a5aadcfb28f5c941df620029d0eba4f2ca99706ad9
-  data.tar.gz: a2cdcbc9abe95a55cd064983a55a8fcb4461663efc542588718ac9be680c5cebdc7cef3bc3a90100505ed7d9d59828f3b2b6ca29368455b68c533ab052c39845
+  metadata.gz: 2448ff969ad38a466e2b04bea3a767a9b6b92575777234be1185b98bbff2a62b88c66ca92600ec84ccc2949042cc9d70388fd3c2ae9766b64b971cf34fcdbdfd
+  data.tar.gz: 5e8fda95465b163f34df96c0bfd8fe229852f2551bb0e9e155865aa7b6ece0d500a14e1bce20bdedd9a3c4855cacc55d91b69adff85519fc017f221177954985

data/README.md

@@ -19,11 +19,11 @@ A "Content Block" is simply an ActiveRecord model with a Smithy inclusion (<code
 To get started, add this to your Gemfile
 
 ```ruby
-gem 'smithy'
+gem 'smithycms'
 ```
 
 If you need basic authentication and don't want to integrate with existing auth in your system, add this to your Gemfile too:
-gem 'smithy-auth'
+gem 'smithycms-auth'
 
 Installing the CMS is simple, you can just
 

data/app/assets/javascripts/smithy/application.js

@@ -4,10 +4,10 @@
 //= require jquery-fileupload/basic
 //= require jquery-fileupload/vendor/tmpl
 //= require bootstrap
-//= require ace/ace
-//= require ace/mode-css.js
-//= require ace/mode-html.js
-//= require ace/mode-javascript.js
-//= require ace/mode-liquid.js
-//= require ace/mode-markdown.js
+//= require ace-1.1.3/ace
+//= require ace-1.1.3/mode-css.js
+//= require ace-1.1.3/mode-html.js
+//= require ace-1.1.3/mode-javascript.js
+//= require ace-1.1.3/mode-liquid.js
+//= require ace-1.1.3/mode-markdown.js
 //= require_tree .

data/app/assets/javascripts/smithy/nested_forms.js

@@ -34,7 +34,7 @@ $(function() {
     var new_id  = new Date().getTime();
     content     = content.replace(regexp, new_id)
 
-    $(this).parent().after(content);
+    $(this).parent().append(content);
     return false;
   });
 

data/app/controllers/smithy/page_contents_controller.rb

@@ -19,6 +19,7 @@ module Smithy
       # see PageContent#content_block_attributes=
       @page_content.content_block_type = filtered_params[:content_block_type]
       @page_content.attributes = filtered_params
+      # @page_content.content_block_attributes = params[:page_content][:content_block_attributes] if params[:page_content][:content_block_attributes]
       @page_content.page = @page
       @page_content.save
       respond_with @page_content do |format|
@@ -32,6 +33,7 @@ module Smithy
 
     def update
       @page_content = Smithy::PageContent.find(params[:id])
+      # @page_content.content_block_attributes = params[:page_content][:content_block_attributes]
       @saved = @page_content.update_attributes(filtered_params)
       flash.notice = "Your content was saved" if @saved
       respond_with @page_content do |format|

data/app/controllers/smithy/pages_controller.rb

@@ -78,7 +78,11 @@ module Smithy
       end
 
       def load_page_from_path
-        @page = Page.friendly.find(page_path)
+        if smithy_current_user
+          @page = Page.friendly.find(page_path)
+        else
+          @page = Page.published.friendly.find(page_path)
+        end
         redirect_to @page.external_link and return false if @page.external_link?
       end
 

data/app/models/smithy/image.rb

@@ -5,7 +5,6 @@ module Smithy
     validates_presence_of :asset
 
     belongs_to :asset
-    has_many :page_contents, :as => :content_block, :dependent => :destroy
 
     class << self
       def content_block_description

data/app/models/smithy/page.rb

@@ -18,6 +18,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, -> { where("show_in_navigation=? AND published_at <= ?", true, Time.now) }
+    scope :published, -> { where('published_at <= ?', Time.now) }
 
     attr_accessor :publish
 

data/app/models/smithy/page_content.rb

@@ -5,7 +5,7 @@ module Smithy
     validates_presence_of :label, :container, :page
 
     belongs_to :page, :touch => true
-    belongs_to :content_block, :polymorphic => true
+    belongs_to :content_block, :polymorphic => true, :dependent => :destroy
     belongs_to :content_block_template
 
     before_update :set_publishable
@@ -22,6 +22,7 @@ module Smithy
     end
 
     def content_block_attributes=(attributes)
+      return unless attributes.present?
       klass = content_block_type.safe_constantize || "Smithy::#{content_block_type}".safe_constantize
       if klass
         self.content_block = klass.find_or_initialize_by_id(attributes.delete(:id))

data/app/models/smithy/permitted_params.rb

@@ -5,6 +5,8 @@ module Smithy
       attributes = send("#{param.to_s}_attributes".to_sym)
       if attributes == :all
         params.fetch(param, {}).permit!
+      elsif attributes.respond_to? :call
+        attributes.call
       else
         params.fetch(param, {}).permit( *attributes )
       end
@@ -19,7 +21,8 @@ module Smithy
     end
 
     def content_block_attributes
-      [ :name, :templates_attributes ]
+      # [ :name, templates_attributes: [ :id, :name, :content, :_destroy ] ]
+      :all
     end
 
     def content_block_template_attributes
@@ -35,7 +38,8 @@ module Smithy
     end
 
     def page_content_attributes
-      [ :label, :container, :content_block_type, :content_block_attributes, :content_block_template_id, :position ]
+      # [ :label, :container, :content_block_type, :content_block_template_id, :position ]
+      :all
     end
 
     def page_list_attributes

data/app/models/smithy/site.rb

@@ -1,6 +1,6 @@
 module Smithy
   class Site
-    @@title = nil
+    cattr_accessor :title
 
     class << self
       def title

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

@@ -3,8 +3,8 @@
     <%= link_to "<img src=\"#{asset.file.thumb("170x114#").url}\" width=\"170\" height=\"114\" alt=\"\">".html_safe, asset.file.url %>
     <p class="name"><strong><%= asset.name %></strong></p>
     <div class="pull-right">
-      <%= link_to "Edit", [:edit, asset], :class => "btn btn-mini" %>
-      <%= link_to "Delete", asset, :class => "btn btn-mini btn-danger", :method => :delete, :confirm => "Are you sure?" %>
+      <%= link_to "Edit", [:edit, asset], class: "btn btn-mini" %>
+      <%= link_to "Delete", asset, class: "btn btn-mini btn-danger", method: :delete, data: { confirm: "Are you sure?" } %>
     </div>
   </div>
 </li>

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

@@ -4,9 +4,8 @@
     <%= f.input :file, :as => :file %>
     <%= f.input :retained_file, :as => :hidden %>
     <% if @asset.file %>
-    <div>
-      <img src="<%= @asset.file.thumb("300x300").url %>" alt="">
-    </div>
+    <div><img src="<%= @asset.file.thumb("300x300").url %>" alt=""></div>
+    <div><%= link_to @asset.file.remote_url, @asset.file.remote_url %></div>
     <% end %>
   <% end %>
   <%= f.actions :submit %>

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

@@ -1,6 +1,6 @@
 <% content_for :title, "Content Blocks" %>
 
-<%= render :partial => "secondary_nav" %>
+<%= render partial: "secondary_nav" %>
 
 <%= semantic_form_for @content_block do |f| %>
   <%= f.inputs do %>
@@ -18,14 +18,14 @@
 
   <div><%= link_to_add_fields "Add a Template", :templates, f %></div>
   <%= f.semantic_fields_for(:templates) do |builder| %>
-    <%= render :partial => "template_fields", :locals => { :f => builder } %>
+    <%= render partial: "template_fields", locals: { f: builder } %>
   <% end %>
 
   <%= f.actions do %>
-    <%= f.action :submit, :label => "Save this Content Block" %>
+    <%= f.action :submit, label: "Save this Content Block" %>
   <% end %>
 <% end %>
 
 <% content_for :related do %>
-  <p><%= link_to "Delete Content Block", @content_block, :method => :delete, :confirm => "Are you sure you want to delete this Content Block?", :class => 'btn btn-danger' %></p>
+  <p><%= link_to "Delete Content Block", @content_block, method: :delete, data: { confirm: "Are you sure you want to delete this Content Block?" }, class: 'btn btn-danger' %></p>
 <% end %>

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

@@ -9,5 +9,5 @@
 
 
 <% content_for :related do %>
-  <%= content_tag :p, link_to("Delete #{klass_name}", @record, :method => :delete, :confirm => "Are you sure you want to delete this #{klass_name}?", :class => 'btn btn-danger') if @record.persisted? %></p>
+  <%= content_tag :p, link_to("Delete #{klass_name}", @record, method: :delete, data: { confirm: "Are you sure you want to delete this #{klass_name}?" }, class: 'btn btn-danger') if @record.persisted? %></p>
 <% end %>

data/app/views/smithy/images/_form_fields.html.erb

@@ -2,9 +2,12 @@
   <%= f.input :asset, :collection => Smithy::Asset.order(:name) %>
   <%= f.input :alternate_text %>
 <% end %>
+<%= f.inputs "Linked Image (optional)" do %>
+  <%= f.input :link_url %>
+<% end %>
 <%= f.inputs "Content (optional)" do %>
   <%= f.input :content, :as => :text, :input_html => { :class => "span12", :id => "image_content-#{f.object.id || 'new'}" }, :hint => "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe %>
-  <div id="image_content_editor-<%= f.object.id || 'new' %>" class="image_content_editor"></div>
+  <div id="image_content_editor-<%= f.object.id || 'new' %>" class="ace_editor"></div>
   <div id="content-guide"></div>
 <% end %>
 
@@ -20,9 +23,6 @@
   <%= f.input :height %>
   <%= f.input :image_scaling, :as => :select, :collection => Smithy::Image.image_scaling_options %>
 <% end %>
-<%= f.inputs "Linked Image (optional)" do %>
-  <%= f.input :link_url %>
-<% end %>
 <%= f.inputs "HTML Attributes (optional)" do %>
   <%= f.input :html_attributes %>
 <% end %>

data/app/views/smithy/pages/_container.html.erb

@@ -5,20 +5,20 @@
     <%= content_tag_for :tr, page_content do %>
       <td>
         <i class="icon-reorder handle"></i>
-        <%= link_to "edit", edit_page_content_path(@page.id, page_content), :class => "btn btn-small btn-primary" %>
+        <%= link_to "edit", edit_page_content_path(@page.id, page_content), class: "btn btn-small btn-primary" %>
       </td>
       <td><strong><%= page_content.label %></strong></td>
       <td><%= page_content.content_block_type.demodulize %></td>
       <td><%= page_content.updated_at.strftime('%b %e, %Y %H:%M:%S') %></td>
       <td>
         <div class="pull-right">
-          <%= link_to "preview", preview_page_content_path(@page.id, page_content), :class => "btn btn-small", "data-previewtoggle" => "modal" %>
-          <%= link_to "<i class=\"icon-trash\"></i> delete".html_safe, page_content_path(@page.id, page_content), :method => :delete, :confirm => "Do you really want to delete this content?", :class => "btn btn-small btn-danger" %>
+          <%= link_to "preview", preview_page_content_path(@page.id, page_content), class: "btn btn-small", data: { previewtoggle: "modal" } %>
+          <%= link_to "<i class=\"icon-trash\"></i> delete".html_safe, page_content_path(@page.id, page_content), method: :delete, data: { confirm: "Do you really want to delete this content?" }, class: "btn btn-small btn-danger" %>
         </div>
       </td>
     <% end %>
   <% end %>
   </table>
-  <div><%= link_to "Add to #{container.display_name}", new_page_content_path(@page.id, :page_content => { :container => container.name }), :class => "btn btn-primary btn-small" %></div>
+  <div><%= link_to "Add to #{container.display_name}", new_page_content_path(@page.id, page_content: { container: container.name }), class: "btn btn-primary btn-small" %></div>
 <% end %>
 </div>

data/app/views/smithy/pages/_page_related.html.erb

@@ -17,5 +17,6 @@
   </dl>
 </div>
 
-<%= content_tag :p, link_to("Delete Page", page_path(@page.id), :method => :delete, :confirm => "Are you sure you want to delete this page?", :class => 'btn btn-danger') if @page.persisted? %></p>
+<%= content_tag :p, link_to("View Page", @page.path, class: 'btn btn-primary') if @page.persisted? && @page.published? %></p>
+<%= content_tag :p, link_to("Delete Page", page_path(@page.id), method: :delete, data: { confirm: "Are you sure you want to delete this page?" }, class: 'btn btn-danger') if @page.persisted? %></p>
 <% end %>

data/app/views/smithy/settings/_setting.html.erb

@@ -2,5 +2,5 @@
 <dd>
   <%= setting.value %>
   <%= link_to "edit", [:edit, setting], :class => 'btn btn-mini' %>
-  <%= link_to "delete", setting, :class => 'btn btn-mini btn-danger', :confirm => "Are you sure?", :method => :delete %>
+  <%= link_to "delete", setting, class: 'btn btn-mini btn-danger', data: { confirm: "Are you sure?" }, method: :delete %>
 </dd>

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

@@ -5,7 +5,7 @@
 
 <%= semantic_form_for @template do |f| %>
   <%= f.inputs do %>
-    <%= f.input :content, :label => "Template Content", :input_html => { :id => "template_content-#{@template.id}" } %>
+    <%= f.input :content, :label => "Template Content", input_html: { id: "template_content-#{@template.id}" } %>
     <div id="template_content_editor-<%= @template.id %>" class="template_content_editor"></div>
   <% end %>
   <%= f.actions do %>
@@ -32,5 +32,5 @@
     </div>
   <% end %>
 
-  <p><%= link_to "Delete #{@template.template_type.capitalize}", @template, :method => :delete, :confirm => "Are you sure you want to delete this #{@template.template_type}?", :class => 'btn btn-danger' %></p>
+  <p><%= link_to "Delete #{@template.template_type.capitalize}", @template, method: :delete, data: { confirm: "Are you sure you want to delete this #{@template.template_type}?" }, class: 'btn btn-danger' %></p>
 <% end %>

data/config/initializers/dragonfly.rb

@@ -10,7 +10,7 @@ Dragonfly.app.configure do
   convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
   identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
 
-  url_format '/uploads/assets/:job/:basename.:format'
+  url_format '/uploads/assets/:job/:name'
 
   datastore Smithy::Asset.dragonfly_datastore
 end

data/lib/smithy/content_blocks/model.rb

@@ -3,7 +3,8 @@ module Smithy
     module Model
       extend ActiveSupport::Concern
       included do
-        has_many :page_contents, :as => :content_block
+        has_many :page_contents, :as => :content_block, class_name: '::Smithy::PageContent'
+        has_many :pages, through: :page_contents, class_name: '::Smithy::Page'
         Smithy::ContentBlocks::Registry.register self
       end
 

data/lib/smithy/liquid/drops/page.rb

@@ -16,6 +16,10 @@ module Smithy
           self._source.children.map(&:to_liquid)
         end
 
+        def nav_children
+          self._source.children.included_in_navigation.map(&:to_liquid)
+        end
+
         def container
           self.rendered_containers
         end
@@ -28,6 +32,20 @@ module Smithy
           self._source.keywords
         end
 
+        def next
+          sibling = if self._source.leaf?
+            self._source.right_sibling
+          elsif self._source.children.size
+            self._source.children.first
+          end
+          sibling ||= self._source.parent.right_sibling
+          sibling.to_liquid
+        end
+
+        def next_sibling
+          self._source.right_sibling.to_liquid
+        end
+
         def parent
           self._source.parent.to_liquid
         end
@@ -36,6 +54,20 @@ module Smithy
           self._source.url
         end
 
+        def previous
+          sibling = if self._source.left_sibling && self._source.left_sibling.leaf?
+            self._source.left_sibling
+          elsif self._source.left_sibling && self._source.left_sibling.children.size
+            self._source.left_sibling.children.last
+          end
+          sibling ||= self._source.parent
+          sibling.to_liquid
+        end
+
+        def previous_sibling
+          sibling = self._source.left_sibling.to_liquid
+        end
+
         def published?
           self._source.published?
         end

data/lib/smithy/liquid/filters/asset_tag.rb

@@ -3,8 +3,8 @@ module Smithy
     module Filters
       module AssetTag
         def image_tag(input, *args)
-          image_options = inline_options(args_to_options(args))
-          "<img src=\"#{input}\" #{image_options}>"
+          image_options = args_to_options(args)
+          controller.view_context.send(:image_tag, input, image_options)
         end
 
         protected
@@ -20,6 +20,14 @@ module Smithy
             options
           end
 
+          def context
+            context = self.instance_variable_get(:@context)
+          end
+
+          def controller
+            context.registers[:controller]
+          end
+
           # Write options (Hash) into a string according to the following pattern:
           # <key1>="<value1>", <key2>="<value2", ...etc
           def inline_options(options = {})

data/lib/smithy/liquid/filters/resize.rb

@@ -3,7 +3,7 @@ module Smithy
     module Filters
       module Resize
         def resize(input, resize_string)
-          Locomotive::Dragonfly.resize_url(input, resize_string)
+          Smithy::Dragonfly.resize_url(input, resize_string)
         end
       end
       ::Liquid::Template.register_filter(Resize)

data/lib/smithy/liquid/tags/nav.rb

@@ -4,17 +4,21 @@ module Smithy
       class Nav < ::Liquid::Tag
         Syntax = /(#{::Liquid::Expression}+)?/
 
-        # {% nav site|page, id: 'main-nav', depth: 1, class: 'nav', active_class: 'on' }
+        # {% nav %} is equivalent to
+        # {% nav site, depth: 1, id: 'nav', class: '', wrapper: true, active_class: 'on', include_root: 'true'}
+        # {% nav site|site-section|page|section %}
         def initialize(tag_name, markup, tokens)
-          @options = { :id => 'nav', :depth => 1, :class => '', :active_class => 'on' }
+          @options = { :id => 'nav', :depth => 1, :class => '', :active_class => 'on', :include_root => false }
           if markup =~ Syntax
             @source = ($1 || 'site').gsub(/"|'/, '')
             markup.scan(::Liquid::TagAttributes) do |key, value|
               @options[key.to_sym] = value.gsub(/"|'/, '')
             end
+            @options[:active_nested_class] = 'in'
             @options[:depth] = @options[:depth].to_i
             @options[:depth] = 100 if @options[:depth] == 0
-            @options[:wrapper] == "false" ? false : true
+            @options[:wrapper] = @options[:wrapper] == "false" ? false : true
+            @options[:include_root] = @options[:include_root] == "true" ? true : false
           else
             raise ::Liquid::SyntaxError.new("Syntax Error in 'nav' - Valid syntax: nav <site|page|section> <options>")
           end
@@ -29,7 +33,8 @@ module Smithy
           @site = context.registers[:site]
           @page = context.registers[:page]
           @controller = context.registers[:controller]
-          render_wrapper(render_list_items(root_node, 1), @options[:id])
+          list_items = render_list_items(root_node)
+          @options[:wrapper] ? render_wrapper(list_items, @options[:id]) : list_items
         end
 
         def render_children(parent, depth)
@@ -43,12 +48,15 @@ module Smithy
           href = item.url
           label = item.title
           css_class = " class=\"#{@options[:active_class]}\"" if (@page && @page.id == item.id) || (@controller && [item.path, item.external_link].include?(@controller.request.path))
+          css_class ||= " class=\"#{@options[:active_nested_class]}\"" if @page && @page.ancestors.include?(item)
           %Q{#{"  " * depth}<li id="#{item_id}"#{css_class}><a href="#{href}" id="#{item_id}-link">#{label}</a>#{render_children(item, depth.succ)}</li>}
         end
 
-        def render_list_items(parent, depth)
-          return if depth > @options[:depth] || parent.leaf?
-          parent.children.included_in_navigation.inject([]) do |items, item|
+        def render_list_items(parent, depth=1)
+          return unless write_child_list_items?(parent, depth)
+          items = []
+          items << render_list_item(parent, depth) if depth == 1 && @options[:include_root]
+          parent.children.included_in_navigation.inject(items) do |items, item|
             items << render_list_item(item, depth)
           end.join("\n")
         end
@@ -60,7 +68,7 @@ module Smithy
 
         def root_node
           case @source
-          when 'site'
+          when 'site', 'site-section'
             Smithy::Page.root
           when 'page'
             @page
@@ -69,6 +77,13 @@ module Smithy
           end
         end
 
+        private
+          def write_child_list_items?(parent, depth)
+            return false unless parent.present? && !parent.leaf?
+            return true if @source == 'site-section' && @page.self_and_ancestors.include?(parent)
+            depth > @options[:depth] ? false : true
+          end
+
       end
       ::Liquid::Template.register_tag('nav', Nav)
     end

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end