liquid_cms 0.3.0.10 → 0.3.1.0

data/test/functional/components_controller_test.rb

@@ -3,7 +3,96 @@ require File.expand_path('../../test_helper', __FILE__)
 class Cms::ComponentsControllerTest < ActionController::TestCase
   def setup
     setup_company_and_login_admin
+    @context = Cms::Context.new(@company)
   end
 
-  should "add component tests"
+  context "component file" do
+    teardown do
+      cleanup_components
+    end
+
+    context "editable" do
+      setup do
+        @file = File.join('path', 'to', 'file.js')
+        setup_component Cms::Component.full_path(@context).join(@file)
+      end
+
+      teardown do
+        cleanup_components
+      end
+
+      should "edit" do
+        get :edit, :url => @file
+        assert_response :success
+        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))
+      end
+
+      should "valid destroy" do
+        delete :destroy, :url => @file
+        assert_response :redirect
+        assert_equal "The component has been removed.", flash[:notice]
+      end
+
+      should "invalid destroy" do
+        delete :destroy, :url => "#{@file}.bak"
+        assert_response :redirect
+        assert_equal "The component path was invalid.", flash[:error]
+      end
+    end
+
+    context "non-editable" do
+      setup do
+        @file = File.join('path', 'to', 'file.jpg')
+        setup_component Cms::Component.full_path(@context).join(@file)
+      end
+
+      should "edit" do
+        get :edit, :url => @file
+        assert_response :redirect
+        assert_equal "Not an editable component.", flash[:error]
+      end
+
+      should "update" do
+        put :update, :url => @file, :file_content => 'new content'
+        assert_response :redirect
+        assert_equal "Not an editable component.", flash[:error]
+      end
+    end
+  end
+
+  context "upload" do
+    teardown do
+      cleanup_components
+    end
+
+    should "successfully upload a valid zip" do
+      create_zip 'test.zip' do |path, relpath|
+        post :upload, :zip_file => fixture_file_upload(relpath)
+        assert_response :redirect
+        assert_equal 'The component has been uploaded.', flash[:notice]
+
+        assert File.exist?(Cms::Component.full_path(@context).join('test.txt'))
+        assert !File.exist?(Cms::Component.full_path(@context).join('test.ext'))
+        assert File.exist?(Cms::Component.full_path(@context).join('dir', 'test.txt'))
+        assert !File.exist?(Cms::Component.full_path(@context).join('dir', 'test.exe'))
+        assert !File.exist?(Cms::Component.full_path(@context).join('../../dir', 'test.exe'))
+        assert !File.exist?(Cms::Component.full_path(@context).join('../../dir', 'test.txt'))
+      end
+    end
+
+    should "produce an error" do
+      create_zip 'test.bmp' do |path, relpath|
+        post :upload, :zip_file => fixture_file_upload(relpath)
+        assert_response :redirect
+        assert_equal 'The component file must be a zip archive.', flash[:error]
+      end
+    end
+  end
 end

data/test/functional/main_controller_test.rb

@@ -27,6 +27,27 @@ class Cms::MainControllerTest < ActionController::TestCase
       assert_response :success
       assert_select "#assets p.preview", false
     end
+
+    should "show no tags" do
+      Factory(:image_asset, :context => @company)
+
+      get :index
+      assert_response :success
+      assert_select 'li.group.tagged', false
+      assert_select 'li.group.untagged', true
+      assert_select 'li.group.untagged h4', false
+    end
+    
+    should "show tags" do
+      tagged = Factory(:image_asset, :context => @company, :tag_list => 'test, this')
+      Factory(:image_asset, :context => @company)
+
+      get :index
+      assert_response :success
+      assert_select 'li.group.tagged', tagged.tags.count
+      assert_select 'li.group.untagged'
+      assert_select 'li.group.untagged h4', 'Untagged'
+    end
   end
 
   context "permission access" do

data/test/integration/pages_test.rb

@@ -132,6 +132,82 @@ class Cms::PagesTest < ActionController::IntegrationTest
           assert_select '#content span', "test"
         end
       end
