liquid_cms 0.2.0.7 → 0.2.0.8

data/README.rdoc

@@ -2,9 +2,9 @@
 
 A context aware CMS Ruby on Rails engine that uses liquid templates.
 
-If you're using rails 2, use the 0.2.x series of this gem. https://github.com/redlinesoftware/liquid_cms/tree/rails2
+If you're using rails 2, use the 0.2.x series of this gem (tested with ruby 1.8.7). https://github.com/redlinesoftware/liquid_cms/tree/rails2
 
-If you're using rails 3, use the 0.3.x series of this gem. https://github.com/redlinesoftware/liquid_cms
+If you're using rails 3, use the 0.3.x series of this gem (tested with ruby 1.9.2). https://github.com/redlinesoftware/liquid_cms
 
 {rubygems page}[https://rubygems.org/gems/liquid_cms]
 
@@ -12,17 +12,17 @@ See the {wiki page}[http://github.com/redlinesoftware/liquid_cms/wiki] for addit
 
 = Installation
 
-Install the gem:
+Add it to your config/environment.rb:
 
-  gem install liquid_cms
+  config.gem 'liquid_cms', :version => '~> 0.2.0'
 
-Add it to your config/environment.rb:
+Install the gem:
 
-  config.gem 'liquid_cms', '~> 0.2.0'
+  rake gems:install
 
 Run the generator:
 
-  script/generator liquid_cms
+  script/generate liquid_cms
 
 = Configuration
 

data/app/helpers/cms/components_helper.rb

@@ -6,7 +6,7 @@ module Cms::ComponentsHelper
 
   def component_delete_link(path)
     full_path = Cms::Component.component_path(@context, path)
-    link_to(delete_icon, {:controller => 'cms/components', :action => 'destroy', :url => CGI::escape(full_path)}, :confirm => "Are you sure you want to remove '#{full_path}'?")
+    link_to(cms_icon('delete.png', :title => 'Delete'), {:controller => 'cms/components', :action => 'destroy', :url => CGI::escape(full_path)}, :confirm => "Are you sure you want to remove '#{full_path}'?")
   end
 
   def list_files(path, hidden = false)

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

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

data/generators/liquid_cms/liquid_cms_generator.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'lib', 'insert_commands')
+require File.expand_path('../lib/insert_commands', __FILE__)
 
 class LiquidCmsGenerator < Rails::Generator::Base
   def manifest
@@ -46,7 +46,9 @@ class LiquidCmsGenerator < Rails::Generator::Base
 
       # add paperclip to the applications environment.rb file due to some loading issues
       logger.gem "config.gem 'paperclip'"
-      add_gem m
+      add_gem m, 'paperclip', '~> 2.3.1'
+      logger.gem "config.gem 'simple_form'"
+      add_gem m, 'simple_form', '1.0.4'
     end
   end
 
@@ -60,12 +62,12 @@ class LiquidCmsGenerator < Rails::Generator::Base
     end
   end
 
-  def add_gem(m)
+  def add_gem(m, gem, version)
     sentinel = "end"
-    line = "config.gem 'paperclip'"
+    line = "config.gem '#{gem}'"
     unless File.read(destination_path('config/environment.rb')).include?(line)
       m.gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)}\Z)/mi do |match|
-        "\n\t# liquid_cms dependency\n\t#{line}, '~> 2.3.1'\n#{sentinel}"
+        "\n\t# liquid_cms dependency\n\t#{line}, :version => '#{version}'\n#{sentinel}"
       end
     end
   end

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

@@ -68,7 +68,7 @@ a img {
   margin-top: 0;
   padding-bottom: 0.3em;
 }
-#content .message {
+#content #intro {
   padding: 0.5em;
   text-align: center;
   background: none repeat scroll 0 0 #CCCCCC;
@@ -160,6 +160,9 @@ h2 p.message {
 #cms ul.tree ul {
   margin-left: 15px;
 }
+#cms ul.tree li img.folder:hover {
+  cursor: pointer;
+}
 
 .left {
   float: left;

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.2.0.7"
+  VERSION = "0.2.0.8"
 end

data/test/functional/components_controller_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class Cms::ComponentsControllerTest < ActionController::TestCase
+  def setup
+    setup_company_and_login_admin
+  end
+
+  should "add component tests"
+end

data/test/rails_app/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.10' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -20,6 +20,7 @@ Rails::Initializer.run do |config|
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
   config.gem 'paperclip', :version => '~> 2.3.1'
+  config.gem 'simple_form', :version => '1.0.4'
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named

data/test/unit/component_test.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class Cms::ComponentTest < ActiveSupport::TestCase
+  def setup
+  end
+
+  should "add component tests"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - 7
-  version: 0.2.0.7
+  - 8
+  version: 0.2.0.8
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -06:00
+date: 2011-02-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1410,6 +1410,7 @@ files:
 - test/fixtures/liquid/layout.liquid
 - test/fixtures/liquid/user_pagination.liquid
 - test/functional/assets_controller_test.rb
+- test/functional/components_controller_test.rb
 - test/functional/main_controller_test.rb
 - test/functional/pages_controller_test.rb
 - test/integration/pages_test.rb
@@ -1479,6 +1480,7 @@ files:
 - test/test_helper.rb
 - test/test_helpers/login_methods.rb
 - test/unit/asset_test.rb
+- test/unit/component_test.rb
 - test/unit/page_test.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/liquid_cms
@@ -1524,6 +1526,7 @@ test_files:
 - test/fixtures/liquid/layout.liquid
 - test/fixtures/liquid/user_pagination.liquid
 - test/functional/assets_controller_test.rb
+- test/functional/components_controller_test.rb
 - test/functional/main_controller_test.rb
 - test/functional/pages_controller_test.rb
 - test/integration/pages_test.rb
@@ -1593,4 +1596,5 @@ test_files:
 - test/test_helper.rb
 - test/test_helpers/login_methods.rb
 - test/unit/asset_test.rb
+- test/unit/component_test.rb
 - test/unit/page_test.rb