spiderfw 0.6.26.pre1 → 0.6.26

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

@@ -234,7 +234,14 @@ module Spider; module Model
                                 if pos == 1
                                     tree_insert_node_first(el, obj, parent)
                                 else
-                                    tree_insert_node_right(el, obj, sub[pos-2])
+                                    sibling_i = pos-2
+                                    sub.each_index do |i|
+                                        if sub[i] == obj
+                                            sibling_i += 1 if i <= sibling_i
+                                            break
+                                        end
+                                    end
+                                    tree_insert_node_right(el, obj, sub[sibling_i])
                                 end
                             else
                                 tree_insert_node_under(el, obj, parent)
@@ -294,6 +301,9 @@ module Spider; module Model
                 bulk_update({right_el => QueryFuncs::Expression.new(":#{right_el}+#{diff}")}, condition)
                 condition = Condition.new.set(left_el, '>=', left)
                 bulk_update({left_el => QueryFuncs::Expression.new(":#{left_el}+#{diff}")}, condition)
+                obj.get(tree_el).each do |child|
+                    child.save
+                end
             end
             
             def tree_assign_values(tree_el, obj, left)

data/lib/spiderfw/model/model.rb

@@ -222,10 +222,12 @@ module Spider
             uow = self.unit_of_work
             self.start_unit_of_work unless uow
             self.with_identity_mapper do
-                yield Spider::Model.unit_of_work
-                unless uow
-                    self.unit_of_work.commit
-                    self.stop_unit_of_work 
+                begin
+                    yield Spider::Model.unit_of_work
+                
+                    self.unit_of_work.commit unless uow
+                ensure
+                    self.stop_unit_of_work unless uow
                 end
             end
             
@@ -476,4 +478,4 @@ require 'spiderfw/model/query_set'
 require 'spiderfw/model/unit_of_work'
 require 'spiderfw/model/proxy_model'
 require 'spiderfw/model/mixins/tree'
-require 'spiderfw/model/mixins/list'
+require 'spiderfw/model/mixins/list'

data/lib/spiderfw/model/query_set.rb

@@ -299,6 +299,12 @@ module Spider; module Model
         def delete_at(index)
             @objects.delete_at(index)
         end
+
+        # Deletes every element for which block evaluates to true
+        # @return [nil]
+        def delete_if(&proc)
+            @objects.delete_if(&proc)
+        end
         
         # Removes the given object from the QuerySet
         # @param [BaseModel] obj

data/lib/spiderfw/setup/app_server_client.rb

@@ -13,7 +13,7 @@ module Spider
         end
         
         def specs(branch=nil)
-            load_specs(branch) unless @specs
+            load_specs unless @specs
             @specs
         end
         

data/lib/spiderfw/spider.rb

@@ -111,8 +111,8 @@ module Spider
                 if File.directory?(File.join(mod.path, 'po'))
                     repos <<  FastGettext::TranslationRepository.build(mod.short_name, :path => File.join(mod.path, 'data', 'locale'))
                 end
-                home_pot = File.join(Spider.paths[:root], 'po', "#{mod.short_name}.pot")
-                home_locale = File.join(Spider.paths[:root], 'data', 'locale')
+                home_pot = File.join(mod.base_path, 'po', "#{mod.short_name}.pot")
+                home_locale = File.join(mod.base_path, 'data', 'locale')
                 if File.file?(home_pot) && File.directory?(home_locale)
                     repos << FastGettext::TranslationRepository.build(mod.short_name, :path => home_locale)
                 end
@@ -152,17 +152,16 @@ module Spider
                 load_configuration(File.join(path, 'config'))
             end
             @runmode = nil
-            self.runmode = $SPIDER_RUNMODE if $SPIDER_RUNMODE
             load_configuration File.join($SPIDER_PATH, 'config')
             begin
                 user_rc = File.join(Etc.getpwuid.dir, '.spider.conf.yml')
+                if File.file?(user_rc)
+                    load_configuration_file(user_rc)
+                end
             rescue NoMethodError # No getpwuid under windows
             end
-            if File.file?(user_rc)
-                load_configuration_file(user_rc)
-            end
             load_configuration File.join(@root, 'config')
-            self.runmode ||= $SPIDER_RUNMODE if $SPIDER_RUNMODE
+            self.runmode = $SPIDER_RUNMODE || 'devel'
             Locale.default = Spider.conf.get('i18n.default_locale')
             setup_env
             @logger = Spider::Logger
