spiderfw 0.6.20 → 0.6.21

data/lib/spiderfw/setup/setup_task.rb

@@ -74,6 +74,41 @@ module Spider
                 m.mapper.sync_schema(false, options)
             end
         end
+
+        def confirm(msg, default=nil)
+            yes = _("yes")
+            no = _("no")
+            y = yes[0].chr
+            n = no[0].chr
+            if default == true
+                y = y.upcase
+            elsif default == false
+                n = n.upcase
+            end
+
+            good = false
+
+            while !good
+                print "#{msg} #{y}/#{n}]: "
+                res = $stdin.gets.strip
+                
+                good = true
+                if res == yes || res == y
+                    res = true
+                elsif res == no || res == n
+                    res = false
+                elsif res.blank? && !default.nil?
+                    res = default
+                else
+                    good = false
+                end
+
+            end
+
+            return res
+
+
+        end
         
         # def no_sync_schema
         #     @no_sync = true
@@ -145,6 +180,14 @@ module Spider
             @cleanup = proc if proc
             @cleanup
         end
+
+        def self.interactive!
+            @interactive = true
+        end
+
+        def self.interactive?
+            !!@interactive
+        end
         
     end
     

data/lib/spiderfw/setup/spider_setup_wizard.rb

@@ -77,7 +77,7 @@ module Spider
                         res = true
                     elsif res == no || res == n
                         res = false
-                    elsif options[:default]
+                    elsif res.blank? && options[:default]
                         res = options[:default]
                     else
                         good = false

data/lib/spiderfw/spider.rb

@@ -73,7 +73,9 @@ module Spider
             end
             init_file = File.join($SPIDER_RUN_PATH, 'init.rb')
             ENV['BUNDLE_GEMFILE'] ||= File.join($SPIDER_RUN_PATH, 'Gemfile')
-            require 'bundler/setup' if File.exists? ENV['BUNDLE_GEMFILE']
+            if File.exists?(ENV['BUNDLE_GEMFILE']) && File.exists?(File.join($SPIDER_RUN_PATH, 'Gemfile.lock'))
+                require 'bundler/setup' 
+            end
             
             if File.exist?(init_file)
                 @home.instance_eval(File.read(init_file), init_file)
@@ -85,8 +87,17 @@ module Spider
         
         def init_apps
             @apps.each do |name, mod|
+                repos = []
                 if File.directory?(File.join(mod.path, 'po'))
-                    FastGettext.add_text_domain(mod.short_name, :path => File.join(mod.path, 'data', 'locale'))
+                    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')
+                if File.file?(home_pot) && File.directory?(home_locale)
+                    repos << FastGettext::TranslationRepository.build(mod.short_name, :path => home_locale)
+                end
+                unless repos.empty?
+                    FastGettext.add_text_domain(mod.short_name, :type => :chain, :chain => repos)
                 end
             end
             @apps.each do |name, mod|
@@ -99,10 +110,10 @@ module Spider
         end
         
         def init_base(force=false)
+            return if @init_base_done && !force
             l = Spider.locale.to_s
             l = $1 if l =~ /(\w\w)_+/
             FastGettext.locale = l
-            return if @init_base_done && !force
             
             @apps_to_load = []
             @root = $SPIDER_RUN_PATH
@@ -146,6 +157,7 @@ module Spider
 
         # Invoked before a long running service started. Apps may implement the app_startup method, that will be called.
         def startup
+            init
             setup_env
             if Spider.conf.get('template.cache.reload_on_restart')
                 FileUtils.touch("#{Spider.paths[:tmp]}/templates_reload.txt")
@@ -314,6 +326,7 @@ module Spider
         
         # Closes any open loggers, and opens new ones based on configured settings.
         def start_loggers(force=false)
+            init_base
             return if @logger_started && !force
             @logger.close_all
             @logger.open(STDERR, Spider.conf.get('log.console')) if Spider.conf.get('log.console')

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

@@ -30,7 +30,9 @@ module Spider; module TemplateBlocks
                 if @el.has_attribute?('id')
                     cl += ' ' unless cl.empty?
                     cl += "id-#{@el.get_attribute('id')}"
+                    our_id = @el.get_attribute('id')
                     @el.remove_attribute('id')
+                    @el.set_attribute('id', "{ @widget[:full_id] }-#{our_id}")
                 end
                 if (options[:root])
                     cl += " widget"

data/lib/spiderfw/templates/layout.rb

@@ -193,16 +193,21 @@ module Spider
             return ass unless ass[:src]
             if ass[:type] == :css
                 ext = File.extname(ass[:path])
-                if ['.scss', '.sass'].include?(ext)
+                compile_exts = ['.scss', '.sass', '.less']
+                if compile_exts.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)
+                    compiler = if ['.scss', '.sass'].include?(ext)
+                        require 'spiderfw/templates/resources/sass'
+                        Spider::SassCompiler
+                    elsif ext == '.less'
+                        require 'spiderfw/templates/resources/less'
+                        Spider::LessCompiler
+                    end
+                    compiler.compile(ass[:path], dest)
                     ass[:path] = dest
                     ass[:src] = File.join(File.dirname(ass[:src]), newname)
                 end

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

@@ -1,14 +1,17 @@
-module Spider; module TemplateResources
+require 'less-js'
+
+module Spider
     
-    module Less
+    module LessCompiler
         
-        def self.process
-            
-            
-            
+        def self.compile(src, dest)
+            output = LessJs.compile File.read(src)
+            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; end
+end

data/lib/spiderfw/templates/template_blocks.rb

@@ -141,7 +141,7 @@ module Spider
                     when :plain
                         res += escape_text(val)
                     when :escaped_expr
-                        res += "{ #{val} }"
+                        res += "{ #{escape_text(val)} }"
                     when :expr
                         res += "'+("+vars_to_scene(val)+").to_s+'"
                     when :gettext

data/lib/spiderfw/test/capybara.rb

@@ -4,4 +4,5 @@ require 'capybara/cucumber'
 require 'culerity'
 
 Capybara.app = Spider::HTTP::RackApplication.new
-Capybara.default_host = 'localhost'
+Capybara.default_host = 'localhost'
+Capybara.app_host = 'http://localhost'

data/lib/spiderfw/test.rb

@@ -62,8 +62,9 @@ module Spider; module Test
     
     def self.load_fixtures(app, truncate=false)
         path = File.join(app.path, 'test', 'fixtures')
+        loaded = []
         Dir.glob(File.join(path, '*.yml')).each do |yml|
-            Spider::Model.load_fixtures(yml, truncate)
+            loaded += Spider::Model.load_fixtures(yml, truncate)
         end
     end
     

data/lib/spiderfw.rb

@@ -1,4 +1 @@
-require 'spiderfw/spider'
-
-
-Spider::init()
+require 'spiderfw/spider'

data/spider.gemspec

@@ -38,9 +38,12 @@ Gem::Specification.new do |s|
   s.add_dependency("builder", ["> 2.1"])
   s.add_dependency("macaddr", [">= 1.0.0"])
   s.add_dependency("bundler")
+  s.add_dependency("mail")
   s.add_development_dependency("rake", ["> 0.7.3"])
-  s.add_development_dependency("ruby-debug", ["> 0.9.3"])
-  s.requirements << "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
+  s.add_development_dependency("gettext", ['>= 2.1.0'])
+  s.add_development_dependency("fssm")
+
+  s.requirements << "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, cldr"
   # optional dependencies
   # 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 6
-  - 20
-  version: 0.6.20
+  - 21
+  version: 0.6.21
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 +02:00
+date: 2011-11-03 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,9 +186,23 @@ dependencies:
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: mail
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -200,23 +214,37 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: gettext
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 11
         segments: 
+        - 2
+        - 1
         - 0
-        - 9
-        - 3
-        version: 0.9.3
+        version: 2.1.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: fssm
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id015
 description: Spider is yet another Ruby framework.
 email: abmajor7@gmail.com
 executables: 
@@ -984,10 +1012,9 @@ files:
 - blueprints/home/.gitignore
 - blueprints/home/apps/.gitignore
 - blueprints/home/config/config.yml
-- blueprints/home/Gemfile.disabled
+- blueprints/home/Gemfile
 - blueprints/home/init.rb
 - blueprints/home/public/.gitignore
-- blueprints/home/spider.gemfile
 - blueprints/home/tmp/.gitignore
 - blueprints/home/var/.gitignore
 - blueprints/home/var/cache/.gitignore
@@ -1065,6 +1092,7 @@ files:
 - lib/spiderfw/i18n/provider.rb
 - lib/spiderfw/i18n/rails.rb
 - lib/spiderfw/i18n/shtml_parser.rb
+- lib/spiderfw/init.rb
 - lib/spiderfw/model/active_record.rb
 - lib/spiderfw/model/base_model.rb
 - lib/spiderfw/model/condition.rb
@@ -1095,6 +1123,7 @@ files:
 - 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/drop_table.rb
 - lib/spiderfw/model/migrations/irreversible_migration.rb
 - lib/spiderfw/model/migrations/migration.rb
 - lib/spiderfw/model/migrations/replace.rb
@@ -1256,9 +1285,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
+- "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, cldr"
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A (web) framework

data/blueprints/home/Gemfile.disabled

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-self.instance_eval(Bundler.read_file('spider.gemfile'), 'spider.gemfile', 1) if File.exist?('spider.gemfile')