spiderfw 0.6.20 → 0.6.21

data/CHANGELOG

@@ -1,3 +1,16 @@
+= 0.6.21
+== 03 November, 2011
+* require 'spidefw' no longer runs Spider.init(); use require 'spiderfw/init' instead
+* Support for home Gettext translations
+* Fixed stupid memory leak
+* Avoid some useless queries and joins in DbMapper
+* Enabled home Gemfile
+* Ruby 1.9.3 support
+* Updated test for new Capybara
+* Fixed unescaped text in views variables
+* Added BaseModel#own_elements method to list non-integrated elements
+* Changed Controller before and after calling to avoid problems in subclassed controllers
+
 = 0.6.20
 == 05 October, 2011
 * Added support for aggregate functions in DB conditions

data/README.rdoc

@@ -6,6 +6,7 @@ Its main features are:
 
 * A model layer that is easy to use, yet flexible enough to adapt to legacy schemas. 
   Models are defined in Ruby: schemas are autogenerated, but can be specified manually when needed.
+  Direct sql is almost never used, but you can embed custom sql behaviour per model for each storage.
   
   Deep loading and deep querying are supported, through a simple pure-Ruby query language: 
     
@@ -20,7 +21,8 @@ Its main features are:
 
 * A view layer based on HTML, with reusable widgets that are easy to extend in both their controller and their view.
 
-  Templates are mostly valid HTML, but implement variable substitution, widget instantiation, conditional and iteration logic.
+  Templates are mostly HTML, but implement variable substitution, widget instantiation, conditional and iteration logic.
+  They are valid XML, though the namespace is implied.
 
     <div id="my-view">
         <h1>Hello, { @my_name }</h1>
@@ -98,7 +100,11 @@ In addition, Spider provides:
 
 * Full internazionalization using gettext and CLDR, even for Javascript files.
 
-You can dive in by running
+To install:
+
+  $ gem install spiderfw
+
+Dive in by running
 
   $ spider create home test
   $ cd test

data/Rakefile

@@ -9,7 +9,7 @@ def check_app_path(full, partial)
     return true if rel.to_s == partial
     if Spider.paths[:apps]
         rel = p.relative_path_from(Pathname.new(Spider.paths[:apps]))
-        return true if rel.to_s == partial
+        return true if rel.to_s == partial || (partial == 'home' && !rel.to_s.blank?)
     end
     return false
 end
@@ -20,21 +20,42 @@ task :updatepo, [:app] do |t, args|
     require 'spiderfw/i18n/shtml_parser'
     require 'spiderfw/i18n/javascript_parser'
     require 'gettext/tools'
-    GetText.update_pofiles("spider", Dir.glob("{lib,bin,views,public}/**/*.{rb,rhtml,shtml,js}"), "Spider #{Spider::VERSION}") if !args[:app] || args[:app] == 'spider'
-    apps = Spider.find_all_apps
-    apps.each do |path|
-        next if args[:app] && !check_app_path(path, args[:app])
-        require path+'/_init.rb' if File.directory?(path+'/po')
-    end
-    Spider.apps.each do |name, mod|
-        next unless File.directory?(mod.path+'/po')
-        next if args[:app] && !check_app_path(mod.path, args[:app])
-        Dir.chdir(mod.path)
-        mod.gettext_parsers.each do |p|
-            require p
+
+    if !args[:app] || args[:app] == 'spider'
+        Dir.chdir($SPIDER_PATH)
+        GetText.update_pofiles("spider", Dir.glob("{lib,bin,views,public}/**/*.{rb,rhtml,shtml,js}"), "Spider #{Spider::VERSION}")
+    else
+        if args[:app] == 'home'
+            Spider.init
+        else
+            Spider.init
+            apps = Spider.find_all_apps
+            apps.each do |path|
+                next if args[:app] && !check_app_path(path, args[:app])
+                require path+'/_init.rb' if File.directory?(path+'/po')
+            end
+        end
+        Spider.apps.each do |name, mod|
+            if args[:app] == 'home'
+                next unless File.directory?(File.join(Spider.paths[:apps], mod.relative_path))
+                rel_path = File.join(Spider.paths[:root], 'views', mod.relative_path)
+                next unless File.directory?(rel_path)
+                mod.gettext_parsers.each do |p|
+                    require p
+                end
+                files = Dir.glob(File.join(rel_path, '**', '*{.shtml}'))
+                GetText.update_pofiles(mod.short_name, files, File.join(Spider.paths[:root], 'po', mod.relative_path))
+            else
+                next unless File.directory?(mod.path+'/po')
+                next if args[:app] && !check_app_path(mod.path, args[:app])
+                Dir.chdir(mod.path)
+                mod.gettext_parsers.each do |p|
+                    require p
+                end
+                GetText.update_pofiles(mod.short_name, Dir.glob("{#{mod.gettext_dirs.join(',')}}/**/*.{#{mod.gettext_extensions.join(',')}}"), "#{mod.name} #{mod.version}")
+                print "\n"
+            end
         end