@@ -196,8 +195,6 @@ module Spider
                 if domain = Spider.conf.get('site.domain')
                     ssl_port = Spider.conf.get('site.ssl') ? Spider.conf.get('site.ssl_port') : nil
                     Spider.site = Site.new(domain, Spider.conf.get('site.port'), ssl_port)
-                elsif File.exists?(Site.cache_file)
-                    Spider.site = Site.load_cache
                 end
             end
             if Spider.conf.get('request.mutex')
@@ -381,6 +378,8 @@ module Spider
         # @return [void]
         def request_started
             @request_mutex.lock if (@request_mutex)
+            if File.file?(Spider.paths[:reset_file])
+            end
             Spider::Request.current = {
                 :_start => Time.now
             }
@@ -462,6 +461,7 @@ module Spider
             @paths[:data] = File.join(root, 'data')
             @paths[:log] = File.join(@paths[:var], 'log')
             @paths[:restart_file] = File.join(@paths[:tmp], 'restart.txt')
+            @paths[:reset_file] = File.join(@paths[:tmp], 'reset.txt')
             @paths.each do |k, path|
                 @paths[k] = File.expand_path(File.readlink(path)) if File.symlink?(path)
             end

data/lib/spiderfw/templates/layout.rb

@@ -268,7 +268,7 @@ module Spider
                             end
                             compiler = compiler_class.new(ass[:app].pub_path)
                             compiler.compile(ass[:path], dest)
-                        rescue Exception
+                        rescue Exception => exc
                             if ext == '.less'
                                 msg = "Unable to compile LESS file #{ass[:path]}."
                                 msg += "Please ensure you have a JS backend (see https://github.com/sstephenson/execjs)"
@@ -277,7 +277,9 @@ module Spider
                                 msg += "Please ensure that you have the 'sass' (and optionally 'compass') gems installed."
                             end
                             Spider.logger.error(msg)
-                            unless File.exist?(dest)
+                            if Spider.runmode == "production" && File.exist?(dest)
+                                Spider.logger.error(exc)
+                            else
                                 raise
                             end
                         end
@@ -401,7 +403,7 @@ module Spider
                         FileUtils.mkdir_p(File.dirname(url_dest))
                         cachebuster = Spider.conf.get('css.cachebuster')
                         new_url = app_relative_path ? "#{app_relative_path}/#{src_rel}" : src_rel
-                        if File.exist?(url_src)
+                        if File.file?(url_src)
                             mtime = File.mtime(url_src).to_i
                             if cachebuster && File.exist?(url_dest) && mtime > File.mtime(url_dest).to_i
                                 if cachebuster == :soft

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

@@ -19,9 +19,28 @@ require 'sass'
 
 
 module Spider
+
+    class SassAppImporter < Sass::Importers::Filesystem
+
+        def _find(dir, name, options)
+            Spider.apps_by_path.each do |app_name, mod|
+                if name.index(app_name) == 0 && File.directory?(File.join(dir, app_name))
+                    rel_path = name[app_name.length+1..-1]
+                    name = File.join(app_name, 'public', rel_path)
+                    return super(dir, name, options)
+                end
+            end
+            return super
+        end
+
+    end
     
     class SassCompiler
 
+        def self.options
+            @options ||= {:load_paths => []}
+        end
+
         def initialize(base_path)
             @base_path = base_path
         end
@@ -43,6 +62,16 @@ module Spider
                 src_dir = src_dir
                 # dest_dir = File.dirname(dest)
 
+                sass_options = Compass.sass_engine_options.merge({
+                    :cache_location => File.join(work_dir, '.sass_cache')
+                })
+                # Spider.apps.each do |name, app|
+                #     sass_options[:load_paths] << Sass::Importers::Filesystem.new(app.pub_path)
+                # end
+                Spider.app_paths.each do |path|
+                    sass_options[:load_paths] << SassAppImporter.new(path)
+                end
+
                 options = {
                     :project_path => @base_path,
                     :css_dir => 'css', 
@@ -54,11 +83,10 @@ module Spider
                     :javascripts_dir => 'js',
                     :relative_assets => true,
                     :line_comments => Spider.runmode == 'devel' ? true : false,
-                    :sass => Compass.sass_engine_options.merge({
-                        :cache_location => File.join(work_dir, '.sass_cache')
-                    }),
+                    :sass => sass_options,
                     :css_filename => dest
                 }
