spiderfw 0.6.16 → 0.6.17

data/lib/spiderfw/setup/setup_task.rb

@@ -1,8 +1,10 @@
+require 'spiderfw/model/migrations'
+
 module Spider
     
     class SetupTask
         attr_reader :path, :version
-        attr_accessor :up, :down, :app
+        attr_accessor :before, :up, :down, :cleanup, :sync_models, :app
         
         class <<self
             def tasks
@@ -18,8 +20,11 @@ module Spider
                 Thread.critical = true unless crit
                 Kernel.load(path)
                 obj = self.new(path)
+                obj.before = Setup.before
                 obj.up = Setup.up
                 obj.down = Setup.down
+                obj.cleanup = Setup.cleanup
+                obj.sync_models = Setup.sync_models
                 #obj = @last_class.new(path)
 #                Kernel.send(:remove_const, @last_class.name)
                 #@last_class = nil
@@ -44,52 +49,87 @@ module Spider
         end
         
         def do_up
-            intance_eval(&@up)
-            sync_schema unless @no_sync || @sync_done
+            Spider::Model::Managed.no_set_dates = true
+            instance_eval(&@up)
+            #sync_schema unless @no_sync || @sync_done
+            Spider::Model::Managed.no_set_dates = false
         end
         
         def do_down
-            instance_eval(&@down)
+            Spider::Model::Managed.no_set_dates = true
+            instance_eval(&@down) if @down
+            Spider::Model::Managed.no_set_dates = false
         end
-        
-        def no_sync_schema
-            @no_sync = true
+
+        def do_cleanup
+            instance_eval(&@cleanup) if @cleanup
         end
-        
-        def sync_schema(*models)
-            if models[-1].is_a?(Hash)
-                options = models.pop
-            else
-                options = {}
-            end
-            if models.empty?
-                models = @app.models.reject{ |m| !(m < Spider::Model::Managed) }
+
+        def do_sync
+            return unless @sync_models
+            options = {
+                :no_foreign_key_constraints => true
+            }
+            @sync_models.each do |m|
+                m.mapper.sync_schema(false, options)
             end
-            Spider::Model.sync_schema(
-                model, options[:force], 
-                :drop_fields => options[:drop_fields], 
-                :update_sequences => options[:update_sequences], 
-                :no_foreign_key_constraints => options[:no_foreign_key_constraints]
-            )
-            @sync_done = true
         end
         
-        def sync_schema!(*models)
-            if models[-1].is_a?(Hash)
-                options = models.pop
-            else
-                options = {}
-            end
-            options[:force] = true
-            args = models + [options]
-            sync_schema(*args)
-        end
+        # def no_sync_schema
+        #     @no_sync = true
+        # end
+        
+        # def sync_schema(*models)
+        #     if models[-1].is_a?(Hash)
+        #         options = models.pop
+        #     else
+        #         options = {}
+        #     end
+        #     if models.empty?
+        #         models = @app.models.reject{ |m| !(m < Spider::Model::Managed) }
+        #     end
+        #     Spider::Model.sync_schema(
+        #         model, options[:force], 
+        #         :drop_fields => options[:drop_fields], 
+        #         :update_sequences => options[:update_sequences], 
+        #         :no_foreign_key_constraints => options[:no_foreign_key_constraints]
+        #     )
+        #     @sync_done = true
+        # end
+        
+        # def sync_schema!(*models)
+        #     if models[-1].is_a?(Hash)
+        #         options = models.pop
+        #     else
+        #         options = {}
+        #     end
+        #     options[:force] = true
+        #     args = models + [options]
+        #     sync_schema(*args)
+        # end
         
 
     end
     
     module Setup
-        
+
+        def self.task(&proc)
+            self.instance_eval(&proc)
+        end
+
+        # TODO: pass options
+        def self.sync_schema(*models)
+            @sync_models = models
+        end
+
+        def self.sync_models
+            @sync_models
+        end
+
+        def self.before(&proc)
+            @before = proc if proc
+            @before
+        end
         
         def self.up(&proc)
             @up = proc if proc
