liquid_cms 0.3.0.10 → 0.3.1.0

data/test/unit/asset_test.rb

@@ -9,6 +9,51 @@ class Cms::AssetTest < ActiveSupport::TestCase
     cleanup_assets
   end
 
+  context "asset field" do
+    setup do
+      @asset = Factory(:image_asset, :context => @context)
+      @fname = File.expand_path('../../rails_app/public/images/rails.png', __FILE__)
+    end
+
+    should "have a valid custom file" do
+      %w(original tiny thumb custom).each do |type|
+        assert_nil @asset.asset.to_file(type)
+      end
+
+      @asset.asset = nil
+      @asset.asset = File.open(@fname)
+      @asset.save
+
+      %w(original tiny thumb custom).each do |type|
+        assert_not_nil @asset.asset.to_file(type)
+      end
+    end
+
+    should "create an image with a custom size" do
+      # check normal size first
+      @asset.asset = File.open(@fname)
+      @asset.save
+
+      assert_equal '50x64', Paperclip::Geometry.from_file(@asset.asset.path(:custom)).to_s
+
+      # assign custom dimensions
+      @asset.custom_width = 5
+      @asset.custom_height = 5
+      @asset.save
+
+      # check new dimensions
+      assert_equal '4x5', Paperclip::Geometry.from_file(@asset.asset.path(:custom)).to_s
+    end
+
+    should "correctly create a custom asset while assigning the asset and dims at the same time" do
+      asset_attrs = {:asset => File.open(@fname), :custom_height => '10', :custom_width => '5'}
+      @asset.assign_ordered_attributes asset_attrs
+      @asset.save
+      assert_equal '50x64', Paperclip::Geometry.from_file(@asset.asset.path(:original)).to_s
+      assert_equal '5x6', Paperclip::Geometry.from_file(@asset.asset.path(:custom)).to_s
+    end
+  end
+
   context "type checks" do
     setup do
       @asset = Factory(:image_asset, :context => @context)
@@ -29,8 +74,10 @@ class Cms::AssetTest < ActiveSupport::TestCase
         assert !@asset.editable?
       end
       should "not be able to read or write" do
-        assert_equal '', @asset.read
-        assert_equal false, @asset.write('test')
+        assert_equal '', @asset.file_content
+        assert_equal false, @asset.send(:write, 'test')
+        assert_equal 'test', @asset.file_content=('test')
+        assert_equal '', @asset.file_content
       end
     end
 
@@ -45,8 +92,10 @@ class Cms::AssetTest < ActiveSupport::TestCase
         assert !@asset.editable?
       end
       should "not be able to read or write" do
-        assert_equal '', @asset.read
-        assert_equal false, @asset.write('test')
+        assert_equal '', @asset.file_content
+        assert_equal false, @asset.send(:write, 'test')
+        assert_equal 'test', @asset.file_content=('test')
+        assert_equal '', @asset.file_content
       end
     end
 
@@ -64,8 +113,10 @@ class Cms::AssetTest < ActiveSupport::TestCase
         assert !@asset.editable?
       end
       should "not be able to read or write" do
-        assert_equal '', @asset.read
-        assert_equal false, @asset.write('test')
+        assert_equal '', @asset.file_content
+        assert_equal false, @asset.send(:write, 'test')
+        assert_equal 'test', @asset.file_content=('test')
+        assert_equal '', @asset.file_content
       end
     end
 
@@ -85,9 +136,64 @@ class Cms::AssetTest < ActiveSupport::TestCase
         assert @asset.editable?
       end
       should "be able to read or write" do
-        assert_equal true, @asset.write("alert('test')")
-        assert_equal "alert('test')\n", @asset.read
+        assert_equal true, @asset.send(:write, "alert('test')")
+        assert_equal "alert('test')", @asset.file_content=("alert('test')")
+        assert_equal "alert('test')\n", @asset.file_content
       end
     end
   end
