spiderfw 0.6.21 → 0.6.22

data/CHANGELOG

@@ -1,3 +1,36 @@
+= 0.6.22
+== 14 December, 2011
+* New core admin app
+* Core widgets now include only minimal CSS
+* SASS, Compass and Less support
+* Added dependency on Backports gem
+* Branches support for app server and client
+* Interactive/non-interactive modes in setup
+* Added Model::Request.strict, which creates a Request that is not auto-expanded
+* Added support for aggregates in query Request; added explicit 'group by' option in Query.
+* Much improved Tree model mixin
+* DbMapper#bulk_update now allows nil conditions (whole table update)
+* Static requests are now logged according to log.static_extensions config option (only errors are fully
+  logged by default, otherwise only a GET line is printed)
+* Added fallback routes for Controllers (with 'route nil :destination')
+* :do proc in Route now receives the matched part as an argument (in addition to route arguments)
+* Fixed error messages being printed multiple times
+* Each Controller's before and after methods are now executed only once when there are routes to self
+* Fixes for Windows and JRuby 
+* Migrations now can refer to previous version's models through Migrations::PreviousModel
+* Added RenameElement migration
+* All form inputs are now wrapped in DIVs
+* Fixed error in MySQL when synching schemas that change the primary autoincrement key
+* Added :fixed attribute to DbSchema#set_foreign_key
+* Widget.parse_content_xml is now responsible for wrapping the xml to construct a document
+* FileInput widget now saves to var/data/uploaded_files instead of data/uploaded_files
+* Widget attributes now can have a dash ('-') in their name; the dash is replaced with an
+  underscore in variables
+* Fixed broken app update command
+* An object's children are no longer added to the UnitOfWork if they are unmodified
+* Added template.cache.use_fssm to clear template cache on file change (faster alternative to template.cache.disable)
+* Various other minor fixes and enhancements
+
 = 0.6.21
 == 03 November, 2011
 * require 'spidefw' no longer runs Spider.init(); use require 'spiderfw/init' instead

data/Rakefile

@@ -5,7 +5,6 @@ require 'pathname'
 def check_app_path(full, partial)
     p = Pathname.new(full)
     rel = p.relative_path_from(Pathname.new($SPIDER_PATHS[:core_apps]))
-    return true if partial == "spider" && !rel.to_s.blank?
     return true if rel.to_s == partial
     if Spider.paths[:apps]
         rel = p.relative_path_from(Pathname.new(Spider.paths[:apps]))

data/VERSION

@@ -1 +1 @@
-0.6.21
+0.6.22

data/apps/core/admin/_init.rb

@@ -6,6 +6,7 @@ module Spider
         @description = ""
         @version = 0.1
         @short_name = 'admin'
+        @route_url = 'admin'
         @path = File.dirname(__FILE__)
         @controller = :AdminController
         include Spider::App
@@ -15,7 +16,10 @@ module Spider
     
 end
 
+require 'apps/core/admin/admin'
+
 require 'apps/core/admin/controllers/admin_controller'
+require 'apps/core/admin/controllers/app_admin_controller'
 require 'apps/core/admin/widgets/admin_menu/admin_menu'
 
 Spider::Template.register_namespace('spider-admin', Spider::Admin)

data/apps/core/admin/admin.rb

@@ -3,11 +3,27 @@ module Spider
     module Admin
     
         def self.apps
-            @apps.values
+            @apps ||= Spider::OrderedHash
         end
-        
-        def self.add(app)
-            @apps[app.name] = app
+
+        def self.register_app(mod, controller, options)
+            @apps[mod.short_name] = {
+                :module => mod,
+                :controller => controller,
+                :options => options
+            }
+
+            Admin::AdminController.route mod.short_name, controller, :do => lambda{ |app_name|
+                @scene.current_app = Spider::Admin.apps[app_name]
+            }
+        end
+
+        def self.allowed_users
+            users = [Spider::Auth::SuperUser]
+            @apps.each do |name, app|
+                users += app[:options][:users] if app[:options][:users]
+            end
+            users.uniq
         end
         
         

data/apps/core/admin/controllers/admin_controller.rb

@@ -1,12 +1,71 @@
 module Spider; module Admin
+
+    class LoginController < Spider::Auth::LoginController
+        
+        layout 'login'
+        
+        def before(action='', *params)
+            @scene.login_title = _("Administration")
+            super
+        end
+        
+        def self.users
+            Spider::Admin.allowed_users
+        end
+
+        
+        def self.default_redirect
+            AdminController.url
+        end
+        
+        def self.logout_redirect
+            AdminController.url('login')
+        end
+    end
     
     class AdminController < Spider::PageController
-        layout :spider_admin
-        
+        layout 'admin'
+
+        include Spider::Auth::AuthHelper
+        include StaticContent
+
+        def self.auth_require_users
+            [[Spider::Admin.allowed_users, {:unless => [:login], :redirect => 'login'}]]
+        end
         
