liquid_cms 0.3.0.10 → 0.3.1.0

data/config/initializers/cms/liquid_cms.rb

@@ -1,4 +1,12 @@
 Cms.setup do |config|
+  # Valid component file extensions that are allowed to be uploaded to the CMS.
+  # Defaults to %w(.css .js .png .jpg .jpeg .gif .json .xml .fla .ico .txt)
+  #config.valid_component_exts += %w(.xhtml .bmp)
+
+  # Compnent file types that can be edited (text based) in the CMS. Make sure new extensions here are also set in the valid_component_exts setting.
+  # Defaults to %w(.js .css .html .xml .txt)
+  #config.editable_component_exts += %w(.xhtml)
+
   # The class of your apps context object if it has one. This attribute must be set last.
   #config.context_class = :Context
 end

data/config/locales/cms/en.yml

@@ -61,6 +61,7 @@ en:
         root: 'Home Page'
       cms_asset:
         asset_file_name: 'File'
+        tag_list: 'Tags'
     hints:
       cms_page:
         name: 'The name must contain no whitespace or any other special characters. Letters, numbers, hyphens, underscores and periods are valid.<br/>The extensions <em>.css</em>, <em>.js</em>, <em>.xml</em>, <em>.json</em> and <em>.txt</em> can used to auto-identify the content-type.  If no extension is provided, html is the default type.'
@@ -71,6 +72,10 @@ en:
         file_content: '<em>No liquid support for editing components.</em> Use ctrl+s to save.'
       cms_asset:
         asset: 'Upload an asset file.'
+        tag_list: 'Seperate tags with commas.'
+        dimensions: 'Specify custom dimensions in pixels as width x height.  The aspect ratio will be maintained, so actual dimensions may differ.  Applies to image assets only.'
+        meta:
+          name: 'The name must begin with a letter and consist only of lowercase letters, numbers and underscores.'
         file_content: '<em>No liquid support for editing assets.</em> Use ctrl+s to save.'
         edit:
           asset: 'An existing file has been uploaded.  Upload a new file to replace it.'

data/generators/liquid_cms/templates/migration_rev1.rb

@@ -0,0 +1,38 @@
+class CreateLiquidCmsUpgradeRev1 < ActiveRecord::Migration
+  def self.up
+    change_table :cms_assets do |t|
+      t.integer :custom_height
+      t.integer :custom_width
+      t.text :meta_data # serialized yaml
+    end
+
+    drop_table :versions
+
+    create_table :cms_tags do |t|
+      t.column :name, :string
+    end
+    
+    create_table :cms_taggings do |t|
+      t.column :tag_id, :integer
+      t.column :taggable_id, :integer
+      t.column :taggable_type, :string
+      
+      t.column :created_at, :datetime
+    end
+    
+    add_index :cms_taggings, :tag_id
+    add_index :cms_taggings, [:taggable_id, :taggable_type]
+  end
+
+  def self.down
+    drop_table :cms_taggings
+    drop_table :cms_tags
+
+    create_table :versions do |t|
+    end
+
+    change_table :cms_assets do |t|
+      t.remove :custom_height, :custom_width, :meta_data
+    end
+  end
+end

data/lib/generators/liquid_cms/install_generator.rb

@@ -8,11 +8,13 @@ module LiquidCms
     source_root File.expand_path('templates', File.dirname(__FILE__))
 
     def copy_migration_file
-      name = 'create_liquid_cms_setup'
-      if self.class.migration_exists?(File.join('db', 'migrate'), name).blank?
-        migration_template 'migration.rb', File.join('db', 'migrate', name)
-      else
-        puts "Migration '#{name}' already exists... skipping"
+      [{name: 'create_liquid_cms_setup', file: 'migration.rb'}, {name: 'create_liquid_cms_upgrade_rev1', file: 'migration_rev1.rb'}].each do |m|
+        name = m[:name]
+        if self.class.migration_exists?(File.join('db', 'migrate'), name).blank?
+          migration_template m[:file], File.join('db', 'migrate', name)
+        else
+          puts "Migration '#{name}' already exists... skipping"
+        end
       end
     end
 
@@ -20,10 +22,6 @@ module LiquidCms
       ActiveRecord::Generators::Base.next_migration_number migration_dir
     end
 
-    def add_unreleased_gem_dependencies
-      append_file 'Gemfile', %q(gem 'vestal_versions', '~> 1.2.1', :git => 'git://github.com/adamcooper/vestal_versions.git')
-    end
-
     def copy_setup_controller
       copy_file 'setup_controller.rb', File.join('app', 'controllers', 'cms', 'setup_controller.rb')
     end

