spiderfw 0.6.22 → 0.6.23

data/CHANGELOG

@@ -1,3 +1,12 @@
+= 0.6.23
+== 6 February, 2011
+* Config options can now have a Proc for :choices; new :fallback param to reuse other config
+* Added new-link, edit-link attributes to Crud
+* Added Twitter Bootstrap 2 to core components
+* Updated CKEditor
+* Added test folder to app blueprint
+* Minor fixes
+
 = 0.6.22
 == 14 December, 2011
 * New core admin app

data/VERSION

@@ -1 +1 @@
-0.6.22
+0.6.23

data/apps/app_server/controllers/app_server_controller.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'json'
 
 module Spider; module AppServer
 
@@ -9,6 +10,7 @@ module Spider; module AppServer
         __.html :template => 'app_list'
         __.json :call => :list_json
         def list(name=nil)
+            # FIXME: names, branches
             @scene.apps = AppServer.apps
         end
 
@@ -44,8 +46,11 @@ module Spider; module AppServer
             new_apps = names
             specs = {}
             while !new_apps.empty? && curr = new_apps.pop
+                curr, branch = curr.split('@')
                 raise NotFound.new("App #{curr}") unless AppServer.apps_by_id[curr]
-                spec = AppServer.apps_by_id[curr].spec 
+                a = AppServer.apps_by_id[curr]
+                spec = a.spec
+                spec = a.read_spec(branch) if branch 
                 specs[curr] = spec
                 new_apps += spec.depends.reject{ |app| specs[app] }
                 new_apps += spec.depends_optional.reject{ |app| specs[app] } unless @request.params['no_optional']
@@ -56,4 +61,4 @@ module Spider; module AppServer
     end
 
 
-end; end
+end; end

data/apps/app_server/lib/git_app.rb

@@ -12,8 +12,8 @@ module Spider; module AppServer
             spec = nil
             repo_branches = repo.heads.map{ |h| h.name }
             @branches = repo_branches
-            read_spec
             @repo = repo
+            read_spec
         end
 
         def read_spec(branch='master')
@@ -21,7 +21,7 @@ module Spider; module AppServer
                 next unless blob.basename =~ /\.appspec$/
                 spec = blob.data
                 @spec = Spider::App::AppSpec.eval(spec)
-                @spec.branch = branch
+                #@spec.branch = branch
                 if repo_base = Spider.conf.get('app_server.git_repo_base')
                     unless @spec.git_repo
                         @spec.git_repo(repo_base+'/'+@spec.id)
@@ -33,8 +33,10 @@ module Spider; module AppServer
                     end
                 end
                 @last_modified = repo.commits.first.authored_date # FIXME
+                @spec.app_server ||= AppServer::AppServerController.http_url
                 break
             end
+            @repo = repo
             @spec
         end
         
@@ -44,4 +46,4 @@ module Spider; module AppServer
         
     end
     
-end; end
+end; end

data/apps/cas_server/controllers/mixins/cas_login_mixin.rb

@@ -95,7 +95,8 @@ module Spider; module CASServer
             return true
         end
 
-        def authenticate
+        def authenticate(params={})
+            return super if params[:ignore_cas]
             if error = validate_login_ticket(@request.params['lt'])
                 @scene.message = error
                 return nil

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

@@ -19,7 +19,7 @@ module Spider; module Admin
         end
         
         def self.logout_redirect
-            AdminController.url('login')
+            AdminController.http_url('login')
         end
     end
     
@@ -58,10 +58,10 @@ module Spider; module Admin
                 }
             end
             @scene.admin_breadcrumb = []
-            @scene.admin_breadcrumb << {:url => self.class.url, :label => _('Home')} if @scene.apps.length > 1
+            @scene.admin_breadcrumb << {:url => self.class.http_url, :label => _('Home')} if @scene.apps.length > 1
 
             # FIXME
-            @scene.apps.sort!{ |a,b| a[:priority] <=> b[:priority] }
+            @scene.apps.sort!{ |a,b| b[:priority] <=> a[:priority] }
         end
 
         __.html :template => 'index'
@@ -71,4 +71,4 @@ module Spider; module Admin
     end
     
     
-end; end
+end; end

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

@@ -3,8 +3,9 @@ module Spider; module Admin
     class AppAdminController < Spider::PageController
 
         def before(action='', *params)
+            @scene.admin_breadcrumb ||= []
             unless @_did_breadcrumb
-                @scene.admin_breadcrumb << {:url => self.class.url, :label => self.class.app.full_name}
+                @scene.admin_breadcrumb << {:url => self.class.http_url, :label => self.class.app.full_name}
             end
             @_did_breadcrumb = true
             super
