liquid_cms 0.3.1.0 → 0.3.2.0

data/test/functional/components_controller_test.rb

@@ -27,11 +27,21 @@ class Cms::ComponentsControllerTest < ActionController::TestCase
         assert_template 'edit'
       end
 
-      should "update" do
-        put :update, :url => @file, :file_content => 'new content'
-        assert_response :redirect
-        assert_equal "The component file has been updated.", flash[:notice]
-        assert_equal "new content\n", File.read(Cms::Component.full_path(@context).join(@file))
+      context "update" do
+        should "update via HTTP" do
+          put :update, :url => @file, :file_content => 'new content'
+          assert_response :redirect
+          assert_redirected_to :controller => 'cms/components', :action => 'edit', :url => @file
+          assert_equal "The component file has been updated.", flash[:notice]
+          assert_equal "new content\n", File.read(Cms::Component.full_path(@context).join(@file))
+        end
+
+        should "update via XHR" do
+          xhr :put, :update, :url => @file, :file_content => 'new content'
+          assert_response :success
+          assert_equal "The component file has been updated.", flash[:notice]
+          assert_equal "new content\n", File.read(Cms::Component.full_path(@context).join(@file))
+        end
       end
 
       should "valid destroy" do

data/test/functional/pages_controller_test.rb

@@ -70,12 +70,25 @@ class Cms::PagesControllerTest < ActionController::TestCase
       assert_template 'edit'
     end
 
-    should "update a page" do
-      put :update, :id => @company.pages.first.id, :cms_page => {:slug => '', :published => false}
-      assert_response :redirect
-      assert_equal true, assigns(:page).errors.empty?
-      assert_equal 'The page has been updated.', flash[:notice]
-      assert_redirected_to edit_cms_page_path
+    context "update" do
+      setup do
+        @page = @company.pages.first
+      end
+
+      should "update via HTTP" do
+        put :update, :id => @page.id, :cms_page => {:slug => '', :published => false}
+        assert_response :redirect
+        assert_equal true, assigns(:page).errors.empty?
+        assert_redirected_to edit_cms_page_path(@page)
+        assert_equal 'The page has been updated.', flash[:notice]
+      end
+
+      should "update via XHR" do
+        xhr :put, :update, :id => @page.id, :cms_page => {:slug => '', :published => false}
+        assert_response :success
+        assert_equal true, assigns(:page).errors.empty?
+        assert_equal 'The page has been updated.', flash[:notice]
+      end
     end
 
     should "destroy a page via HTML :DELETE" do

data/test/rails_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.5'
+gem 'rails', '3.0.10'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -30,4 +30,3 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 # end
 
 gem 'liquid_cms', :path => '../..'
-gem 'vestal_versions', '~> 1.2.1', :git => 'http://github.com/adamcooper/vestal_versions.git'

data/test/rails_app/config/locales/cms/en.yml

@@ -1,14 +1,19 @@
 en:
   pages:
+    layout:
+      title: 'Liquid CMS'
     actions:
       index:
-        title: 'Site Pages'
+        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.'
@@ -17,9 +22,9 @@ en:
   assets:
     actions:
       index:
-        title: 'Site Assets'
+        title: 'Assets'
         none: 'There are currently no assets.'
-        new_link: 'Upload a new asset'
+        new: 'Upload a new asset'
       new:
         title: 'New Asset'
       edit:
@@ -33,6 +38,9 @@ en:
     actions:
       index:
         title: 'Components'
+        none: 'There are currently no components.'
+    flash:
+      updated: 'The component file has been updated.'
 
   simple_form:
     "yes": 'Yes'
@@ -54,9 +62,23 @@ 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.'
         content: 'To create a layout page, add the <em>{{ content_for_layout }}</em> tag which will act as a placeholder for the contents of another page.  Use ctrl+s to save.'
         slug: 'The url path that will be used to access this page.  Defaults to the page name if not provided. ie. /name.<br/> Ex. /home_page'
         layout_page_id: 'Optional page that will be used as this pages layout.  Ie. This pages content will be inserted into the layout page where the <em>{{ content_for_layout }}</em> tag is specified.'
+        published: 'Make this page accessible via the pages name or url path?'
+        root: 'Make this page the sites root path (/)? Only one page can have this designation.'
+      cms_component:
+        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/test/rails_app/db/migrate/20110511161859_create_liquid_cms_upgrade_rev2.rb

@@ -0,0 +1,13 @@
+class CreateLiquidCmsUpgradeRev2 < ActiveRecord::Migration
+  def self.up
+    change_table :cms_assets do |t|
+      t.text :cms_asset_dimensions # serialized yaml
+    end
+  end
+
+  def self.down
+    change_table :cms_assets do |t|
+      t.remove :cms_asset_dimensions
+    end
+  end
+end

