trinidad_sandbox_extension 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.2 (2010-12-21)
+
+* Fix application name when the context path is an empty string
+
 == 0.4.1 (2010-11-05)
 
 * Add redeploy button

data/Rakefile

@@ -81,14 +81,11 @@ end
 
 task :default => :spec
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_opts = ['--options', 'spec/spec.opts']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['--colour', "--format documentation"]
+end
 
 #############################################################################
 #

data/lib/trinidad_sandbox_extension.rb

@@ -6,7 +6,7 @@ require File.expand_path('../../trinidad-libs/trinidad-sandbox-extension', __FIL
 module Trinidad
   module Extensions
     class SandboxServerExtension < ServerExtension
-      VERSION = '0.4.1'
+      VERSION = '0.4.2'
 
       def configure(tomcat)
         opts = prepare_options

data/lib/trinidad_sandbox_extension/app/model/application_context.rb

@@ -16,8 +16,11 @@ module Trinidad
       end
 
       def self.find(name)
-        name = '/' + name unless name[0..1] == '/'
-        path = CGI.unescape(name)
+        escaped_name = ''
+        unless name == 'default'
+          escaped_name = '/' + name unless name[0..1] == '/'
+        end
+        path = CGI.unescape(escaped_name)
         context = host.findChild(path)
         ApplicationContext.new(context) if context
       end
@@ -30,6 +33,14 @@ module Trinidad
         @slug ||= CGI.escape(name.sub('/', ''))
       end
 
+      def name
+        @name ||= super.empty? ? 'default' : super
+      end
+
+      def path
+        @path ||= super.empty? ? '/' : super
+      end
+
       def self_path
         @self_path ||= "#{ApplicationContext.sandbox_context.path}/apps/#{slug}"
       end

data/lib/trinidad_sandbox_extension/app/views/app.xml.haml

@@ -1,6 +1,8 @@
 %application
   %name= app.name
+  %path= app.path
   %available= app.available
+  %link(rel = "edit" href = "#{app.self_path}.xml")
   - app.actions.each do |action|
     %link(rel = "#{action[:rel]}" href = "#{action[:href]}.xml")
   - if app.parameters

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems'
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
@@ -12,6 +12,6 @@ require 'java'
 require 'trinidad_sandbox_extension'
 require 'mocha'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end

data/trinidad_sandbox_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_sandbox_extension'
-  s.version           = '0.4.1'
-  s.date              = '2010-11-05'
+  s.version           = '0.4.2'
+  s.date              = '2010-12-21'
   s.rubyforge_project = 'trinidad_sandbox_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', '>=2.2')
   s.add_development_dependency('mocha')
 
   ## Leave this section as-is. It will be automatically generated from the

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 4
-    - 1
-  version: 0.4.1
+    - 2
+  version: 0.4.2
 platform: ruby
 authors: 
   - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -07:00
+date: 2010-12-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -99,8 +99,9 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             segments: 
-              - 0
-            version: "0"
+              - 2
+              - 2
+            version: "2.2"
     type: :development
     version_requirements: *id007
   - !ruby/object:Gem::Dependency