data/lib/generators/liquid_cms/templates/migration_rev1.rb

@@ -0,0 +1,38 @@
+class CreateLiquidCmsUpgradeRev1 < ActiveRecord::Migration
+  def self.up
+    change_table :cms_assets do |t|
+      t.integer :custom_height
+      t.integer :custom_width
+      t.text :meta_data # serialized yaml
+    end
+
+    drop_table :versions
+
+    create_table :cms_tags do |t|
+      t.column :name, :string
+    end
+    
+    create_table :cms_taggings do |t|
+      t.column :tag_id, :integer
+      t.column :taggable_id, :integer
+      t.column :taggable_type, :string
+      
+      t.column :created_at, :datetime
+    end
+    
+    add_index :cms_taggings, :tag_id
+    add_index :cms_taggings, [:taggable_id, :taggable_type]
+  end
+
+  def self.down
+    drop_table :cms_taggings
+    drop_table :cms_tags
+
+    create_table :versions do |t|
+    end
+
+    change_table :cms_assets do |t|
+      t.remove :custom_height, :custom_width, :meta_data
+    end
+  end
+end

data/lib/generators/liquid_cms/templates/public/cms/stylesheets/sidebar.css

@@ -19,15 +19,35 @@
   margin: 0;
   padding: 0;
 }
-#sidebar #assets li {
+#sidebar #assets li.cms_asset {
+  position: relative;
+}
+#sidebar #assets li.group.tagged {
+  margin-bottom: 0.5em;
+}
+#sidebar #assets li.group li {
   border: 1px solid #AAA;
   padding: 0.3em 0.4em;
   margin-bottom: 0.3em;
 }
-#sidebar #assets li:hover {
+#sidebar #assets li.group h4 {
+  background-color: #BBB;
+  border: 1px solid #999;
+  margin: 0.2em 0;
+  padding: 0.4em;
+  text-shadow: -1px -1px 1px #CCCCCC;
+}
+#sidebar #assets li.group.tagged h4 {
+  background: url("/cms/images/icons/tag_blue.png") no-repeat scroll 5px center #BBB;
+  padding: 0.4em 0.4em 0.4em 25px;
+}
+#sidebar #assets li.group h4 a {
+  float: right;
+}
+#sidebar #assets li.group li:hover {
   background-color: #BFD6FF !important;
 }
-#sidebar #assets li.light {
+#sidebar #assets li.group li.light {
   background-color: #DDD;
 }
 #sidebar .asset_details {
@@ -41,7 +61,8 @@
 }
 #sidebar .asset_size {
   font-size: 8pt;
-  float: right;
+  position: absolute;
+  right: 0.4em;
 }
 #sidebar #components form {
   margin-bottom: 0.5em;
@@ -120,9 +141,6 @@
 #cms ul.tree li { margin: 0; padding: 0 0px 0 12px; line-height: 20px; background: url(/cms/images/tree/node.png) no-repeat; color: #369; font-weight: bold; } 
 #cms ul.tree li:last-child { background: url(/cms/images/tree/lastnode.png) no-repeat; }
 
-#cms ul.tree, #sidebar #assets ul {
-  margin-bottom: 0.5em;
-}
 #cms ul.tree ul {
   margin-left: 15px;
 }

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

@@ -43,17 +43,18 @@ form.simple_form a.cancel:hover {
   background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#F55), color-stop(1.0,#C11));
 }
 