@@ -100,7 +140,12 @@ module Spider
             @down = proc if proc
             @down
         end
+
+        def self.cleanup(&proc)
+            @cleanup = proc if proc
+            @cleanup
+        end
         
     end
     
-end
+end

data/lib/spiderfw/spider.rb

@@ -245,6 +245,11 @@ module Spider
             @main_process_shutdown_blocks << block
         end
         
+
+        def restart!
+            FileUtils.touch(@paths[:restart_file])
+        end
+
         def current
             Spider::Request.current
         end
@@ -313,7 +318,7 @@ module Spider
         def setup_paths(root)
             @paths[:root] = root
             @paths[:apps] = File.join(root, 'apps')
-            @paths[:core_apps] = File.join($SPIDER_PATH, 'apps')
+            @paths[:core_apps] = $SPIDER_PATHS[:core_apps]
             @paths[:config] = File.join(root, 'config')
             @paths[:layouts] = File.join(root, 'layouts')
             @paths[:var] = File.join(root, 'var')
@@ -326,11 +331,17 @@ module Spider
                 @paths[k] = File.expand_path(File.readlink(path)) if File.symlink?(path)
             end
         end
+
+        def app_paths
+            paths = [$SPIDER_PATHS[:core_apps]]
+            paths.unshift(@paths[:apps]) if @paths[:apps]
+            paths
+        end
         
         # Finds an app by name, looking in paths[:apps] and paths[:core_apps]. Returns the found path.
         def find_app(name)
             path = nil
-            [@paths[:apps], @paths[:core_apps]].each do |base|
+            app_paths.each do |base|
                 test = File.join(base, name)
                 if File.exist?(File.join(test, '_init.rb'))
                     path = test
@@ -341,7 +352,7 @@ module Spider
         end
         
         def find_apps(name)
-            [@paths[:apps], @paths[:core_apps]].each do |base|
+            app_paths.each do |base|
                 test = File.join(base, name)
                 if File.exist?(test)
                     return find_apps_in_folder(test)
@@ -359,7 +370,7 @@ module Spider
         def load_app_at_path(path)
             return if @loaded_apps[path]
             relative_path = path
-            if path.index(Spider.paths[:root])
+            if Spider.paths[:root] && path.index(Spider.paths[:root])
                 home = Pathname.new(Spider.paths[:root])
                 pname = Pathname.new(path)
                 relative_path = pname.relative_path_from(home).to_s
@@ -387,7 +398,8 @@ module Spider
         end
         
         def find_all_apps(paths=nil)
-            paths ||= [@paths[:core_apps], @paths[:apps]]
+            paths ||= self.app_paths
+
             app_paths = []
             Find.find(*paths) do |path|
                 if (File.basename(path) == '_init.rb')
@@ -456,7 +468,7 @@ module Spider
             Spider.config.loaded_files.each do |f|
                 editor.load(f)
             end
-            c_apps = Spider.config.get('apps')
+            c_apps = Spider.config.get('apps') || []
             c_apps = (c_apps + apps).uniq
             editor.set('apps', Spider.apps_load_order(c_apps, specs))
             editor.save
@@ -600,7 +612,7 @@ module Spider
                         end
                     end
                     app = path_app
-                elsif owner_class <= Spider::App
+                elsif owner_class <= Spider::App || owner_class == Spider
                     app = owner_class
                 else
                     app = owner_class.app if (owner_class && owner_class.app)
@@ -777,16 +789,14 @@ module Spider
         end
         
         def locale
-            unless Thread.current[:current_languages] # Locale sets this
-                c_l = Spider.conf.get('locale')
-                return c_l if c_l
-            end
             begin
                 @current_locale = Locale.current[0]
             rescue
                 # There are problems with subsequent requests on Windows, 
                 # so use cached locale if Locale.current fails