-        GetText.update_pofiles(mod.short_name, Dir.glob("{#{mod.gettext_dirs.join(',')}}/**/*.{#{mod.gettext_extensions.join(',')}}"), "#{mod.name} #{mod.version}")
-        print "\n"
     end
 
 end
@@ -42,21 +63,25 @@ end
 desc "Create mo-files. To create for a single app, call rake makemo[app_relative_path], where app_relative_path is the path relative to the apps folder (or 'spider')."
 task :makemo, [:app] do |t, args|
     require 'gettext/tools'
-    GetText.create_mofiles(:verbose => true) if !args[:app] || args[:app] == 'spider'
-    require 'spiderfw/spider'
-    apps = Spider.find_all_apps
-    apps.each do |path|
-        next if args[:app] && !check_app_path(path, args[:app])
-        if File.directory?(path+'/po')
-            Dir.chdir(path)
-            GetText.create_mofiles(:verbose => true, :po_root => './po', :mo_root => "#{path}/data/locale")
+    if !args[:app] || args[:app] == 'spider' || args[:app] == 'home'
+        GetText.create_mofiles(:verbose => true) 
+    else
+        require 'spiderfw/spider'
+        Spider.setup_paths(Dir.pwd)
+        apps = Spider.find_all_apps
+        apps.each do |path|
+            next if args[:app] && !check_app_path(path, args[:app])
+            if File.directory?(path+'/po')
+                Dir.chdir(path)
+                GetText.create_mofiles(:verbose => true, :po_root => './po', :mo_root => "#{path}/data/locale")
+            end
         end
     end
 end
 
 task :test do
     Dir.chdir("test")
-    require 'spiderfw'
+    require 'spiderfw/init'
     require 'test/unit/collector/dir'
     require 'test/unit'
     

data/VERSION

@@ -1 +1 @@
-0.6.20
+0.6.21

data/apps/app_server/controllers/app_server_controller.rb

@@ -12,7 +12,6 @@ module Spider; module AppServer
             @scene.apps = AppServer.apps
         end
 
-        __.text
         def list_json(names=nil)
             if names
                 apps = names.split('+')
@@ -24,12 +23,13 @@ module Spider; module AppServer
 
         __.action
         def pack(name=nil)
+            branch = @request.params['branch'] || 'master'
             app = AppServer.apps_by_id[name]
             raise NotFound.new("App #{name}") unless app
             tmp = Tempfile.new("spider-app-archive")
             if app.is_a?(GitApp)
                 repo = app.repo
-                repo.archive_to_file('master', nil, tmp.path, nil, 'cat') 
+                repo.archive_to_file(branch, nil, tmp.path, nil, 'cat') 
             else
                 # TODO
             end
@@ -39,6 +39,7 @@ module Spider; module AppServer
         
         __.json
         def deps(names)
+            AppServer.apps
             names = names.split('+')
             new_apps = names
             specs = {}

data/apps/app_server/lib/git_app.rb

@@ -4,15 +4,24 @@ module Spider; module AppServer
     
     class GitApp < App
         attr_reader :repo
+        attr_reader :branches
         
         def initialize(path)
             super
             repo = Grit::Repo.new(path)
             spec = nil