+                
                 config = Compass::Configuration::Data.new(:spider, options)
                 Compass.add_project_configuration(config)
                 compiler = Compass::Compiler.new(work_dir, File.dirname(src), File.dirname(dest), options)

data/lib/spiderfw/templates/template.rb

@@ -194,6 +194,7 @@ module Spider
             # *<tpl:delete />* removes the found nodes
             # *<tpl:before />* inserts the given content before the found nodes
             # *<tpl:after />* inserts the given content after the found nodes
+            # *<tpl:content name="content-name" />* replaces a <tpl:placeholder> with the same name
             def override_tags
                 @@overrides
             end
@@ -495,7 +496,7 @@ module Spider
             add_overrides overrides
             our_domain = nil
             if @definer_class
-                our_domain = @definer_class.respond_to?(:app) ? @definer_class.app.short_name : 'spider'
+                our_domain = @definer_class.respond_to?(:app) ? @definer_class.app.gettext_domain : 'spider'
             end
             @overrides += orig_overrides
             if root.name == 'tpl:extend'
@@ -531,8 +532,8 @@ module Spider
                 end
                 @dependencies << ext
                 root = get_el(ext)
-                if ext_app.short_name != our_domain
-                    root.set_attribute('tpl:text-domain', ext_app.short_name)
+                if ext_app.gettext_domain != our_domain
+                    root.set_attribute('tpl:text-domain', ext_app.gettext_domain)
                 end
                 root.children_of_type('tpl:asset').each do |ass|
                     ass_src = ass.get_attribute('src')
@@ -575,7 +576,7 @@ module Spider
                         end
                     end
                     incl_el.search('.to_delete').remove
-                    td = resource.definer.respond_to?(:app) ? resource.definer.app.short_name : 'spider'
+                    td = resource.definer.respond_to?(:app) ? resource.definer.app.gettext_domain : 'spider'
                     if td != our_domain
                         incl_el.set_attribute('tpl:text-domain', td)
                     end
@@ -697,7 +698,7 @@ module Spider
         def render(scene=nil)
             prev_domain = nil
             if @definer_class
-                td = @definer_class.respond_to?(:app) ? @definer_class.app.short_name : 'spider'
+                td = @definer_class.respond_to?(:app) ? @definer_class.app.gettext_domain : 'spider'
                 prev_domain = Spider::GetText.set_domain(td)
             end
             scene ||= @scene
@@ -837,11 +838,11 @@ module Spider
                 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
+                    td = @definer_class.respond_to?(:app) ? @definer_class.app.gettext_domain : nil
+                    orig_td = @extended_app.gettext_domain
                 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
+                    td = @subtemplate_of.respond_to?(:app) ? @subtemplate_of.app.gettext_domain : nil
+                    orig_td = @definer_class.respond_to?(:app) ? @definer_class.app.gettext_domain : nil
                 end
                 if td && orig_td && td != orig_td
                     override.innerHTML = '<tpl:pass tpl:text-domain="'+td+'">'+override.innerHTML+'</tpl:pass>'                

data/lib/spiderfw/widget/widget.rb

@@ -419,7 +419,7 @@ module Spider
         def load_widgets(template=@template)
             if self.class.scene_attributes
                 self.class.scene_attributes.each do |name|
-                    @scene[name] = instance_variable_get("@#{name}")
+                    @scene[name] = instance_variable_get("@#{name}") || attributes[name]
                 end
             end
             template.request = @request
@@ -756,7 +756,7 @@ module Spider
         def set_scene_vars(scene)
             if self.class.scene_attributes # Repeat for new instance variables
                 self.class.scene_attributes.each do |name|
-                    @scene[name] = instance_variable_get("@#{name}")
+                    @scene[name] = instance_variable_get("@#{name}") || attributes[name]
                 end
             end
         end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 1923831835
-  prerelease: 7
+  hash: 51
+  prerelease: 
   segments: 
   - 0
   - 6
   - 26
-  - pre
-  - 1
-  version: 0.6.26.pre1
+  version: 0.6.26
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 +01:00
+date: 2012-04-24 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -420,7 +418,6 @@ files:
 - apps/core/components/public/bootstrap/scss/_close.scss
 - apps/core/components/public/bootstrap/scss/_code.scss
 - apps/core/components/public/bootstrap/scss/_component-animations.scss