-form.simple_form div.string, form.simple_form div.text, form.simple_form div.boolean, form.simple_form div.select, form.simple_form div.file {
+form.simple_form div.string, form.simple_form div.text, form.simple_form div.boolean, form.simple_form div.select, form.simple_form div.file, form.simple_form div.integer {
   margin-bottom: 1.3em;
 }
-form.simple_form label {
-  color: #333;
+form.simple_form label, form.simple_form .label {
   float: left;
+  width: 9%;
+  color: #333;
   font-size: 10pt;
   font-family: Verdana;
   font-weight: bold;
   line-height: 1.8em;
-  width: 9%;
+  text-shadow: 1px 1px 1px #DDD;
 }
 form.simple_form input.string {
   display: block;
@@ -66,6 +67,13 @@ form.simple_form .buttons { margin-left: 9%; margin-top: 1.5em; }
 form.simple_form span.hint { color: #666; display: block; font-size: 8pt; font-style: italic; margin: 0.5em 0 0 9%;}
 form.simple_form span.hint em { color: #333; font-weight: bold; }
 
+form.simple_form div.fieldWithErrors:first-child {
+  width: 9%;
+  float: left;
+}
+form.simple_form div.fieldWithErrors:first-child label {
+  float: none;
+}
 form.simple_form div.fieldWithErrors { background-color: #FBE3E4; padding: 0.5em 0; }
 form.simple_form span.error {
   background: white;
@@ -77,3 +85,70 @@ form.simple_form span.error {
   margin-top: 0.5em;
   padding: 0.5em;
 }
+
+form.simple_form .preview {
+  margin-bottom: 1em;
+}
+form.simple_form .preview h4 {
+  margin-top: 0;
+  margin-bottom: 0.5em;
+}
+form.simple_form .preview img {
+  border: 1px solid #CCC;
+}
+form.simple_form .details p:first-child {
+  margin-top: 0;
+}
+form.simple_form .details .label {
+  display: inline-block;
+  float: none;
+}
+
+.CodeMirror-wrapping {
+  display: inline-block;
+}
+.CodeMirror-wrapping iframe {
+  background-color: white;
+  border: 1px solid #BBBBBB !important;
+}
+
+div.dimensions {
+  margin-bottom: 1.3em;
+}
+div.dimensions div.integer {
+  display: inline;
+}
+
+fieldset legend {
+  font-weight: bold;
+  text-shadow: 1px 1px 1px #DDD;
+}
+ul#meta_fields {
+  list-style-type: none;
+  padding-left: 0;
+  margin: 0.5em 0 0;
+}
+ul#meta_fields li {
+  position: relative;
+  background: #EEE;
+  background: -moz-linear-gradient(0deg, #EEEEEE 0%, #F3F3F3 100%) repeat scroll 0 0 transparent;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#EEE), color-stop(1.0,#F3F3F3));
+  border: 1px solid #999;
+  margin-bottom: 0.5em;
+  padding: 0.5em;
+  padding-bottom: 0;
+}
+ul#meta_fields li div.field {
+  margin-top: 0.5em;
+}
+ul#meta_fields li div.field input.string {
+  width: auto;
+}
+ul#meta_fields li .delete {
+  position: absolute;
+  bottom: 0.5em;
+  right: 0.5em;
+}
+form.simple_form ul div.string, form.simple_form ul div.text {
+  margin-bottom: 0.5em;
+}

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

@@ -105,14 +105,6 @@ h2 p.message {
   float: right;
 }
 
-.CodeMirror-wrapping {
-  display: inline-block;
-}
-.CodeMirror-wrapping iframe {
-  background-color: white;
-  border: 1px solid #BBBBBB !important;
-}
-
 .cms_pages #content h2 {
   background: url("/cms/images/icons/page.png") no-repeat scroll right 50% transparent;
 }

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

@@ -13,6 +13,9 @@ body {
 #content a {
   color: #FFE900;
 }
+#content form.simple_form a {
+  color: #170;
+}
 #content h2 {
   color: #AAA;
   text-shadow: -1px -1px 2px #000000;

data/lib/liquid_cms/configuration.rb

@@ -20,6 +20,18 @@ module Cms
     bind_to.instance_variable_set :@cms_context, context
   end
 
+  mattr_reader :valid_component_exts
+  def self.valid_component_exts=(exts)
+    @@valid_component_exts = exts.to_a
+  end
+  @@valid_component_exts = %w(.css .js .png .jpg .jpeg .gif .json .xml .fla .ico .txt)
+
+  mattr_reader :editable_component_exts
+  def self.editable_component_exts=(exts)
+    @@editable_component_exts = exts.to_a
+  end
+  @@editable_component_exts = %w(.js .css .html .xml .txt)
+
   def self.setup
     yield self
   end

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.3.0.10"
+  VERSION = "0.3.1.0"
 end

data/test/functional/assets_controller_test.rb

@@ -13,6 +13,53 @@ class Cms::AssetsControllerTest < ActionController::TestCase
         assert_select 'div.text', false
         #assert_select 'div.file .hint', 'Upload an asset file.'
       end
+
+      should "populate the new asset with tag and meta details" do
+        asset = Factory(:image_asset, :context => @company, :tag_list => 'test', :meta_data => [{:name => 'field1', :value => 'test1'}, {:name => 'field2', :value => 'test2'}], :custom_width => 200, :custom_height => 100)
+        get :new, :tag => asset.tag_list.to_s
+        assert_response :success
+
+        new_asset = assigns(:asset)
+        assert_equal 'test', new_asset.tag_list.to_s
+        assert_equal 2, new_asset.meta_data.length
+        # values are removed from new assets
+        assert_equal 'field1', new_asset.meta_data[0][:name]
+        assert_equal '', new_asset.meta_data[0][:value]
+        assert_equal 'field2', new_asset.meta_data[1][:name]
+        assert_equal '', new_asset.meta_data[1][:value]
+        assert_equal 200, new_asset.custom_width
+        assert_equal 100, new_asset.custom_height
+
+        assert_select '#meta_fields li', new_asset.meta_data.length
+      end
+
+      should "not populate the new asset with tag and meta details" do
+        asset = Factory(:image_asset, :context => @company, :tag_list => 'test', :meta_data => [{:name => 'field1', :value => 'test1'}, {:name => 'field2', :value => 'test2'}])
+        get :new, :tag => 'unknown'
+        assert_response :success
+
+        new_asset = assigns(:asset)
+        assert_equal 'unknown', new_asset.tag_list.to_s
+        assert_nil new_asset.meta_data
+      end
+    end
+
+    context "create" do
+      teardown do
+        cleanup_assets
+      end
+
+      should "create an asset" do
+        asset_file = asset_file('new_test.pdf')
+        setup_asset asset_file
+
+        post :create, :cms_asset => {:asset => fixture_file_upload(File.join('assets', File.basename(asset_file))), :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}} }
+        assert_response :redirect
+        assert_redirected_to cms_root_path
+
+        asset = assigns(:asset)
+        assert_equal 2, asset.meta_data.length
+      end
     end
 
     context "show" do
