spiderfw 0.5.15 → 0.5.16

data/lib/spiderfw/controller/controller_mixin.rb

@@ -39,6 +39,7 @@ module Spider
                 self.controller_mixins.each do |mod|
                     klass.send(:include, mod)
                 end
+                super
             end
             
         end

data/lib/spiderfw/controller/dispatcher.rb

@@ -115,6 +115,7 @@ module Spider
         
         # Looks in defined routes, and returns the first matching Route for path.
         def get_route(path)
+            path ||= ''
             r = routes + self.class.routes
             r.each do |route|
                 try, dest, options = route

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

@@ -10,10 +10,15 @@ module Spider; module ControllerMixins
         
         def self.included(klass)
            klass.extend(ClassMethods)
-           klass.define_annotation(:html) { |k, m, params| k.output_format(m, :html, params) }
-           klass.define_annotation(:xml) { |k, m, params| k.output_format(m, :xml, params) }
-           klass.define_annotation(:json) { |k, m, params| k.output_format(m, :json, params) }
-           klass.define_annotation(:text) { |k, m, params| k.output_format(m, :text, params) }
+           klass.extend(OutputFormatMethods)
+           define_format_annotations(klass)
+        end
+        
+        def self.define_format_annotations(klass)
+            klass.define_annotation(:html) { |k, m, params| k.output_format(m, :html, params) }
+            klass.define_annotation(:xml) { |k, m, params| k.output_format(m, :xml, params) }
+            klass.define_annotation(:json) { |k, m, params| k.output_format(m, :json, params) }
+            klass.define_annotation(:text) { |k, m, params| k.output_format(m, :text, params) }
         end
         
         def before(action='', *params)
@@ -411,9 +416,8 @@ module Spider; module ControllerMixins
             return bt
         end
         
-        
-        module ClassMethods
-            
+        module OutputFormatMethods
+           
             def output_format(method=nil, format=nil, params={})
                 return @default_output_format unless method
                 @output_formats ||= {}
@@ -449,7 +453,11 @@ module Spider; module ControllerMixins
             def default_output_format(format)
                 @default_output_format = format if format
                 @default_output_format
-            end
+            end 
+            
+        end
+        
+        module ClassMethods
 
             
             def layouts

data/lib/spiderfw/home.rb

@@ -23,9 +23,10 @@ module Spider
         end
 
         def list_apps
-            apps_dir = Pathname.new(Spider.paths[:apps])
+            apps_path = Spider.respond_to?(:paths) ? Spider.paths[:apps] : File.join(@path, 'apps')
+            apps_dir = Pathname.new(apps_path)
             apps = []
-            Dir.glob("#{Spider.paths[:apps]}/**/_init.rb").each do |path|
+            Dir.glob("#{apps_path}/**/_init.rb").each do |path|
                 dir = Pathname.new(File.dirname(path))
                 apps << dir.relative_path_from(apps_dir).to_s
             end

data/lib/spiderfw/i18n/javascript_parser.rb

@@ -6,7 +6,7 @@ module Spider; module I18n
     module JavascriptParser
         module_function
         
-        GettextRegexp = /_\(['"]([^\)'"]+)['"](,\s*[^\)]\s*)*\)/
+        GettextRegexp = /\W_\(['"]([^\)'"]+)['"](,\s*[^\)]\s*)*\)/
         
         
 

data/lib/spiderfw/model/base_model.rb

@@ -66,6 +66,8 @@ module Spider; module Model
         attr_accessor :_parent
         # If _parent is a model instance, which element points to this one
         attr_accessor :_parent_element
+        #
+        attr_accessor :_check_if_saved
         
         # If this object is used as a superclass in class_table_inheritance, points to the current subclass
         attr_accessor :_subclass_object
@@ -1091,7 +1093,7 @@ module Spider; module Model
         # See #self.where for parameter syntax.
         def self.load(*params, &proc)
             qs = self.where(*params, &proc)
-            qs.limit = 1
+            qs.only_one
             return qs[0]
         end
         