-            repo.tree.blobs.each do |blob|
+            repo_branches = repo.heads.map{ |h| h.name }
+            @branches = repo_branches
+            read_spec
+            @repo = repo
+        end
+
+        def read_spec(branch='master')
+            @repo.tree(branch).blobs.each do |blob|
                 next unless blob.basename =~ /\.appspec$/
                 spec = blob.data
                 @spec = Spider::App::AppSpec.eval(spec)
+                @spec.branch = branch
                 if repo_base = Spider.conf.get('app_server.git_repo_base')
                     unless @spec.git_repo
                         @spec.git_repo(repo_base+'/'+@spec.id)
@@ -26,7 +35,7 @@ module Spider; module AppServer
                 @last_modified = repo.commits.first.authored_date # FIXME
                 break
             end
-            @repo = repo
+            @spec
         end
         
         def package

data/apps/config_editor/_init.rb

@@ -11,4 +11,5 @@ Spider::Template.register_namespace('config_editor', Spider::ConfigEditor)
 
 
 require 'apps/config_editor/controllers/config_editor_controller'
-require 'apps/config_editor/widgets/edit/edit'
+require 'apps/config_editor/widgets/edit/edit'
+require 'apps/config_editor/widgets/edit_bool/edit_bool'

data/apps/config_editor/controllers/config_editor_controller.rb

@@ -75,7 +75,13 @@ module Spider; module ConfigEditor
         end
         
         def create_edit_widget(key, option)
-            w = Edit.new(@request, @response, @scene)
+            wclass = case option[:params][:type].name
+            when 'Spider::Bool', 'Spider::DataTypes::Bool'
+                EditBool
+            else
+                Edit
+            end
+            w = wclass.new(@request, @response, @scene)
             w.attributes[:name] = key
             w.attributes[:option] = option
             w.widget_init

data/apps/drb_server/script/start_server.rb

@@ -1,4 +1,4 @@
-require 'spiderfw'
+require 'spiderfw/init'
 require 'apps/drb_server/lib/model_server'
 
 unless ARGV.length == 2

data/apps/servant/bin/spider-servant.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'spiderfw'
+require 'spiderfw/init'
 require 'cmdparse'
 require $SPIDER_PATH+'/apps/servant/lib/servant.rb'
 require 'ruby-debug'

data/blueprints/home/{spider.gemfile → Gemfile}

@@ -1,11 +1,23 @@
 source "http://rubygems.org"
 
-gem 'fssm', :group => :devel
+# Place your gems here
 
-gem "mysql", :groups => [:db, :mysql]
+
+# Spider
+
+gem "spiderfw" #, :path => ''
+
+
+# Database gems
+
+# gem "mysql", :group => :mysql
+# gem "ruby-oci8", :group => :oci8
+
+# Optional gems
 
 gem "json", :platforms => [:mri_18, :mri_19]
-gem "mongrel"
+gem "mongrel", :platforms => [:ruby_18, :mingw_18]
+# gem "mongrel", ">= 1.2.0.pre2" # replace previous line with this for Mongrel on 1.9
 gem "ripl", :platforms => [:ruby, :mingw]
 gem "ripl-irb", :platforms => [:ruby, :mingw]
 gem "ripl-multi_line", :platforms => [:ruby, :mingw]
@@ -17,6 +29,7 @@ gem "rspec", :group => :test
 gem "cucumber", '~> 0.10.0', :group => :test
 gem "capybara", :group => :test
 gem "yui-compressor", :group => :production
+gem "fssm", :group => :devel
 
 if RUBY_PLATFORM =~ /darwin/
   gem "rb-fsevent", :group => :devel, :platforms => [:mri]
@@ -25,6 +38,8 @@ if RUBY_PLATFORM =~ /linux/
   gem "rb-inotify", :group => :devel, :platforms => [:mri]
 end
 
+# Include app Gemfiles
+
 Dir.glob("apps/*/Gemfile") do |f|
   self.instance_eval(Bundler.read_file(f), f, 1)
 end

data/blueprints/install/config.ru

@@ -1,4 +1,4 @@
-require 'spiderfw'
+require 'spiderfw/init'
 require 'spiderfw/http/adapters/rack'
 PhusionPassenger.on_event(:starting_worker_process) do
     Spider.start_loggers

data/lib/spiderfw/app.rb

