spiderfw 0.6.8 → 0.6.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 0.6.9
+== 28 July, 2011
+* App installer now uses Git gem instead of Grit for better Windows compatibility
+* Switched from GetText to FastGettext
+
 = 0.6.8
 == 26 July, 2011
 * Windows fix (no HUP trapping)

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

data/apps/core/auth/models/mixins/rbac_provider.rb

@@ -89,8 +89,8 @@ module Spider; module Auth
                                         model_name = parts[i..-2].join('_')+'_'
                                         self_name = self_parts[i..-2].join('_')+'_'
                                     end
-                                    model_name += model.label_plural
-                                    self_name += self.label_plural
+                                    model_name += model.label_plural_
+                                    self_name += self.label_plural_
                                     model_name.downcase!
                                     self_name.downcase!
                                     break

data/apps/core/components/widgets/admin/admin.rb

@@ -44,7 +44,6 @@ module Spider; module Components
                     crud.table_widget = @custom_widgets[model][:table] if @custom_widgets[model][:table]
                     crud.form_widget = @custom_widgets[model][:form] if @custom_widgets[model][:form]
                 end
-                
                 @widgets[:switcher].add(model.label_plural, crud, _('Manage Data'))
             end
             if (@request.respond_to?(:user) && @request.user)

data/apps/master/models/server.rb

@@ -13,7 +13,7 @@ module Spider; module Master
         many :commands, Master::Command, :add_reverse => :server
         element_query :pending_commands, :commands, :condition => Spider::Model::Condition.new{ |c| c.status == 'pending' }
         many :resources, Master::Resource, :delete_cascade => true
-        choice :customer, Master::Customer, :add_multiple_reverse => :server
+        choice :customer, Master::Customer, :add_multiple_reverse => :servers
         element :scout_plan_changed, DateTime, :hidden => true
         multiple_choice :admins, Master::Admin, :add_multiple_reverse => :server do
             element :receive_notifications, Bool, :default => true

data/lib/spiderfw/config/configuration_editor.rb

@@ -98,7 +98,7 @@ module Spider
                     context = []
                     indents = {}
                     prev_indent = ""
-                    curr = data
+                    curr = data.dup
                     curr_val = ""
                     last_key = nil
                     level = 0

data/lib/spiderfw/controller/http_controller.rb

@@ -90,6 +90,10 @@ module Spider
             Locale.init(:driver => :cgi)
             Locale.set_request(@request.params['lang'], @request.cookies['lang'], @request.env['HTTP_ACCEPT_LANGUAGE'], @request.env['HTTP_ACCEPT_CHARSET'])
             @request.locale = Locale.current[0]
+            l = @request.locale.to_s
+            l = $1 if l =~ /(\w\w)_+/
+            FastGettext.locale = l
+            FastGettext.text_domain = 'spider'
             if (action =~ /(.+)\.(\w+)$/) # strip extension, set format
                 action = $1
                 @request.format = $2.to_sym

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

@@ -94,7 +94,7 @@ module Spider; module ControllerMixins
         end
         
         def base_url
-            self.class.base_url
+            HTTPMixin.base_url
         end
 
         def prepare_scene(scene)

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

@@ -210,11 +210,13 @@ module Spider; module ControllerMixins
             end
             init_widgets(template, layout)
             return template if done?
-            if layout
-                layout.render(scene)
-            else
-                template.render(scene)
-            end
+            Spider::GetText.in_domain(self.class.app.short_name){
+                if layout
+                    layout.render(scene)
+                else
+                    template.render(scene)
+                end
+            }
             return template
         end
         

data/lib/spiderfw/create.rb

@@ -34,21 +34,21 @@ module Spider
             create(source_path, dest_path)
             
             begin
-                require 'grit'
+                require 'git'
 
                 cwd = Dir.getwd
                 Dir.chdir(dest_path)
                 begin
-                    repo = Grit::Repo.init(dest_path)
-                    repo.add('apps', 'config', 'init.rb', 'public')
+                    repo = Git.init(dest_path)
+                    repo.add(['apps', 'config', 'init.rb', 'public'])
                     repo.add('.gitignore')
-                    repo.commit_index(_("Created repository"))
+                    repo.commit(_("Created repository"))
                 rescue => exc
                     puts "Unable to init Git repo, please init manually"
                 end
                 Dir.chdir(cwd)
             rescue LoadError
-                puts "Grit not installed, cannot init repo"
+                puts "git gem not installed, cannot init repo"
             end
         end
         

data/lib/spiderfw/i18n/gettext.rb

@@ -1,8 +1,24 @@
-# def _(s)
-#     s
-# end
+require 'fast_gettext'
+require 'locale'
+include FastGettext::Translation
+FastGettext.add_text_domain('spider', :path => File.join($SPIDER_PATH, 'data', 'locale'))
+FastGettext.text_domain = 'spider'
+l = Locale.current[0].to_s
+l = $1 if l =~ /(\w\w)_+/
+FastGettext.locale = l
 