data/test/unit/asset_test.rb

@@ -122,7 +122,7 @@ class Cms::AssetTest < ActiveSupport::TestCase
 
     context "javascript" do
       setup do
-        @asset.update_attribute :asset_content_type, 'text/javascript'
+        @asset.update_attributes :asset_content_type => 'text/javascript', :asset_file_name => 'test.js'
         setup_asset @asset.asset.path(:original)
       end
 

data/test/unit/component_test.rb

@@ -55,7 +55,7 @@ class Cms::ComponentTest < ActiveSupport::TestCase
       end
 
       should "expand a zip file" do
-        create_zip 'test.zip' do |path|
+        create_zip 'test.zip' do |path, relpath|
           Cms::Component.expand @context, path
 
           assert File.exist?(Cms::Component.full_path(@context).join('test.txt'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 95
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
+  - 2
   - 0
-  version: 0.3.1.0
+  version: 0.3.2.0
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -05:00
+date: 2011-09-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,12 +76,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 7
         segments: 
         - 1
+        - 5
         - 2
-        - 0
-        version: 1.2.0
+        version: 1.5.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -222,9 +222,9 @@ files:
 - app/liquid/drops/cms_params_drop.rb
 - app/liquid/filters/cms_filters.rb
 - app/liquid/tags/asset_search_tag.rb
+- app/liquid/tags/cms/data_tag.rb
 - app/liquid/tags/cms/tag_common.rb
 - app/liquid/tags/cms_include_tag.rb
-- app/liquid/tags/data_tag.rb
 - app/models/cms/asset.rb
 - app/models/cms/component.rb
 - app/models/cms/editable.rb
@@ -239,8 +239,10 @@ files:
 - app/views/cms/assets/edit.html.erb
 - app/views/cms/assets/new.html.erb
 - app/views/cms/assets/show.html.erb
+- app/views/cms/assets/update.js.rjs
 - app/views/cms/components/_list.html.erb
 - app/views/cms/components/edit.html.erb
+- app/views/cms/components/update.js.rjs
 - app/views/cms/documentation/_app_blocks.html.erb
 - app/views/cms/documentation/_app_drops.html.erb
 - app/views/cms/documentation/_app_filters.html.erb
@@ -264,6 +266,7 @@ files:
 - app/views/cms/pages/edit.html.erb
 - app/views/cms/pages/new.html.erb
 - app/views/cms/pages/search.html.erb
+- app/views/cms/pages/update.js.rjs
 - app/views/cms/shared/_index.html.erb
 - app/views/cms/shared/_sidebar.html.erb
 - app/views/layouts/cms.html.erb
@@ -275,34 +278,83 @@ files:
 - config/initializers/cms/vestal_versions.rb
 - config/locales/cms/en.yml
 - config/routes.rb
-- generators/liquid_cms/templates/migration_rev1.rb
 - lib/generators/liquid_cms/install_generator.rb
 - lib/generators/liquid_cms/templates/migration.rb
 - lib/generators/liquid_cms/templates/migration_rev1.rb
+- lib/generators/liquid_cms/templates/migration_rev2.rb
 - lib/generators/liquid_cms/templates/public/cms/codemirror/LICENSE
-- lib/generators/liquid_cms/templates/public/cms/codemirror/css/csscolors.css
-- lib/generators/liquid_cms/templates/public/cms/codemirror/css/docs.css
-- lib/generators/liquid_cms/templates/public/cms/codemirror/css/font.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/css/jscolors.css
-- lib/generators/liquid_cms/templates/public/cms/codemirror/css/sparqlcolors.css
-- lib/generators/liquid_cms/templates/public/cms/codemirror/css/xmlcolors.css
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/codemirror.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/editor.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/highlight.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/mirrorframe.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsecss.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsedummy.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsehtmlmixed.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsejavascript.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsesparql.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/parsexml.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/select.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/stringstream.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/tokenize.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/tokenizejavascript.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/undo.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/unittests.js
-- lib/generators/liquid_cms/templates/public/cms/codemirror/js/util.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/lib/codemirror.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/lib/codemirror.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/lib/overlay.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/lib/runmode.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/clike/clike.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/clike/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/clojure/clojure.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/clojure/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/coffeescript/LICENSE
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/coffeescript/coffeescript.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/coffeescript/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/css/css.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/css/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/diff/diff.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/diff/diff.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/diff/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/haskell/haskell.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/haskell/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/htmlmixed/htmlmixed.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/htmlmixed/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/javascript/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/javascript/javascript.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/jinja2/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/jinja2/jinja2.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/lua/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/lua/lua.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/markdown/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/markdown/markdown.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/markdown/markdown.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/ntriples/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/ntriples/ntriples.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/pascal/LICENSE
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/pascal/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/pascal/pascal.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/php/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/php/php.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/plsql/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/plsql/plsql.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/python/LICENSE.txt
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/python/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/python/python.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/r/LICENSE
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/r/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/r/r.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/rst/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/rst/rst.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/rst/rst.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/ruby/LICENSE
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/ruby/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/ruby/ruby.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/scheme/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/scheme/scheme.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/smalltalk/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/smalltalk/smalltalk.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/sparql/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/sparql/sparql.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/stex/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/stex/stex.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/velocity/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/velocity/velocity.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/xml/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/xml/xml.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/xmlpure/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/xmlpure/xmlpure.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/yaml/index.html
+- lib/generators/liquid_cms/templates/public/cms/codemirror/mode/yaml/yaml.js
+- lib/generators/liquid_cms/templates/public/cms/codemirror/theme/cobalt.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/theme/default.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/theme/eclipse.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/theme/elegant.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/theme/neat.css
+- lib/generators/liquid_cms/templates/public/cms/codemirror/theme/night.css
 - lib/generators/liquid_cms/templates/public/cms/images/icons/accept.png
 - lib/generators/liquid_cms/templates/public/cms/images/icons/add.png
 - lib/generators/liquid_cms/templates/public/cms/images/icons/anchor.png
@@ -1328,6 +1380,7 @@ files:
 - lib/generators/liquid_cms/templates/public/cms/images/tree/vline.png
 - lib/generators/liquid_cms/templates/public/cms/images/trentacinque.gif
 - lib/generators/liquid_cms/templates/public/cms/javascripts/cms.js
+- lib/generators/liquid_cms/templates/public/cms/javascripts/codemirror_custom.js
 - lib/generators/liquid_cms/templates/public/cms/javascripts/cookiejar.js
 - lib/generators/liquid_cms/templates/public/cms/javascripts/humanmsg.js
 - lib/generators/liquid_cms/templates/public/cms/javascripts/livepipe.js
@@ -1335,10 +1388,12 @@ files:
 - lib/generators/liquid_cms/templates/public/cms/javascripts/remote_helpers.js
 - lib/generators/liquid_cms/templates/public/cms/javascripts/tabs.js
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/clearfix.css
+- lib/generators/liquid_cms/templates/public/cms/stylesheets/codemirror_changes.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/documentation.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/humanmsg.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/ie.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/ie9.css
+- lib/generators/liquid_cms/templates/public/cms/stylesheets/liquid.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/liquidcolors.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/sidebar.css
 - lib/generators/liquid_cms/templates/public/cms/stylesheets/simple_form.css
@@ -1480,6 +1535,7 @@ files:
 - test/rails_app/config/routes.rb
 - test/rails_app/db/migrate/20101018211856_create_liquid_cms_setup.rb
 - test/rails_app/db/migrate/20110329201435_create_liquid_cms_upgrade_rev1.rb
+- test/rails_app/db/migrate/20110511161859_create_liquid_cms_upgrade_rev2.rb
 - test/rails_app/db/seeds.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
@@ -1586,6 +1642,7 @@ test_files:
 - test/rails_app/config/routes.rb
 - test/rails_app/db/migrate/20101018211856_create_liquid_cms_setup.rb
 - test/rails_app/db/migrate/20110329201435_create_liquid_cms_upgrade_rev1.rb
+- test/rails_app/db/migrate/20110511161859_create_liquid_cms_upgrade_rev2.rb
 - test/rails_app/db/seeds.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html

data/generators/liquid_cms/templates/migration_rev1.rb

@@ -1,38 +0,0 @@
-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/codemirror/css/csscolors.css

@@ -1,55 +0,0 @@
-html {
-  cursor: text;
-}
-
-.editbox {
-  margin: .4em;
-  padding: 0;
-  font-family: monospace;
-  font-size: 10pt;
-  color: black;
-}
-
-pre.code, .editbox {
-  color: #666;
-}
-
-.editbox p {
-  margin: 0;
-}
-
-span.css-at {
-  color: #708;
-}
-
-span.css-unit {
-  color: #281;
-}
-
-span.css-value {
-  color: #708;
-}
-
-span.css-identifier {
-  color: black;
-}
-
-span.css-selector {
-  color: #11B;
-}
-
-span.css-important {
-  color: #00F;
-}
-
-span.css-colorcode {
-  color: #299;
-}
-
-span.css-comment {
-  color: #A70;
-}
-
-span.css-string {
-  color: #A22;
-}