@@ -247,6 +247,9 @@ module Spider
                 end
                 alias :#{name}= :#{name}
 END_OF_EVAL
+                if options[:default].is_a?(TrueClass) || options[:default].is_a?(FalseClass)
+                    str += "\nalias :#{name}? :#{name}\n"
+                end
                 class_eval(str)
             end
             
@@ -276,6 +279,9 @@ END_OF_EVAL
             array_attribute :gems_optional
             attribute :version
             attribute :app_server
+            attribute :auto_update, :default => true
+
+            attr_accessor :branch
             
             def id(val=nil)
                 self.app_id(val)
@@ -315,6 +321,7 @@ END_OF_EVAL
                 @@attributes.each do |a|
                     h[a] = send(a)
                 end
+                h[:branch] = @branch unless @branch.blank?
                 h
             end
             

data/lib/spiderfw/cmd/cmd.rb

@@ -70,7 +70,7 @@ module Spider; module CommandLine
             cmd_name ||= 'help'
             if !@cmd.main_command.commands[cmd_name]
                 $SPIDER_CMD = true
-                require 'spiderfw'
+                require 'spiderfw/init'
                 if Spider.apps_by_short_name[cmd_name] && Spider.apps_by_short_name[cmd_name].const_defined?(:Cmd)
                     app_cmd = Spider.apps_by_short_name[cmd_name].const_get(:Cmd).new
                     @cmd.add_command(app_cmd)

data/lib/spiderfw/cmd/commands/app.rb

@@ -117,6 +117,7 @@ class AppCommand < CmdParse::Command
             }
             opt.on("--ssh-user [USERNAME]", _("SSH user")){ |s| @ssh_user = s }
             opt.on("--no-activate", _("Don't activate installed apps")){ |s| @no_activate = true }
+            opt.on("--branch", _("Install app from specific branch"), "-b"){ |b| @branch = b }
         end
         install.set_execution_block do |args|
             $SPIDER_INTERACTIVE = true
@@ -130,6 +131,7 @@ class AppCommand < CmdParse::Command
                 :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
             }
             options[:url] = @server_url if @server_url
+            options[:branch] = @branch if @branch
             if @git && !Spider::AppManager.git_available?
                 puts _("git gem not available; install git gem for Git support")
                 exit
@@ -151,7 +153,7 @@ class AppCommand < CmdParse::Command
             unless specs[:update].empty?
                 puts _("The following apps will be updated as a dependency: %s") % specs[:update].map{ |s| s.app_id }.join(', ')
             end
-            Spider::AppManager.new.install(specs, options)
+            Spider::AppManager.new(:interactive => true).install(specs, options)
         end
         self.add_command(install)
         
@@ -183,6 +185,7 @@ class AppCommand < CmdParse::Command
             opt.on("--refresh", _("Update apps even if the version has not changed"), "-r"){ |r| @refresh = true }
             opt.on("--no-clear-cache", _("Don't clear cache"), "-C"){ |c| @no_clear_cache = true }
             opt.on("--no-restart", _("Don't restart the server after the udpate"), "-R"){ |r| @no_restart = true }
+            opt.on("--branch", _("Install app from specific branch"), "-b"){ |b| @branch = b }
         end
         update.set_execution_block do |args|
             $SPIDER_INTERACTIVE = true
@@ -197,6 +200,7 @@ class AppCommand < CmdParse::Command
                 :clear_cache => !@no_clear_cache, :restart => !@no_restart
             }
             options[:url] = @server_url if @server_url
+            options[:branch] = @branch if @branch
             apps = args
             options[:refresh] = apps if @refresh
             apps.each do |app|
@@ -243,7 +247,7 @@ class AppCommand < CmdParse::Command
         setup.set_execution_block do |args|
             $SPIDER_INTERACTIVE = true
             require 'spiderfw/setup/app_manager'
-            tasks = Spider::AppManager.new.setup(name)
+            tasks = Spider::AppManager.new(:interactive => true).setup(name)
             unless @no_cleanup
                 tasks.each do |t|
                     begin

data/lib/spiderfw/cmd/commands/cert.rb

@@ -19,6 +19,7 @@ class CertCommand < CmdParse::Command
         end
         generate.set_execution_block do |args|
             require 'spiderfw'