@@ -1530,7 +1532,7 @@ module Spider; module Model
                 checks.each do |msg, check|
                     test = case check
                     when Regexp
-                        val == nil || val.empty? ? true : check.match(val)
+                        val.blank? ? true : check.match(val.to_s)
                     when Proc
                         check.call(val)
                     end
@@ -2464,20 +2466,28 @@ module Spider; module Model
             h
         end
         
-        def self.from_hash_dump(h)
+        def self.from_hash_dump(h, options={})
             obj = self.static
+            obj._check_if_saved = true if options[:check_if_saved]
             h.each do |key, val|
                 el = self.elements[key.to_sym]
                 next unless el
                 if el.multiple? && val
                     qs = obj.get(el)
                     val.each do |v|
-                        v = el.model.from_hash_dump(v) if v.is_a?(Hash)
+                        v = el.model.from_hash_dump(v, options) if v.is_a?(Hash)
                         qs << v
                     end
                 else
-                    val = el.model.from_hash_dump(val) if val.is_a?(Hash)
-                    obj.set(el, val)
+                    val = el.model.from_hash_dump(val, options) if val.is_a?(Hash)
+	                case el.type.name.to_sym
+                    when :Date, :DateTime
+                        val =  el.type.parse(val) unless val.blank?
+                    end
+					begin
+                        obj.set(el, val)
+                    rescue # FIXME: should be and option
+                    end
                 end
             end
             obj

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

@@ -134,7 +134,7 @@ module Spider; module Model; module Mappers
             return nil unless save[:values].length > 0
             condition = Condition.and
             @model.primary_keys.each do |key|
-                condition[key.name] = map_condition_value(key.type, obj.get(key))
+                condition[key.name] = obj.get(key)
             end
             preprocess_condition(condition)
             save[:condition], save[:joins] = prepare_condition(condition)
@@ -310,7 +310,7 @@ module Spider; module Model; module Mappers
             keys = []
             primary_keys = []
             types = {}
-            if (query.limit && query.order.empty?)
+            if (query.limit && query.order.empty? && !query.only_one?)
                 @model.primary_keys.each do |key|
                     elements << key.name unless elements.include?(key.name)
                     query.order_by(key.name, :asc)

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

@@ -164,7 +164,7 @@ module Spider; module Model
                     @model.extended_models.each do |m, el|
                         sub = obj.get(el)
                         done_extended << el
-                        if mode == :update || sub.class.auto_primary_keys?
+                        if mode == :update || sub.class.auto_primary_keys? || sub._check_if_saved
                             sub.save if (obj.element_modified?(el) || !obj.primary_keys_set?) && sub.mapper.class.write?
                         else
                             sub.insert unless sub.in_storage?
@@ -222,7 +222,12 @@ module Spider; module Model
                     end
                 end
             end
-            save_mode = (!is_insert && obj.primary_keys_set?) ? :update : :insert
+            save_mode = nil
+            if obj.class.auto_primary_keys? && !obj._check_if_saved
+                save_mode = (!is_insert && obj.primary_keys_set?) ? :update : :insert
+            else
+                save_mode = obj.in_storage? ? :update : :insert
+            end
             before_save(obj, save_mode)
             # @model.elements_array.select{ |el| el.attributes[:integrated_model] }.each do |el|
             #     obj.get(el).save if obj.element_modified?(el)

data/lib/spiderfw/model/query.rb

@@ -123,6 +123,16 @@ module Spider; module Model
        def first
            self.limit = 1
        end
+
+       def only_one
+           self.limit = 1
+           @only_one = true
+       end
+
+
+       def only_one?
+           @only_one
+       end
        
        def page(page, rows)
            page = page.to_i
@@ -159,4 +169,4 @@ module Spider; module Model
     
 
     
-end; end
+end; end

data/lib/spiderfw/setup/app_manager.rb

@@ -75,6 +75,66 @@ module Spider
                 end
             end
         end
