lucy_cms 0.0.3 → 0.0.4

data/README.md

@@ -37,7 +37,7 @@ Before creating pages and populating them with content you need to create a layo
 
 Once you have a layout, you may start creating pages and populating content. It's that easy.
 
-Many options can be found and changed in the cms initializer: /config/initializers/LucyCMS.rb
+Many options can be found and changed in the cms initializer: /config/initializers/lucy_cms.rb
 
 CMS Tags
 --------

data/Rakefile

@@ -5,7 +5,7 @@ require File.expand_path('../config/application', __FILE__)
 require 'rubygems'
 require 'rake'
 
-LucyCMS::Application.load_tasks
+LucyCms::Application.load_tasks
 
 begin
   require 'jeweler'
@@ -14,7 +14,8 @@ begin
     gem.summary     = 'LucyCMS is a Rails 3 CMS that lives inside your Rails App, but does not interfere with it'
     gem.description = ''
     gem.email       = 'lucy@lucysoft.com'
-    gem.authors     = ['Lucysoft']
+    gem.authors     = ['Lucy']
+
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/app/controllers/cms_admin/base_controller.rb

@@ -18,8 +18,8 @@ protected
       redirect_to new_cms_admin_site_path
     else
       @cms_site = CmsSite.first
-      if @cms_site.version <  LucyCMS.config.version
-        @cms_site.version = LucyCMS.config.version
+      if @cms_site.version <  LucyCms.config.version
+        @cms_site.version = LucyCms.config.version
         @cms_site.save
       end
     end

data/app/controllers/cms_admin/sites_controller.rb

@@ -60,10 +60,12 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   protected
   
   def check_admin
-    if ! CmsUser.find_by_id(session[:cms_user_id]).admin?
-       flash[:error] = 'You must be an Admin to change the Setup'
-       redirect_to :action => 'setup'
-    end 
+    unless CmsUser.count == 0
+      if ! CmsUser.find_by_id(session[:cms_user_id]).admin?
+        flash[:error] = 'You must be an Admin to change the Setup'
+        redirect_to :action => 'setup'
+      end 
+    end
   end
 
 end

data/app/controllers/cms_admin/upload_dirs_controller.rb

@@ -69,7 +69,7 @@ class CmsAdmin::UploadDirsController < CmsAdmin::BaseController
   protected
   
   def check_and_set_base_dir
-    @base_dir = File.join(Rails.public_path,LucyCMS.config.cms_upload_directory)
+    @base_dir = File.join(Rails.public_path,LucyCms.config.cms_upload_directory)
     if File::exists?(@base_dir) && !File::directory?(@base_dir)
       flash[:error] = 'File conflict'
       redirect_to :action => :conflict

data/app/controllers/cms_content_controller.rb

@@ -4,7 +4,7 @@ class CmsContentController < ApplicationController
   before_filter :load_cms_page,   :only => :render_html
   before_filter :load_cms_layout, :only => [:render_css, :render_js]
   
-  caches_page :render_css, :render_js, :if => LucyCMS.config.enable_caching
+  caches_page :render_css, :render_js, :if => LucyCms.config.enable_caching
   
   def render_html(status = 200)
     layout = @cms_page.cms_layout.app_layout.blank?? false : @cms_page.cms_layout.app_layout

data/app/models/cms_layout.rb

@@ -49,8 +49,8 @@ class CmsLayout < ActiveRecord::Base
   
   # Attempting to initialize layout object from yaml file that is found in config.seed_data_path
   def self.load_from_file(site, slug)
-    return nil if LucyCMS.config.seed_data_path.blank?
-    file_path = "#{LucyCMS.config.seed_data_path}/#{site.hostname}/layouts/#{slug}.yml"
+    return nil if LucyCms.config.seed_data_path.blank?
+    file_path = "#{LucyCms.config.seed_data_path}/#{site.hostname}/layouts/#{slug}.yml"
     return nil unless File.exists?(file_path)
     attributes            = YAML.load_file(file_path).symbolize_keys!
     attributes[:parent]   = CmsLayout.load_from_file(site, attributes[:parent])
@@ -63,7 +63,7 @@ class CmsLayout < ActiveRecord::Base
   # Wrapper around load_from_file and find_by_slug
   # returns layout object if loaded / found
   def self.load_for_slug!(site, slug)
-    if LucyCMS.configuration.seed_data_path
+    if LucyCms.configuration.seed_data_path
       load_from_file(site, slug)
     else
       site.cms_layouts.find_by_slug(slug)

data/app/models/cms_page.rb

@@ -56,9 +56,9 @@ class CmsPage < ActiveRecord::Base
   # Attempting to initialize page object from yaml file that is found in config.seed_data_path
   # This file defines all attributes of the page plus all the block information
   def self.load_from_file(site, path)