+        route 'login', LoginController
+
+
+        def before(action='', *params)
+            super
+            
+            return if serving_static?(action)
+            return unless @request.user
+            @scene.username = @request.user.username
+            @scene.apps = []
+            Admin.apps.each do |short_name, app|
+                unless @request.user.superuser?
+                    next if app[:options][:users] && !app[:options][:users].include?(@request.user.class)
+                end
+                url = self.class.http_url(short_name)
+                @scene.apps << {
+                    :icon => app[:module].pub_url+'/'+app[:options][:icon],
+                    :url => self.class.http_url(short_name),
+                    :name => app[:module].full_name,
+                    :description => app[:module].description,
+                    :module => app[:module],
+                    :priority => app[:options][:priority] || 1
+                }
+            end
+            @scene.admin_breadcrumb = []
+            @scene.admin_breadcrumb << {:url => self.class.url, :label => _('Home')} if @scene.apps.length > 1
+
+            # FIXME
+            @scene.apps.sort!{ |a,b| a[:priority] <=> b[:priority] }
+        end
+
+        __.html :template => 'index'
         def index
-            @response.headers['Content-Type'] = 'text/html'
-            render 'index'
         end
         
     end

data/apps/core/admin/controllers/app_admin_controller.rb

@@ -0,0 +1,15 @@
+module Spider; module Admin
+
+    class AppAdminController < Spider::PageController
+
+        def before(action='', *params)
+            unless @_did_breadcrumb
+                @scene.admin_breadcrumb << {:url => self.class.url, :label => self.class.app.full_name}
+            end
+            @_did_breadcrumb = true
+            super
+        end
+
+    end
+
+end; end

data/apps/core/admin/po/admin.pot

@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Spider::Admin 0.1\n"
+"POT-Creation-Date: 2011-11-15 16:11+0100\n"
+"PO-Revision-Date: 2011-11-15 16:11+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: controllers/admin_controller.rb:15
+msgid "Home"
+msgstr ""
+
+#: views/admin.layout.shtml:6 views/admin.layout.shtml:14
+msgid "Administration"
+msgstr ""
+
+#: views/admin.layout.shtml:17
+msgid "Welcome, %s."
+msgstr ""
+
+#: widgets/admin_menu/admin_menu.rb:10
+msgid "Applications"
+msgstr ""

data/apps/core/admin/po/it/admin.po

@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Spider::Admin 0.1\n"
+"POT-Creation-Date: 2011-11-15 16:11+0100\n"
+"PO-Revision-Date: 2011-11-15 16:12+0100\n"
+"Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: controllers/admin_controller.rb:15
+msgid "Home"
+msgstr "Home"
+
+#: views/admin.layout.shtml:6
+#: views/admin.layout.shtml:14
+msgid "Administration"
+msgstr "Amministrazione"
+
+#: views/admin.layout.shtml:17
+msgid "Welcome, %s."
+msgstr "Benvenuto, %s"
+
+#: widgets/admin_menu/admin_menu.rb:10
+msgid "Applications"
+msgstr "Applicazioni"
+

data/apps/core/admin/public/css/admin.css

@@ -0,0 +1,13 @@
+#header{
+    height: 130px;
+    background: url("img/header_bg.png") repeat-x scroll center top;
+    background-color: #417690;
+    position: relative;
+}
+
+#admin_controls{
+    position: absolute;
+    top: 20px;
+    right: 30px;
+    color: white;
+}

data/apps/core/admin/public/css/login.css

@@ -0,0 +1,51 @@
+/* @override http://localhost:8989/cms/public/css/login.css */
+
+body{
+    background-color: #C5C5C5;
+}
+
+#content{
+    text-align: center;
+}
+
+.login-page{
+    margin: 10px auto;
+    padding: 10px 10px 20px 10px;
+    background-color: #ebebeb;
+    overflow: hidden;
+    width: 20em;
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+}
+
+h3{
+    background-color: #d0cede;
+    padding: 5px 0;
+    color: #535353;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+form{
+    width: 10em;
+    display: block;
+    margin: auto;
+}
+
+form .row{
+    text-align: left;
+    margin-bottom: 15px;
+}
+
+form .row label{
+    text-align: left;
+    display: block;
+    color: #6a6a6a;
+}
+
+#login, #password{
+    width: 15em;
+    
+}

data/apps/core/admin/public/css/sass/admin.css

