spiderfw 0.6.21 → 0.6.22

data/lib/spiderfw/utils/memory.rb

@@ -1,6 +1,10 @@
-begin
-  require 'win32ole'
-rescue LoadError
+require 'rbconfig'
+
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    begin
+      require 'win32ole'
+    rescue LoadError
+    end
 end
 
 module Spider

data/lib/spiderfw/widget/widget.rb

@@ -41,7 +41,8 @@ module Spider
                     s = s.superclass
 
                 end
-                file = caller[cnt].split(':')[0]
+                raise "Unable to determine widget file" unless caller[cnt] =~ /(.+):(\d+)(:in .+)?$/
+                file = $1
                 subclass.instance_variable_set("@widget_path", File.dirname(file))
             end
 
@@ -62,16 +63,18 @@ module Spider
             
             def i_attribute(name, params={})
                 params[:instance_attr] = true
+                params[:ruby_name] = name.to_s.gsub('-', '_').to_sym
                 params[:set_var] = true
                 attribute(name, params)
-                attr_reader(name)
+                attr_reader(params[:ruby_name])
             end
             
             def is_attribute(name, params={})
                 params[:instance_attr] = true
+                params[:ruby_name] = name.to_s.gsub('-', '_').to_sym
                 i_attribute(name, params)
-                attr_to_scene(name)
-                attr_reader(name)
+                attr_to_scene(params[:ruby_name])
+                attr_reader(params[:ruby_name])
             end
             
             def s_attribute(name, params={})
@@ -81,14 +84,16 @@ module Spider
             
             def i_attr_accessor(name, params={})
                 params[:instance_attr] = true
+                params[:ruby_name] = name.to_s.gsub('-', '_').to_sym
                 i_attribute(name, params)
-                attr_accessor(name)
+                attr_accessor(params[:ruby_name])
             end
             
             def is_attr_accessor(name, params={})
                 params[:instance_attr] = true
+                params[:ruby_name] = name.to_s.gsub('-', '_').to_sym
                 is_attribute(name, params)
-                attr_accessor(name)
+                attr_accessor(params[:ruby_name])
             end
             
             def attr_to_scene(*names)
@@ -156,7 +161,7 @@ module Spider
             
             def parse_content_xml(xml)
                 return ["", []] if !xml || xml.strip.empty?
-                return parse_content(Hpricot(xml))
+                return parse_content(Hpricot("<sp:widget-content>#{xml}</sp:widget-content>"))
             end
             
             # Parses widget content at compile time.
@@ -735,6 +740,7 @@ module Spider
             scene.widget[:target_only] = attributes[:"sp:target-only"]
             scene.widget[:is_target] = @is_target
             scene.widget[:is_running] = run?
+            scene.widget[:id] = @id
             if (@parent && @parent.respond_to?(:scene) && @parent.scene)
                 scene._parent = @parent.scene
             end

data/lib/spiderfw/widget/widget_attributes.rb

@@ -33,7 +33,7 @@ module Spider
                 end
             end
             v = params[:process].call(v) if params[:process] && v
-            @widget.instance_variable_set("@#{k}", v) if params[:set_var]
+            @widget.instance_variable_set("@#{params[:ruby_name]}", v) if params[:set_var]
             super(k, v)
         end
         
@@ -42,7 +42,7 @@ module Spider
             params = @attributes[k]
             v = super
             if (!v)
-                return @widget.instance_variable_get("@#{k}") if params[:instance_attr]
+                return @widget.instance_variable_get("@#{params[:ruby_name]}") if params[:instance_attr]
                 return nil
             end
             return v

data/spider.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency("macaddr", [">= 1.0.0"])
   s.add_dependency("bundler")
   s.add_dependency("mail")
+  s.add_dependency("backports")
   s.add_development_dependency("rake", ["> 0.7.3"])
   s.add_development_dependency("gettext", ['>= 2.1.0'])
   s.add_development_dependency("fssm")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 6
-  - 21
-  version: 0.6.21
+  - 22
+  version: 0.6.22
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 +01:00
+date: 2011-12-14 00:00:00 +01:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,9 +200,23 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: backports
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -214,11 +228,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: gettext
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -230,11 +244,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: fssm
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -244,7 +258,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 description: Spider is yet another Ruby framework.
 email: abmajor7@gmail.com
 executables: 
@@ -292,8 +306,42 @@ files:
 - apps/core/admin/_init.rb
 - apps/core/admin/admin.rb
 - apps/core/admin/controllers/admin_controller.rb