-    return nil if LucyCMS.config.seed_data_path.blank?
+    return nil if LucyCms.config.seed_data_path.blank?
     path = (path == '/')? '/index' : path.to_s.chomp('/')
-    file_path = "#{LucyCMS.config.seed_data_path}/#{site.hostname}/pages#{path}.yml"
+    file_path = "#{LucyCms.config.seed_data_path}/#{site.hostname}/pages#{path}.yml"
     return nil unless File.exists?(file_path)
     attributes              = YAML.load_file(file_path).symbolize_keys!
     attributes[:cms_layout] = CmsLayout.load_from_file(site, attributes[:cms_layout])
@@ -72,7 +72,7 @@ class CmsPage < ActiveRecord::Base
   # Wrapper around load_from_file and find_by_full_path
   # returns page object if loaded / found
   def self.load_for_full_path!(site, path)
-    if LucyCMS.configuration.seed_data_path
+    if LucyCms.configuration.seed_data_path
       load_from_file(site, path)
     else
       site.cms_pages.find_by_full_path(path)

data/app/models/cms_snippet.rb

@@ -29,8 +29,8 @@ class CmsSnippet < ActiveRecord::Base
   
   # Attempting to initialize snippet object from yaml file that is found in config.seed_data_path
   def self.load_from_file(site, name)
-    return nil if LucyCMS.config.seed_data_path.blank?
-    file_path = "#{LucyCMS.config.seed_data_path}/#{site.hostname}/snippets/#{name}.yml"
+    return nil if LucyCms.config.seed_data_path.blank?
+    file_path = "#{LucyCms.config.seed_data_path}/#{site.hostname}/snippets/#{name}.yml"
     return nil unless File.exists?(file_path)
     attributes = YAML.load_file(file_path).symbolize_keys!
     new(attributes)
@@ -41,7 +41,7 @@ class CmsSnippet < ActiveRecord::Base
   # Wrapper around load_from_file and find_by_slug
   # returns layout object if loaded / found
   def self.load_for_slug!(site, slug)
-    if LucyCMS.configuration.seed_data_path
+    if LucyCms.configuration.seed_data_path
       load_from_file(site, slug)
     else
       # FIX: This a bit odd... Snippet is used as a tag, so sometimes there's no site scope

data/app/views/cms_admin/pages/_form_blocks.html.erb

@@ -1,5 +1,5 @@
 <div id='form_blocks'>
-  <%= fields_for :cms_blocks, :builder => LucyCMS::FormBuilder do |cms_blocks| %>
+  <%= fields_for :cms_blocks, :builder => LucyCms::FormBuilder do |cms_blocks| %>
     <% @cms_page.cms_tags(true).each do |tag| %>
       <%= cms_blocks.send(tag.class.name.underscore.downcase.idify, tag)%>
     <% end %>

data/app/views/cms_admin/sites/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form.hidden_field :version,  :value => LucyCMS.config.version %>
+<%= form.hidden_field :version,  :value => LucyCms.config.version %>
 <%= form.text_field :label, :label => 'Title'%>
 <%= form.text_field :hostname, :label => 'Hostname<br>(www.example.com)' %>
 <div class='form_element radio_button_element '>

data/app/views/cms_admin/upload_dirs/conflict.html.erb

@@ -1,12 +1,12 @@
 <h1>Houston we have a problem</h1>
 
-<%= LucyCMS.config.cms_title %> uses a directory named <b><%= LucyCMS.config.cms_upload_directory %></b> to put all uploaded content in.  This directory is located in <b><%=Rails.public_path%></b>.<br>
+<%= LucyCms.config.cms_title %> uses a directory named <b><%= LucyCms.config.cms_upload_directory %></b> to put all uploaded content in.  This directory is located in <b><%=Rails.public_path%></b>.<br>
 <br>
-Unfortunatly there is already a file named <b><%= LucyCMS.config.cms_upload_directory %></b> in this directory.<br>
+Unfortunatly there is already a file named <b><%= LucyCms.config.cms_upload_directory %></b> in this directory.<br>
 <br>
 This problem can be fixed in two ways:<br>
 <br>
 1. Delete or rename this file.<br>
-2. Edit the setting <i>config.cms_upload_directory</i> in the <b>LucyCMS.rb</b> file located in the <b>config/initializers/</b> directory to use a directory name that is not already in use.<br>
+2. Edit the setting <i>config.cms_upload_directory</i> in the <b>lucy_cms.rb</b> file located in the <b>config/initializers/</b> directory to use a directory name that is not already in use.<br>
 <br>
 Sorry for the inconvenience

data/app/views/cms_admin/upload_dirs/index.html.erb

@@ -1,6 +1,6 @@
 <%= link_to span_tag('Create New Directory'), new_cms_admin_upload_dir_path, :class => 'big button' %>
 <h1>Upload Directories</h1>
