liquid_cms 0.2.0.12 → 0.2.0.13

data/.gitignore

@@ -2,4 +2,5 @@ pkg/*
 *.gem
 *.swp
 .bundle
+Gemfile.lock
 test/rails_app/log

data/CHANGELOG.rdoc

@@ -1,4 +1,13 @@
-== 0.2.0.11
+== 0.2.0.13
+
+* Enhancements
+  * Integrate basic page search capabilities.
+  * locale file now allows you to change the CMS title
+
+* Fixes
+  * Fix generation of duplicate migration files if they already exist.
+
+== 0.2.0.12
 
 * Enhancements
   * Upgrade codemirror syntax highlighting to 0.94

data/app/controllers/cms/main_controller.rb

@@ -16,8 +16,8 @@ protected
   def load_resources
     @context = Cms::Context.new(@cms_context)
 
-    @pages = @context.pages.ordered.all(:conditions => {:layout_page_id => nil})
-    @assets = @context.assets.ordered
-    @components = @context.components
+    @cms_pages = @context.pages.ordered.all(:conditions => {:layout_page_id => nil})
+    @cms_assets = @context.assets.ordered
+    @cms_components = @context.components
   end
 end

data/app/controllers/cms/pages_controller.rb

@@ -3,6 +3,8 @@ class Cms::PagesController < Cms::MainController
 
   authenticate_user :all, :except => %w(load page_asset)
 
+  SEARCH_LIMIT = 40
+
   def new
     @page = Cms::Page.new
   end
@@ -85,7 +87,15 @@ class Cms::PagesController < Cms::MainController
     end
   end
 
+  def search
+    @search_term = (params[:search] || '').strip
+    # use upper which should be compatible with mysql, postgresql and sqlite
+    @pages = @search_term.blank? ? [] : @context.pages.all(:conditions => ["upper(content) like ?", "%#{@search_term.upcase}%"])
+  end
+
 protected
+  # the current url with the last level of the path removed which essentially allows a page to be loaded with anything (wildcard) one level deeper
+  # ex. normal page at /page will also accept /page/test, /page/abcd, etc.
   def wildcard_path
     '/'+params[:url].slice(0..-2).join('/')
   end

data/app/helpers/cms/pages_helper.rb

@@ -14,4 +14,10 @@ module Cms::PagesHelper
       link_to cms_icon('delete.png', :title => 'Delete'), cms_page_path(page), options
     end
   end
+
+  # find the # of term matches in each page and sorts the pages by the match count (highest to lowest)
+  # only shows the first SEARCH_LIMIT pages
+  def page_match_order(pages, term)
+    pages.collect{|page| [page, page.content.scan(/#{term}/i).length]}.sort{|a,b| b[1] <=> a[1]}[0..(Cms::PagesController::SEARCH_LIMIT-1)]
+  end
 end

data/app/views/cms/assets/_list.html.erb

@@ -1,14 +1,17 @@
 <div id="assets">
   <p>
-    <%= cms_icon 'picture_add.png' %> <%= link_to t('assets.actions.index.new_link'), new_cms_asset_path %>
+    <%= cms_icon 'picture_add.png' %> <%= link_to t('assets.actions.index.new'), new_cms_asset_path %>
   </p>
 
-  <% if @assets.empty? %>
+  <% if @cms_assets.empty? %>
     <p><%= t 'assets.actions.index.none' %></p>
   <% else %>
+    <% if @cms_assets.any?(&:image?) %>
     <p class="preview"><%= link_to_function 'Toggle image previews', "asset_preview_toggle()" %></p>
+    <% end %>
+
     <ul>
-      <%= render :partial => 'cms/assets/asset', :collection => @assets %>
+      <%= render :partial => 'cms/assets/asset', :collection => @cms_assets %>
     </ul>
   <% end %>
 </div>

data/app/views/cms/assets/show.html.erb

@@ -1,14 +1,12 @@
-<div class="basic">
-  <h2><%= @asset.asset_file_name %></h2>
+<h2><%= @asset.asset_file_name %></h2>
 
-  <% if @asset.image? %>
-    <%= image_tag @asset.asset.url %>
-  <% else %>
-    <p>Open: <%= link_to @asset.asset_file_name, @asset.asset.url %></p>
-  <% end %>
+<% if @asset.image? %>
+  <%= image_tag @asset.asset.url %>
+<% else %>
+  <p>Open: <%= link_to @asset.asset_file_name, @asset.asset.url %></p>
+<% end %>
 
-  <p>Filesize: <%= number_to_human_size(@asset.asset_file_size) %></p>
-  <p>Last Updated: <%= @asset.asset_updated_at.to_formatted_s(:long) %></p>
+<p>Filesize: <%= number_to_human_size(@asset.asset_file_size) %></p>
+<p>Last Updated: <%= @asset.asset_updated_at.to_formatted_s(:long) %></p>
 
-  <p><%= link_to 'Edit Asset', edit_cms_asset_path(@asset) %></p>
-</div>
+<p><%= link_to 'Edit Asset', edit_cms_asset_path(@asset) %></p>

data/app/views/cms/components/_list.html.erb

@@ -1,12 +1,14 @@
 <div id="components">
   <% form_tag upload_cms_components_path, :multipart => true do %>
-    <%= file_field_tag :zip_file %>
-    <%= submit_tag 'Upload' %> <em>.zip files only</em>
+    <div>
+      <%= file_field_tag :zip_file %>
+      <%= submit_tag 'Upload' %> <em>.zip files only</em>
+    </div>
   <% end %>
 
-  <% if @components.empty? %>
+  <% if @cms_components.empty? %>
     <p><%= t 'components.actions.index.none' %></p>
   <% else %>
-    <%= list_files @components %>
+    <%= list_files @cms_components %>
   <% end %>
 </div>

data/app/views/cms/pages/_list.html.erb

@@ -1,13 +1,13 @@
 <div id="pages">
-  <p>
-    <%= cms_icon 'page_add.png' %> <%= link_to t('pages.actions.index.new_link'), new_cms_page_path %>
-  </p>
+  <p><%= cms_icon 'page_add.png' %> <%= link_to t('pages.actions.index.new'), new_cms_page_path %></p>
 
-  <% if @pages.empty? %>
+  <% if @cms_pages.empty? %>
     <p><%= t 'pages.actions.index.none' %></p>
   <% else %>
+    <p><%= cms_icon 'page_find.png' %> <%= link_to t('pages.actions.index.search'), search_cms_pages_path %></p>
+
     <ul class="tree">
-      <%= render :partial => 'cms/pages/page', :collection => @pages %>
+      <%= render :partial => 'cms/pages/page', :collection => @cms_pages %>
     </ul>
   <% end %>
 </div>

data/app/views/cms/pages/search.html.erb

@@ -0,0 +1,24 @@
+<h2><%= t 'pages.actions.search.title' %></h2>
+
+<% form_tag search_cms_pages_path, {:class => 'simple_form'} do %>
+  <%= text_field_tag 'search', @search_term, :size => 45, :placeholder => 'enter your search term' %>
+  <%= submit_tag 'Search' %>
+<% end %>
+
+<div id="search_results">
+<% if @pages.empty? && request.post? %>
+  <p>No matching pages were found.</p>
+<% elsif !@pages.empty? %>
+  <% if @pages.length >= Cms::PagesController::SEARCH_LIMIT %>
+    <p>Search results have been limited to <%= Cms::PagesController::SEARCH_LIMIT %> pages. &nbsp;Use a more exact search term to refine your results.</p>
+  <% else %>
+    <p><%= pluralize @pages.length, 'page' %> found.</p>
+  <% end %>
+
+  <ul class="panel shadow">
+  <% for page, matches in page_match_order(@pages, @search_term) %>
+    <li><span class="page"><%= link_to page.to_s, edit_cms_page_path(page) %></span> - <span class="count"><%= pluralize matches, 'match' %></span></li>
+  <% end %>
+  </ul>
+<% end %>
+</div>

data/app/views/cms/shared/_index.html.erb

@@ -1,3 +1,3 @@
-<div id="intro" class="shadow curved">
+<div id="intro" class="panel shadow curved">
   <p>Add a new page or upload a new asset.</p>
 </div>

data/app/views/layouts/cms.html.erb

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-  <title>Liquid CMS</title>
+  <title><%= t 'pages.layout.title' %></title>
   <%= javascript_include_tag 'prototype', 'effects' %>
   <%= javascript_include_tag '/cms/javascripts/humanmsg', '/cms/javascripts/cookiejar', '/cms/javascripts/cms', '/cms/javascripts/livepipe', '/cms/javascripts/tabs', :cache => 'cms_scripts' %>
   <%= javascript_include_tag '/cms/codemirror/js/codemirror' %>
@@ -18,9 +18,9 @@
   <%= stylesheet_link_tag '/cms/stylesheets/ie9' %>
   <![endif]-->
 </head>
-<body id="cms" class="cms_<%= params[:controller].camelize.demodulize.downcase %>">
+<body id="cms" class="cms_<%= params[:controller].camelize.demodulize.downcase %> cms_action_<%= params[:action].camelize.demodulize.downcase %>">
   <div id="header">
-    <h1><%= link_to 'Liquid CMS', cms_root_path %></h1>
+    <h1><%= link_to t('pages.layout.title'), cms_root_path %></h1>
   </div>
 
   <div id="outer-container" class="clearfix">

data/config/routes.rb

@@ -3,7 +3,7 @@ ActionController::Routing::Routes.draw do |map|
     cms.resources :components, :only => [], :collection => {:upload => :post}
     cms.connect 'components/:action/*url', :controller => 'components'
     cms.resources :assets, :except => :index
-    cms.resources :pages, :except => [:index, :show]
+    cms.resources :pages, :except => [:index, :show], :collection => {:search => :any}
     cms.documentation 'documentation', :controller => 'documentation', :action => 'index'
     cms.connect ':path/:id.:format', :controller => 'pages', :action => 'page_asset', :requirements => {:path => /javascripts|stylesheets/}
 

data/generators/liquid_cms/lib/insert_commands.rb

@@ -1,16 +1,22 @@
 require 'fileutils'
 
 Rails::Generator::Commands::Create.class_eval do
-  def copy_files(base, source)
+  def copy_files(base, source, template_path = nil)
     logger.copy "Copying '#{source}' to '#{base}'"
-    FileUtils.cp_r File.join(source_root, base, source), File.join(destination_root, base)
+    FileUtils.cp_r File.join(source_root, template_path || '', base, source), File.join(destination_root, base)
   end
 
   # override the migration template method so that we can continue the generation and not fail if the migration already exists
   def migration_template(relative_source, relative_destination, template_options = {})
     migration_directory relative_destination
     migration_file_name = template_options[:migration_file_name] || file_name
-    puts "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}... skipping" and return if migration_exists?(migration_file_name)
+
+    # override the default behavior of halting the generator if the file is found and instead provide a warning for the migration and continue
+    if migration_exists?(migration_file_name)
+      puts "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}... skipping"
+      return
+    end
+
     template(relative_source, "#{relative_destination}/#{next_migration_string}_#{migration_file_name}.rb", template_options)
   end
 end

data/generators/liquid_cms/templates/config/locales/cms/en.yml

@@ -1,14 +1,19 @@
 en:
   pages:
+    layout:
+      title: 'Liquid CMS'
     actions:
       index:
         title: 'Pages'
         none: 'There are currently no pages.'
-        new_link: 'Create a new page'
+        new: 'Create a new page'
+        search: 'Search'
       new:
         title: 'New Page'
       edit:
         title: 'Editing Page'
+      search:
+        title: 'Page Search'
     flash:
       created: 'The page has been saved.'
       updated: 'The page has been updated.'
@@ -19,7 +24,7 @@ en:
       index:
         title: 'Assets'
         none: 'There are currently no assets.'
-        new_link: 'Upload a new asset'
+        new: 'Upload a new asset'
       new:
         title: 'New Asset'
       edit:

data/generators/liquid_cms/templates/public/cms/stylesheets/documentation.css

@@ -4,12 +4,6 @@ h4 {
 .cms_documentation #content h2 {
   margin-top: 1em;
 }
-.cms_documentation #content a {
-  text-decoration: none;
-}
-.cms_documentation #content a:hover {
-  text-decoration: underline;
-}
 #content pre {
   margin: 0;
 }
@@ -25,6 +19,7 @@ span.function {
 }
 .required {
   background-color: #FFF15F;
+  padding: 0 2px;
 }
 .example {
   font-style: italic;

data/generators/liquid_cms/templates/public/cms/stylesheets/simple_form.css

@@ -32,10 +32,10 @@ form.simple_form a.cancel {
   background: #D00;
   background: -moz-linear-gradient(90deg, #BB0000 0%, #EE4444 100%) repeat scroll 0 0 transparent;
   background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#E44), color-stop(1.0,#B00));
-  color: white;
+  color: white !important;
   margin-left: 0.3em;
   text-decoration: none;
-  text-shadow: 0 1px #555;
+  text-shadow: 0px 1px 0px #555;
 }
 form.simple_form a.cancel:hover {
   background: #E00;

data/generators/liquid_cms/templates/public/cms/stylesheets/styles.css

@@ -55,10 +55,15 @@ a img {
 }
 
 #content {
+  color: #333333;
+  min-width: 500px;
   margin-left: 23em;
   margin-right: 1em;
   padding-bottom: 0.5em;
 }
+#content .panel, #content form {
+  color: #333;
+}
 #content h1 {
   padding-top: 0.5em;
   margin-top: 0;
@@ -72,7 +77,6 @@ a img {
   padding: 0.5em;
   text-align: center;
   background: none repeat scroll 0 0 #CCCCCC;
-  color: #333333;
   font-weight: bold;
   line-height: 5em;
   padding: 0.5em;
@@ -112,6 +116,45 @@ h2 p.message {
 .cms_pages #content h2 {
   background: url("/cms/images/icons/page.png") no-repeat scroll right 50% transparent;
 }
+.cms_pages.cms_action_search #content h2 {
+  background: url("/cms/images/icons/page_find.png") no-repeat scroll right 50% transparent;
+}
 .cms_assets #content h2 {
   background: url("/cms/images/icons/picture.png") no-repeat scroll right 50% transparent;
 }
+
+#search_results p {
+  font-weight: bold;
+}
+#search_results ul {
+  border: 1px solid #CCC;
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+#search_results li {
+  line-height: 2em;
+  padding: 0.2em 0.5em;
+  margin-bottom: 1px;
+}
+#search_results li:last-child {
+  margin-bottom: 0;
+}
+#search_results li a {
+  color: black;
+  font-weight: bold;
+}
+#search_results li:nth-child(odd) {
+  background-color: #F5F5F5;
+}
+#search_results li:nth-child(even) {
+  background-color: lightGoldenRodYellow;
+}
+#search_results li:hover {
+  background-color: #BFD6FF !important;
+}
+#search_results li .page {
+}
+#search_results li .count {
+  font-family: courier new;  
+}

data/generators/liquid_cms/templates/public/cms/stylesheets/themes/dark.css

@@ -5,23 +5,24 @@ body {
   background: #222;
   background: -moz-linear-gradient(270deg, #555555 0%, #222 40%, #000 100%) repeat scroll 0 0 transparent;
   background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#555), color-stop(0.40,#222), color-stop(1.0,#000));
+  color: #EEE;
 }
-#content h2 {
-  color: #AAA;
-  text-shadow: -1px -1px 2px #000000;
-}
-.cms_documentation #content {
+#content {
   color: #EEE;
 }
-#content .basic a, .cms_documentation #content a {
+#content a {
   color: #FFE900;
 }
-#content .basic p, .cms_components #content p {
-  color: white;
+#content h2 {
+  color: #AAA;
+  text-shadow: -1px -1px 2px #000000;
 }
 .cms_documentation span.function {
   color: #49FF3F;
 }
+.cms_documentation .required {
+  color: #333;
+}
 .cms_documentation .cms_info {
   color: #333;
 }

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.2.0.12"
+  VERSION = "0.2.0.13"
 end

data/test/functional/main_controller_test.rb

@@ -13,11 +13,20 @@ class Cms::MainControllerTest < ActionController::TestCase
 
       get :index
       assert_response :success
+      assert_select "#assets p.preview", true
       assert_select "li#cms_asset_#{img_asset.id} a", img_asset.asset_file_name
       assert_select "li#cms_asset_#{img_asset.id} div.asset_image"
       assert_select "li#cms_asset_#{pdf_asset.id} a", pdf_asset.asset_file_name
       assert_select "li#cms_asset_#{pdf_asset.id} div.asset_image", false
     end
+
+    should "not should the preview link if no images have been uploaded" do
+      pdf_asset = Factory(:pdf_asset, :context => @company)
+
+      get :index
+      assert_response :success
+      assert_select "#assets p.preview", false
+    end
   end
 
   context "permission access" do

data/test/functional/pages_controller_test.rb

@@ -88,5 +88,50 @@ class Cms::PagesControllerTest < ActionController::TestCase
       xhr :delete, :destroy, :id => @company.pages.first.id
       assert_response :success
     end
+
+    context "search" do
+      setup do
+        # the company already has a home page created
+        @page1 = @company.pages.first
+        # so we'll create a second page
+        @page2 = Factory.create :page, :context => @company, :content => 'add search keywords - page page page'
+      end
+
+      should "show no results via :GET" do
+        get :search
+        assert_response :success
+        assert_select '#content form'
+        assert_select '#search_results p', false
+        assert_select '#search_results ul', false
+      end
+
+      should "show a message with an empty search via :POST" do
+        post :search, :search => ''
+        assert_response :success
+        assert_select '#content form'
+        assert_select '#search_results p', 'No matching pages were found.'
+        assert_select '#search_results ul', false
+      end
+
+      should "show results via :POST" do
+        post :search, :search => 'page'
+        assert_response :success
+        assert_select '#search_results p', '2 pages found.'
+        assert_select '#search_results ul', true
+        assert_select '#search_results li', 2
+        assert_select '#search_results li', "#{@page2} - 3 matches"
+        assert_select '#search_results li', "#{@page1} - 1 match"
+      end
+
+      should "show search limit" do
+        (1..40).each do |i|
+          Factory.create :page, :context => @company, :name => "test#{i}", :slug => "/test#{i}", :content => 'page'
+        end
+
+        post :search, :search => 'page'
+        assert_response :success
+        assert_select '#search_results p', 'Search results have been limited to 40 pages. &nbsp;Use a more exact search term to refine your results.'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
-  hash: 71
   prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - 12
-  version: 0.2.0.12
+  - 13
+  version: 0.2.0.13
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -06:00
+date: 2011-03-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 3
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 3
@@ -60,7 +57,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
@@ -76,7 +72,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -92,7 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
         segments: 
         - 0
         - 9
@@ -108,7 +102,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 2
         - 3
@@ -124,7 +117,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -138,7 +130,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 2
@@ -154,7 +145,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 2
         - 10
@@ -170,7 +160,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -242,6 +231,7 @@ files:
 - app/views/cms/pages/destroy.js.rjs
 - app/views/cms/pages/edit.html.erb
 - app/views/cms/pages/new.html.erb
+- app/views/cms/pages/search.html.erb
 - app/views/cms/shared/_index.html.erb
 - app/views/cms/shared/_sidebar.html.erb
 - app/views/layouts/cms.html.erb
@@ -1507,7 +1497,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -1516,7 +1505,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3