+
+      context "asset_data" do
+        should "find assets" do
+          @asset = Factory(:image_asset, :context => @company, :custom_height => 200, :custom_width => 200)
+
+          @page = @company.pages.create :name => 'content', :published => true, :content => <<-LIQUID
+          {% asset_data %}
+          LIQUID
+
+          get @page.url
+          assert response.body.include?("The required 'tag' parameter is missing.")
+
+          @page.content = <<-LIQUID
+          {% asset_data tag:'test' %}
+          <span id="count">{{ assets | size }}</span>
+          LIQUID
+          @page.save
+
+          get @page.url
+          assert_select '#count', '0'
+
+          # update the tags
+          @asset.tag_list = "test"
+          @asset.save
+
+          @page.content = <<-LIQUID
+          {% asset_data tag:'test' random:true %}
+          <span id="count">{{ assets | size }}</span>
+          {{ assets | first | assign_to: 'meta_asset' }}
+          <span class="o_dims">{{ meta_asset.image.original.width }}</span>
+          <span class="c_dims">{{ meta_asset.image.custom.width }}</span>
+          <span class="name">{{ meta_asset.meta.name_test }}</span>
+          <span class="location">{{ meta_asset.meta.location }}</span>
+          <span class="none">{{ meta_asset.meta.none }}</span>
+          LIQUID
+          @page.save
+
+          get @page.url
+          assert_select '#count', '1'
+          assert_select '.o_dims', '20'
+          assert_select '.c_dims', '20'
+          assert_select '.name', ''
+          assert_select '.location', ''
+          assert_select '.none', ''
+
+          # update the meta data
+          @asset.meta_data = [{:name => 'name_test', :value => 'value test'}, {:name => 'location', :value => 'earth'}]
+          @asset.save
+
+          @page.content = <<-LIQUID
+          {% asset_data tag:'test' as:'meta_assets' %}
+          <span id="count">{{ meta_assets | size }}</span>
+          {{ meta_assets | first | assign_to: 'meta_asset' }}
+          <span class="name">{{ meta_asset.meta.name_test }}</span>
+          <span class="location">{{ meta_asset.meta.location }}</span>
+          <span class="none">{{ meta_asset.meta.none }}</span>
+          LIQUID
+          @page.save
+
+          get @page.url
+          assert_select '#count', '1'
+          assert_select '.name', 'value test'
+          assert_select '.location', 'earth'
+          assert_select '.none', ''
+
+          # specify the limit as 0
+          @page.content = <<-LIQUID
+          {% asset_data tag:'test' as:'meta_assets' random:true limit:0 %}
+          <span id="count">{{ meta_assets | size }}</span>
+          LIQUID
+          @page.save
+
+          get @page.url
+          assert_select '#count', '0'
+        end
+      end
     end
     
     context "filters" do
@@ -296,4 +372,51 @@ class Cms::PagesTest < ActionController::IntegrationTest
       end
     end
   end
+
+=begin
+  context "caching" do
+    setup do
+      ActionController::Base.perform_caching = true
+      Rails.cache.clear
+      @page = Factory(:page, :context => @company)
+    end
+
+    teardown do
+      ActionController::Base.perform_caching = false
+    end
+
+    should "expire the cache when the page is updated" do
+      assert_cache_empty
+
+      get @page.url
+      assert_cache_present
+
+      # updating the page will remove the cache
+      put cms_page_path(@page), :content => 'new content'
+      assert_cache_empty
+
+      get @page.url
+      assert_cache_present
+
+      # destroying the page will remove the cache
+      delete cms_page_path(@page)
+      assert_cache_empty
+    end
+
+    should "generate a cache key" do
+      get '/'
+      assert_cache_key "views/CONTEXT_PATH_#{@company.id}"
+
+      get @page.url
+      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page"
+
+      get @page.url+'?page=1&test=abcde'
+      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page/page=1&test=abcde"
+
+      # different order sent via url, but the path params will be sorted in the path
+      get @page.url+'?test=abcde&page=1'
+      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page/page=1&test=abcde"
+    end
+  end
+=end
 end