@@ -39,7 +86,7 @@ class Cms::AssetsControllerTest < ActionController::TestCase
 
     context "edit" do
       should "show form for an editable asset with a textarea" do
-        Cms::Asset.any_instance.stubs(:asset).returns(stub(:to_file => stub(:read => 'test contents')))
+        Cms::Asset.any_instance.stubs(:asset).returns(stub(:url => 'test.com', :to_file => stub(:read => 'test contents')))
         asset = Factory(:js_asset, :context => @company)
 
         get :edit, :id => asset.id
@@ -78,24 +125,33 @@ class Cms::AssetsControllerTest < ActionController::TestCase
         assert_equal File.basename(new_asset_file), asset.reload.asset_file_name
       end
 
-      should "modify the contents of an editable asset file" do
+      should "modify the contents of a non-editable asset file" do
         asset = Factory(:pdf_asset, :context => @company)
-        put :update, :id => asset, :file_content => 'new content'
-        assert_response :success
-        assert_template 'edit'
+
+        # file contents are ignored for non-editable assets
+        put :update, :id => asset, :cms_asset => {:file_content => 'new content'}
+        assert_response :redirect
+        assert_redirected_to cms_root_path
       end
 
-      should "modify the contents of an non-editable asset file" do
+      should "modify the contents of an editable asset file and it's meta data" do
         asset = Factory(:js_asset, :context => @company)
+        assert_nil asset.meta_data
+        assert_equal 0, asset.meta.length
 
         asset_file = asset_file(asset.asset_file_name)
         setup_asset asset_file
 
         Cms::Asset.any_instance.stubs(:asset => stub(:path => asset_file))
-        Cms::Asset.any_instance.expects(:write).with('new content').returns(true)
+        Cms::Asset.any_instance.expects(:file_content=).with('new content').returns('new content')
 
-        put :update, :id => asset, :file_content => 'new content'
+        put :update, :id => asset, :cms_asset => {:file_content => 'new content', :meta => {'new_0' => {:name => 'key_a', :value => 'test'}, 'new_1' => {:name => 'key_b', :value => 'test'}}}
         assert_response :redirect
+        assert_redirected_to cms_root_path
+
+        asset.reload
+        assert_not_nil asset.meta_data
+        assert_equal 2, asset.meta.length
       end
     end
 
@@ -112,14 +168,6 @@ class Cms::AssetsControllerTest < ActionController::TestCase
         assert_redirected_to cms_root_path
         assert_nil @company.assets.find_by_id(@asset.id)
       end
-
-      should "destroy asset via XHR :DELETE" do
-        assert_not_nil @company.assets.find_by_id(@asset.id)
-
-        xhr :delete, :destroy, :id => @asset
-        assert_response :success
-        assert_nil @company.assets.find_by_id(@asset.id)
-      end
     end
   end
 end