@@ -12,4 +13,4 @@ module Spider; module Admin
 
     end
 
-end; end
+end; end

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

@@ -23,7 +23,27 @@ body:after {
   background-position: 0 0;
 }
 
-/* line 11, ../../sass/admin.scss */
+/* line 17, ../../sass/admin.scss */
+#admin form.form-horizontal input,
+#admin form.form-horizontal textarea,
+#admin form.form-horizontal select,
+#admin form.form-horizontal .uneditable-input {
+  width: 300px;
+}
+/* line 21, ../../sass/admin.scss */
+#admin form.form-horizontal select {
+  width: 310px;
+}
+/* line 25, ../../sass/admin.scss */
+#admin form.form-horizontal input.btn {
+  width: auto;
+}
+/* line 29, ../../sass/admin.scss */
+#admin form.form-horizontal .form-actions {
+  padding-left: 250px;
+}
+
+/* line 39, ../../sass/admin.scss */
 #header {
   padding-bottom: 10px;
   background: url('../../img/css/header_bg.png?1321971233') repeat-x scroll center top;
@@ -31,27 +51,27 @@ body:after {
   position: relative;
   border-bottom: 2px solid #555555;
 }
-/* line 18, ../../sass/admin.scss */
+/* line 46, ../../sass/admin.scss */
 #header #header_top {
   overflow: hidden;
   *zoom: 1;
 }
-/* line 22, ../../sass/admin.scss */
+/* line 50, ../../sass/admin.scss */
 #header h1 {
   font-size: 27px;
   color: #444444;
 }
-/* line 27, ../../sass/admin.scss */
+/* line 55, ../../sass/admin.scss */
 #header #main_title {
   float: left;
   margin-top: 8px;
   margin-left: 40px;
 }
-/* line 32, ../../sass/admin.scss */
+/* line 60, ../../sass/admin.scss */
 #header #main_title h1 {
   margin-bottom: 8px;
 }
-/* line 36, ../../sass/admin.scss */
+/* line 64, ../../sass/admin.scss */
 #header #admin_controls {
   font-size: .95em;
   float: right;
@@ -59,26 +79,25 @@ body:after {
   margin-right: 30px;
   color: white;
 }
-/* line 43, ../../sass/admin.scss */
+/* line 71, ../../sass/admin.scss */
 #header #admin_controls a {
   color: white;
 }
-/* line 47, ../../sass/admin.scss */
+/* line 75, ../../sass/admin.scss */
 #header #admin_controls .welcome {
   margin-right: 6px;
 }
-/* line 51, ../../sass/admin.scss */
+/* line 79, ../../sass/admin.scss */
 #header #admin_controls .logout_link {
   background-position: right;
   padding-right: 25px;
   margin-left: 6px;
 }
-/* line 60, ../../sass/admin.scss */
+/* line 88, ../../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;
@@ -102,11 +121,11 @@ body:after {
 #header #app_buttons {
   *display: inline;
 }
-/* line 72, ../../sass/admin.scss */
+/* line 99, ../../sass/admin.scss */
 #header #app_buttons a {
   color: #222222;
 }
-/* line 76, ../../sass/admin.scss */
+/* line 103, ../../sass/admin.scss */
 #header #app_buttons div {
   width: 55px;
   height: 55px;
@@ -116,7 +135,7 @@ body:after {
   float: left;
   background-color: #EEEEEE;
 }
-/* line 85, ../../sass/admin.scss */
+/* line 112, ../../sass/admin.scss */
 #header #app_buttons div img {
   margin-left: auto;
   margin-right: auto;
@@ -124,35 +143,41 @@ body:after {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
   opacity: 0.8;
 }
-/* line 92, ../../sass/admin.scss */
+/* line 119, ../../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 */
+/* line 126, ../../sass/admin.scss */
 #header #app_buttons a.active div {
   border: 1px solid #DDDD00;
 }
-/* line 101, ../../sass/admin.scss */
+/* line 128, ../../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 */
+/* line 131, ../../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 */
+/* line 139, ../../sass/admin.scss */
+#admin-switcher-menu .section_title {
+  font-size: 14px;
+  line-height: 36px;
+}
+
+/* line 149, ../../sass/admin.scss */
 #spider-admin .container-fluid .content {
   background-color: white;
 }
 
