spiderfw 0.6.23 → 0.6.24

data/lib/spiderfw/templates/layout.rb

@@ -111,7 +111,7 @@ module Spider
                 'css.compress'
             end
             no_compress = @scene.__is_error_page || !Spider.conf.get(compress_config) || \
-                            ass[:runtime] || ass[:if_ie_lte] || ass[:media] || (use_cdn && ass[:cdn])
+                            ass[:no_compress] || ass[:runtime] || ass[:if_ie_lte] || ass[:media] || (use_cdn && ass[:cdn])
             
             if no_compress
                 if ass[:runtime]
@@ -351,8 +351,13 @@ module Spider
                     src_dir = File.dirname(path)
                     app = a[:app]
                     if app
-                        app_relative_path = a[:app].relative_path
-                        app_path = app.path
+                        if app.is_a?(Spider::Home)
+                            app_relative_path = nil
+                            app_path = app.path
+                        else
+                            app_relative_path = a[:app].relative_path
+                            app_path = app.path
+                        end
                     elsif path.index(Spider::SpiderController.pub_path) == 0
                         app_relative_path = 'spider'
                         app_path = Spider::SpiderController.pub_path
@@ -386,7 +391,7 @@ module Spider
                         
                         FileUtils.mkdir_p(File.dirname(url_dest))
                         cachebuster = Spider.conf.get('css.cachebuster')
-                        new_url = "#{app_relative_path}/#{src_rel}"
+                        new_url = app_relative_path ? "#{app_relative_path}/#{src_rel}" : src_rel
                         if File.exist?(url_src)
                             mtime = File.mtime(url_src).to_i
                             if cachebuster && File.exist?(url_dest) && mtime > File.mtime(url_dest).to_i

data/lib/spiderfw/templates/resources/sass.rb

@@ -6,7 +6,7 @@ module Sass::Plugin::Configuration
     @default_options ||= {
       :css_location       => './public/stylesheets',
       :always_update      => false,
-      :always_check       => true,
+      :always_check       => false,
       :full_exception     => true,
       :cache_location     => File.join(Spider.paths[:tmp], 'sass', '.sass_cache')
       }.freeze
@@ -62,7 +62,8 @@ module Spider
                 config = Compass::Configuration::Data.new(:spider, options)
                 Compass.add_project_configuration(config)
                 compiler = Compass::Compiler.new(work_dir, File.dirname(src), File.dirname(dest), options)
-                compiler.compile(src, dest)
+                
+                compiler.compile(src, dest) if compiler.out_of_date?
             else
                 engine = Sass::Engine.for_file(src, {})
                 output = engine.render

data/lib/spiderfw/templates/template.rb

@@ -452,6 +452,7 @@ module Spider
                     ass[:compressed] = base_url+cpr
                 end
             end
+            ass[:no_compress] = attributes[:"no-compress"]
             ass[:copy_dir] = attributes[:copy_dir]
             ass[:copy_dir] = ass[:copy_dir] =~ /\d+/ ? ass[:copy_dir].to_i : true
             [:gettext, :media, :if_ie_lte, :cdn].each do |key|

data/lib/spiderfw/utils/annotations.rb

@@ -50,6 +50,7 @@ module Annotations
                             kl.define_annotation(name, &proc)
                         end
                     end
+                    @annotations ||= {}
                     @annotations.each do |method, vals|
                         vals.each do |k, args|
                             args = [args] unless args.is_a?(Array)
@@ -63,7 +64,8 @@ module Annotations
         super
     end
 
-    class Annotator #:nodoc:
+    # @private
+    class Annotator
 
         def initialize(owner) 
             @owner = owner

data/lib/spiderfw/utils/logger.rb

@@ -224,7 +224,7 @@ module Spider
             end
         end
         
-        class LogDevice < Logger::LogDevice
+        class LogDevice < ::Logger::LogDevice
             
             def shift_log_period(now)
                 super

data/lib/spiderfw/utils/monkey/symbol.rb

@@ -1,7 +1,9 @@
 # Symbol monkey patch.
 
 class Symbol
-    def to_proc
-        proc { |obj, *args| obj.send(self, *args) }
+    unless self.method_defined?(:to_proc)
+        def to_proc
+            proc { |obj, *args| obj.send(self, *args) }
+        end
     end
 end

data/lib/spiderfw/utils/shared_store/file_shared_store.rb

@@ -25,7 +25,7 @@ module Spider; module Utils
             path = map_path(key)
             if (File.exist?(path))
                 @sync.lock(Sync::SH)
-                f = File.new(path, 'r')
+                f = File.new(path, 'rb')
                 f.flock(File::LOCK_SH)
                 data = Marshal.restore(f.read)
                 f.flock(File::LOCK_UN)
@@ -38,7 +38,7 @@ module Spider; module Utils
         def []=(key, value)
             path = map_path(key)
             @sync.lock(Sync::EX)
-            f = File.new(path, 'w')
+            f = File.new(path, 'wb')
             f.flock(File::LOCK_EX)
             f.puts(Marshal.dump(value))
             f.flush

data/lib/spiderfw/utils/thread_out.rb

@@ -22,13 +22,15 @@ module ThreadOut #:nodoc:
   end
   
   def self.output_to(io)
+      prev_out = Thread.current[:stdout]
       if block_given?
-          prev_out = Thread.current[:stdout]
           Thread.current[:stdout] = io
           yield
           Thread.current[:stdout] = prev_out