-                @current_locale || Locale::Tag.parse('en')
+                l = @current_locale
+                l ||= Locale::Tag.parse(Spider.conf.get('locale')) if Spider.conf.get('locale')
+                l ||= Locale::Tag.parse('en')
             end
         end
         
@@ -811,9 +821,14 @@ module Spider
                 mod.test_teardown if mod.respond_to?(:test_teardown)
             end
         end
+
+        def interactive?
+            !!$SPIDER_INTERACTIVE
+        end
         
         def output(str, level=:INFO)
-            if @logger_started
+            use_log = !Spider.interactive? && @logger_started
+            if use_log
                 @logger.log(level, str)
             else
                 str = "#{level}: #{str}" if level == :ERROR

data/lib/spiderfw/templates/layout.rb

@@ -45,6 +45,9 @@ module Spider
                 next if seen[seen_check]
                 seen[seen_check] = true
                 type = ass[:type].to_sym
+                
+                ass = compile_asset(ass)
+                
                 compress_config = case type
                 when :js
                     'javascript.compress'
@@ -62,16 +65,16 @@ module Spider
                     end
                 else
                     unless pub_dest
-                        pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
+                        pub_dest = self.class.compiled_folder_path
                         FileUtils.mkdir_p(pub_dest)
                     end
-                    if comp = ass[:compressed_path]
+                    if comp = ass[:compressed_path] # Already compressed assets
                         name = File.basename(comp)
-                        if ass[:compressed_rel_path]
+                        if ass[:compressed_rel_path] # Keeps the compressed files in a subdir
                             dir = File.dirname(ass[:compressed_rel_path])
-                            if ass[:copy_dir]
+                            if ass[:copy_dir] # Copies the source dir (which may contain resources used by the assets)
                                 start = dir
-                                if ass[:copy_dir].is_a?(Fixnum)
+                                if ass[:copy_dir].is_a?(Fixnum) # How many levels to go up
                                     ass[:copy_dir].downto(0) do |i|
                                         start = File.dirname(start)
                                     end
@@ -96,7 +99,7 @@ module Spider
                         end
                         ass[:src] = Spider::HomeController.pub_url+'/'+COMPILED_FOLDER+'/'+src
                         assets[type] << ass
-                    else
+                    else # needs compression
                         name = ass[:compress] || cname
                         unless compress_assets[type][name]
                             cpr = {:name => name, :assets => [], :cpr => true}
@@ -175,6 +178,10 @@ module Spider
         end
         
         COMPILED_FOLDER = '_c'
+
+        def self.compiled_folder_path
+             File.join(Spider::HomeController.pub_path, COMPILED_FOLDER)
+        end
         
         def asset_gettext_messages_file(path)
             dir = File.dirname(path)
@@ -182,10 +189,31 @@ module Spider
             File.join(dir, "#{name}.i18n.json")
         end
         
+        def compile_asset(ass)
+            return ass unless ass[:src]
+            if ass[:type] == :css
+                ext = File.extname(ass[:path])
+                if ['.scss', '.sass'].include?(ext)
+                    dir = File.dirname(ass[:path])
+                    base = File.basename(ass[:path], ext)
+                    newname = "#{base}.css"
+                    tmpdestdir = File.join(dir, 'stylesheets')
+                    
+                    dest = File.join(tmpdestdir, newname)
+                    require 'spiderfw/templates/resources/sass'
+                    
+                    Spider::SassCompiler.compile(ass[:path], dest)
+                    ass[:path] = dest
+                    ass[:src] = File.join(File.dirname(ass[:src]), newname)
+                end
+            end
+            return ass
+        end
+        
         def compress_javascript(cpr)
             require 'yui/compressor'
 
-            pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
+            pub_dest = self.class.compiled_folder_path
             name = cpr[:name]
             
             already_compressed = Dir.glob(pub_dest+'/'+name+'.*.js')
@@ -232,7 +260,7 @@ module Spider
         def compress_css(cpr)
             require 'yui/compressor'
             
