spiderfw 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 0.6.1
+== 2 May, 2011
+* Bundler support
+* Bugfixes
+
 = 0.6.0
 == 20 April, 2011
 * Test support

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/apps/core/components/public/js/spider.js

@@ -83,6 +83,7 @@ Spider.Widget = Class.extend({
 	startup: function(){},
 	ready: function(){},
 	update: function(){},
+	afterReplace: function(){},
 	
 	replaceHTML: function(html){
 		var el = $(html);
@@ -92,7 +93,7 @@ Spider.Widget = Class.extend({
 		this.ready();
 		Spider.newHTML(this.el);
 		this.applyReady();
-		
+		this.afterReplace();
 	},
 	
 	replaceEl: function(el){
@@ -101,6 +102,7 @@ Spider.Widget = Class.extend({
 		this.update();
 		this.ready();
 		this.applyReady();
+		this.afterReplace();
 	},
 	
 	findWidgets: function(){

data/apps/core/forms/public/css/form.css

@@ -1,6 +1,7 @@
 .spider.forms.form .errors{
     margin: 0px 15px;
     padding: 10px;
+    border: 1px solid #D9766F;
 }
 
 .spider.forms.form .errors ul{
@@ -28,7 +29,10 @@
 }
 
 .spider.forms.form .row.error label{
-    padding-left: 4px;
+}
+
+.spider.forms.form .row.error input{
+    background-color: #FF9999;
 }
 
 .spider.forms.form .row{

data/apps/core/forms/widgets/form/form.rb

@@ -287,6 +287,11 @@ module Spider; module Forms
                 input.condition = el.condition if el.condition
             end
             @multipart = true if input.needs_multipart?
+            if errs = @errors[el.name]
+                while err = errs.pop
+                    input.add_error(err)
+                end
+            end
             return input
         end
         
@@ -406,7 +411,11 @@ module Spider; module Forms
         def add_error(message, element_name=nil, exception=nil)
             @error = true
             @errors[element_name] ||= []
-            @errors[element_name] << message
+            if @inputs[element_name]
+                @inputs[element_name].add_error(message) 
+            else
+                @errors[element_name] << message
+            end
         end
         
         def is_new?

data/apps/core/forms/widgets/form/form.shtml

@@ -1,6 +1,5 @@
 <div class="{ @widget[:css_class] }">
     <tpl:assets widgets="forms:datetime,forms:file,forms:select,forms:search-select,forms:textarea" />
-    
 	<tpl:asset type="css" src="css/form.css" />
 	<tpl:asset type="js" src="form.js" />
 	<div sp:if="@error" class='errors'>

data/apps/messenger/Gemfile

@@ -0,0 +1 @@
+gem "mail", "~> 2.3.0", :groups => [:messenger, :messenger_email, :email]

data/apps/messenger/_init.rb

@@ -21,8 +21,6 @@ require 'apps/messenger/messenger'
 require 'apps/messenger/controllers/messenger_controller'
 require 'apps/messenger/controllers/mixins/messenger_helper'
 
-# gem dependencies: mailfactory for sending email from templates
-
 available_backends = {}
 base = File.join(Spider::Messenger.path, 'backends')
 Dir.new(base).each do |type|

data/apps/messenger/backends/email/smtp.rb

@@ -7,6 +7,11 @@ module Spider; module Messenger; module Backends; module Email
         
         def self.send_message(msg)
             Spider.logger.debug("Sending e-mail #{msg.ticket}")
+            if msg.to.blank?
+                Spider.logger.error("Message has no recipient, can't send:")
+                Spider.logger.error(msg)
+                raise "E-mail with no recipient"                
+            end
             mail = prepare_mail(msg)
             mail.delivery_method :smtp, {
                 :address => Spider.conf.get('messenger.smtp.address'),

data/apps/messenger/messenger.rb

@@ -23,7 +23,7 @@ module Spider
         
         def self.process_queues
             self.queues.each_key do |queue|
-                self.process_queue(queue)
+                self.process_queue(queue) unless Spider.conf.get("messenger.#{queue}.backends").empty?
             end
         end
         
@@ -69,6 +69,19 @@ module Spider
                         else
                             backend_response = exc ? exc.to_s : res
                             msg.add_failure(backend_response)
+                            msg.attempts ||= 0
+                            msg.attempts += 1
+                            msg.last_try = now
+                            if (exc)
+                                msg.backend_response = exc.to_s
+                            else
+                                msg.backend_response = res
+                            end
+                            if (msg.attempts >= Spider.conf.get("messenger.#{queue}.retries"))
+                                msg.next_try = nil
+                            else
+                                msg.next_try = msg.last_try.to_local_time + (msg.attempts * Spider.conf.get("messenger.#{queue}.retry_time") * 60)
+                            end
                             msg.save
                         end
                             

data/apps/worker/worker.rb

@@ -79,9 +79,10 @@ module Spider
                             load @scripts_dir+'/'+script
                         end
                     end
-                    Spider::Worker.every("#{Spider.conf.get('worker.jobs_interval')}s") do
-                        Spider::Worker.run_jobs
-                    end
+                    # TODO: remove worker jobs completely, they are a bad idea
+                    #Spider::Worker.every("#{Spider.conf.get('worker.jobs_interval')}s") do
+                    #    Spider::Worker.run_jobs
+                    #end
                     Spider.apps.each do |name, mod|
                         if File.directory?(mod.path+'/config/worker')
                             Dir.glob(mod.path+'/config/worker/*.rb').each do |path|

data/blueprints/home/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+self.instance_eval(Bundler.read_file('spider.gemfile'), 'spider.gemfile', 1) if File.exist?('spider.gemfile')

data/blueprints/home/spider.gemfile

@@ -0,0 +1,30 @@
+source "http://rubygems.org"
+
+gem 'fssm', :group => :devel
+
+gem "mysql", :groups => [:db, :mysql]
+
+gem "json", :platforms => [:mri_18, :mri_19]
+gem "mongrel"
+gem "ripl", :platforms => [:ruby, :mingw]
+gem "ripl-irb", :platforms => [:ruby, :mingw]
+gem "ripl-multi_line", :platforms => [:ruby, :mingw]
+gem "cldr"
+gem "ruby-debug", :group => :devel, :platforms => [:mri_18]
+gem "ruby-debug19", :group => :devel, :platforms => [:mri_19], :require => 'ruby-debug'
+gem "ruby-prof", :group => :devel
+gem "rspec", :group => :test
+gem "cucumber", '~> 0.10.0', :group => :test
+gem "capybara", :group => :test
+gem "yui-compressor", :group => :production
+
+if RUBY_PLATFORM =~ /darwin/
+  gem "rb-fsevent", :group => :devel, :platforms => [:mri]
+end
+if RUBY_PLATFORM =~ /linux/
+  gem "rb-inotify", :group => :devel, :platforms => [:mri]
+end
+
+Dir.glob("apps/*/Gemfile") do |f|
+  self.instance_eval(Bundler.read_file(f), f, 1)
+end

data/lib/spiderfw/model/mappers/db_mapper.rb

@@ -891,7 +891,7 @@ module Spider; module Model; module Mappers
                                 set.each do |set_obj|
                                     sub_task = MapperTask.new(set_obj, :save)
                                     set_obj.set_modified(element.reverse) if element.reverse
-                                    if set_obj.class.attributes[:junction] && delete_ass
+                                    if set_obj.class.attributes[:sub_model] && delete_ass
                                         set_obj.class.primary_keys.each{ |pk| set_obj.set(pk, nil) }
                                     end
                                     if prev_task

data/lib/spiderfw/model/mixins/versioned.rb

@@ -295,14 +295,16 @@ module Spider; module Model
                 vobj.set(:version_date, DateTime.now)
                 # vobj.set(:version_comment, comment)
                 object.mapper.do_update(object)
+                dup = false
                 begin
                     vobj.mapper.insert(vobj)
                     #vobj.insert
                 rescue Spider::Model::Storage::DuplicateKey
+                    dup = true
                     Spider.logger.error("Duplicate version for #{self}")
                 end
                 object.autoload(true)
-                object.trigger(:version_saved)
+                object.trigger(:version_saved) unless dup
             end
             
             def save_junction_version(object)
@@ -556,4 +558,4 @@ module Spider; module Model
         end
     end
     
-end; end
+end; end

data/lib/spiderfw/setup/app_manager.rb

@@ -7,6 +7,7 @@ module Spider
 
         def self.install(specs, home_path, options)
             options[:use_git] = true unless options[:use_git] == false
+            options[:home_path] = home_path
             specs = [specs] unless specs.is_a?(Array)
             pre_setup(specs, options)
             specs.each do |spec|
@@ -16,6 +17,7 @@ module Spider
                     pack_install(spec, home_path, options)
                 end
             end
+            post_setup(specs, options)
         end
 
         def self.git_install(spec, home_path, options={})
@@ -67,23 +69,19 @@ module Spider
             require 'rubygems/command.rb'
             require 'rubygems/dependency_installer.rb'
             unless options[:no_gems]
-                gems = specs.map{ |s| s.gems }
-                # unless options[:no_optional_gems]
-                #     gems += specs.map{ |s| s.gems_optional }
-                # end
-                gems = gems.flatten.uniq
-                gems.reject!{ |g| Gem.available?(g) }
-                unless gems.empty?
-                    puts _("Installing the following needed gems:")
-                    puts gems.inspect
+                unless Gem.available?('bundler')
+                    puts _("Installing bundler gem")
                     inst = Gem::DependencyInstaller.new
-                    gems.each do |g|
-                        inst.install g
-                    end
+                    inst.install 'bundler'
                 end
             end
         end
         
+        def self.post_setup(specs, options={})
+            require 'bundler'
+            Bundler::Installer.install(options[:home_path], Bundler.definitions, {})
+        end
+        
         def self.update(specs, home_path, options)
             options[:use_git] = true unless options[:use_git] == false
             specs = [specs] unless specs.is_a?(Array)

data/lib/spiderfw/spider.rb

@@ -4,7 +4,6 @@ require 'rubygems'
 require 'find'
 require 'fileutils'
 require 'pathname'
-require 'bundler/setup'
 require 'spiderfw/autoload'
 require 'spiderfw/requires'
 
@@ -67,6 +66,9 @@ module Spider
                 $SPIDER_CONFIG_SETS.each{ |set| @configuration.include_set(set) }
             end
             init_file = File.join($SPIDER_RUN_PATH, 'init.rb')
+            ENV['BUNDLE_GEMFILE'] ||= File.join($SPIDER_RUN_PATH, 'Gemfile')
+            require 'bundler/setup' if File.exists? ENV['BUNDLE_GEMFILE']
+            
             if File.exist?(init_file)
                 @home.instance_eval(File.read(init_file), init_file)
             end
@@ -609,9 +611,8 @@ module Spider
             if Spider.conf.get('debugger.start') || File.exists?(File.join($SPIDER_RUN_PATH,'tmp', 'debug.txt'))
                 init_debug
             end
-            if (mode != 'production')
-                Spider.paths[:var] = File.join(Spider.paths[:var], mode)
-            end
+            Spider.paths[:var] = File.join(Spider.paths[:var], mode) if mode != 'production'
+            Bundler.require(:default, @runmode.to_sym) if defined?(Bundler)
         end
         
         def init_debug

data/lib/spiderfw/templates/layout.rb

@@ -214,7 +214,7 @@ module Spider
             dest = "#{pub_dest}/#{compiled_name}"
             File.cp(tmp_combined, combined)
             File.unlink(tmp_combined)
-            compressor = YUI::JavaScriptCompressor.new("charset" => "UTF-8")
+            compressor = ::YUI::JavaScriptCompressor.new("charset" => "UTF-8")
             io = open(combined, 'r')
             cjs = compressor.compress(io)
             open(dest, 'w') do |f|
@@ -225,6 +225,7 @@ module Spider
         end
         
         def compress_css(cpr)
+            require 'yui/compressor'
             
             pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
             name = cpr[:name]
@@ -319,7 +320,7 @@ module Spider
             dest = "#{pub_dest}/#{compiled_name}"
             File.cp(tmp_combined, combined)
             File.unlink(tmp_combined)
-            compressor = YUI::CssCompressor.new("charset" => "UTF-8")
+            compressor = ::YUI::CssCompressor.new("charset" => "UTF-8")
             io = open(combined, 'r')
             cjs = compressor.compress(io)
             open(dest, 'w') do |f|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +02:00
+date: 2011-05-02 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -872,6 +872,7 @@ files:
 - apps/messenger/controllers/messenger_controller.rb
 - apps/messenger/controllers/mixins/messenger_helper.rb
 - apps/messenger/data/locale/it/LC_MESSAGES/spider_messenger.mo
+- apps/messenger/Gemfile
 - apps/messenger/lib/email_backend.rb
 - apps/messenger/lib/sms_backend.rb
 - apps/messenger/messenger.rb
@@ -940,7 +941,9 @@ files:
 - blueprints/app/views/__APP__.layout.shtml
 - blueprints/app/views/index.shtml
 - blueprints/home/config/config.yml
+- blueprints/home/Gemfile
 - blueprints/home/init.rb
+- blueprints/home/spider.gemfile
 - blueprints/install/config.ru
 - data/locale/it/LC_MESSAGES/spider.mo
 - data/locale/it/LC_MESSAGES/spider_auth.mo