-/* line 122, ../../sass/admin.scss */
-.spider-admin-container {
+/* line 156, ../../sass/admin.scss */
+#container, .spider-admin-container {
   background: url('../../img/css/side_bg.png?1321971233') repeat-y;
   position: relative;
   min-width: 940px;
@@ -163,35 +188,35 @@ body:after {
   overflow: hidden;
   *zoom: 1;
 }
-/* line 132, ../../sass/admin.scss */
-.spider-admin-container > .spider-admin-sidebar {
+/* line 166, ../../sass/admin.scss */
+#container #sidebar, #container > .spider-admin-sidebar, .spider-admin-container #sidebar, .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 {
+/* line 173, ../../sass/admin.scss */
+#container #sidebar li.active a, #container > .spider-admin-sidebar li.active a, .spider-admin-container #sidebar li.active a, .spider-admin-container > .spider-admin-sidebar li.active a {
   text-decoration: underline;
 }
-/* line 143, ../../sass/admin.scss */
-.spider-admin-container > .spider-admin-sidebar li {
+/* line 177, ../../sass/admin.scss */
+#container #sidebar li, #container > .spider-admin-sidebar li, .spider-admin-container #sidebar li, .spider-admin-container > .spider-admin-sidebar li {
   margin-bottom: 1px;
 }
-/* line 148, ../../sass/admin.scss */
-.spider-admin-container > .spider-admin-content {
+/* line 182, ../../sass/admin.scss */
+#container #content, #container > .spider-admin-content, .spider-admin-container #content, .spider-admin-container > .spider-admin-content {
   margin-left: 240px;
 }
 
-/* line 153, ../../sass/admin.scss */
+/* line 187, ../../sass/admin.scss */
 .crud .table {
   width: auto;
   min-width: 400px;
 }
 
 @media screen and (max-width: 500px) {
-  /* line 162, ../../sass/admin.scss */
+  /* line 196, ../../sass/admin.scss */
   #header #main_title {
     font-size: 10px;
   }

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

@@ -8,6 +8,34 @@
 $base_color: #417690;
 $sidebar_color: #DFDFDF;
 
+#admin {
+    form.form-horizontal {
+
+        input,
+        textarea,
+        select,
+        .uneditable-input {
+            width: 300px;
+        }
+
+        select {
+            width: 310px;
+        }
+
+        input.btn {
+            width: auto;
+        }
+
+        .form-actions {
+            padding-left: 250px;
+        }
+        
+    }
+
+}
+
+
+
 #header{
     padding-bottom: 10px;
     background: image-url("css/header_bg.png") repeat-x scroll center top;
@@ -61,7 +89,6 @@ $sidebar_color: #DFDFDF;
         height: 68px;
         min-width: 200px;
         margin-left: 60px;
-        background: image-url("css/noise.png") repeat-x scroll center top;
         background-color: lighten(desaturate($base_color, 30%), 55%);
 
         @include box-shadow();
@@ -108,6 +135,13 @@ $sidebar_color: #DFDFDF;
     }
 }
 
+#admin-switcher-menu {
+    .section_title {
+        font-size: 14px;
+        line-height: 36px;
+    }
+}
+
 #spider-admin{
 
     .container-fluid{
@@ -119,7 +153,7 @@ $sidebar_color: #DFDFDF;
 
 }
 
-.spider-admin-container{
+#container, .spider-admin-container{
     background: image-url("css/side_bg.png") repeat-y;
     position: relative;
     min-width: 940px;
@@ -129,7 +163,7 @@ $sidebar_color: #DFDFDF;
     min-height: 500px;
     @include clearfix();
 
-    > .spider-admin-sidebar {
+    #sidebar, > .spider-admin-sidebar {
         position: absolute;
         top: 0;
         left: 20px;
@@ -145,7 +179,7 @@ $sidebar_color: #DFDFDF;
         }
     }
 
-    > .spider-admin-content {
+    #content, > .spider-admin-content {
         margin-left: 240px;
     }
 }

data/apps/core/admin/views/_breadcrumb.shtml

@@ -0,0 +1,8 @@
+<ul class="breadcrumb" sp:if="@admin_breadcrumb">
+    <li sp:each="@admin_breadcrumb[0..@admin_breadcrumb.length-2] |bc|">
+        <a href="{ bc[:url] }">{ bc[:label] }</a> <span class="divider">/</span>
+    </li>
+    <li class="active" sp:if="@admin_breadcrumb.last">
+        { @admin_breadcrumb.last[:label] }
+    </li>
+</ul>

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

@@ -1,9 +1,11 @@
 <!DOCTYPE HTML>
 <html>
-    <tpl:asset type="css" src="sass/bootstrap/bootstrap.scss" />
+    <tpl:asset name="bootstrap-sass" />
     <tpl:asset type="css" src="sass/admin.scss" />
     <head>