-require 'gettext'
-include GetText
-bindtextdomain('spider')
-GetText.set_output_charset('utf-8')
+module Spider
+    
+    module GetText
+        
+        def self.in_domain(domain, &block)
+            prev_text_domain = FastGettext.text_domain
+            FastGettext.text_domain = domain if FastGettext.translation_repositories.key?(domain)
+            v = yield
+            FastGettext.text_domain = prev_text_domain
+            v
+        end
+        
+    end
+    
+end

data/lib/spiderfw/model/base_model.rb

@@ -99,7 +99,11 @@ module Spider; module Model
             @subclasses ||= []
             @subclasses << subclass
             each_element do |el|
-                subclass.add_element(el.clone) unless el.attributes[:local_pk]
+                unless el.attributes[:local_pk]
+                    cl_el = el.clone
+                    cl_el.definer_model = el.definer_model
+                    subclass.add_element(cl_el) 
+                end
             end
             subclass.instance_variable_set("@mapper_modules", @mapper_modules.clone) if @mapper_modules
             subclass.instance_variable_set("@extended_models", @extended_models.clone) if @extended_models
@@ -116,7 +120,7 @@ module Spider; module Model
         def self.app
             return @app if @app
             app = self
-            while (!app.include?(Spider::App))
+            while !app.include?(Spider::App)
                 app = app.parent_module
             end
             @app = app
@@ -527,6 +531,7 @@ module Spider; module Model
         def self.add_element(el)
             @elements ||= {}
             @elements[el.name] = el
+            el.definer_model ||= self
             @elements_order ||= []
             if (el.attributes[:element_position])
                 @elements_order.insert(el.attributes[:element_position], el.name)
@@ -880,13 +885,29 @@ module Spider; module Model
         def self.label(sing=nil, plur=nil)
             @label = sing if sing
             @label_plural = plur if plur
-            _(@label || self.name || '')
+            unless sing
+                Spider::GetText.in_domain(self.app.short_name){
+                    _(@label || self.name || '')
+                }
+            end
         end
         
         # Sets/retrieves the plural form for the label
         def self.label_plural(val=nil)
             @label_plural = val if (val)
-            _(@label_plural || self.name || '')
+            unless val
+                Spider::GetText.in_domain(self.app.short_name){
+                    _(@label_plural || self.name || '')
+                }
+            end
+        end
+        
+        def self.label_
+            @label
+        end
+        
+        def self.label_plural_
+            @label_plural
         end
         
         def self.auto_primary_keys?

data/lib/spiderfw/model/element.rb

@@ -7,6 +7,7 @@ module Spider; module Model
     class Element
         attr_reader :name
         attr_accessor :attributes
+        attr_accessor :definer_model
 
         def initialize(name, type, attributes={})
             @name = name
@@ -145,7 +146,16 @@ module Spider; module Model
         
         # Label. Will use the :label attribute, or return the name split by '_' with each word capitalized.
         def label
-            return self.attributes[:label] ? _(self.attributes[:label]) : Inflector.underscore_to_upcasefirst(@name.to_s)
+            prev_text_domain = nil
+            if @definer_model && @definer_model != Spider::Model::Managed
+                prev_text_domain = FastGettext.text_domain
+                FastGettext.text_domain = @definer_model.app.short_name
+            end
+            l = self.attributes[:label] ? _(self.attributes[:label]) : Inflector.underscore_to_upcasefirst(@name.to_s)
+            if prev_text_domain
+                FastGettext.text_domain = prev_text_domain
+            end
+            l
         end
         
         def to_s

data/lib/spiderfw/model/inline_model.rb

@@ -18,9 +18,11 @@ module Spider; module Model
                 self.data = val if (val)
                 d = @data
                 if self.translate?
-                    @data.each do |k, v|
-                        d[k] = _(v)
-                    end
+                    Spider::GetText.in_domain(self.app.short_name){
+                        @data.each do |k, v|
+                            d[k] = _(v)
+                        end
+                    }
                 end
                 d
             end

data/lib/spiderfw/model/integrated_element.rb

@@ -6,11 +6,13 @@ module Spider; module Model
         def initialize(name, owner, integrated_element, integrated_element_element, attributes={})
             @name = name
             @owner = owner
+            el = @owner.elements[integrated_element]
+            @definer_model = el.model.elements[integrated_element_element].definer_model
             @integrated_element = integrated_element
             @integrated_element_element = integrated_element_element
             @attributes = ({
                 :integrated => true,
-                :integrated_from => @owner.elements[@integrated_element],
+                :integrated_from => el,
                 :integrated_from_element => @integrated_element_element
             }).merge(attributes)
         end