+        
+        def self.update(specs, home_path, options)
+            options[:use_git] = true unless options[:use_git] == false
+            specs = [specs] unless specs.is_a?(Array)
+            pre_setup(specs, options)
+            specs.each do |spec|
+                if spec.git_repo && options[:use_git]
+                    git_update(spec, home_path)
+                else
+                    pack_update(spec, home_path)
+                end
+            end
+        end
+        
+        def self.git_update(spec, home_path)
+            require 'grit'
+            home_repo = Grit::Repo.new(home_path)
+            app_path = File.join(home_path, "apps/#{spec.id}")
+            app_repo = Grit::Repo.new(app_path)
+            puts _("Updating %s from %s") % [spec.app_id, spec.git_repo]
+            Dir.chdir(app_path) do
+                app_repo.git.checkout({}, "master")
+            end
+            cmd = "#{Grit::Git.git_binary} --git-dir='#{app_path}/.git' pull"
+            response = err = nil
+            Dir.chdir(app_path) do
+                response, err = app_repo.git.wild_sh(cmd)
+            end
+            if response =~ /Aborting/
+                puts err
+                return
+            end
+            Dir.chdir(app_path) do
+                app_repo.git.reset({:hard => true}, 'HEAD')
+                app_repo.git.checkout
+            end
+            
+            home_repo.add("apps/#{spec.id}")
+            home_repo.commit_index(_("Updated app %s") % spec.id) 
+        end
+        
+        def self.pack_update(spec, home_path)
+            require 'fileutils'
+            require 'date'
+            require 'time'
+            app_path = File.join(home_path, "apps/#{spec.id}")
+            tmp_path = File.join(home_path, 'tmp')
+            FileUtils.mkdir_p(tmp_path)
+            tmp_app_path = File.join(tmp_path, "#{spec.id}-update-#{DateTime.now}")
+            FileUtils.mv(app_path, tmp_app_path)
+            begin
+                pack_install(spec, home_path)
+                FileUtils.rmdir(tmp_app_path)
+            rescue
+                puts _("Update of %s failed" % spec.id)
+                FileUtils.mv(tmp_app_path, app_path)
+            end
+        end
+        
+        
 
     end
 

data/lib/spiderfw/templates/blocks/widget.rb

@@ -62,7 +62,7 @@ module Spider; module TemplateBlocks
             end
             html.gsub!("'", "\\\\'")
             init += "add_widget('#{id}', #{klass}.new(@request, @response), {#{init_params.join(', ')}}, '#{html}', #{t_param})\n"
-            c = "yield :#{id}\n"
+            c = "yield :\"#{id}\"\n"
             return CompiledBlock.new(init, c)
         end
         

data/lib/spiderfw/utils/annotations.rb

@@ -181,7 +181,7 @@ module Annotations
 
         # Searches for a defined annotation in class and ancestors.
         def find_defined_annotation(name)
-            return nil if self.class == Module
+            return nil if self.class == Module && !@defined_annotations
             k = self
             while (k != Object)
                 return nil unless k < Annotations

data/lib/spiderfw/widget/widget.rb

@@ -263,6 +263,7 @@ module Spider
             @widgets_runtime_content = {}
             @widget_procs = {}
             @runtime_overrides = []
+            @_plugins = []
         end
         
         def full_id
@@ -308,8 +309,8 @@ module Spider
             widget_init(action)
             return unless active?
             #Spider.logger.debug("Preparing widget #{self}")
-            prepare
             prepare_scene(@scene)
+            prepare
             @before_done = true
         end
         
@@ -776,9 +777,19 @@ module Spider
             mod = self.class.plugin(name)
             return unless mod
             self.extend(mod)
+            @_plugins << mod
             @runtime_overrides << [name, mod.get_overrides, mod.overrides_path]
         end
         
+        def controller_action?(method)
+            r = super
+            return r if r
+            @_plugins.each do |pl|
+                return r if r = pl.controller_action?(method)
+            end
+            return false
+        end
+        
     end
     
     module WidgetScene

data/lib/spiderfw/widget/widget_plugin.rb

@@ -5,10 +5,12 @@ module Spider
         def self.included(mod)
             mod.extend(ModuleMethods)
             mod.module_eval{ include Annotations }