-- apps/core/components/public/bootstrap/scss/_custom.css
 - apps/core/components/public/bootstrap/scss/_dropdowns.scss
 - apps/core/components/public/bootstrap/scss/_forms.scss
 - apps/core/components/public/bootstrap/scss/_grid.scss
@@ -433,7 +430,6 @@ files:
 - apps/core/components/public/bootstrap/scss/_navs.scss
 - apps/core/components/public/bootstrap/scss/_pager.scss
 - apps/core/components/public/bootstrap/scss/_pagination.scss
-- apps/core/components/public/bootstrap/scss/_patterns.scss
 - apps/core/components/public/bootstrap/scss/_popovers.scss
 - apps/core/components/public/bootstrap/scss/_print.scss
 - apps/core/components/public/bootstrap/scss/_progress-bars.scss
@@ -447,11 +443,10 @@ files:
 - apps/core/components/public/bootstrap/scss/_utilities.scss
 - apps/core/components/public/bootstrap/scss/_variables.scss
 - apps/core/components/public/bootstrap/scss/_wells.scss
-- apps/core/components/public/bootstrap/scss/bootstrap-responsive.css
-- apps/core/components/public/bootstrap/scss/bootstrap-responsive.scss
 - apps/core/components/public/bootstrap/scss/bootstrap.css
 - apps/core/components/public/bootstrap/scss/bootstrap.scss
-- apps/core/components/public/bootstrap/scss/config.rb
+- apps/core/components/public/bootstrap/scss/responsive.css
+- apps/core/components/public/bootstrap/scss/responsive.scss
 - apps/core/components/public/css/admin.css
 - apps/core/components/public/css/crud.css
 - apps/core/components/public/css/grid/1140.css
@@ -1083,6 +1078,7 @@ files:
 - apps/messenger/controllers/mixins/messenger_helper.rb
 - apps/messenger/data/locale/it/LC_MESSAGES/spider_messenger.mo
 - apps/messenger/Gemfile
+- apps/messenger/lib/backends/mobyt.rb
 - apps/messenger/lib/email_backend.rb
 - apps/messenger/lib/sms_backend.rb
 - apps/messenger/messenger.rb
@@ -1095,8 +1091,10 @@ files:
 - apps/messenger/test/features/attachments.feature
 - apps/messenger/test/features/messenger_helper.feature
 - apps/messenger/test/features/sending_email.feature
+- apps/messenger/test/features/sms_mobyt.feature
 - apps/messenger/test/features/step_definitions/common_steps.rb
 - apps/messenger/test/features/step_definitions/email_steps.rb
+- apps/messenger/test/features/step_definitions/sms_mobyt.rb
 - apps/messenger/test/features/support/env.rb
 - apps/messenger/test/files/test_file1.txt
 - apps/messenger/test/lib/controllers/mail_test_controller.rb
@@ -1443,14 +1441,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, cldr"
 rubyforge_project: 

data/apps/core/components/public/bootstrap/scss/_patterns.scss

@@ -1,13 +0,0 @@
-// PATTERNS
-// Repeatable UI elements outside the base styles provided from the scaffolding
-// ----------------------------------------------------------------------------
-
-
-// PAGE HEADERS
-// ------------
-
-footer {
-  padding-top: $baseLineHeight - 1;
-  margin-top: $baseLineHeight - 1;
-  border-top: 1px solid #eee;
-}

data/apps/core/components/public/bootstrap/scss/config.rb

@@ -1,36 +0,0 @@
-# COMPASS
-# ----------------------------------------------
-# Configuration: http://compass-style.org/help/tutorials/configuration-reference/
-#
-# ----------------------------------------------
-# PRODUCTION
-# compass compile -e production -s compressed --no-line-comments --force --trace --time
-#
-
-# Can be :stand_alone or :rails. Defaults to :stand_alone
-project_type = :stand_alone
-
-# paths
-# Set this to the root of your project when deployed:
-http_path       = "/"
-sass_dir        = ""
-css_dir         = ""
-images_dir      = "../img"
-javascripts_dir = "../js"
-
-# output option: nested, expanded, compact, compressed
-output_style = :expanded
-
-# The environment mode.
-# Defaults to :production, can also be :development
-# Use :development to see line numbers, file names, etc
-environment = :production
-
-# Enable/Disable line comments
-line_comments = false
-
-# Enable relative paths to assets via compass helper functions.
-relative_assets = true
-
-# disable the asset cache buster
-asset_cache_buster :none