caterpillar 1.2.5 → 1.3.1

data/test/liferay_helpers_test.rb

@@ -4,10 +4,48 @@
 require 'test_helper'
 require File.dirname(File.expand_path(__FILE__))+'/test_helper'
 
-class LiferayHelpersTest < Caterpillar::TestCase # :nodoc:
+class LiferayHelpersTest < ActionController::TestCase # :nodoc:
+  include Caterpillar::Helpers::Liferay
+  
   def test_link_to_liferay
     #user = User.first
     #flunk
     assert true
   end
+  
+  def test_liferay_resource_url
+    # Simulated value from the cookie sent
+    resource_url = "http://localhost:8080/resourceUrl"
+
+    params = {
+      :controller => :c1,
+      :action     => :a1
+    }
+    
+    # expected behavior
+    url = liferay_resource_url(params, resource_url)
+    assert_not_nil url
+    assert_equal "#{resource_url}&railsRoute=/c1/a1", url
+    
+    params = {
+      :controller => :c1
+    }
+    
+    # expected behavior without :action param
+    url = liferay_resource_url(params, resource_url)
+    assert_not_nil url
+    assert_equal "#{resource_url}&railsRoute=/c1/index", url
+    
+    # expected behavior without :controller
+    params = {}
+    url = liferay_resource_url(params, resource_url)
+    assert_not_nil url
+    assert_equal "#{resource_url}", url
+    
+    # expected behavior without resource_url
+    assert_raise RuntimeError do
+      liferay_resource_url(params, nil)
+    end
+  end
+  
 end

data/test/portlet_support_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+require File.dirname(File.expand_path(__FILE__))+'/test_helper'
+
+class PortletSupportTest < ActionController::TestCase # :nodoc:
+  include Caterpillar::PortletSupport
+  
+  def test_get_liferay_preferences
+    # Simulated value from the cookie sent
+    value = "font_size=20px;background_color=#000000;page_size=20;"
+    
+    hash = get_liferay_preferences(value)
+    assert_not_nil hash
+    assert_equal 3, hash.length
+    [:font_size, :background_color, :page_size].each do |key|
+      hash.has_key? key
+    end
+    
+    ["20px", "#000000", "20"].each do |value|
+      hash.has_value? value
+    end
+    
+    assert_nil get_liferay_preferences(nil)
+  end
+  
+end

data/test/rails_task_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+require File.dirname(File.expand_path(__FILE__))+'/test_helper'
+
+class RailsTaskTest < Caterpillar::TestCase
+
+  def test_generated_rails_project
+    project_name = 'caterpillar_rails_test'
+
+#    Rake::Task['rails'].execute(project_name)
+    `ruby -S caterpillar rails #{project_name}`
+    assert FileTest.directory? project_name
+    assert File.read("#{project_name}/config/environment.rb") =~ /caterpillar/
+    assert FileTest.directory? "#{project_name}/vendor/plugins/caterpillar-#{Caterpillar::VERSION}"
+    assert FileTest.exists? "#{project_name}/config/warble.rb"
+    assert FileTest.exists? "#{project_name}/config/portlets.rb"
+    FileUtils.rm_rf project_name
+  end
+    
+  
+end

data/test/test_helper.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+
+require File.expand_path(File.dirname(__FILE__) + "/../init")
+
+class Caterpillar::TestCase < Test::Unit::TestCase # :nodoc:
+  #fixtures [ :portletitem, :portlet_names, :portletpreferences ]
+
+  def setup
+    @config = Caterpillar::Util.eval_configuration
+    @config.routes = Caterpillar::Util.parse_routes(@config)
+    @portlets = Caterpillar::Parser.new(@config).portlets
+  end
+
+  def default_test
+    assert true
+  end
+end

data/test/xml_test.rb

@@ -1,18 +1,24 @@
 # encoding: utf-8
 
-
 require 'test_helper'
 require File.dirname(File.expand_path(__FILE__))+'/test_helper'
 
+require 'libxml'
+
 class XmlTest < Caterpillar::TestCase # :nodoc:
 
-  def test_portlet_xml
-    xml = Caterpillar::Portlet.xml(@portlets)
-    assert_not_nil xml
-    assert !xml.empty?
-    assert xml[/secret/]
+  def setup
+    super
+    @dtd_dir = File.dirname(File.expand_path(__FILE__)) + '/dtd'
+    # what DTD version to match against:
+    # Liferay version => DTD version
+    @liferay_tld_table = {
+      '5.1.1' => '5.1.0',
+      '5.2.0' => '5.2.0',
+      '6.0.1' => '6.0.0'
+    }
   end
-  
+
   def test_portlet_template
     portlet = {
       :name  => "some name",
@@ -40,7 +46,7 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
     assert_not_nil xml
     assert !xml.empty?
 
-    assert xml[/#{session[:secret]}/]
+    assert xml[/#{session[:secret]}/], 'No secret'
   end
 
   def test_session_key
@@ -52,27 +58,55 @@ class XmlTest < Caterpillar::TestCase # :nodoc:
     secret = Caterpillar::Security.get_secret
     assert_not_nil secret
   end
-  
+
+  def test_portlet_xml
+    xml = Caterpillar::Portlet.xml(@portlets)
+
+    # parse xml document
+    doc = LibXML::XML::Parser.string(xml).parse
+
+    schema = LibXML::XML::Schema.new(File.join(@dtd_dir,'portlet-app_2_0.xsd'))
+    assert doc.validate_schema(schema)
+  end
 
   def test_liferay_display_xml
-# FIXME
-#    xml = @config.container.display_xml(@portlets)
-#    assert_not_nil xml
-#    assert !xml.empty?
+    @liferay_tld_table.each_pair do |version,tld|
+      @config.container.version = version
+      xml = @config.container.display_xml(@portlets)
+
+      assert xml[/liferay-display.*#{tld}/],
+        'Failed to create DTD with proper version; liferay %s' % version
+
+      # parse DTD
+      dtd_file = File.join(@dtd_dir,'liferay-display_%s.dtd' % tld.gsub('.','_'))
+      dtd = LibXML::XML::Dtd.new(File.read(dtd_file))
+
+      # parse xml document
+      doc = LibXML::XML::Parser.string(xml).parse
+
+      # validate
+      assert doc.validate(dtd)
+    end
   end
 
   def test_liferay_portlet_xml
-    { '5.1.1' => '5.1.0',
-      '5.2.0' => '5.2.0' }.each_pair do |version,tld|
-
+    @liferay_tld_table.each_pair do |version,tld|
       @config.container.version = version
       xml = @config.container.portletapp_xml(@portlets)
-      assert_not_nil xml
-      assert !xml.empty?
-      assert_not_nil xml[/liferay-portlet-app.*#{tld}/], 'Failed to create DTD with proper version; liferay %s' % version
-    end
-  end
 
+      assert xml[/liferay-portlet-app.*#{tld}/],
+        'Failed to create DTD with proper version; liferay %s' % version
+
+      # parse DTD
+      dtd_file = File.join(@dtd_dir,'liferay-portlet-app_%s.dtd' % tld.gsub('.','_'))
+      dtd = LibXML::XML::Dtd.new(File.read(dtd_file))
 
+      # parse xml document
+      doc = LibXML::XML::Parser.string(xml).parse
+
+      # validate
+      assert doc.validate(dtd)
+    end
+  end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caterpillar
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Mikael Lammentausta
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +03:00
+date: 2010-05-15 00:00:00 +03:00
 default_executable: caterpillar
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 335
         segments: 
         - 0
         - 6
@@ -32,19 +35,35 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: libxml-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 7
         - 3
         version: 0.7.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: = Caterpillar
 email: mikael.lammentausta@gmail.com
 executables: 
@@ -65,13 +84,14 @@ files:
 - lib/caterpillar/navigation.rb
 - lib/caterpillar/parser.rb
 - lib/caterpillar/portlet.rb
+- lib/caterpillar/portlet_support.rb
 - lib/caterpillar/security.rb
 - lib/caterpillar/task.rb
 - lib/caterpillar/usage.rb
 - lib/caterpillar/util.rb
 - lib/caterpillar.rb
+- lib/java/rails-portlet-0.10.0.jar
 - lib/java/rails-portlet-0.6.0.jar
-- lib/java/rails-portlet-0.9.2.jar
 - lib/rails_gem_chooser.rb
 - lib/web/portlet.rb
 - generators/caterpillar/caterpillar_generator.rb
@@ -100,6 +120,7 @@ files:
 - portlet_test_bench/helpers/caterpillar/application_helper.rb
 - portlet_test_bench/helpers/caterpillar/junit_helper.rb
 - portlet_test_bench/README.rdoc
+- portlet_test_bench/resources/jake_sully.jpg
 - portlet_test_bench/routing.rb
 - portlet_test_bench/views/caterpillar/application/_back_to_menu.html.erb
 - portlet_test_bench/views/caterpillar/application/index.html.erb
@@ -141,11 +162,25 @@ files:
 - portlet_test_bench/views/caterpillar/user/home.html.erb
 - portlet_test_bench/views/layouts/bare.html.erb
 - portlet_test_bench/views/layouts/basic.html.erb
+- test/dtd/liferay-display_5_1_0.dtd
+- test/dtd/liferay-display_5_2_0.dtd
+- test/dtd/liferay-display_6_0_0.dtd
+- test/dtd/liferay-portlet-app_5_1_0.dtd
+- test/dtd/liferay-portlet-app_5_2_0.dtd
+- test/dtd/liferay-portlet-app_6_0_0.dtd
+- test/dtd/portlet-app_2_0.xsd
+- test/liferay_helpers_test.rb
+- test/portlet_support_test.rb
+- test/portlets_test.rb
+- test/rails_task_test.rb
+- test/test_helper.rb
+- test/xml_test.rb
+- bin/caterpillar
 - README.rdoc
 - MIT-LICENSE
 - ChangeLog
 has_rdoc: true
-homepage: http://rails-portlet.rubyforge.org
+homepage: http://github.com/lamikae/caterpillar
 licenses: []
 
 post_install_message: 
@@ -157,27 +192,41 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails-portlet
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Caterpillar helps building Rails applications for JSR286 portlets.
 test_files: 
+- test/dtd/liferay-display_5_1_0.dtd
+- test/dtd/liferay-display_5_2_0.dtd
+- test/dtd/liferay-display_6_0_0.dtd
+- test/dtd/liferay-portlet-app_5_1_0.dtd
+- test/dtd/liferay-portlet-app_5_2_0.dtd
+- test/dtd/liferay-portlet-app_6_0_0.dtd
+- test/dtd/portlet-app_2_0.xsd
 - test/liferay_helpers_test.rb
+- test/portlet_support_test.rb
 - test/portlets_test.rb
+- test/rails_task_test.rb
+- test/test_helper.rb
 - test/xml_test.rb