-<b>Base Directory: /<%=LucyCMS.config.cms_upload_directory%></b><br>
+<b>Base Directory: /<%=LucyCms.config.cms_upload_directory%></b><br>
 <br>
 <ul class='list'>
   <% @cms_upload_dirs.each do |cms_upload_dir| %>

data/app/views/cms_admin/upload_dirs/show.html.erb

@@ -3,7 +3,7 @@
     <a id='uploader_button' href='#' class='big button'>Upload Files</a>
   </div>
 </div>
-<h1>Directory: /<%=LucyCMS.config.cms_upload_directory%>/<%=@cms_upload_dir.label%></h1>
+<h1>Directory: /<%=LucyCms.config.cms_upload_directory%>/<%=@cms_upload_dir.label%></h1>
 
 <ul class='list' id = 'uploaded_files'>
   <% @cms_uploads.each do |cms_upload| %>

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

@@ -10,8 +10,8 @@
       <% end %>
     </title>
     <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag :cms, :cache => ('_cms' if LucyCMS.config.enable_caching) %>
-    <%= javascript_include_tag :cms, :cache => ('_cms' if LucyCMS.config.enable_caching) %>
+    <%= stylesheet_link_tag :cms, :cache => ('_cms' if LucyCms.config.enable_caching) %>
+    <%= javascript_include_tag :cms, :cache => ('_cms' if LucyCms.config.enable_caching) %>
     <%= yield :head %>
     <%= cms_hook :html_head %>
   </head>

data/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run LucyCMS::Application
+run LucyCms::Application

data/config/application.rb

@@ -6,10 +6,10 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-module LucyCMS
+module LucyCms
   class Application < Rails::Application
     
-    require 'LucyCMS'
+    require 'lucy_cms'
     
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
-LucyCMS::Application.initialize!
+LucyCms::Application.initialize!

data/config/environments/development.rb

@@ -1,4 +1,4 @@
-LucyCMS::Application.configure do
+LucyCms::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
   # In the development environment your application's code is reloaded on

data/config/environments/production.rb

@@ -1,4 +1,4 @@
-LucyCMS::Application.configure do
+LucyCms::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
   # The production environment is meant for finished, "live" apps.

data/config/environments/test.rb

@@ -1,4 +1,4 @@
-LucyCMS::Application.configure do
+LucyCms::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
   # The test environment is used exclusively to run your application's

data/config/initializers/{LucyCMS.rb → lucy_cms.rb}

@@ -1,4 +1,4 @@
-LucyCMS.configure do |config|
+LucyCms.configure do |config|
   
   # Default url to access admin area is http://yourhost/cms-admin/ 
   # You can change 'cms-admin' to 'admin', for example.
@@ -32,6 +32,6 @@ end
 
 # If you need to inject some html in cms admin views you can define what partial
 # should be rendered into the following areas:
-#   ComfortableMexicanSofa::ViewHooks.add(:navigation, '/layouts/admin/navigation')
-#   ComfortableMexicanSofa::ViewHooks.add(:html_head, '/layouts/admin/html_head')
-#   ComfortableMexicanSofa::ViewHooks.add(:page_form, '/layouts/admin/page_form')
+#   LucyCms::ViewHooks.add(:navigation, '/layouts/admin/navigation')
+#   LucyCms::ViewHooks.add(:html_head, '/layouts/admin/html_head')
+#   LucyCms::ViewHooks.add(:page_form, '/layouts/admin/page_form')

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   
-  namespace :cms_admin, :path => LucyCMS.config.admin_route_prefix, :except => :show do
-    get '/' => redirect(LucyCMS.config.admin_route_redirect)
+  namespace :cms_admin, :path => LucyCms.config.admin_route_prefix, :except => :show do
+    get '/' => redirect(LucyCms.config.admin_route_redirect)
     resources :pages do
       member do 
         match :form_blocks

data/lib/LucyCMS/acts_as_tree.rb

@@ -1,4 +1,4 @@
-module LucyCMS::ActsAsTree
+module LucyCms::ActsAsTree
   
   def self.included(base)
     base.extend(ClassMethods)
@@ -27,7 +27,7 @@ module LucyCMS::ActsAsTree
         :dependent      => configuration[:dependent]
         
       class_eval <<-EOV
-        include LucyCMS::ActsAsTree::InstanceMethods
+        include LucyCms::ActsAsTree::InstanceMethods
         
         scope :roots,
           :conditions => "#{configuration[:foreign_key]} IS NULL",
@@ -99,4 +99,4 @@ module LucyCMS::ActsAsTree
   end
 end
 
-ActiveRecord::Base.send :include, LucyCMS::ActsAsTree
+ActiveRecord::Base.send :include, LucyCms::ActsAsTree