+
+  context "tags" do
+    setup do
+      @asset = Factory(:image_asset, :context => @context)
+    end
+    
+    should "be untagged" do
+      assert_nil @context.assets.tagged.find_by_id(@asset.id)
+      assert_not_nil @context.assets.untagged.find_by_id(@asset.id)
+    end
+
+    should "be tagged" do
+      @asset.tag_list = "test, this stuff"
+      @asset.save
+
+      assert_not_nil @context.assets.tagged.find_by_id(@asset.id)
+      assert_not_nil @context.assets.tagged_with('test').find_by_id(@asset.id)
+      assert_not_nil @context.assets.tagged_with('this').find_by_id(@asset.id)
+      assert_not_nil @context.assets.tagged_with('stuff').find_by_id(@asset.id)
+      assert_nil @context.assets.tagged_with('notthis').find_by_id(@asset.id)
+      assert_nil @context.assets.untagged.find_by_id(@asset.id)
+    end
+  end
+
+  context "meta data" do
+    setup do
+      @asset = Factory(:image_asset, :context => @context)
+    end
+
+    should "assign meta data" do
+      @asset.meta = {'new_1' => {:name => 'test name 1', :value => 'test value 1'}, 'new_2' => {:name => ' ', :value => 'test value 2'}}
+      assert @asset.meta_data.is_a?(Array)
+      assert_equal 2, @asset.meta_data.length
+    end
+
+    should "validate" do
+      @asset.meta = {'new_1' => {:name => 'test name 1', :value => 'test value 1'}, 'new_2' => {:name => ' ', :value => 'test value 2'}}
+      assert !@asset.valid?
+      assert_equal "is invalid", @asset.errors[:meta_data].first
+      assert_equal "is an invalid format", @asset.meta[0].errors[:name].first
+      assert_equal "must be set", @asset.meta[1].errors[:name].first
+
+      @asset.meta = {'new_1' => {:name => 'test_name', :value => 'test value 1'}, 'new_2' => {:name => 'new_$', :value => 'test value 2'}}
+      assert !@asset.valid?
+      assert_equal "is invalid", @asset.errors[:meta_data].first
+      assert @asset.meta[0].errors.empty?
+      assert_equal "is an invalid format", @asset.meta[1].errors[:name].first
+      
+      @asset.meta = {'new_1' => {:name => 'test_name', :value => 'test value 1'}, 'new_2' => {:name => 'new_2', :value => 'test value 2'}}
+      assert @asset.valid?
+      assert @asset.meta[0].errors.empty?
+      assert @asset.meta[1].errors.empty?
+    end
+  end
 end

data/test/unit/component_test.rb

@@ -2,7 +2,70 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class Cms::ComponentTest < ActiveSupport::TestCase
   def setup
+    @context = Cms::Context.new(nil)
   end
+  
+  context "no context" do
+    should "have valid paths" do
+      assert_equal 'cms/components', Cms::Component.base_path(@context).to_s
+      assert_equal Rails.root.to_s + '/public/cms/components', Cms::Component.full_path(@context).to_s
+      assert_equal 'zipdir/test.jpg', Cms::Component.component_path(@context, Cms::Component.full_path(@context).join('zipdir', 'test.jpg')).to_s
+      assert_equal '', Cms::Component.component_path(@context, Cms::Component.full_path(@context).join('..', 'zipdir', 'test.jpg')).to_s
+    end
 
-  should "add component tests"
+    should "verify valid extensions" do
+      assert Cms::Component.valid_ext?('test.jpg')
+      assert Cms::Component.valid_ext?('test.JPG')
+      assert !Cms::Component.valid_ext?('test.bmp')
+
+      Cms.valid_component_exts += %w(.bmp)
+
+      assert Cms::Component.valid_ext?('test.jpg')
+      assert Cms::Component.valid_ext?('test.JPG')
+      assert Cms::Component.valid_ext?('test.bmp')
+    end
+
+    should "check for being editable" do
+      assert !Cms::Component.editable?('test.jpg')
+      assert !Cms::Component.editable?('test.JPG')
+      assert Cms::Component.editable?('test.txt')
+      assert Cms::Component.editable?('test.TXT')
+      assert !Cms::Component.editable?('test.xhtml')
+
+      Cms.editable_component_exts += %w(.xhtml)
+
+      assert Cms::Component.editable?('test.xhtml')
+    end
+
+    context "component instance" do
+      setup do
+        file = File.join('path', 'to', 'file.js')
+        setup_component Cms::Component.full_path(@context).join(file)
+        @component = Cms::Component.new(@context, file)
+      end
+
+      teardown do
+        cleanup_components
+      end
+
+      should "be able to perform file operations" do
+        assert_equal true, @component.write("alert('test')")
+        assert_equal "alert('test')\n", @component.read
+        assert_equal true, @component.delete
+      end
+
+      should "expand a zip file" do
+        create_zip 'test.zip' do |path|
+          Cms::Component.expand @context, path
+
+          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
+    end
+  end
 end

data/test/unit/helpers/cms/common_helper_test.rb