+            Spider::ControllerMixins::Visual.define_format_annotations(mod)
+            mod.extend(Spider::ControllerMixins::Visual::OutputFormatMethods)
         end
         
         module ModuleMethods
-            
+                        
             def plugin_name
                 @plugin_name
             end
@@ -41,6 +43,18 @@ module Spider
                 }
             end
             
+            def controller_actions(*methods)
+                if (methods.length > 0)
+                    @controller_actions ||= []
+                    @controller_actions += methods
+                end
+                @controller_actions
+            end
+            
+            def controller_action?(method)
+                @controller_actions && @controller_actions.include?(method)
+            end
+            
         end
         
     end

data/lib/spiderfw.rb

@@ -3,6 +3,7 @@ require 'spiderfw/env'
 require 'rubygems'
 require 'find'
 require 'fileutils'
+require 'pathname'
 require 'spiderfw/autoload'
 require 'spiderfw/requires'
 
@@ -61,12 +62,13 @@ module Spider
             setup_paths(@root)
             all_apps = find_all_apps
             all_apps.each do |path|
-                require path+'/config/options.rb' if File.exist?(path+'/config/options.rb')
+                opts = File.join(path, 'config/options.rb')
+                require opts if File.exist?(opts)
             end
             @runmode = nil
             self.runmode = $SPIDER_RUNMODE if $SPIDER_RUNMODE
-            load_configuration($SPIDER_PATH+'/config')
-            load_configuration(@root+'/config')
+            load_configuration File.join($SPIDER_PATH, 'config')
+            load_configuration File.join(@root, 'config')
             start_loggers
 #            @controller = Controller
             @paths[:spider] = $SPIDER_PATH
@@ -74,8 +76,9 @@ module Spider
             if ($SPIDER_CONFIG_SETS)
                 $SPIDER_CONFIG_SETS.each{ |set| @configuration.include_set(set) }
             end
-            if File.exist?($SPIDER_RUN_PATH+'/init.rb')
-                @home.instance_eval(File.read($SPIDER_RUN_PATH+'/init.rb'), $SPIDER_RUN_PATH+'/init.rb')
+            init_file = File.join($SPIDER_RUN_PATH, 'init.rb')
+            if File.exist?(init_file)
+                @home.instance_eval(File.read(init_file), init_file)
             end
             @logger.close(STDERR)
             @logger.open(STDERR, Spider.conf.get('debug.console.level')) if Spider.conf.get('debug.console.level')
@@ -85,15 +88,6 @@ module Spider
                 mod.app_init if mod.respond_to?(:app_init)
             end
             @init_done=true
-            # routes_file = "#{@paths[:config]}/routes.rb"
-            # if (File.exist?(routes_file))
-            #     load(routes_file)
-            # end
-            # else
-            #     @apps.each do |name, app|
-            #         @controller.route('/'+app.name.gsub('::', '/'), app.controller, :ignore_case => true)
-            #     end
-            # end
         end
         
         # 
@@ -106,7 +100,7 @@ module Spider
 
         # Invoked before a server is started. Apps may implement the app_startup method, that will be called.
         def startup
-            unless File.exists?(Spider.paths[:root]+'/init.rb')
+            unless File.exists?(File.join(Spider.paths[:root], 'init.rb'))
                 raise "The server must be started from the root directory"
             end
             if (Spider.conf.get('template.cache.reload_on_restart'))
@@ -181,9 +175,9 @@ module Spider
                 @logger.error("Unable to create log folder")
             end
             if (File.exist?(@paths[:log]))
-                @logger.open(@paths[:log]+'/error.log', :ERROR) if Spider.conf.get('log.errors')
+                @logger.open(File.join(@paths[:log], 'error.log'), :ERROR) if Spider.conf.get('log.errors')
                 if (Spider.conf.get('log.debug.level'))
-                    @logger.open(@paths[:log]+'/debug.log', Spider.conf.get('log.debug.level'))
+                    @logger.open(File.join(@paths[:log], 'debug.log'), Spider.conf.get('log.debug.level'))
                 end
             end
             $LOG = @logger