data/test/integration/pages_test_no_context.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../../no_context_test_helper', __FILE__)
+require File.expand_path('../../test_helpers/cache_helper', __FILE__)
+
+class Cms::PagesTestNoContext < ActionController::IntegrationTest
+
+  def setup
+    @company = Factory(:company)
+    @user = @company.users.first
+    login_company(@user.username, 'password')
+    set_company_host(@company)
+  end
+
+  context "caching" do
+    setup do
+      ActionController::Base.perform_caching = true
+      Rails.cache.clear
+      @page = Factory(:page)
+    end
+
+    teardown do
+      ActionController::Base.perform_caching = false
+    end
+
+    should "expire the cache when the page is updated" do
+      assert_cache_empty
+
+      get @page.url
+      assert_cache_present
+
+      # updating the page will remove the cache
+      put cms_page_path(@page), :content => 'new content'
+      assert_cache_empty
+
+      get @page.url
+      assert_cache_present
+
+      # destroying the page will remove the cache
+      delete cms_page_path(@page)
+      assert_cache_empty
+    end
+
+    should "generate a cache key" do
+      get '/'
+      assert_cache_key "views/NO_CONTEXT"
+
+      get @page.url
+      assert_cache_key "views/NO_CONTEXT/page"
+
+      get @page.url+'?page=1&test=abcde'
+      assert_cache_key "views/NO_CONTEXT/page/page=1&test=abcde"
+
+      # different order sent via url, but the path params will be sorted in the path
+      get @page.url+'?test=abcde&page=1'
+      assert_cache_key "views/NO_CONTEXT/page/page=1&test=abcde"
+    end
+  end
+end

data/test/rails_app/db/migrate/20110329201435_create_liquid_cms_upgrade_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/test/test_helper.rb

@@ -32,12 +32,14 @@ end
 
 require 'test_helpers/login_methods'
 require 'test_helpers/asset_helpers'
+require 'test_helpers/component_helpers'
 
 class ActionController::TestCase
   include AssetHelpers
 end
 class ActiveSupport::TestCase
   include AssetHelpers
+  include ComponentHelpers
 end
 
 

data/test/test_helpers/asset_helpers.rb

@@ -1,12 +1,14 @@
+require File.expand_path('../file_helpers', __FILE__)
+
 module AssetHelpers
+  include FileHelpers
+
   def setup_asset(file_name)
-    FileUtils.mkdir_p File.dirname(file_name)
-    FileUtils.touch file_name
+    setup_file file_name
   end
 
   def cleanup_assets
-    FileUtils.rm_rf TestConfig.paperclip_test_root
-    FileUtils.rm_rf Rails.root.join('public', 'cms', 'assets')
+    cleanup_files 'assets'
   end
 
   def asset_path

data/test/test_helpers/component_helpers.rb

@@ -0,0 +1,37 @@
+require File.expand_path('../file_helpers', __FILE__)
+
+module ComponentHelpers
+  include FileHelpers
+
+  def setup_component(file_name)
+    setup_file file_name
+  end
+
+  def cleanup_components
+    cleanup_files 'components'
+  end
+
+  def create_zip(name)
+    path = Pathname.new(File.join('public', 'cms', 'temp', name))
+    fname = Rails.root.join('test', 'fixtures', path).to_s
+
+    FileUtils.mkdir_p File.dirname(fname)
+
+    begin
+      Zip::ZipFile.open(fname, Zip::ZipFile::CREATE) do |zipfile|
+        zipfile.get_output_stream("test.txt") {}
+        zipfile.get_output_stream("test.exe") {} # invalid file ext will be ignored
+        zipfile.mkdir("dir")
+        zipfile.get_output_stream("dir/test.exe") {}
+        zipfile.get_output_stream("dir/test.txt") {}
+        zipfile.get_output_stream("../../dir/test.exe") {} # relative path file will be ignored
+        zipfile.get_output_stream("../../dir/test.txt") {} # relative path file will be ignored 
+      end
+
+      yield fname, path
+
+    ensure
+      cleanup_files 'temp'
+    end
+  end
+end

data/test/test_helpers/file_helpers.rb

@@ -0,0 +1,11 @@
+module FileHelpers
+  def setup_file(file_name)
+    FileUtils.mkdir_p File.dirname(file_name)
+    FileUtils.touch file_name
+  end
+
+  def cleanup_files(dir)
+    FileUtils.rm_rf TestConfig.paperclip_test_root
+    FileUtils.rm_rf Rails.root.join('public', 'cms', dir)
+  end
+end