+          io.rewind
       else
           Thread.current[:stdout] = io
+          return prev_out
       end
   end
   

data/public/css/error_page.css

@@ -0,0 +1,83 @@
+/* @override http://localhost:8989/spider/public/css/error_page.css */
+
+body{
+	background-color: white;
+	padding-left: 15px;
+	padding-right: 15px;
+	font-family:"Lucida Grande","Bitstream Vera Sans",Helvetica,Verdana,Arial,sans-serif;
+}
+
+#header{
+	background-color: #b2b3a7;
+}
+
+h3.error_message{
+	font-size: 1.5em;
+}
+
+.error_description{
+}
+
+#footer{
+	margin-top: 25px;
+	background-color: #e6e6e6;
+	padding: 8px;
+	font-size: 0.8em;
+}
+
+#bottom_break{
+	margin-top: 20px;
+	border-top: 1px solid #cecece;
+	border-bottom: 0;
+}
+
+#debug{
+	margin-top: 20px;
+}
+
+#debug h4{
+	background-color: #fccc83;
+	padding: 3px;
+}
+
+#debug div{
+	margin-bottom: 10px;
+}
+
+#exception_message{
+	border: 1px solid #cacaca;
+	padding: 3px;
+	background-color: #f9f9dc;
+}
+
+
+#exception_backtrace ul{
+	padding-top: 15px;
+	padding-bottom: 15px;
+	padding-left: 45px;
+	border: 1px solid #cacaca;
+	font-size: .9em;
+	background-color: #f9f9dc;
+}
+
+#exception_backtrace li{
+	margin-bottom: 2px;
+}
+
+#exception_backtrace ul a{
+	color: #3b2122;
+}
+
+.var-name{
+	cursor: pointer;
+	text-decoration: underline;
+	color: #0f007f;
+}
+
+.var-value{
+	display: none;
+	background-color: #e3e3e3;
+	border: 1px solid #cecece;
+	padding: 4px;
+	margin-right: 25px;
+}

data/public/js/error_page.js

@@ -0,0 +1,5 @@
+$(document).ready(function(){
+	$('.local-name, .iv-name').click(function(){
+		$('pre', $(this).parent()).toggle();
+	});
+});

data/spider.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |s|
       + Dir.glob('blueprints/**/*', File::FNM_DOTMATCH) \
       + Dir.glob('data/**/*') \
       + Dir.glob('lib/**/*.rb') \
-      + Dir.glob('views/**/*')
+      + Dir.glob('views/**/*') \
+      + Dir.glob('public/**/*') \
+      + Dir.glob('templates/**/*')
 #  s.test_files = []
 #  s.rdoc_options = ["--main", "README.rdoc"]
 #  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc"]
@@ -40,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_dependency("bundler")
   s.add_dependency("mail")
   s.add_dependency("backports")
+  s.add_dependency("rack")
   s.add_development_dependency("rake", ["> 0.7.3"])
   s.add_development_dependency("gettext", ['>= 2.1.0'])
   s.add_development_dependency("fssm")

data/templates/email/error.erb

@@ -0,0 +1,9 @@
+Request: <%= request.inspect %>
+
+Error: <%= exception.message %>
+
+Backtrace:
+<% exception.backtrace.each do |bt| %>
+<%= bt %>
+<% end %>
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 6
-  - 23
-  version: 0.6.23
+  - 24
+  version: 0.6.24
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-06 00:00:00 +01:00
+date: 2012-02-24 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -214,9 +214,23 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rack
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -228,11 +242,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: gettext
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -244,11 +258,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: fssm
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -258,7 +272,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 description: Spider is yet another Ruby framework.
 email: abmajor7@gmail.com
 executables: 
@@ -301,8 +315,6 @@ files:
 - apps/config_editor/views/index.shtml
 - apps/config_editor/widgets/edit/edit.rb
 - apps/config_editor/widgets/edit/edit.shtml
-- apps/config_editor/widgets/edit_bool/edit_bool.rb
-- apps/config_editor/widgets/edit_bool/edit_bool.shtml
 - apps/core/admin/_init.rb
 - apps/core/admin/admin.rb
 - apps/core/admin/controllers/admin_controller.rb
@@ -1151,6 +1163,7 @@ files:
 - blueprints/home/.gitignore
 - blueprints/home/apps/.gitignore
 - blueprints/home/config/config.yml
+- blueprints/home/config.ru
 - blueprints/home/Gemfile
 - blueprints/home/init.rb
 - blueprints/home/public/.gitignore
@@ -1399,6 +1412,9 @@ files:
 - views/errors/simple.layout.shtml
 - views/generic.layout.shtml
 - views/maintenance.shtml
+- public/css/error_page.css
+- public/js/error_page.js
+- templates/email/error.erb
 has_rdoc: true
 homepage: http://github.com/me/spider
 licenses: []

data/apps/config_editor/widgets/edit_bool/edit_bool.rb

@@ -1,8 +0,0 @@
-module Spider; module ConfigEditor
-
-	class EditBool < Edit
-
-
-	end
-
-end; end

data/apps/config_editor/widgets/edit_bool/edit_bool.shtml

@@ -1,5 +0,0 @@
-<div>
-    <label>{ @name }</label>
-    _(Yes) <input type="radio" name="options[{ @name }]" value="1">
-    _(No) <input type="radio" name="options[{ @name }]" value="0">
-</div>