spiderfw 0.6.24 → 0.6.25

data/VERSION

@@ -1 +1 @@
-0.6.24
+0.6.25

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

@@ -689,6 +689,19 @@ jQuery.parseISODate = function(iso){
     else return null;
 };
 
+// Same as toISOString, but without time, and ignoring timezone
+Date.prototype.toISODate = (function(){
+    function t(i){return i<10?"0"+i:i;};
+    return function(){
+        return "".concat(
+            this.getFullYear(), "-",
+            t(this.getMonth() + 1), "-",
+            t(this.getDate())
+        );
+    };
+})();
+
+
 if (!Date.prototype.toISOString){
     Date.prototype.toISOString = (function(){
         function t(i){return i<10?"0"+i:i;};
@@ -785,4 +798,4 @@ function basename(path){
 
 function dirname(path){
     return path.replace(/\\/g, '/').replace(/\/[^\/]*$/, '');
-}
+}

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

@@ -148,42 +148,30 @@ module Spider; module Forms
         
         def load_widgets(template=@template)
             super
-            if @action == :sub
-                if @sub_element.multiple?
-                    @crud = Spider::Components::Crud.new(@request, @response)
-                    @crud.id = "crud_#{@sub_element.name.to_s}"
-                    @crud.model = @sub_element.model
-                    add_widget(@crud)
-                    @scene.crud = @crud
-                    @obj = load
-                    cond = {}
-                    debugger
-                    if @sub_element.integrated?
-                        @sub_element.integrated_from.model.primary_keys.each do |key|
-                            cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get("#{@sub_element.integrated_from.name}.#{key.name}")
-                        end
-                    else
-                        @model.primary_keys.each do |key|
-                            cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
-                        end
+            if (@action == :sub)
+                @crud = Spider::Components::Crud.new(@request, @response)
+                @crud.id = "crud_#{@sub_element.name.to_s}"
+                @crud.model = @sub_element.model
+                add_widget(@crud)
+                @scene.crud = @crud
+                @obj = load
+                cond = {}
+                if @sub_element.integrated?
+                    @sub_element.integrated_from.model.primary_keys.each do |key|
+                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get("#{@sub_element.integrated_from.name}.#{key.name}")
                     end
-                    @crud.fixed = cond
-                    sub_elements = []
-                    #sub_elements += @sub_element.model.primary_keys.map{ |k| k.name }
-                    @sub_element.model.elements_array.each do |el|
-                        sub_elements << el.name unless el.integrated? || el.model == @model
+                else
+                    @model.primary_keys.each do |key|
+                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
                     end
-                    @crud.attributes[:table_elements] = sub_elements
-                # else
-                #     @crud = Spider::Forms::Form.new(@request, @response)
-                #     @form.id = "crud_#{@sub_element.name.to_s}"
-                #     @form.model = @sub_element.model
-                #     add_widget(@crud)
-                #     @scene.crud = @crud
-                #     @obj.load
-                #     debugger
-                #     @form.pk = @obj.get(@sub_element).id
                 end
+                @crud.fixed = cond
+                sub_elements = []
+                #sub_elements += @sub_element.model.primary_keys.map{ |k| k.name }
+                @sub_element.model.elements_array.each do |el|
+                    sub_elements << el.name unless el.integrated? || el.model == @model
+                end
+                @crud.attributes[:table_elements] = sub_elements
             else
                 create_inputs
             end
@@ -263,7 +251,7 @@ module Spider; module Forms
                     if ([:choice, :multiple_choice, :state, :multiple_state].include?(el.association) && !el.extended?)
                         widget_type = el.type.attributes[:estimated_size] && el.type.attributes[:estimated_size] > 30 ? 
                             SearchSelect : Select
-                    elsif @attributes[:show_related] && @pk
+                    elsif @attributes[:show_related] && @pk && el.multiple?
                         @sub_links[el.name] = sub_link(el)
                     end
                 end

data/lib/spiderfw/app.rb

@@ -516,6 +516,11 @@ END_OF_EVAL
             def self.parse_hash(h)
                 spec = self.new
                 h.each do |key, value|
+                    unless spec.respond_to?(:"#{key}")
+                        Spider.output("Bad spec key #{key} in:", :ERROR)
+                        Spider.output(h.inspect, :ERROR)
+                        next
+                    end
                     if value.is_a?(Array)
                         spec.send(:"#{key}", *value)
                     else
@@ -544,6 +549,11 @@ END_OF_EVAL
                 self.gems_optional.map{ |g| g.is_a?(Array) ? g.first : g }
             end
 
+            def branch(val=nil)
+                @branch = val if val
+                @branch
+            end
+
         end
         
         # Helper class to sort the runtime dependencies of an app using TSort.

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

@@ -109,6 +109,7 @@ module Spider::CommandLine
             install.short_desc = _("Install an app")
             install.options = CmdParse::OptionParserWrapper.new do |opt|
                 opt.on("--[no-]git", _("Use git for installing apps"), "-g"){ |r| @git = r }
+                opt.on("--rw", _("Use read-write git repository"), "-w"){ |rw| @rw = true }
                 opt.on("--no-dependencies", _("Don't install other apps this one depends on"), "-d"){ |d| 
                     @no_deps = true 
                 }
@@ -130,7 +131,8 @@ module Spider::CommandLine
                 require 'spiderfw/setup/app_manager'
                 options = {
                     :use_git => @git, :all => @all, :no_deps => @no_deps, :optional => @optional, 
-                    :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
+                    :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate,
+                    :rw => @rw
                 }
                 options[:url] = @server_url if @server_url
                 options[:branch] = @branch if @branch

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

@@ -37,7 +37,7 @@ module Spider::CommandLine
                 if @opts[:irb]
                     ENV['SPIDER_RUNMODE'] = $SPIDER_RUNMODE if ($SPIDER_RUNMODE)
                     ENV['SPIDER_CONFIG_SETS'] = $SPIDER_CONFIG_SETS.join(',') if ($SPIDER_CONFIG_SETS)
-                    exec("#{@opts[:irb]} -I #{$SPIDER_LIB} -r spiderfw")
+                    exec("#{@opts[:irb]} -I #{$SPIDER_LIB} -r spiderfw/init")
                 elsif @opts[:ripl]
                     require 'ripl/irb'
                     require 'ripl/multi_line' 
@@ -68,4 +68,4 @@ module Spider::CommandLine
 
     end
 
-end
+end

data/lib/spiderfw/controller/controller.rb

@@ -121,7 +121,7 @@ module Spider
             def url(action=nil)
                 u = @default_route || ''
                 u += "/#{action}" if action
-                if @default_dispatcher
+                if @default_dispatcher && @default_dispatcher != self
                     u = @default_dispatcher.url + '/' + u
                 elsif self.app
                     u = self.app.url + '/' + u

data/lib/spiderfw/model/storage/db/connectors/mysql.rb

@@ -0,0 +1,16 @@
+require 'mysql'
+
+module Spider; module Model; module Storage; module Db; module Connectors
+
+    module Mysql
+
+        def self.new_connection(host=nil, user=nil, passwd=nil, db=nil, port=nil, sock=nil, flag=nil)
+            conn = ::Mysql2::Client.new(
+                :host => host, :username => user, :password => passwd, :database => db, :port => port, :socket => sock
+            )
+            return conn
+        end
+
+    end
+
+end; end; end; end; end

data/lib/spiderfw/model/storage/db/connectors/mysql2.rb

@@ -0,0 +1,9 @@
+require 'mysql2'
+
+module Spider; module Model; module Storage; module Db; module Connectors
+
+    module Mysql2
+
+    end
+
+end; end; end; end; end

data/lib/spiderfw/model/storage.rb

@@ -17,9 +17,13 @@ module Spider; module Model
             Thread.current[:storages][type] ||= {}
             return Thread.current[:storages][type][url] if Thread.current[:storages][type][url]
             klass = nil
-            matches = url.match(/^(.+?):\/\/(.+)/)
-            adapter = matches[1]
-            rest = matches[2]
+            begin
+                matches = url.match(/^(.+?):\/\/(.+)/)
+                adapter = matches[1]
+                rest = matches[2]
+            rescue => exc
+                Spider.output _("The connection string %s is not correct") % url, :error
+            end
             if adapter =~ /(.+):(.+)/
                 connector = $1
                 adapter = $2

data/lib/spiderfw/setup/app_manager.rb

@@ -125,7 +125,7 @@ module Spider
             use_git = false
             if spec.git_repo && !options[:no_git]
                 app_path = File.join(@home_path, "apps/#{spec.app_id}")
-                use_git = true if File.directory?(File.join(app_path, '.git'))
+                use_git = true if File.exists?(File.join(app_path, '.git'))
             end
             if use_git && !self.class.git_available?
                 Spider.output _("Can't update app #{spec.id} via git, since git gem is not available") % spec.app_id, :ERROR
@@ -267,7 +267,7 @@ module Spider
              if ::File.directory?(File.join(@home_path, '.git'))
                 repo = Git.open(@home_path)
              end
-             repo_url = spec.git_repo_rw || spec.git_repo
+             repo_url = options[:rw] ? spec.git_repo_rw : spec.git_repo
              Spider.output _("Fetching %s from %s") % [spec.app_id, repo_url]
 
              if options[:ssh_user] && repo_url =~ /ssh:\/\/([^@]+@)?(.+)/
@@ -281,21 +281,33 @@ module Spider
                      `git submodule init`
                      `git submodule update`
                      repo.add(['.gitmodules', "apps/#{spec.id}"])
-                     repo.commit(_("Added app %s") % spec.id) 
+                     begin
+                        repo.commit(_("Added app %s") % spec.id) 
+                    rescue Git::GitExecuteError => exc
+                        # If no changes added, it means the app was deleted and then reinstalled, 
+                        # no need to raise an exception
+                        raise unless exc.message =~ /no changes added/
+                    end
                  end
             else
                 Dir.chdir(File.join(@home_path, 'apps')) do
                     Git.clone(repo_url, spec.id) 
                 end
             end
+            app_path = File.join(@home_path, "apps", spec.id)
+            if spec.branch != 'master'
+                reset_git_env
+                Dir.chdir(app_path) do
+                    `git checkout #{spec.branch}`
+                end
+            end
          end
 
          def pack_install(spec, options={})
              require 'rubygems/package'
              client = AppServerClient.new(spec.app_server)
              print _("Fetching %s from server... ") % spec.app_id
-             options[:branch] ||= 'master'
-             tmp_path = client.fetch_app(spec.app_id, options[:branch])
+             tmp_path = client.fetch_app(spec.app_id, spec.branch)
              Spider.output _("Fetched.")
              dest = File.join(@home_path, "apps/#{spec.app_id}")
              FileUtils.mkdir_p(dest)
@@ -336,9 +348,14 @@ module Spider
             app_path = File.join(@home_path, "apps", spec.id)
             app_repo = Git.open(app_path)
             Spider.output _("Updating %s from %s") % [spec.app_id, spec.git_repo]
-            options[:branch] ||= 'master'
             Dir.chdir(app_path) do
-                app_repo.branch('master').checkout
+                response = `git status`
+                unless response =~ /working directory clean/
+                    Spider.output(_("You have local modifications in the #{spec.id} app"), :ERROR)
+                    Spider.output(_("Commit them or reset repo to update"), :ERROR)
+                    exit
+                end
+                `git checkout master`
             end
             response = err = nil
             Dir.chdir(app_path) do
@@ -348,9 +365,10 @@ module Spider
                 Spider.output err, :ERROR
                 raise "Unable to update"
             end
-            Dir.chdir(app_path) do
-                app_repo.reset('HEAD', :hard => true)
-                app_repo.branch('master').checkout
+            if spec.branch != 'master'
+                Dir.chdir(app_path) do
+                    `git checkout #{spec.branch}`
+                end
             end
             # response = err = nil
             # Dir.chdir(app_path) do
@@ -476,6 +494,16 @@ module Spider
         end
 
 
+        private
+
+        def reset_git_env
+            ENV['GIT_WORK_TREE'] = nil
+            ENV["GIT_INDEX_FILE"] = nil
+            ENV["GIT_WORK_TREE"] = nil
+            ENV["GIT_DIR"] = nil
+        end
+
+
     end
 
 end

data/lib/spiderfw/setup/spider_setup_wizard.rb

@@ -197,7 +197,7 @@ module Spider
                 end
                 ask _("Database type: "), :db_type, :choices => ['sqlite', 'mysql', 'oracle'], \
                     :default => url_db_type
-                break unless @db_type
+                return unless @db_type
                 unless @db_type == 'sqlite'
                     db = wizard_instance(get_db_wizard(@db_type))
                     db.parse_url(conf["url"]) if conf && conf["url"] && @db_type == url_db_type

data/lib/spiderfw/templates/layout.rb

@@ -33,7 +33,7 @@ module Spider
             assets = {:css => [], :js => []}
             compress_assets = {:js => {}, :css => {}}
             seen = {}
-            js_messages = []
+            js_translations = {}
             use_cdn = Spider.conf.get('assets.use_cdn')
             cname = File.basename(@path, '.layout.shtml')
             cname = File.basename(cname, '.shtml')
@@ -49,7 +49,7 @@ module Spider
                 
                 ass = compile_asset(ass)
 
-                res = prepare_asset(ass, compress_assets, js_messages)
+                res = prepare_asset(ass, compress_assets, js_translations)
                 assets[:css] += res[:css]
                 assets[:js] += res[:js]
 
@@ -87,18 +87,16 @@ module Spider
             @content[:yield_to] = @template
             @scene.assets = @template_assets
             @scene.extend(LayoutScene)
-            if js_messages.empty?
+            if js_translations.empty?
                 @scene.js_translations = ""
             else
-                translations = {}
-                js_messages.each{ |msg| translations[msg] = _(msg) }
-                @scene.js_translations = "var translations = #{translations.to_json}"
+                @scene.js_translations = "var translations = #{js_translations.to_json}"
             end
             
             @assets_prepared = true
         end
 
-        def prepare_asset(ass, compress_assets={}, js_messages=[])
+        def prepare_asset(ass, compress_assets={}, js_translations={})
             type = ass[:type].to_sym
             assets = {:css => [], :js => []}
             pub_dest = nil
@@ -168,7 +166,13 @@ module Spider
             if ass[:gettext] && type == :js
                 msg_path = asset_gettext_messages_file(ass[:path])
                 if File.exists?(msg_path)
-                    js_messages += JSON.parse(File.read(msg_path))
+                    js_messages = JSON.parse(File.read(msg_path))
+                    Spider::GetText.in_domain(ass[:app].short_name) do
+                        js_messages.each{ |msg|
+                            next if js_translations.key?(msg)
+                            js_translations[msg] = _(msg) 
+                        }
+                    end
                 else
                     Spider.logger.warn("Javascript Gettext file #{msg_path} not found")
                 end

data/lib/spiderfw/templates/template.rb

@@ -29,6 +29,7 @@ module Spider
         attr_accessor :runtime_overrides
         attr_reader :overrides, :path, :subtemplates, :widgets, :content
         attr_accessor :asset_profiles
+        attr_accessor :subtemplate_of
         
         @@registered = {}
         @@widget_plugins = {}
@@ -258,7 +259,12 @@ module Spider
                 end
             end
             @compiled = self.class.cache.fetch(cache_path) do
-                compile(:mode => @mode)
+                begin
+                    compile(:mode => @mode)
+                rescue Exception
+                    Spider.logger.error("Failed compilation of template #{@path}:")
+                    raise
+                end
             end
         end
         
@@ -268,7 +274,7 @@ module Spider
             compiled.source_path = @path
             doc = open(@path){ |f| Hpricot.XML(f) }
             root = get_el(doc)
-            el = process_tags(root)
+            process_tags(root)
             apply_overrides(root)
             root.search('tpl:placeholder').remove # remove empty placeholders
             owner_class = @owner ? @owner.class : @owner_class
@@ -288,7 +294,6 @@ module Spider
             root.search('.to_delete').remove
             root.search('tpl:assets').each do |ass|
                 if wattr = ass.get_attribute('widgets')
-                    widgets = []
                     wattr.split(/,\s*/).each do |w|
                         w_templates = nil
                         if w =~ /(\.+)\((.+)\)/
@@ -332,6 +337,7 @@ module Spider
             compiled.block = root_block.compile(options)
             subtemplates.each do |id, sub|
                 sub.owner_class = @subtemplate_owners[id]
+                sub.subtemplate_of = options[:owner_class]
                 compiled.subtemplates[id] = sub.compile(options.merge({:mode => :widget})) # FIXME! :mode => :widget is wrong, it's just a quick kludge
                 @assets += compiled.subtemplates[id].assets
             end
@@ -510,6 +516,7 @@ module Spider
                     ext_owner = @owner.class
                     ext_app = ext_owner.app
                 end
+                @extended_app = ext_app
                 ext_search_paths = nil
                 if ext_owner && ext_owner.respond_to?(:template_paths)
                     ext_search_paths = ext_owner.template_paths
@@ -522,7 +529,6 @@ module Spider
                     assets += root.children_of_type('tpl:assets')
                 end
                 @dependencies << ext
-                tpl = Template.new(ext)
                 root = get_el(ext)
                 if ext_app.short_name != our_domain
                     root.set_attribute('tpl:text-domain', ext_app.short_name)
@@ -827,6 +833,18 @@ module Spider
             if override.name == 'tpl:delete'
                 found.remove
             else
+                td = nil
+                orig_td = nil
+                if @extended_app
+                    td = @definer_class.respond_to?(:app) ? @definer_class.app.short_name : nil
+                    orig_td = @extended_app.short_name
+                elsif @subtemplate_of
+                    td = @subtemplate_of.respond_to?(:app) ? @subtemplate_of.app.short_name : nil
+                    orig_td = @definer_class.respond_to?(:app) ? @definer_class.app.short_name : nil
+                end
+                if td && orig_td && td != orig_td
+                    override.innerHTML = '<tpl:pass tpl:text-domain="'+td+'">'+override.innerHTML+'</tpl:pass>'                
+                end
                 found.each do |f|
                     o_doc = nil
                     if override.name == 'tpl:override-content'
@@ -837,10 +855,16 @@ module Spider
                             if o_search = o.get_attribute('search')
                                 o_doc ||= Hpricot("<o>#{overridden}</o>")
                                 ovr = o_doc.root.search(o_search).to_html
-                            end 
+                            end
+                            if orig_td
+                                ovr = '<tpl:pass tpl:text-domain="'+orig_td+'">'+ovr+'</tpl:pass>'
+                            end
                             o.swap(ovr)
                         end
                     elsif override.name == 'tpl:override' || override.name == 'tpl:content'
+                        if orig_td
+                            f.set_attribute('tpl:text-domain', orig_td)
+                        end
                         overridden = f.to_html
                         parent = f.parent
                         if f == el
@@ -872,6 +896,7 @@ module Spider
                     elsif override.name == 'tpl:after'
                         f.after(override.innerHTML)
                     end
+
                 end
             end
         end

data/lib/spiderfw/templates/template_blocks.rb

@@ -37,6 +37,8 @@ module Spider
                 block = :Run
             elsif el.name == 'sp:yield'
                 block = :Yield
+            elsif !skip_attributes && el.has_attribute?('tpl:text-domain')
+                block = :TextDomain    
             elsif el.name == 'sp:pass' || el.name == 'tpl:pass' || el.name == 'sp:template'
                 block = :Pass
             elsif el.name == 'sp:debugger'
@@ -45,8 +47,6 @@ module Spider
                 block = :ParentContext
             elsif el.name == 'sp:recurse'
                 block = :Recurse
-            elsif !skip_attributes && el.has_attribute?('tpl:text-domain')
-                block = :TextDomain    
             elsif Spider::Template.registered?(el.name)
                 klass = Spider::Template.get_registered_class(el.name)
                 if klass < ::Spider::Widget

data/lib/spiderfw/widget/widget.rb

@@ -16,7 +16,7 @@ module Spider
         attr_accessor :active
         
         @@common_attributes = {
-            :id => {}
+            :id => {:process => lambda{ |val| val.gsub('-', '_')}}
         }
         
         class << self