@@ -192,23 +186,23 @@ module Spider
         # Sets the default paths (see #paths).
         def setup_paths(root)
             @paths[:root] = root
-            @paths[:apps] = root+'/apps'
-            @paths[:core_apps] = $SPIDER_PATH+'/apps'
-            @paths[:config] = root+'/config'
-            @paths[:layouts] = root+'/layouts'
-            @paths[:var] = root+'/var'
-            @paths[:certs] = @paths[:config]+'/certs'
-            @paths[:tmp] = root+'/tmp'
-            @paths[:data] = root+'/data'
-            @paths[:log] = @paths[:var]+'/log'
+            @paths[:apps] = File.join(root, 'apps')
+            @paths[:core_apps] = File.join($SPIDER_PATH, 'apps')
+            @paths[:config] = File.join(root, 'config')
+            @paths[:layouts] = File.join(root, 'layouts')
+            @paths[:var] = File.join(root, 'var')
+            @paths[:certs] = File.join(@paths[:config], 'certs')
+            @paths[:tmp] = File.join(root, 'tmp')
+            @paths[:data] = File.join(root, 'data')
+            @paths[:log] = File.join(@paths[:var], 'log')
         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|
-                test = base+'/'+name
-                if (File.exist?(test+'/_init.rb'))
+                test = File.join(base, name)
+                if File.exist?(File.join(test, '_init.rb'))
                     path = test
                     break
                 end
@@ -218,8 +212,8 @@ module Spider
         
         def find_apps(name)
             [@paths[:apps], @paths[:core_apps]].each do |base|
-                test = base+'/'+name
-                if (File.exist?(test))
+                test = File.join(base, name)
+                if File.exist?(test)
                     return find_apps_in_folder(test)
                 end
             end
@@ -234,16 +228,17 @@ module Spider
         
         def load_app_at_path(path)
             return if @loaded_apps[path]
+            relative_path = path
+            if path.index(Spider.paths[:root])
+                home = Pathname.new(Spider.paths[:root])
+                pname = Pathname.new(path)
+                relative_path = pname.relative_path_from(home).to_s
+            end
             @loaded_apps[path] = true
-            last_name = path.split('/')[-1]
+            last_name = File.basename(path)
             app_files = ['_init.rb', last_name+'.rb', 'cmd.rb']
-            app_files.each{ |f| require path+'/'+f if File.exist?(path+'/'+f)}
-            # if File.exist?("#{path}/data/locale")
-            #     ENV['GETTEXT_PATH'] += ',' if ENV['GETTEXT_PATH']
-            #     ENV['GETTEXT_PATH'] += "#{path}/data/locale" 
-            # end
-            # GETTEXT_PATH is broken at the moment in gettext 2.1.0
-            GetText::LocalePath.add_default_rule("#{path}/data/locale/%{lang}/LC_MESSAGES/%{name}.mo")
+            app_files.each{ |f| require File.join(relative_path, f) if File.exist?(File.join(path, f)) }
+            GetText::LocalePath.add_default_rule(File.join(path, "data/locale/%{lang}/LC_MESSAGES/%{name}.mo"))
         end
         
         def load_apps(*l)
@@ -264,7 +259,7 @@ module Spider
                 if (File.basename(path) == '_init.rb')
                     app_paths << File.dirname(path)
                     Find.prune
-                elsif (File.exist?("#{path}/_init.rb"))
+                elsif File.exist?(File.join(path, '_init.rb'))
                     app_paths << path
                     Find.prune
                 end
@@ -273,16 +268,16 @@ module Spider
         end
         
         def find_apps_in_folder(path)
-            path += '/' unless path[-1].chr == '/'
             return unless File.directory?(path)
-            return [path] if File.exist?(path+'/_init.rb')
+            return [path] if File.exist?(File.join(path, '_init.rb'))
             found = []
             Dir.new(path).each do |f|
                 next if f[0].chr == '.'