+            Spider.init_base
             require 'openssl'
             @path ||= Spider.paths[:certs]
             @org ||= 'default'

data/lib/spiderfw/cmd/commands/console.rb

@@ -35,7 +35,7 @@ class ConsoleCommand < CmdParse::Command
                 Ripl.config[:irb_verbose] = false
                 Ripl::Runner.load_rc(Ripl.config[:riplrc])
                 
-                require 'spiderfw'
+                require 'spiderfw/init'
                 Object.send(:remove_const, :IRB) if Object.const_defined?(:IRB)
                 Ripl.shell.loop
             end

data/lib/spiderfw/cmd/commands/content.rb

@@ -13,7 +13,7 @@ class ContentCommand < CmdParse::Command
         end
         
         publish.set_execution_block do |args|
-            require 'spiderfw'
+            require 'spiderfw/init'
             Spider::StaticContent.publish
         end
         
@@ -22,7 +22,7 @@ class ContentCommand < CmdParse::Command
         compress = CmdParse::Command.new('compress', false)
         compress.short_desc = _("Compress Javascript files")
         compress.set_execution_block do |args|
-            require 'spiderfw'
+            require 'spiderfw/init'
             Spider::ContentUtils.compress(*args)
         end
         

data/lib/spiderfw/cmd/commands/create.rb

@@ -51,7 +51,7 @@ class CreateCommand < CmdParse::Command
                     Dir.chdir(inst) do 
                         $SPIDER_RUN_PATH = Dir.pwd
                         $:.push($SPIDER_RUN_PATH)
-                        require 'spiderfw'
+                        require 'spiderfw/init'
                         require 'lib/spiderfw/setup/spider_setup_wizard'
                         wizard = Spider::SpiderSetupWizard.new
                         wizard.first_run = true

data/lib/spiderfw/cmd/commands/model.rb

@@ -28,7 +28,7 @@ class ModelCommand < CmdParse::Command
         end
         
         sync_cmd.set_execution_block do |req_models|
-            require 'spiderfw'
+            require 'spiderfw/init'
             require 'spiderfw/model/mappers/db_mapper'
             req_models || []
             unsafe_fields = {}
@@ -98,7 +98,7 @@ class ModelCommand < CmdParse::Command
             }
         end
         dump_cmd.set_execution_block do |req_models|
-            require 'spiderfw'
+            require 'spiderfw/init'
             req_models || []
             req_models.each do |model_or_app|
                 models = []

data/lib/spiderfw/cmd/commands/setup.rb

@@ -42,7 +42,7 @@ class SetupCommand < CmdParse::Command
             tasks = []
             apps.each do |name|
                 require 'spiderfw/setup/app_manager'
-                tasks += Spider::AppManager.new.setup(name)
+                tasks += Spider::AppManager.new(:interactive => true).setup(name)
             end
             unless @no_cleanup
                 tasks.each do |t|

data/lib/spiderfw/cmd/commands/test.rb

@@ -34,7 +34,7 @@ class TestCommand < CmdParse::Command
             require 'test/unit/collector/dir'
             require 'test/unit'
             $SPIDER_RUNMODE = 'test'
-            require 'spiderfw'
+            require 'spiderfw/init'
             test_env = "#{$SPIDER_PATH}/test"
 #            Dir.cwd(test_env)
             $:.push(test_env)

data/lib/spiderfw/config/options/spider.rb

@@ -181,7 +181,8 @@ module Spider
         :do => lambda{ |val| ENV['http_proxy'] = val }
         
     config_option 'resources.disable_custom', _("Disable resource overriding in home"), :type => Spider::Bool, :default => false
-
+    
+    config_option 'migrations.window', _("Fetch window to use when migrating models"), :type => Fixnum, :default => 100
     
     
 end

data/lib/spiderfw/controller/controller.rb

@@ -215,6 +215,10 @@ module Spider
                     return do_dispatch(:execute, action) if d_next.dest != self 
                     arguments = d_next.params
                 end
+                if d_next && d_next.dest == self
+                    @executed_method = d_next.action.to_sym
+                    @executed_method_arguments = []
+                end
                 if (@executed_method)
                     meth = self.method(@executed_method)
                     args = arguments + @executed_method_arguments