+- apps/core/admin/controllers/app_admin_controller.rb
+- apps/core/admin/data/locale/it/LC_MESSAGES/admin.mo
+- apps/core/admin/po/admin.pot
+- apps/core/admin/po/it/admin.po
+- apps/core/admin/public/css/admin.css
+- apps/core/admin/public/css/login.css
+- apps/core/admin/public/css/sass/admin.css
+- apps/core/admin/public/css/sass/bootstrap/bootstrap.css
+- apps/core/admin/public/img/css/header_bg.png
+- apps/core/admin/public/img/css/noise.png
+- apps/core/admin/public/img/css/side_bg.png
+- apps/core/admin/public/img/icons/logout.png
+- apps/core/admin/public/img/icons-s845a69dd9f.png
+- apps/core/admin/public/js/bootstrap-alerts.js
+- apps/core/admin/public/js/bootstrap-buttons.js
+- apps/core/admin/public/js/bootstrap-dropdown.js
+- apps/core/admin/public/js/bootstrap-modal.js
+- apps/core/admin/public/js/bootstrap-popover.js
+- apps/core/admin/public/js/bootstrap-scrollspy.js
+- apps/core/admin/public/js/bootstrap-tabs.js
+- apps/core/admin/public/js/bootstrap-twipsy.js
+- apps/core/admin/public/sass/admin.scss
+- apps/core/admin/public/sass/bootstrap/bootstrap.scss
+- apps/core/admin/public/sass/bootstrap/forms.scss
+- apps/core/admin/public/sass/bootstrap/mixins.scss
+- apps/core/admin/public/sass/bootstrap/patterns.scss
+- apps/core/admin/public/sass/bootstrap/reset.scss
+- apps/core/admin/public/sass/bootstrap/scaffolding.scss
+- apps/core/admin/public/sass/bootstrap/tables.scss
+- apps/core/admin/public/sass/bootstrap/type.scss
+- apps/core/admin/public/sass/bootstrap/variables.scss
+- apps/core/admin/public/sass/grid.scss
+- apps/core/admin/views/_app_info.shtml
+- apps/core/admin/views/admin.layout.shtml
 - apps/core/admin/views/index.shtml
-- apps/core/admin/views/spider_admin.layout.shtml
+- apps/core/admin/views/login.layout.shtml
 - apps/core/admin/widgets/admin_menu/admin_menu.rb
 - apps/core/auth/_init.rb
 - apps/core/auth/config/options.rb
@@ -586,6 +634,7 @@ files:
 - apps/core/components/public/js/jquery/plugins/ui-timepickr/test/styles.css
 - apps/core/components/public/js/jquery/plugins/ui-timepickr/test/test.js
 - apps/core/components/public/js/jquery/plugins/ui-timepickr/test/unit/ui.timepickr.js
+- apps/core/components/public/js/less-1.1.3.min.js
 - apps/core/components/public/js/list.js
 - apps/core/components/public/js/plugins/plugin.js
 - apps/core/components/public/js/plugins/sortable.js
@@ -931,6 +980,7 @@ files:
 - apps/messenger/config/options.rb
 - apps/messenger/config/test.config.yml
 - apps/messenger/config/worker/queue.rb
+- apps/messenger/controllers/messenger_admin_controller.rb
 - apps/messenger/controllers/messenger_controller.rb
 - apps/messenger/controllers/mixins/messenger_helper.rb
 - apps/messenger/data/locale/it/LC_MESSAGES/spider_messenger.mo
@@ -943,6 +993,7 @@ files:
 - apps/messenger/models/sms.rb
 - apps/messenger/po/it/spider_messenger.po
 - apps/messenger/po/spider_messenger.pot
+- apps/messenger/public/app_icon.png
 - apps/messenger/test/features/attachments.feature
 - apps/messenger/test/features/messenger_helper.feature
 - apps/messenger/test/features/sending_email.feature
@@ -955,6 +1006,9 @@ files:
 - apps/messenger/test/templates/email/multipart.txt.erb
 - apps/messenger/test/templates/email/simple.erb
 - apps/messenger/test/templates/email/vars.erb
+- apps/messenger/views/admin/_admin.layout.shtml
+- apps/messenger/views/admin/index.shtml
+- apps/messenger/views/admin/queue.shtml
 - apps/messenger/views/index.shtml
 - apps/messenger/views/list.shtml
 - apps/messenger/views/messenger.layout.shtml
@@ -1126,6 +1180,8 @@ files:
 - lib/spiderfw/model/migrations/drop_table.rb
 - lib/spiderfw/model/migrations/irreversible_migration.rb
 - lib/spiderfw/model/migrations/migration.rb
+- lib/spiderfw/model/migrations/previous_model.rb
+- lib/spiderfw/model/migrations/rename_element.rb
 - lib/spiderfw/model/migrations/replace.rb
 - lib/spiderfw/model/migrations.rb
 - lib/spiderfw/model/mixins/converted.rb
@@ -1195,6 +1251,7 @@ files:
 - lib/spiderfw/templates/blocks/tag.rb
 - lib/spiderfw/templates/blocks/tag_if.rb
 - lib/spiderfw/templates/blocks/text.rb
+- lib/spiderfw/templates/blocks/text_domain.rb
 - lib/spiderfw/templates/blocks/widget.rb
 - lib/spiderfw/templates/blocks/yield.rb
 - lib/spiderfw/templates/layout.rb

data/apps/core/admin/views/spider_admin.layout.shtml

@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <title>Spider - _(Administration)</title>
-        <script sp:each='@assets[:js] |script|' type="text/javascript" src="{ script }"></script>
-        <link sp:each='@assets[:css] |css_file|' rel='stylesheet' href='{ css_file }' />
-    </head>
-    <body>
-        <table>
-            <tr>
-                <td width="18%" valign="top">
-                    <spider-admin:menu id="menu"/>
-                </td>
-                <td valign="top">
-                    <div id="content">
-                        <sp:yield />
-                    </div>
-                </td>
-            </tr>
-        </table>
-    </body>
-</html>