-        <title>_(Administration) - { @current_app[:module].name }</title>
+        <title>_(Administration)
+              <tpl:pass sp:if="@current_app && @current_app[:module]"> - { @current_app[:module].name }</tpl:pass>
+        </title>
         <tpl:output-assets type="css" />
         <tpl:output-assets type="js" />
     </head>
@@ -12,12 +14,13 @@
             <div id="header_top">
                 <div id="main_title">
                     <h1>
-                        _(Administration) - { @current_app[:module].name }
+                        _(Administration) 
+                        <tpl:pass sp:if="@current_app && @current_app[:module]"> - { @current_app[:module].name }</tpl:pass>
                     </h1>
                 </div>
                 <div id="admin_controls">
                     <span class="welcome">_(Welcome, %s.) % @username</span> - 
-                    <a class="logout_link" href="{ Spider::Admin::AdminController.url('login/logout') }" sp:if="!@guest">Logout</a>
+                    <a class="logout_link" href="{ Spider::Admin::AdminController.http_url('login/logout') }" sp:if="!@guest">Logout</a>
                 </div>
             </div>
             <div id="app_buttons" sp:if="@apps.length > 1">
@@ -32,4 +35,4 @@
         </div>
         <sp:yield />
     </body>
-</html>
+</html>

data/apps/core/auth/controllers/login_controller.rb

@@ -25,12 +25,7 @@ module Spider; module Auth
         def default_redirect
             self.class.default_redirect
         end
-        
-        def before(action='')
-            super
-            @response.headers['Content-Type'] = 'text/html;charset=UTF-8'
-        end
-        
+                
         __.html
         def index
             exception = @request.session.flash[:unauthorized_exception]
@@ -40,7 +35,7 @@ module Spider; module Auth
             render('login')
         end
         
-        def authenticate
+        def authenticate(params={})
             get_user
         end
         
@@ -55,7 +50,7 @@ module Spider; module Auth
         __.html
         def do_login
             user = authenticate
-            if (user)
+            if user
                 user.save_to_session(@request.session)
                 on_success(user)
                 unless success_redirect

data/apps/core/components/assets.rb

@@ -144,4 +144,40 @@ Spider::Template.define_named_asset 'jquery-tools-tooltip', [
 
 Spider::Template.define_named_asset 'less', [
      [:js, 'js/less-1.1.3.min.js', Spider::Components, {:compressed => true}]
- ]
+ ]
+
+Spider::Template.define_named_asset 'bootstrap-sass', [
+    [:css, 'bootstrap/scss/bootstrap.scss', Spider::Components]
+]
+
+Spider::Template.define_named_asset 'bootstrap-alerts', [
+    [:js, 'bootstrap/js/bootstrap-alerts.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-buttons', [
+    [:js, 'bootstrap/js/bootstrap-buttons.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-dropdown', [
+    [:js, 'bootstrap/js/bootstrap-dropdown.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-modal', [
+    [:js, 'bootstrap/js/bootstrap-modal.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-popover', [
+    [:js, 'bootstrap/js//bootstrap-popover.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-scrollspy', [
+    [:js, 'bootstrap/js//bootstrap-scrollspy.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-tabs', [
+    [:js, 'bootstrap/js//bootstrap-tabs.js']
+]
+
+Spider::Template.define_named_asset 'bootstrap-twipsy', [
+    [:js, 'bootstrap/js//bootstrap-twipsy.js']
+]

data/apps/core/components/public/bootstrap/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2012 Twitter, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/apps/core/components/public/bootstrap/README.md

@@ -0,0 +1,28 @@
+TWITTER BOOTSTRAP (SASS, SCSS)
+======================================
+
+A `scss` and `sass` version of Twitter Bootstrap (v2.0).
+The `scss` version is actively maintained while the `sass` is a converted from the `scss` version using `sass-convert`.
+
+> [Bootstrap](http://twitter.github.com/bootstrap/ "Twitter Bootstrap") is Twitter's toolkit for kickstarting CSS for websites, apps, and more.
+> It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
+
+Developers
+----------
+
+<a href="http://compass-style.org/">Compass</a> - author and compile `sass` and `scss` files.
+
+Authors
+-------
+
+**Brajeshwar Oinam**
+
++ [@Brajeshwar](http://twitter.com/Brajeshwar "Title") on Twitter.
++ http://brajeshwar.com
+
+_Looking for co-authors who can help with development of the Compass version._
+
+Copyright, license _et al_
+-------------------------
+
+Please refer to the original <a href="https://github.com/twitter/bootstrap#readme">Readme for Twitter Bootstrap</a> for Copyright, license and everything else.