@@ -233,19 +237,23 @@ module Spider
             end
         end
         
-        def before(action='', *arguments)
+        def call_before(action='', *arguments)
             @call_path = action
+            before(action, *arguments)
             catch(:done) do
                 #debug("#{self} before")
-                do_dispatch(:before, action, *arguments)
+                do_dispatch(:call_before, action, *arguments)
             end
         end
                 
+        def before(action='', *arguments)
+        end
 
         
-        def after(action='', *arguments)
+        def call_after(action='', *arguments)
+            after(action, *arguments)
             catch(:done) do
-                do_dispatch(:after, action, *arguments)
+                do_dispatch(:call_after, action, *arguments)
             end
             # begin
             #     run_chain(:after)
@@ -254,6 +262,9 @@ module Spider
             #     try_rescue(exc)
             # end
         end
+
+        def after(action='', *arguments)
+        end
         
         def done?
             @__done

data/lib/spiderfw/controller/mixins/visual.rb

@@ -558,6 +558,8 @@ module Spider; module ControllerMixins
                 layout = Spider::Layout.new(resource.path)
                 layout.definer_class = resource.definer
                 layout.asset_set = params[:assets] if params[:assets]
+                layout.no_asset_profiles(*params[:no_asset_profiles]) if params[:no_asset_profiles]
+                layout.only_asset_profiles(params[:only_asset_profiles]) if params[:only_asset_profiles]
                 layout
             end
             

data/lib/spiderfw/http/adapters/cgi.rb

@@ -1,5 +1,5 @@
 $:.push(ENV['SPIDER_PATH']+'/lib')
-require 'spiderfw'
+require 'spiderfw/init'
 require 'spiderfw/controller/controller_io'
 require 'spiderfw/controller/http_controller'
 require 'spiderfw/http/adapters/cgi_io'
@@ -51,9 +51,9 @@ controller_response = Spider::Response.new
 controller_response.server_output = CGIIO.new(STDOUT, controller_response)
 begin
     controller = ::Spider::HTTPController.new(controller_request, controller_response)
-    controller.before(path)
+    controller.call_before(path)
     controller.execute(path)
-    controller.after(path)                
+    controller.call_after(path)                
 rescue => exc
     Spider.logger.error(exc)
     controller.ensure()

data/lib/spiderfw/http/adapters/mongrel.rb

@@ -129,7 +129,7 @@ module Spider; module HTTP
                 main_block = lambda do
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)
                     controller.extend(Spider::FirstResponder)
-                    controller.before(path)
+                    controller.call_before(path)
                     MongrelIO.send_headers(controller_response, response) unless Spider.conf.get('http.auto_headers')
                     controller.execute(path)
                     Spider::Logger.debug("Response:")
@@ -157,7 +157,7 @@ module Spider; module HTTP
                 Spider.request_finished
             end
             if controller
-                controller.after(path)
+                controller.call_after(path)
                 controller.ensure
             end
             

data/lib/spiderfw/http/adapters/rack.rb

@@ -101,13 +101,13 @@ module Spider; module HTTP
                 begin
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)
                     controller.extend(Spider::FirstResponder)
-                    controller.before(path)
+                    controller.call_before(path)
                     controller.execute(path)
                     if Spider.conf.get('webserver.force_threads')
                         w.close 
                         controller_response.server_output.send_headers unless controller_response.server_output.headers_sent?
                     end
-                    controller.after(path)
+                    controller.call_after(path)
                     controller_done = true
                     Spider::Logger.debug("Controller done")
                 rescue => exc

data/lib/spiderfw/http/adapters/webrick.rb

@@ -132,9 +132,9 @@ module Spider; module HTTP
                 begin
                     controller = ::Spider::HTTPController.new(controller_request, controller_response)
                     controller.extend(Spider::FirstResponder)
-                    controller.before(path)
+                    controller.call_before(path)
                     controller.execute(path)
-                    controller.after(path)
+                    controller.call_after(path)
                     Spider::Logger.debug("Controller done")
                 rescue => exc
                     Spider.logger.debug("Error:")