-                if (File.exist?(path+f+'/_init.rb'))
-                    found << path+f
+                found_path = File.join(path, f)
+                if File.exist?(File.join(found_path, '/_init.rb'))
+                    found << found_path
                 else
-                    found += find_apps_in_folder(path+f)
+                    found += find_apps_in_folder(found_path)
                 end
             end
             return found
@@ -302,8 +297,8 @@ module Spider
         
         def load_configuration(path)
             return unless File.directory?(path)
-            path += '/' unless path[-1] == ?o
-            require path+'options.rb' if File.exist?(path+'options.rb')
+            opts = File.join(path, 'options.rb')
+            require opts if File.exist?(opts)
             Dir.new(path).each do |f|
                 f.untaint # FIXME: security parse
                 case f
@@ -311,7 +306,7 @@ module Spider
                     next
                 when /\.(yaml|yml)$/
                     begin
-                        @configuration.load_yaml(path+f)
+                        @configuration.load_yaml(File.join(path, f))
                     rescue ConfigurationException => exc
                         if (exc.type == :yaml)
                             @logger.error("Configuration file #{path+f} is not valid YAML")
@@ -320,7 +315,6 @@ module Spider
                         end
                     end
                 end
-                #load(package_path+'/config/'+f)
             end
         end
         
@@ -440,6 +434,7 @@ module Spider
                 end
                 search_locations.each do |p|
                     found = first_found(extensions, p[0]+'/'+path)
+                    next if found == cur_path
                     definer = path_app || p[1]
                     return Resource.new(found, definer) if found
                 end
@@ -488,7 +483,7 @@ module Spider
                 base = p[0]
                 base = File.join(base, start) if start
                 extensions.each do |ext|
-                    Dir.glob("#{base}/*.#{ext}").each do |f|
+                    Dir.glob(File.join(base, "*.#{ext}")).each do |f|
                         res << (Pathname.new(f).relative_path_from(pname)).to_s
                     end
                 end
@@ -514,7 +509,7 @@ module Spider
                    loaded.push(file)
                 else
                     $:.each do |dir|
-                        file_path = dir+'/'+file
+                        file_path = File.join(dir, file)
                         if (file_path =~ /^#{path}/)  # FileTest.exists?(file_path) && 
                             loaded.push(file_path)
                         end
@@ -553,7 +548,7 @@ module Spider
                 init_debug
             end
             if (mode != 'production')
-                Spider.paths[:var] += "/#{mode}"
+                Spider.paths[:var] = File.join(Spider.paths[:var], mode)
             end
         end
         

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 5
-  - 15
-  version: 0.5.15
+  - 16
+  version: 0.5.16
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
+date: 2010-12-07 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -279,6 +279,7 @@ files:
 - apps/core/auth/views/login.shtml
 - apps/core/components/_init.rb
 - apps/core/components/assets.rb
+- apps/core/components/data/locale/it/LC_MESSAGES/spider_components.mo
 - apps/core/components/po/it/spider_components.po
 - apps/core/components/po/spider_components.pot
 - apps/core/components/public/css/admin.css
@@ -557,6 +558,7 @@ files:
 - apps/core/components/widgets/tabs/tabs.rb
 - apps/core/components/widgets/tabs/tabs.shtml
 - apps/core/forms/_init.rb
+- apps/core/forms/data/locale/it/LC_MESSAGES/spider_forms.mo
 - apps/core/forms/po/it/spider_forms.po
 - apps/core/forms/po/spider_forms.pot
 - apps/core/forms/public/ckeditor/adapters/jquery.js
@@ -803,6 +805,7 @@ files:
 - apps/master/plugins/resources/mysql/mysql.rb
 - apps/master/plugins/site_types/spider/spider.rb
 - apps/master/po/it/spider_master.po
+- apps/master/po/master.pot
 - apps/master/po/spider_master.pot
 - apps/master/public/css/img/web.png
 - apps/master/public/css/login.css
@@ -835,6 +838,7 @@ files:
 - apps/messenger/config/worker/queue.rb
 - 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/lib/email_backend.rb
 - apps/messenger/lib/sms_backend.rb
 - apps/messenger/messenger.rb