@@ -0,0 +1,4 @@
+require File.expand_path('../../../../test_helper', __FILE__)
+
+class Cms::CommonHelperTest < ActionView::TestCase
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
+  hash: 83
   prerelease: false
   segments: 
   - 0
   - 3
+  - 1
   - 0
-  - 10
-  version: 0.3.0.10
+  version: 0.3.1.0
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -06:00
+date: 2011-05-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -42,6 +44,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -57,6 +60,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 3
@@ -72,6 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -87,6 +92,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 9
@@ -102,6 +108,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
         - 3
@@ -117,6 +124,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -130,6 +138,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -143,6 +152,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -158,6 +168,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 2
         - 10
@@ -173,6 +184,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -205,18 +217,25 @@ files:
 - app/helpers/cms/components_helper.rb
 - app/helpers/cms/pages_helper.rb
 - app/liquid/cms_paperclip_extension.rb
+- app/liquid/drops/cms_asset_drop.rb
 - app/liquid/drops/cms_common_drop.rb
 - app/liquid/drops/cms_params_drop.rb
 - app/liquid/filters/cms_filters.rb
+- app/liquid/tags/asset_search_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
 - app/models/cms/page.rb
+- app/models/cms/tag.rb
+- app/models/cms/taggable.rb
+- app/models/cms/tagging.rb
 - app/views/cms/assets/_asset.html.erb
 - app/views/cms/assets/_form.html.erb
 - app/views/cms/assets/_list.html.erb
-- app/views/cms/assets/destroy.js.rjs
+- app/views/cms/assets/_meta_field.html.erb
 - app/views/cms/assets/edit.html.erb
 - app/views/cms/assets/new.html.erb
 - app/views/cms/assets/show.html.erb
@@ -256,8 +275,10 @@ 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/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
@@ -1425,6 +1446,7 @@ files:
 - test/functional/main_controller_test.rb
 - test/functional/pages_controller_test.rb
 - test/integration/pages_test.rb
+- test/integration/pages_test_no_context.rb
 - test/no_context_test_helper.rb
 - test/rails_app/Gemfile
 - test/rails_app/Gemfile.lock
@@ -1449,7 +1471,6 @@ files:
 - test/rails_app/config/initializers/cms/remote_indicator.rb
 - test/rails_app/config/initializers/cms/simple_form.rb
 - test/rails_app/config/initializers/cms/simple_form_updates.rb
-- test/rails_app/config/initializers/cms/vestal_versions.rb
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/mime_types.rb
 - test/rails_app/config/initializers/secret_token.rb
@@ -1458,6 +1479,7 @@ files:
 - test/rails_app/config/locales/en.yml
 - 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/seeds.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
@@ -1475,9 +1497,12 @@ files:
 - test/test_helper.rb
 - test/test_helpers/asset_helpers.rb
 - test/test_helpers/cache_helper.rb
+- test/test_helpers/component_helpers.rb
+- test/test_helpers/file_helpers.rb
 - test/test_helpers/login_methods.rb
 - test/unit/asset_test.rb
 - test/unit/component_test.rb
+- test/unit/helpers/cms/common_helper_test.rb
 - test/unit/page_test.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/liquid_cms
@@ -1493,6 +1518,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -1501,6 +1527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -1525,6 +1552,7 @@ test_files:
 - test/functional/main_controller_test.rb
 - test/functional/pages_controller_test.rb
 - test/integration/pages_test.rb
+- test/integration/pages_test_no_context.rb
 - test/no_context_test_helper.rb
 - test/rails_app/Gemfile
 - test/rails_app/Gemfile.lock
@@ -1549,7 +1577,6 @@ test_files:
 - test/rails_app/config/initializers/cms/remote_indicator.rb
 - test/rails_app/config/initializers/cms/simple_form.rb
 - test/rails_app/config/initializers/cms/simple_form_updates.rb
-- test/rails_app/config/initializers/cms/vestal_versions.rb
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/mime_types.rb
 - test/rails_app/config/initializers/secret_token.rb
@@ -1558,6 +1585,7 @@ test_files:
 - test/rails_app/config/locales/en.yml
 - 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/seeds.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
@@ -1575,7 +1603,10 @@ test_files:
 - test/test_helper.rb
 - test/test_helpers/asset_helpers.rb
 - test/test_helpers/cache_helper.rb
+- test/test_helpers/component_helpers.rb
+- test/test_helpers/file_helpers.rb
 - test/test_helpers/login_methods.rb
 - test/unit/asset_test.rb
 - test/unit/component_test.rb
+- test/unit/helpers/cms/common_helper_test.rb
 - test/unit/page_test.rb