data/lib/LucyCMS/cms_tag.rb

@@ -18,7 +18,7 @@ module CmsTag
     #   /\{\{\s*?cms:page:(\w+)\}\}/
     # will match tags like these:
     #   {{cms:page:my_label}}
-    def regex_tag_signature
+    def regex_tag_signature(label = nil)
       nil
     end
     
@@ -56,7 +56,7 @@ module CmsTag
     # Example:
     #   /<\{\s*?cms:page:tag_label\}/
     def regex_tag_signature
-      nil
+      self.class.regex_tag_signature(label)
     end
     
     # Content that is accociated with Tag instance.
@@ -68,7 +68,7 @@ module CmsTag
     # as a default.
     def render
       # cleaning content from possible irb stuff. Partial and Helper tags are OK.
-      if LucyCMS.config.disable_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
+      if ComfortableMexicanSofa.config.disable_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
         content.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
       else
         content.to_s
@@ -116,4 +116,4 @@ private
   def self.tag_classes
     @@tag_classes ||= []
   end
-end
+end

data/lib/LucyCMS/cms_tag/field_datetime.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldDateTime < CmsBlock
     /\{\{\s*cms:field:(#{label}):datetime\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/field_integer.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldInteger < CmsBlock
     /\{\{\s*cms:field:(#{label}):integer\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/field_string.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldString < CmsBlock
     /\{\{\s*cms:field:(#{label}):?(?:string)?\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/field_text.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldText < CmsBlock
     /\{\{\s*cms:field:(#{label}):?(?:text)?\s*?\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/helper.rb

@@ -9,10 +9,6 @@ class CmsTag::Helper
     /\{\{\s*cms:helper:(#{label}):?(.*?)\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content
     "<%= #{label}(#{params.split(':').collect{|p| "'#{p}'"}.join(', ')}) %>"
   end

data/lib/LucyCMS/cms_tag/page_datetime.rb

@@ -7,10 +7,6 @@ class CmsTag::PageDateTime < CmsBlock
     /\{\{\s*cms:page:(#{label}):datetime\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/page_integer.rb

@@ -7,10 +7,6 @@ class CmsTag::PageInteger < CmsBlock
     /\{\{\s*cms:page:(#{label}):integer\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/page_rich_text.rb

@@ -7,10 +7,6 @@ class CmsTag::PageRichText < CmsBlock
     /\{\{\s*cms:page:(#{label}):rich_text\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/page_string.rb

@@ -7,10 +7,6 @@ class CmsTag::PageString < CmsBlock
     /\{\{\s*cms:page:(#{label}):string\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/page_text.rb

@@ -7,10 +7,6 @@ class CmsTag::PageText < CmsBlock
     /\{\{\s*cms:page:(#{label}):?(?:text)?\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/LucyCMS/cms_tag/partial.rb

@@ -9,10 +9,6 @@ class CmsTag::Partial
     /\{\{\s*cms:partial:(#{label}):?(.*?)\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content
     ps = params.split(':').collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
     "<%= render :partial => '#{label}'#{ps.blank?? nil : ", :locals => {#{ps}}"} %>"

data/lib/LucyCMS/cms_tag/snippet.rb

@@ -11,10 +11,6 @@ class CmsTag::Snippet < CmsSnippet
     /\{\{\s*cms:snippet:(#{label})\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content
     self.read_attribute(:content)
   end

data/lib/LucyCMS/configuration.rb

@@ -1,13 +1,7 @@
-class LucyCMS::Configuration
+class LucyCms::Configuration
   
-  # Location of YAML files that can be used to render pages instead of pulling
-  # data from the database. Not active if not specified.
-  attr_accessor :seed_data_path
+  attr_accessor :version 
   
-  attr_accessor :version
-
-  attr_accessor :cms_upload_directory
-
   # Default url to access admin area is http://yourhost/cms-admin/ 
   # You can change 'cms-admin' to 'admin', for example.
   attr_accessor :admin_route_prefix
@@ -16,6 +10,12 @@ class LucyCMS::Configuration
   # to something else
   attr_accessor :admin_route_redirect
   
+  # Location of YAML files that can be used to render pages instead of pulling
+  # data from the database. Not active if not specified.
+  attr_accessor :seed_data_path
+
+  attr_accessor :cms_upload_directory
+  
   # Not allowing irb code to be run inside page content. True by default.
   attr_accessor :disable_irb
   
@@ -24,11 +24,11 @@ class LucyCMS::Configuration
   
   # Configuration defaults
   def initialize
-    @seed_data_path       = nil
-    @version	          = '0.0.2'
-    @cms_upload_directory = 'common'
+    @version              = '0.0.4'
     @admin_route_prefix   = 'cms-admin'
     @admin_route_redirect = "/#{@admin_route_prefix}/pages"
+    @seed_data_path       = nil
+    @cms_upload_directory = 'common'
     @disable_irb          = true
     @enable_caching       = true
   end

data/lib/LucyCMS/controller_methods.rb

@@ -1,4 +1,4 @@
-module LucyCMS::ControllerMethods
+module LucyCms::ControllerMethods
   
   def self.included(base)
     
@@ -21,7 +21,7 @@ module LucyCMS::ControllerMethods
     def render(options = {}, locals = {}, &block)
       if options.is_a?(Hash) && path = options.delete(:cms_page)
         site = CmsSite.find_by_hostname(request.host.downcase)
-        page = CmsPage.load_from_file(site, path) if site && LucyCMS.configuration.seed_data_path
+        page = CmsPage.load_from_file(site, path) if site && LucyCms.configuration.seed_data_path
         page ||= site && site.cms_pages.find_by_full_path(path)
         if page
           cms_app_layout = page.cms_layout.try(:app_layout)
@@ -39,4 +39,4 @@ module LucyCMS::ControllerMethods
   end
 end
 
-ActionController::Base.send :include, LucyCMS::ControllerMethods
+ActionController::Base.send :include, LucyCms::ControllerMethods

data/lib/LucyCMS/engine.rb

@@ -1,10 +1,10 @@
-require 'LucyCMS'
+require 'lucy_cms'
 require 'rails'
 require 'paperclip'
 require 'active_link_to'
 require 'mime/types'
 
-module LucyCMS
+module LucyCms
   class Engine < ::Rails::Engine
     
   end

data/lib/LucyCMS/form_builder.rb

@@ -1,4 +1,4 @@
-class LucyCMS::FormBuilder < ActionView::Helpers::FormBuilder
+class LucyCms::FormBuilder < ActionView::Helpers::FormBuilder
   
   helpers = field_helpers -
     %w(hidden_field fields_for) +

data/lib/LucyCMS/site_form_builder.rb

@@ -1,4 +1,4 @@
-class LucyCMS::SiteFormBuilder < ActionView::Helpers::FormBuilder
+class LucyCms::SiteFormBuilder < ActionView::Helpers::FormBuilder
   
   helpers = field_helpers -
     %w(hidden_field fields_for) +
@@ -23,9 +23,9 @@ class LucyCMS::SiteFormBuilder < ActionView::Helpers::FormBuilder
       desc = "<div class='desc'>#{desc}</div>"
     end
     %(
-      <div class='site_form_element #{type}_element #{'errors' if errors}'>
-        <div class='label'>#{label_for(field, options)}</div>
-        <div class='value'>#{yield}</div>
+      <div class='form_element #{type}_element #{'errors' if errors}'>
+        <div class='site_label'>#{label_for(field, options)}</div>
+        <div class='site_value'>#{yield}</div>
         #{desc}
         #{errors}
       </div>
@@ -35,9 +35,9 @@ class LucyCMS::SiteFormBuilder < ActionView::Helpers::FormBuilder
   def simple_field(label = nil, content = nil, options = {}, &block)
     content ||= @template.capture(&block) if block_given?
     %(
-      <div class='site_form_element #{options.delete(:class)}'>
-        <div class='label'>#{label}</div>
-        <div class='value'>#{content}</div>
+      <div class='form_element #{options.delete(:class)}'>
+        <div class='site_label'>#{label}</div>
+        <div class='site_value'>#{content}</div>
       </div>
     ).html_safe
   end
@@ -69,9 +69,9 @@ class LucyCMS::SiteFormBuilder < ActionView::Helpers::FormBuilder
       @template.send(options[:content_field_method], 'cms_page[cms_blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
     
     %(
-      <div class='site_form_element #{css_class}'>
-        <div class='label'>#{label}</div>
-        <div class='value'>
+      <div class='form_element #{css_class}'>
+        <div class='site_label'>#{label}</div>
+        <div class='site_value'>
           #{field}
           #{@template.hidden_field_tag('cms_page[cms_blocks_attributes][][label]', tag.label, :id => nil)}
           #{@template.hidden_field_tag('cms_page[cms_blocks_attributes][][id]', tag.record_id, :id => nil) if tag.record_id}

data/lib/LucyCMS/view_hooks.rb

@@ -1,4 +1,4 @@
-module LucyCMS::ViewHooks
+module LucyCms::ViewHooks
   
   # Array of declared hooks
   def self.hooks

data/lib/LucyCMS/view_methods.rb

@@ -1,15 +1,14 @@
-module LucyCMS::ViewMethods
+module LucyCms::ViewMethods
   # Wrapper around CmsFormBuilder
   def cms_form_for(record_or_name_or_array, *args, &proc)
     options = args.extract_options!
-    form_for(record_or_name_or_array, *(args << options.merge(:builder => LucyCMS::FormBuilder)), &proc)
+    form_for(record_or_name_or_array, *(args << options.merge(:builder => LucyCms::FormBuilder)), &proc)
   end
 
   def cms_site_form_for(record_or_name_or_array, *args, &proc)
     options = args.extract_options!
-    form_for(record_or_name_or_array, *(args << options.merge(:builder => LucyCMS::SiteFormBuilder)), &proc)
+    form_for(record_or_name_or_array, *(args << options.merge(:builder => LucyCms::SiteFormBuilder)), &proc)
   end
-
   
   # Wrapper for <span>
   def span_tag(*args)
@@ -23,7 +22,7 @@ module LucyCMS::ViewMethods
   
   # Injects some content somewhere inside cms admin area
   def cms_hook(name, options = {})
-    LucyCMS::ViewHooks.render(name, self, options)
+    LucyCms::ViewHooks.render(name, self, options)
   end
   
   # Content of a snippet. Example:
@@ -44,7 +43,7 @@ module LucyCMS::ViewMethods
   end
 end
 
-ActionView::Base.send :include, LucyCMS::ViewMethods
+ActionView::Base.send :include, LucyCms::ViewMethods
 
 ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => [
   'LucyCMS/jquery',
@@ -62,7 +61,6 @@ ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => [
   'LucyCMS/structure',
   'LucyCMS/typography',
   'LucyCMS/form',
-  'LucyCMS/site_form',
   'LucyCMS/content',
   '/javascripts/LucyCMS/jquery-ui/jquery-ui'
 ]

data/lib/generators/README

@@ -1,17 +1,5 @@
-    ____                 __            _        _     _      
-   / ___|___  _ __ ___  / _| ___  _ __| |_ __ _| |__ | | ___ 
-  | |   / _ \| '_ ` _ \| |_ / _ \| '__| __/ _` | '_ \| |/ _ \
-  | |__| (_) | | | | | |  _| (_) | |  | || (_| | |_) | |  __/
-   \____\___/|_| |_| |_|_|  \___/|_|   \__\__,_|_.__/|_|\___|
-   __  __           _                   ____         __       
-  |  \/  | _____  _(_) ___ __ _ _ __   / ___|  ___  / _| __ _ 
-  | |\/| |/ _ \ \/ / |/ __/ _` | '_ \  \___ \ / _ \| |_ / _` |
-  | |  | |  __/>  <| | (_| (_| | | | |  ___) | (_) |  _| (_| |
-  |_|  |_|\___/_/\_\_|\___\__,_|_| |_| |____/ \___/|_|  \__,_|
-
 Hey! Everything is almost done. Please don't forget to
   
   * run migrations -> `rake db:migrate`
   
 After that go to http://your-awesome-app/cms-admin to start populating content.
-Default username and password are: username // password

data/lib/generators/cms_generator.rb

@@ -18,7 +18,7 @@ class CmsGenerator < Rails::Generators::Base
   end
   
   def generate_initialization
-    copy_file 'config/initializers/LucyCMS.rb', 'config/initializers/LucyCMS.rb'
+    copy_file 'config/initializers/lucy_cms.rb', 'config/initializers/lucy_cms.rb'
   end
   
   def generate_public_assets

data/lib/{LucyCMS.rb → lucy_cms.rb}

@@ -1,5 +1,5 @@
 # Loading engine only if this is not a standalone installation
-unless defined? LucyCMS::Application
+unless defined? LucyCms::Application
   require File.expand_path('LucyCMS/engine', File.dirname(__FILE__))
 end
 
@@ -22,14 +22,20 @@ Dir.glob(File.expand_path('LucyCMS/cms_tag/*.rb', File.dirname(__FILE__))).each
   require tag_path
 end
 
-module LucyCMS
+module LucyCms
   
   class << self
     
+    # Modify CMS configuration
+    # Example:
+    #   ComfortableMexicanSofa.configure do |config|
+    #     config.cms_title = 'Comfortable Mexican Sofa'
+    #   end
     def configure
       yield configuration
     end
     
+    # Accessor for ComfortableMexicanSofa::Configuration
     def configuration
       @configuration ||= Configuration.new
     end

data/lucy_cms.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lucy_cms}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lucysoft"]
+  s.authors = ["Lucy"]
   s.date = %q{2011-03-09}
   s.description = %q{}
   s.email = %q{lucy@lucysoft.com}
@@ -85,7 +85,7 @@ Gem::Specification.new do |s|
     "config/environments/development.rb",
     "config/environments/production.rb",
     "config/environments/test.rb",
-    "config/initializers/LucyCMS.rb",
+    "config/initializers/lucy_cms.rb",
     "config/initializers/mime_types.rb",
     "config/locales/en.yml",
     "config/routes.rb",
@@ -97,7 +97,6 @@ Gem::Specification.new do |s|
     "db/cms_seeds/example.local/snippets/example.yml",
     "db/migrate/01_create_cms.rb",
     "db/seeds.rb",
-    "lib/LucyCMS.rb",
     "lib/LucyCMS/acts_as_tree.rb",
     "lib/LucyCMS/cms_tag.rb",
     "lib/LucyCMS/cms_tag/field_datetime.rb",
@@ -122,6 +121,7 @@ Gem::Specification.new do |s|
     "lib/LucyCMS/view_methods.rb",
     "lib/generators/README",
     "lib/generators/cms_generator.rb",
+    "lib/lucy_cms.rb",
     "lib/tasks/LucyCMS.rake",
     "lucy_cms.gemspec",
     "public/404.html",

data/test/functional/cms_content_controller_test.rb

@@ -68,7 +68,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_irb_disabled
-    assert LucyCMS.config.disable_irb
+    assert LucyCms.config.disable_irb
     
     irb_page = cms_sites(:default).cms_pages.create!(
       :label          => 'irb',
@@ -88,7 +88,7 @@ class CmsContentControllerTest < ActionController::TestCase
   end
   
   def test_render_page_with_irb_enabled
-    LucyCMS.config.disable_irb = false
+    LucyCms.config.disable_irb = false
     
     irb_page = cms_sites(:default).cms_pages.create!(
       :label          => 'irb',

data/test/integration/rake_tasks_test.rb

@@ -10,7 +10,7 @@ class RakeTasksTest < ActionDispatch::IntegrationTest
   
   def test_layouts_import
     CmsLayout.destroy_all
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     assert_difference 'CmsLayout.count', 2 do
       capture_rake_output{ 
@@ -24,7 +24,7 @@ class RakeTasksTest < ActionDispatch::IntegrationTest
   
   def test_pages_import
     CmsPage.destroy_all
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     assert_difference ['CmsPage.count', 'CmsBlock.count'], 3 do
       capture_rake_output{ 
@@ -38,7 +38,7 @@ class RakeTasksTest < ActionDispatch::IntegrationTest
   
   def test_snippets_import
     CmsSnippet.destroy_all
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     assert_difference 'CmsSnippet.count', 1 do
       capture_rake_output{ 

data/test/integration/render_cms_seed_test.rb

@@ -6,7 +6,7 @@ class RenderCmsSeedTest < ActionDispatch::IntegrationTest
     get '/child/subchild'
     assert_response 404
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     get '/child/subchild'
     assert_response :success
@@ -14,7 +14,7 @@ class RenderCmsSeedTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_seed_data_page
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     get '/'
     assert_response :success
@@ -23,7 +23,7 @@ class RenderCmsSeedTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_seed_data_css
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     get '/cms-css/default'
     assert_response :success

data/test/integration/sites_test.rb

@@ -43,7 +43,7 @@ class SitesTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_admin_with_no_site_and_no_auto_manage
-    LucyCMS.config.auto_manage_sites = false
+    LucyCms.config.auto_manage_sites = false
     CmsSite.delete_all
     assert_no_difference 'CmsSite.count' do
       http_auth :get, cms_admin_pages_path

data/test/test_helper.rb

@@ -14,7 +14,7 @@ class ActiveSupport::TestCase
   
   # resetting default configuration
   def reset_config
-    LucyCMS.configure do |config|
+    LucyCms.configure do |config|
       config.seed_data_path       = nil
       config.admin_route_prefix   = 'cms-admin'
       config.admin_route_redirect = "/cms-admin/pages"

data/test/unit/cms_configuration_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class CmsConfigurationTest < ActiveSupport::TestCase
   
   def test_configuration_presense
-    assert config = LucyCMS.configuration
+    assert config = LucyCms.configuration
     assert_equal nil, config.seed_data_path
     assert_equal 'cms-admin', config.admin_route_prefix
     assert_equal '/cms-admin/pages', config.admin_route_redirect

data/test/unit/cms_layout_test.rb

@@ -87,7 +87,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
   def test_load_from_file
     assert !CmsLayout.load_from_file(cms_sites(:default), 'default')
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     assert !CmsLayout.load_from_file(cms_sites(:default), 'bogus')
     
@@ -102,8 +102,8 @@ class CmsLayoutTest < ActiveSupport::TestCase
   end
   
   def test_load_from_file_broken
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
-    error_message = "Failed to load from #{LucyCMS.configuration.seed_data_path}/test.host/layouts/broken.yml"
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    error_message = "Failed to load from #{LucyCms.configuration.seed_data_path}/test.host/layouts/broken.yml"
     assert_exception_raised RuntimeError, error_message do
       CmsLayout.load_from_file(cms_sites(:default), 'broken')
     end
@@ -114,7 +114,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert !layout.new_record?
     db_content = layout.content
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     assert layout = CmsLayout.load_for_slug!(cms_sites(:default), 'default')
     assert layout.new_record?
     file_content = layout.content
@@ -127,7 +127,7 @@ class CmsLayoutTest < ActiveSupport::TestCase
     end
     assert !CmsLayout.load_for_slug(cms_sites(:default), 'not_found')
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     assert_exception_raised ActiveRecord::RecordNotFound, 'CmsLayout with slug: not_found cannot be found' do
       CmsLayout.load_for_slug!(cms_sites(:default), 'not_found')
     end

data/test/unit/cms_page_test.rb

@@ -155,7 +155,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_load_from_file
     assert !CmsPage.load_from_file(cms_sites(:default), '/')
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     assert !CmsPage.load_from_file(cms_sites(:default), '/bogus')
     
@@ -178,8 +178,8 @@ class CmsPageTest < ActiveSupport::TestCase
   end
   
   def test_load_from_file_broken
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
-    error_message = "Failed to load from #{LucyCMS.configuration.seed_data_path}/test.host/pages/broken.yml"
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    error_message = "Failed to load from #{LucyCms.configuration.seed_data_path}/test.host/pages/broken.yml"
     assert_exception_raised RuntimeError, error_message do
       CmsPage.load_from_file(cms_sites(:default), '/broken')
     end
@@ -190,7 +190,7 @@ class CmsPageTest < ActiveSupport::TestCase
     assert !page.new_record?
     db_content = page.content
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     assert page = CmsPage.load_for_full_path!(cms_sites(:default), '/')
     assert page.new_record?
     file_content = page.content
@@ -203,7 +203,7 @@ class CmsPageTest < ActiveSupport::TestCase
     end
     assert !CmsPage.load_for_full_path(cms_sites(:default), '/invalid_page')
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     assert_exception_raised ActiveRecord::RecordNotFound, 'CmsPage with path: /invalid_page cannot be found' do
       CmsPage.load_for_full_path!(cms_sites(:default), '/invalid_page')
     end

data/test/unit/cms_snippet_test.rb

@@ -23,7 +23,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
   def test_load_from_file
     assert !CmsSnippet.load_from_file(cms_sites(:default), 'default')
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     
     assert !CmsSnippet.load_from_file(cms_sites(:default), 'bogus')
     
@@ -33,8 +33,8 @@ class CmsSnippetTest < ActiveSupport::TestCase
   end
   
   def test_load_from_file_broken
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
-    error_message = "Failed to load from #{LucyCMS.configuration.seed_data_path}/test.host/snippets/broken.yml"
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    error_message = "Failed to load from #{LucyCms.configuration.seed_data_path}/test.host/snippets/broken.yml"
     assert_exception_raised RuntimeError, error_message do
       CmsSnippet.load_from_file(cms_sites(:default), 'broken')
     end
@@ -45,7 +45,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert !snippet.new_record?
     db_content = snippet.content
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     assert snippet = CmsSnippet.load_for_slug!(cms_sites(:default), 'default')
     assert snippet.new_record?
     file_content = snippet.content
@@ -58,7 +58,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
     end
     assert !CmsSnippet.load_for_slug(cms_sites(:default), 'not_found')
     
-    LucyCMS.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
+    LucyCms.configuration.seed_data_path = File.expand_path('../cms_seeds', File.dirname(__FILE__))
     assert_exception_raised ActiveRecord::RecordNotFound, 'CmsSnippet with slug: not_found cannot be found' do
       CmsSnippet.load_for_slug!(cms_sites(:default), 'not_found')
     end

metadata

@@ -2,10 +2,10 @@
 name: lucy_cms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
-- Lucysoft
+- Lucy
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -157,7 +157,7 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
-- config/initializers/LucyCMS.rb
+- config/initializers/lucy_cms.rb
 - config/initializers/mime_types.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -169,7 +169,6 @@ files:
 - db/cms_seeds/example.local/snippets/example.yml
 - db/migrate/01_create_cms.rb
 - db/seeds.rb
-- lib/LucyCMS.rb
 - lib/LucyCMS/acts_as_tree.rb
 - lib/LucyCMS/cms_tag.rb
 - lib/LucyCMS/cms_tag/field_datetime.rb
@@ -194,6 +193,7 @@ files:
 - lib/LucyCMS/view_methods.rb
 - lib/generators/README
 - lib/generators/cms_generator.rb
+- lib/lucy_cms.rb
 - lib/tasks/LucyCMS.rake
 - lucy_cms.gemspec
 - public/404.html
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3314535251217685534
+      hash: 3548456258913461842
       segments: 
       - 0
       version: "0"