-            pub_dest = Spider::HomeController.pub_path+'/'+COMPILED_FOLDER
+            pub_dest = self.class.compiled_folder_path
             name = cpr[:name]
             
             already_compressed = Dir.glob(pub_dest+'/'+name+'.*.css')
@@ -340,6 +368,10 @@ module Spider
             end
             return compiled_name
         end
+
+        def self.clear_compiled_folder!
+            FileUtils.rm_rf(Dir.glob(File.join(self.compiled_folder_path, '*')))
+        end
         
     end
     

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

@@ -0,0 +1,21 @@
+require 'sass'
+require 'sass/plugin'
+
+Sass::Plugin.options[:cache_location] = File.join(Spider.paths[:tmp], 'sass-cache')
+
+module Spider
+    
+    module SassCompiler
+        
+        def self.compile(src, dest)
+            engine = Sass::Engine.for_file(src, {})
+            output = engine.render
+            File.open(dest, 'w') do |f|
+                f.write "/* This file is autogenerated; do not edit directly (edit #{src} instead) */\n\n"
+                f.write output
+            end
+        end
+        
+    end
+    
+end

data/lib/spiderfw/test.rb

@@ -52,7 +52,7 @@ module Spider; module Test
         rescue
         end
         Spider.apps.each do |name, mod|
-            mod.before_test if mod.respond_to?(:after_test)
+            mod.after_test if mod.respond_to?(:after_test)
         end
     end
     

data/lib/spiderfw/utils/events/event_source.rb

@@ -34,10 +34,9 @@ module Spider
             
         end
         
-        def on(event_name, *params)
+        def on(event_name, *params, &proc)
             @event_handlers ||= {}
             @event_handlers[event_name] ||= []
-            debugger unless proc
             @event_handlers[event_name] << proc
         end
         

data/lib/spiderfw/utils/gems.rb

@@ -3,7 +3,11 @@ module Spider
     # TODO: remove when old RubyGems versions are not a problem anymore
     def self.gem_available?(name, *requirements)
         if Gem::Specification.respond_to?(:find_by_name)
-            Gem::Specification.find_by_name(name, *requirements)
+            begin
+                Gem::Specification.find_by_name(name, *requirements)
+            rescue Gem::LoadError
+                return false
+            end
         else
             Gem.available?(name, requirements.first)
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 6
-  - 16
-  version: 0.6.16
+  - 17
+  version: 0.6.17
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 +02:00
+date: 2011-09-13 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -899,6 +899,7 @@ files:
 - apps/messenger/backends/email/smtp.rb
 - apps/messenger/backends/email/test.rb
 - apps/messenger/backends/sms/smstools.rb
+- apps/messenger/backends/sms/test.rb
 - apps/messenger/config/options.rb
 - apps/messenger/config/test.config.yml
 - apps/messenger/config/worker/queue.rb
@@ -1093,6 +1094,11 @@ files:
 - lib/spiderfw/model/mappers/mappers.rb
 - lib/spiderfw/model/mappers/proxy_mapper.rb
 - lib/spiderfw/model/mappers/vfs/flat_file.rb
+- lib/spiderfw/model/migrations/drop_element.rb
+- lib/spiderfw/model/migrations/irreversible_migration.rb
+- lib/spiderfw/model/migrations/migration.rb
+- lib/spiderfw/model/migrations/replace.rb
+- lib/spiderfw/model/migrations.rb
 - lib/spiderfw/model/mixins/converted.rb
 - lib/spiderfw/model/mixins/list.rb
 - lib/spiderfw/model/mixins/mixins.rb
@@ -1164,6 +1170,7 @@ files:
 - lib/spiderfw/templates/blocks/yield.rb
 - lib/spiderfw/templates/layout.rb
 - lib/spiderfw/templates/resources/less.rb
+- lib/spiderfw/templates/resources/sass.rb
 - lib/spiderfw/templates/template.rb
 - lib/spiderfw/templates/template_blocks.rb
 - lib/spiderfw/test/capybara.rb