@@ -0,0 +1,198 @@
+/* line 33, ../../sass/grid.scss */
+body {
+  width: 100%;
+  *zoom: 1;
+}
+/* line 20, ../../sass/grid.scss */
+body:before, body:after {
+  content: "";
+  display: table;
+}
+/* line 24, ../../sass/grid.scss */
+body:after {
+  clear: both;
+}
+
+/* line 27, icons */
+.icons-sprite, .icons-logout, #header #admin_controls .logout_link {
+  background: url('../../img/icons-s845a69dd9f.png') no-repeat;
+}
+
+/* line 60, ../../../../../../../../../../Users/cerebus/.rbenv/versions/1.8.7-p352/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss */
+.icons-logout, #header #admin_controls .logout_link {
+  background-position: 0 0;
+}
+
+/* line 11, ../../sass/admin.scss */
+#header {
+  padding-bottom: 10px;
+  background: url('../../img/css/header_bg.png?1321971233') repeat-x scroll center top;
+  background-color: #417690;
+  position: relative;
+  border-bottom: 2px solid #555555;
+}
+/* line 18, ../../sass/admin.scss */
+#header #header_top {
+  overflow: hidden;
+  *zoom: 1;
+}
+/* line 22, ../../sass/admin.scss */
+#header h1 {
+  font-size: 27px;
+  color: #444444;
+}
+/* line 27, ../../sass/admin.scss */
+#header #main_title {
+  float: left;
+  margin-top: 8px;
+  margin-left: 40px;
+}
+/* line 32, ../../sass/admin.scss */
+#header #main_title h1 {
+  margin-bottom: 8px;
+}
+/* line 36, ../../sass/admin.scss */
+#header #admin_controls {
+  font-size: .95em;
+  float: right;
+  margin-top: 12px;
+  margin-right: 30px;
+  color: white;
+}
+/* line 43, ../../sass/admin.scss */
+#header #admin_controls a {
+  color: white;
+}
+/* line 47, ../../sass/admin.scss */
+#header #admin_controls .welcome {
+  margin-right: 6px;
+}
+/* line 51, ../../sass/admin.scss */
+#header #admin_controls .logout_link {
+  background-position: right;
+  padding-right: 25px;
+  margin-left: 6px;
+}
+/* line 60, ../../sass/admin.scss */
+#header #app_buttons {
+  height: 68px;
+  min-width: 200px;
+  margin-left: 60px;
+  background: url('../../img/css/noise.png?1321971233') repeat-x scroll center top;
+  background-color: #f4f5f6;
+  -moz-box-shadow: 0px 0px 5px #333333;
+  -webkit-box-shadow: 0px 0px 5px #333333;
+  -o-box-shadow: 0px 0px 5px #333333;
+  box-shadow: 0px 0px 5px #333333;
+  -moz-border-radius: 1px;
+  -webkit-border-radius: 1px;
+  -o-border-radius: 1px;
+  -ms-border-radius: 1px;
+  -khtml-border-radius: 1px;
+  border-radius: 1px;
+  overflow: hidden;
+  *zoom: 1;
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: middle;
+  *vertical-align: auto;
+}
+/* line 7, ../../../../../../../../../../Users/cerebus/.rbenv/versions/1.8.7-p352/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheets/compass/css3/_inline-block.scss */
+#header #app_buttons {
+  *display: inline;
+}
+/* line 72, ../../sass/admin.scss */
+#header #app_buttons a {
+  color: #222222;
+}
+/* line 76, ../../sass/admin.scss */
+#header #app_buttons div {
+  width: 55px;
+  height: 55px;
+  margin: 5px;
+  border: 1px solid #BBBBBB;
+  text-align: center;
+  float: left;
+  background-color: #EEEEEE;
+}
+/* line 85, ../../sass/admin.scss */
+#header #app_buttons div img {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 2px;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+  opacity: 0.8;
+}
+/* line 92, ../../sass/admin.scss */
+#header #app_buttons div span.name {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=90);
+  opacity: 0.9;
+  display: block;
+  font-size: 0.8em;
+}
+/* line 99, ../../sass/admin.scss */
+#header #app_buttons a.active div {
+  border: 1px solid #DDDD00;
+}
+/* line 101, ../../sass/admin.scss */
+#header #app_buttons a.active div img {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
+  opacity: 0.7;
+}
+/* line 104, ../../sass/admin.scss */
+#header #app_buttons a.active div span.name {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+  opacity: 0.8;
+}
+
+/* line 115, ../../sass/admin.scss */
+#spider-admin .container-fluid .content {
+  background-color: white;
+}
+
+/* line 122, ../../sass/admin.scss */
+.spider-admin-container {
+  background: url('../../img/css/side_bg.png?1321971233') repeat-y;
+  position: relative;
+  min-width: 940px;
+  padding-left: 20px;
+  padding-right: 20px;
+  border-bottom: 1px solid #CCCCCC;
+  min-height: 500px;
+  overflow: hidden;
+  *zoom: 1;
+}
+/* line 132, ../../sass/admin.scss */
+.spider-admin-container > .spider-admin-sidebar {
+  position: absolute;
+  top: 0;
+  left: 20px;
+  width: 220px;
+  padding: 20px 10px;
+}
+/* line 139, ../../sass/admin.scss */
+.spider-admin-container > .spider-admin-sidebar li.active a {
+  text-decoration: underline;
+}
+/* line 143, ../../sass/admin.scss */
+.spider-admin-container > .spider-admin-sidebar li {
+  margin-bottom: 1px;
+}
+/* line 148, ../../sass/admin.scss */
+.spider-admin-container > .spider-admin-content {
+  margin-left: 240px;
+}
+
+/* line 153, ../../sass/admin.scss */
+.crud .table {
+  width: auto;
+  min-width: 400px;
+}
+
+@media screen and (max-width: 500px) {
+  /* line 162, ../../sass/admin.scss */
+  #header #main_title {
+    font-size: 10px;
+  }
+}