data/lib/spiderfw/setup/app_manager.rb

@@ -34,11 +34,11 @@ module Spider
             use_git = false
             unless options[:no_git]
                 begin
-                    require 'grit'
+                    require 'git'
                     use_git = true
                 rescue => exc
                     puts exc.message
-                    puts "Grit not available; install Grit for Git support"
+                    puts "git gem not available; install git gem for Git support"
                 end
             end
             
@@ -74,7 +74,7 @@ module Spider
                 :no_optional_gems => options[:no_optional_gems]
             }
             i_options[:ssh_user] = options[:ssh_user] if options[:ssh_user]
-            inst_specs = specs.reject!{ |s| existent.include? s.app_id }
+            inst_specs = specs.reject{ |s| existent.include? s.app_id }
             Spider::AppManager.install(inst_specs, Dir.pwd, i_options)
             unless options[:no_activate]
                 require 'spiderfw/spider'
@@ -93,10 +93,10 @@ module Spider
             use_git = false
             unless options[:no_git]
                 begin
-                    require 'grit'
+                    require 'git'
                     use_git = true
                 rescue
-                    puts "Grit not available; install Grit for Git support"
+                    puts "git gem not available; install git gem for Git support"
                 end
             end
             if options[:all]
@@ -131,7 +131,8 @@ module Spider
         def self.install(specs, home_path, options)
             options[:use_git] = true unless options[:use_git] == false
             options[:home_path] = home_path
-            specs = [specs] unless specs.is_a?(Array)
+            specs = [specs] if specs && !specs.is_a?(Array)
+            specs ||= []
             pre_setup(specs, options)
             specs.each do |spec|
                 if spec.git_repo && options[:use_git]
@@ -144,22 +145,25 @@ module Spider
         end
 
         def self.git_install(spec, home_path, options={})
-            require 'grit'
+            require 'git'
             if ::File.exist?("apps/#{spec.id}")
                 puts _("%s already installed, skipping") % spec.id
                 return
             end
-            repo = Grit::Repo.new(home_path)
+            repo = Git.open(home_path)
             puts _("Fetching %s from %s") % [spec.app_id, spec.git_repo]
             repo_url = spec.git_repo
             if options[:ssh_user] && repo_url =~ /ssh:\/\/([^@]+@)?(.+)/
                 repo_url = "ssh://#{options[:ssh_user]}@#{$2}"
             end
-            `#{Grit::Git.git_binary} submodule add #{repo_url} apps/#{spec.id}`
-            repo.git.submodule({}, "init")
-            repo.git.submodule({}, "update")
-            repo.add('.gitmodules', "apps/#{spec.id}")
-            repo.commit_index(_("Added app %s") % spec.id) 
+            
+            Dir.chdir(home_path) do
+                `git submodule add #{repo_url} apps/#{spec.id}`
+                `git submodule init`
+                `git submodule update`
+            end
+            repo.add(['.gitmodules', "apps/#{spec.id}"])
+            repo.commit(_("Added app %s") % spec.id) 
         end
 
         def self.pack_install(spec, home_path, options={})
@@ -223,30 +227,29 @@ module Spider
         end
         
         def self.git_update(spec, home_path, options={})
-            require 'grit'
-            home_repo = Grit::Repo.new(home_path)
+            require 'git'
+            home_repo = Git.open(home_path)
             app_path = File.join(home_path, "apps/#{spec.id}")
-            app_repo = Grit::Repo.new(app_path)
+            app_repo = Git.open(app_path)
             puts _("Updating %s from %s") % [spec.app_id, spec.git_repo]
             Dir.chdir(app_path) do
-                app_repo.git.checkout({}, "master")
+                app_repo.branch('master').checkout
             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)
+                `git --git-dir='#{app_path}/.git' pull origin master`
             end
             if response =~ /Aborting/
                 puts err
                 return
             end
             Dir.chdir(app_path) do
-                app_repo.git.reset({:hard => true}, 'HEAD')
-                app_repo.git.checkout
+                app_repo.reset('HEAD', :hard => true)
+                app_repo.branch('master').checkout
             end
             
             home_repo.add("apps/#{spec.id}")
-            home_repo.commit_index(_("Updated app %s") % spec.id) 
+            home_repo.commit(_("Updated app %s") % spec.id) 
         end
         
         def self.pack_update(spec, home_path, options={})

data/lib/spiderfw/spider.rb

@@ -83,15 +83,15 @@ module Spider
         end
         
         def init_apps
-            @apps.each do |name, mod|
-                mod.app_init if mod.respond_to?(:app_init)
-            end
-            GetText::LocalePath.memoize_clear # since new paths have been added to GetText
             @apps.each do |name, mod|
                 if File.directory?(File.join(mod.path, 'po'))
