chef-server-webui 0.8.10 → 0.8.14

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "chef-server-webui"
-CHEF_SERVER_VERSION="0.8.10"
+CHEF_SERVER_VERSION="0.8.14"
 AUTHOR = "Opscode"
 EMAIL = "chef@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
@@ -29,13 +29,11 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "merb-helpers", "~> 1.0.0"
   s.add_dependency "merb-haml", "~> 1.0.0"
   s.add_dependency "merb-param-protection", "~> 1.0.0"
-  
-  ["thin",
-   "haml",
-   "json",
-   "ruby-openid",
-   "coderay"].each { |g| s.add_dependency g}
-  
+
+  s.add_dependency "json", "<= 1.4.2"
+
+  %w{thin haml ruby-openid coderay}.each { |g| s.add_dependency g}
+
   s.require_path = 'lib'
   s.files = %w(LICENSE README.rdoc Rakefile config.ru) + Dir.glob("{bin,config,lib,spec,app,public,stubs}/**/*")
 end

data/app/helpers/application_helper.rb

@@ -112,19 +112,9 @@ module Merb
         count
       end
       
-      def syntax_highlight(code)
-        tokens = File.exists?(code) ? CodeRay.scan_file(code, :ruby) : CodeRay.scan(code, :ruby)
-        CodeRay.encode_tokens(tokens, :span)
-      end
-      
-      def get_file(uri)
-        r = Chef::REST.new(Chef::Config[:chef_server_url])
-        content = r.get_rest(uri)
-        a = Tempfile.new("cookbook_temp_file")
-        File.open(a.path, 'w'){|f| f.write(content)}
-        path = a.path
-        a.close
-        path
+      def syntax_hightlight(uri)
+        code = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest(uri)
+        CodeRay.encode_tokens(CodeRay.scan(code, :ruby), :span)
       end
       
       def str_to_bool(str)

data/app/views/cookbooks/show.html.haml

@@ -4,37 +4,37 @@
     .inner
       .accordion
         - unless @cookbook["libraries"].empty?
-          %h2.head= link_to "Library Files", "#"
+          %h2.head= link_to "Library Files", "JavaScript:void(0);"
           .files
             - @cookbook["libraries"].each do |f|
               .code
-                %h4.head= link_to File.basename(f["name"]), "#"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))      
+                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
+                %pre.ruby= syntax_highlight(f["uri"])
         - unless @cookbook["attributes"].empty?
-          %h2.head= link_to "Attribute Files", "#"
+          %h2.head= link_to "Attribute Files", "JavaScript:void(0);"
           .files
             - @cookbook["attributes"].each do |f|
               .code
-                %h4.head= link_to File.basename(f["name"]), "#"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))  
+                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
+                %pre.ruby= syntax_highlight(f["uri"])
         - unless @cookbook["definitions"].empty?
-          %h2.head= link_to "Definition Files", "#"
+          %h2.head= link_to "Definition Files", "JavaScript:void(0);"
           .files
             - @cookbook["definitions"].each do |f|
               .code
-                %h4.head= link_to File.basename(f["name"]), "#"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
+                %pre.ruby= syntax_highlight(f["uri"])
         - unless @cookbook["recipes"].empty?
-          %h2.head= link_to "Recipe Files", "#"
+          %h2.head= link_to "Recipe Files", "JavaScript:void(0);"
           .files
             - @cookbook["recipes"].each do |f|
               .code
-                %h4.head= link_to File.basename(f["name"]), "#"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
+                %pre.ruby= syntax_highlight(f["uri"])
         - unless @cookbook["templates"].empty?
-          %h2.head= link_to "Template Files", "#"
+          %h2.head= link_to "Template Files", "JavaScript:void(0);"
           .files
             - @cookbook["templates"].each do |f|
               .code
-                %h4.head= link_to File.basename(f["name"]), "#"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
+                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
+                %pre.ruby= syntax_highlight(f["uri"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 10
-  version: 0.8.10
+  - 14
+  version: 0.8.14
 platform: ruby
 authors: 
 - Opscode
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: merb-slices
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: merb-assets
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: merb-helpers
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -77,6 +81,7 @@ dependencies:
   name: merb-haml
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -91,6 +96,7 @@ dependencies:
   name: merb-param-protection
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -102,21 +108,25 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: json
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: thin
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -126,9 +136,10 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: haml
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -141,6 +152,7 @@ dependencies:
   name: ruby-openid
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -153,6 +165,7 @@ dependencies:
   name: coderay
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -387,6 +400,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -394,6 +408,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -403,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.6.1
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.