-                    GetText.bindtextdomain(mod.short_name)
+                    Spider.logger.debug("Adding text domain #{mod.short_name}")
+                    FastGettext.add_text_domain(mod.short_name, :path => File.join(mod.path, 'data', 'locale'))
                 end
             end
+            @apps.each do |name, mod|
+                mod.app_init if mod.respond_to?(:app_init)
+            end
         end
         
         def init_done?
@@ -365,7 +365,6 @@ module Spider
             last_name = File.basename(path)
             app_files = ['_init.rb', last_name+'.rb', 'cmd.rb']
             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
         
         

data/lib/spiderfw/widget/widget.rb

@@ -249,7 +249,9 @@ module Spider
             super
             @is_target = false
             @widgets = {}
-            @attributes = WidgetAttributes.new(self)
+            Spider::GetText.in_domain(self.class.app.short_name){
+                @attributes = WidgetAttributes.new(self)
+            }
             @id_path = []
             @widget_attributes = {}
             locale = @request.locale.language
@@ -317,13 +319,15 @@ module Spider
         end
         
         def widget_before(action='')
-            #Spider.logger.debug("Widget #{self} widget_before(#{action})")
-            widget_init(action)
-            return unless active?
-            #Spider.logger.debug("Preparing widget #{self}")
-            prepare_scene(@scene)
-            prepare
-            @before_done = true
+            Spider::GetText.in_domain(self.class.app.short_name){
+                widget_init(action)
+                if active?
+                    prepare_scene(@scene)
+                    prepare
+                    @before_done = true
+                end
+            }
+
         end
         
         
@@ -425,7 +429,7 @@ module Spider
         
         # Instantiates this widget's own subwidgets.
         def load_widgets(template=@template)
-            if (self.class.scene_attributes)
+            if self.class.scene_attributes
                 self.class.scene_attributes.each do |name|
                     @scene[name] = instance_variable_get("@#{name}")
                 end
@@ -472,7 +476,7 @@ module Spider
         
         def run(action='')
             @widgets.each do |wname, w|
-                w.run if w.run?
+                w.do_run if w.run?
             end
             if (@parent)
                 @parent.after_widget(@id.to_sym)
@@ -489,33 +493,43 @@ module Spider
         end
         
         def index
-            run
+            do_run
             render
         end
         
+        def do_run
+            Spider::GetText.in_domain(self.class.app.short_name){
+                run
+            }
+        end
+        
         def render
-            prepare_scene(@scene)
-            set_scene_vars(@scene)
-            @template.render(@scene) unless @is_target_ancestor && !@is_target
+            Spider::GetText.in_domain(self.class.app.short_name){
+                prepare_scene(@scene)
+                set_scene_vars(@scene)
+                @template.render(@scene) unless @is_target_ancestor && !@is_target 
+            }
         end
         
         def execute(action='', *params)
             Spider.logger.debug("Widget #{self} executing #{action}")
-            widget_execute = @request.params['_we']
-            if (@is_target)
-                if (widget_execute)
-                    super(widget_execute, *params)
+            Spider::GetText.in_domain(self.class.app.short_name){
+                widget_execute = @request.params['_we']
+                if (@is_target)
+                    if (widget_execute)
+                        super(widget_execute, *params)
+                    else
+                        do_run
+                        render
+                    end
+                elsif (@_widget)
+                    @_widget.set_action(widget_execute)
+                    @_widget.before(@_widget_rest, *params)
+                    @_widget.execute(@_widget_rest, *params)
                 else
-                    run
-                    render
+                    super
                 end
-            elsif (@_widget)
-                @_widget.set_action(widget_execute)
-                @_widget.before(@_widget_rest, *params)
-                @_widget.execute(@_widget_rest, *params)
-            else
-                super
-            end
+            }
         end
                         
         def try_rescue(exc)
@@ -751,7 +765,7 @@ module Spider
         end
         
         def set_scene_vars(scene)
-            if (self.class.scene_attributes) # Repeat for new instance variables
+            if self.class.scene_attributes # Repeat for new instance variables
                 self.class.scene_attributes.each do |name|
                     @scene[name] = instance_variable_get("@#{name}")
                 end

data/spider.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.executables = ['spider']
   s.default_executable = 'spider'
   s.add_dependency("cmdparse", ["> 2.0.0"])
-  s.add_dependency("gettext", ["> 2.0.0"])
+  s.add_dependency("fast_gettext", [">= 0.5.13"])
   s.add_dependency("hpricot", ["> 0.8"])
   s.add_dependency("json_pure", ["> 1.1"])
   s.add_dependency("uuidtools", ["> 2.1"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 +02:00
+date: 2011-07-28 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,19 +35,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: gettext
+  name: fast_gettext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 17
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
+        - 5
+        - 13
+        version: 0.5.13
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency