tr8n 3.1.1 → 3.1.2

data/lib/tr8n/tokens/data_token.rb

@@ -45,7 +45,7 @@ module Tr8n
   module Tokens
     class DataToken < Tr8n::Token
       def self.expression
-        /(\{[^_][\w]+(:[\w]+)?(::[\w]+)?\})/
+        /(\{[^_:][\w]*(:[\w]+)?(::[\w]+)?\})/
       end
     end
   end

data/lib/tr8n/tokens/method_token.rb

@@ -34,7 +34,7 @@ module Tr8n
   module Tokens
     class MethodToken < Tr8n::Token
       def self.expression
-        /(\{[^_][\w]+(\.[\w]+)(:[\w]+)?(::[\w]+)?\})/
+        /(\{[^_:.][\w]*(\.[\w]+)(:[\w]+)?(::[\w]+)?\})/
       end
     
       def object_name

data/lib/tr8n/tokens/transform_token.rb

@@ -40,7 +40,7 @@ module Tr8n
   module Tokens
     class TransformToken < Tr8n::Token
       def self.expression
-        /(\{[^_][\w]+(:[\w]+)?(::[\w]+)?\s*\|\|?[^{^}]+\})/
+        /(\{[^_:|][\w]*(:[\w]+)?(::[\w]+)?\s*\|\|?[^{^}]+\})/
       end
     
       def name

data/lib/tr8n/version.rb

@@ -1,3 +1,3 @@
 module Tr8n
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/{test/dummy → local/tr8n_server}/Rakefile

@@ -4,4 +4,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-Dummy::Application.load_tasks
+Tr8nServer::Application.load_tasks

data/local/tr8n_server/app/assets/stylesheets/components.css.scss

@@ -0,0 +1,211 @@
+/* General */
+
+  .flt_r                                {float:right}
+  .quiet                                {color:#888 !important;}
+  .strong                               {font-weight:bold}
+  .em                                   {font-style:italic}
+  .small                                {font-size:11px}
+  .xsmall                               {font-size:10px}
+  .sub_heading                          {border-bottom:solid 1px #ddd;margin-bottom:3px;}
+  .notice_msg                           {color:darkorange;background:#feffef;padding:3px 5px;margin:0 0 3px 0}
+  .warning_msg                          {color:darkred;background:pink;padding:3px 5px;margin:0 0 3px 0}
+  .focus                                {background-color:#f1f5ff}
+  .highlight                            {background-color:#fefff1}
+  .highlight_hover:hover                {background:#fefff1}
+  .nowrap                               {white-space:nowrap}
+  .underscore {border-bottom:solid 1px #eee}
+
+  .light_bevel_hr                       {height:0px;border:solid 1px #e1e5e8;border-bottom-color:#fff;}
+
+  .padding_0                            {padding:0px !important;}
+  .padding_5                            {padding:5px !important;}
+  .padding_10                           {padding:10px !important;}
+  .padding_15                           {padding:15px !important;}
+
+/* Module Skins */
+
+  .basic .inner                         {padding:10px;}
+
+  .outset .inner                        {border:1px solid #D7D7D7;border-color:#e9e9e9 #cdcdcd #a4a4a4;border-width:1px 1px 2px;padding:10px;}
+  .outset b                             {background-image:url('rounded_corners_sprite.gif');}
+  .outset .tl                           {background-position: 0 -70px;}
+  .outset .tr                           {background-position: -10px -70px;}
+  .outset .bl                           {background-position: 0 -80px;}
+  .outset .br                           {background-position: -10px -80px;}
+
+  .inset .inner                         {border:1px solid #e1e5e8;border-color:#b1b3b7 #e1e5e8 #e1e5e8;border-width:2px 1px 1px;padding:10px;}
+  .inset b                              {background-image:url('rounded_corners_sprite.gif');}
+  .inset .tl                            {background-position: 0 -93px;}
+  .inset .tr                            {background-position: -10px -93px;}
+  .inset .bl                            {background-position: 0 -103px;}
+  .inset .br                            {background-position: -10px -103px;}
+
+  .rounded .inner                       {padding:10px;text-align:left;}
+  .rounded b                            {background-image:url('rounded_corners_sprite.gif');}
+  .rounded .tl                          {background-position: 0 -116px;}
+  .rounded .tr                          {background-position: -10px -116px;}
+  .rounded .bl                          {background-position: 0 -126px;}
+  .rounded .br                          {background-position: -10px -126px;}
+
+
+/* Module Backgrounds */
+
+  .highlight_bevel                      {background:url('/images/highlight_bkgd.gif') repeat-x 0 bottom #fefff1}
+  .focus_bevel                          {background:url('/images/focus_bkgd.gif') repeat-x 0 bottom #edf2f8}
+  .success_bevel                        {background:url('/images/success_bkgd.gif') repeat-x 0 bottom #eefce7}
+
+
+/* Module Headers */
+  .pagination_hd                        {border-bottom:solid 1px #ddd;padding:5px 0}
+
+/* Module Body */
+
+
+/* Module Footers */
+  .action_ft                            {background:#fbfbfb;border-top:solid 1px #eee;padding:15px 20px;}
+  .pagination_ft                        {border-top:solid 1px #ddd;padding:5px 0;margin-top:-1px;}
+
+
+/* Forms */
+
+  .field                                {clear:both;padding:5px 0 7px 0;overflow:hidden;}
+  .field_hd                             {float:left;width:145px;text-align:right;color:#666;}
+  .field_bd                             {margin-left:165px;clear:right}
+  .field_section                        {float:left;margin-right:5px;color:#999;font-size:10px;}
+  .field_note                           {margin-top:5px;font-size:10px;color:#666;clear:both;}
+  .field_hint                           {float:right;font-size:10px;color:#666;width:170px;line-height:11px;font-weight:normal}
+
+  .xshort_input                         {width:50px}
+  .short_input                          {width:100px}
+  .medium_input                         {width:150px}
+  .long_input                           {width:200px}
+  .xlong_input                          {width:250px}
+  .full_width_input                     {width:98%}
+
+
+/* Lists */
+
+  ol.simple_list li                     {list-style-type: decimal; margin-left:40px;}
+  ul.simple_list li                     {list-style-type:disc; margin-left:0px;padding:4px 0}
+
+  .nav_list,
+  .horiz_list,
+  .right_horiz_list                     {overflow:hidden;text-align:left}
+
+  .nav_list li                          {margin-top:-1px;border-top:solid 1px #ced2e4;padding:3px 5px;zoom:1}
+  .nav_list li:hover                    {background-color:#ebeef1}
+  .nav_list li a                        {text-decoration:none;}
+
+  .horiz_list li                        {margin-left:-11px;border-left:solid 1px #ccc;padding:0px 10px;margin-right:10px;float:left;}
+  .right_horiz_list li                  {margin-right:-11px;border-right:solid 1px #ccc;padding:0px 10px;margin-left:10px;float:left;}
+
+  .checklist li                         {overflow:hidden;padding:0px 0}
+  .checklist input                      {float:left;}
+  .checklist label                      {margin:0 0 5px 25px;display:block}
+
+  .segmented_list                       {overflow:hidden;}
+  .segmented_list li                    {padding:7px 0;border-bottom:solid 1px #eee;margin-bottom:-1px}
+
+  .block_list li                        {padding:3px 0}
+
+
+/* Pagination */
+
+  .pagination                           {overflow:hidden;zoom:1}
+  .pagination li                        {padding:0 3px;margin-right:2px;float:left;font-weight:bold;}
+
+
+
+/* Buttons */
+
+  .btn                                  {position:relative;border:0;padding:0;margin:0 2px 0 -2px;cursor:pointer;overflow:visible;background:transparent url('/images/site_sprite.gif') no-repeat right -100px;font-size:11px;font-weight:bold;text-align:center;font-family:Arial}
+  .btn span                             {position:relative;display:block;white-space:nowrap;background:transparent url('/images/site_sprite.gif') no-repeat left top;}
+  button::-moz-focus-inner              {border:none;}
+  @media screen and (-webkit-min-device-pixel-ratio:0) {
+    .btn span                           {margin-top:-1px;}
+  }
+  a.btn                                 {display:block;display:-moz-inline-box;display:inline-block;vertical-align:middle}
+  a.btn span                            {display:block;margin-top:0px}
+
+/* Button Skins */
+
+  .button {-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-box-shadow: rgba(0, 0, 0, 0.246094) 0px 1px 3px;-moz-box-shadow: rgba(0, 0, 0, 0.246094) 0px 1px 3px;background-color: #222;border-bottom: 1px solid rgba(0, 0, 0, 0.246094);color: white !important;cursor: pointer;display: inline-block;font-size: 13px;font-weight: bold;line-height: 1;overflow: visible;padding: 5px 15px 6px;position: relative;text-decoration: none !important;width: auto;}
+
+  .super.button {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAeCAYAAADtlXTHAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABYSURBVHjaZM27EcAgDANQSzZZgP0XpKLh20BM7mjS6J7kwrrWEuScgZQS2HsXjjHEdaqytfZ4kLXWU81lruAK9wqWUuBVvni3n+4Pc9nRnFOUZFQAcQswAI/sUZSGPd0tAAAAAElFTkSuQmCC) repeat-x 0 bottom;background-position:0 bottom;border: 1px solid rgba(0, 0, 0, 0.246094);font-size: 12px;padding: 0px;}
+  .super.button span {border-top: 1px solid rgba(255, 255, 255, 0.199219);display: block;line-height: 1;padding: 4px 15px 6px;}
+
+  .green.button {background-color: #91BD09;}
+  .green.button:hover {background-color:#749a02}
+
+  .blue.button {background-color:#5689c0}
+  .blue.button:hover {background-color:#4a77a8}
+
+  .large.super.button span {padding: 7px 20px 9px;font-size:13px;}
+  .xlarge.super.button span {padding: 8px 20px 10px;font-size:16px;}
+
+/* Icons */
+
+  .icn                                  {background:url(/images/icon_sprite.gif) no-repeat 0 0;}
+
+
+
+
+/* Tabs */
+
+  .tab_nav                              {list-style-type:none;overflow:auto;margin-bottom:0px !important;position:relative}
+  .tab_nav li                           {float:left;margin-right:2px;cursor:pointer;}
+  .tab_nav li a                         {display:block;padding:6px 10px 6px 10px;}
+
+/* Tables */
+
+  .data_table                           {padding:0;width:auto;margin:0}
+  .data_table td, .data_table th        {vertical-align:top;padding:1px 0px 2px 0px}
+  .data_table th                        {width:115px;color:#777;font-weight:normal;padding-right:6px}
+
+  .data_table.small th                  {width:70px}
+
+  .segmented_table                      {width:100%;}
+  .segmented_table td                   {border-bottom:solid 1px #eee;padding:10px 5px}
+  .segmented_table .last td             {border:none}
+
+  .skinny_cells td                      {padding:5px}
+  .fat_cells td                         {padding:10px 5px}
+
+  .txt_c                                {text-align:center;}
+  .txt_l                                {text-align:left;}
+  .txt_r                                {text-align:right;}
+  .txt_t                                {vertical-align:top;}
+  .txt_b                                {vertical-align:bottom;}
+  .txt_m                                {vertical-align:middle;}
+
+  .min_cell_width                       {width:1%}
+  .max_cell_width                       {width:99%}
+
+  .mrgn_v {margin:10px 0}
+  .mrgn_h {margin:0 10px}
+
+/* Media Block */
+
+  .media                                {overflow:hidden;_overflow:visible; zoom:1;}
+  .media .img                           {float:left;margin-right: 10px;}
+  .media .img img                       {display:block;}
+  .media .imgExt                        {float:right; margin-left: 10px;}
+
+
+
+
+/* Home */
+
+.home_banner {background:url('/images/bubbles_bkgd.jpg');-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;padding:50px 25px 0px 25px;height:220px;border-bottom:solid 10px #c2d6eb}
+.home_banner h1 {font:normal bold 45px Arial, Helvetica, sans-serif;color:#fff;text-shadow:0 -1px 1px #000;letter-spacing:-2px}
+.home_banner h2 {font:normal normal 24px Arial, Helvetica, sans-serif;color:#ccc;text-shadow:0 -1px 1px #000;width:520px;}
+
+
+.benefit_details {line-height:20px;height:70px;}
+.page_form {margin:0 50px}
+
+.tr8n {
+	width:auto !important;
+	overflow:hidden !important
+}
+

data/local/tr8n_server/app/assets/stylesheets/layout.css.scss

@@ -0,0 +1,143 @@
+@mixin shadow($info) {
+	text-shadow:$info;
+	-moz-text-shadow:$info;
+	-webkit-text-shadow:$info;
+}
+
+@mixin rounded-corners($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+  body                        {margin:0;padding:0;font:normal normal 12px Arial, Helvetica, sans-serif;text-align:left;background:#f5f5f5;color:#444;}
+
+  h1,h2,h3,h4,h5,h6           {margin:0 0 5px 0;padding:0;line-height: 1em;}
+  h1,.h1                      {font:normal normal 35px Georgia, serif;color:#424c56;letter-spacing:-1px;}
+  h2,.h2                      {font: normal normal normal 24px/normal Arial, Helvetica, sans-serif;color:#666;margin:0 0 8px 0;letter-spacing:-1px;}
+  h3,.h3                      {font: normal normal bold 18px/normal Arial, Helvetica, sans-serif;color:#555;margin:0 0 8px 0;padding-bottom:5px;}
+  h4,.h4                      {font:normal normal 14px Arial, Helvetica, sans-serif;color:#444;padding:6px;}
+  h5,.h5                      {font:normal bold 11px Arial, Helvetica, sans-serif;color:#999}
+  h6,.h6                      {font:normal bold 11px Arial, Helvetica, sans-serif;color:#444}
+
+
+  a                           {color:#3B5998;text-decoration: none;outline:none}
+  a:focus, a:hover            {text-decoration: underline }
+  a:visited                   {color:#3B5998;}
+
+  p                           {margin:0 0 10px 0;}
+  table                       {border-collapse:collapse;border-spacing:0}
+  table,ul,ol,dt,dl,dd        {padding:0;margin:0;list-style-type:none}
+  td,th                       {vertical-align:top}
+  img                         {vertical-align:middle;border:none}
+  input, select, textarea     {vertical-align:middle;border:solid 1px #eee;border-color:#bbb #eee #eee #bbb;border-width:1px;font:normal normal 11px Arial, Helvetica, sans-serif;color:#444;outline:none;padding:3px;}
+  select                      {padding:2px;}
+  input[type=checkbox],
+  input[type=radio],
+  input[type=file],
+  checkbox,
+  radio                       {border:none;padding:0;}
+
+
+/* Page Template */
+
+  .page_fixed                 {width:1000px;margin:0 auto;}
+  .page_elastic               {width:auto;margin:0;}
+  .page_fluid                 {max-width:1100px;min-width:925px;_width:960px;margin:0 auto;padding:0 25px;}
+
+  .page_body,
+  .page_body .main_col        {overflow:hidden;_overflow:visible;_zoom:1;}
+  .page_body .left_col        {float:left; width:250px;_margin-right:-3px;}
+  .page_body .right_col       {float:right; width: 300px;_margin-left:-3px;}
+
+
+/* Header */
+
+  .page_head  {background:#fff;border-bottom: 1px solid #DDD;border-top: 4px solid #6699cc;margin-bottom: 15px;padding: 5px 15px 2px;}
+  .logo a   	{
+		font-family:Arial;
+		color:#424c56;
+		text-decoration:none;
+	 	@include shadow(2px 3px 3px 2px rgba(0,0,0,0.6));	
+	 }
+  .logo a:hover {color:#000}
+  .top_nav {padding-top:13px;}
+
+/* Grids */
+
+  .line, .last_unit           {overflow:hidden;_overflow:visible;_zoom:1; }
+  .unit                       {float:left;_zoom:1;}
+  .size_1of1                  {float:none;}
+  .size_1of2                  {width:50%;}
+  .size_1of3                  {width:33.33333%;}
+  .size_2of3                  {width:66.66666%;}
+  .size_1of4                  {width:25%;}
+  .size_3of4                  {width:75%;}
+  .size_1of5                  {width:20%;}
+  .size_2of5                  {width:40%;}
+  .size_3of5                  {width:60%;}
+  .size_4of5                  {width:80%;}
+  .last_unit                  {float:none;_position:relative;_left:-3px;_margin-right:-3px;width:auto;}
+
+
+/* Page Content */
+
+  .content_module             {margin:0 10px 10px;}
+  .content_inner              {
+		border:1px solid #D7D7D7;
+		border-color:#e9e9e9 #cdcdcd #a4a4a4;
+		border-width:1px 1px 2px;
+		background:#fff;
+	 	@include rounded-corners(10px);	
+	}
+		
+
+
+  .content_hd,
+  .content_bd,
+  .content_ft                 {overflow:hidden;zoom:1;padding:25px}
+
+
+
+/* Module */
+
+  .module                     {margin:10px;}
+  .hd,.bd,.ft                 {overflow:hidden;_overflow:visible;_zoom:1;}
+  .inner                      {position:relative;}
+
+
+/* Rounded Corners */
+
+  .tl, .tr, .bl, .br          {height:10px; width:10px;position:absolute;}
+  .tl                         {background-position: left top;left:0}
+  .tr                         {background-position: right top;}
+  .bl                         {background-position: left bottom;left:0}
+  .br                         {background-position: right bottom;}
+  .br,.tr                     {right:0}
+  .tr,.tl                     {overflow:hidden;margin-bottom:-32000px;}
+  .bl,.br                     {bottom:0}
+
+
+/* Complex Module  */
+
+  .complex                    {overflow:visible;margin: 10px 20px 20px 10px; background-position:left top;}
+  .complex .inner             {right:-10px; bottom:-10px; background-position:right bottom;padding:0 10px 10px 0;}
+  .complex .tl, .complex .br  {display:none;}
+  .complex .bl                {bottom:-10px;}
+  .complex .tr                {right:-10px;}
+
+
+/* Media Block */
+
+  .media                      {overflow:auto;zoom:1}
+  .media .thumb               {width:100px;float:left;}
+  .media .desc                {margin-left:110px;}
+
+
+/* Clear Floats */
+  .clearfix:after             {visibility: hidden;display: block;font-size: 0;content: " ";clear: both;height: 0;}
+  .clearfix                   {display: inline-block; }
+  /* start commented backslash hack \*/
+  * html .clearfix            {height: 1%;}
+  .clearfix                   {display:block;}
+  /* close commented backslash hack */

data/{test/dummy → local/tr8n_server}/app/controllers/application_controller.rb

@@ -4,6 +4,11 @@
 class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
 
+  rescue_from StandardError do |e|
+    pp e.backtrace
+    raise e
+  end
+
   def current_user
     @current_user ||= (User.find_by_id(session[:user_id]) unless session[:user_id].blank?) || User.new
   end

data/local/tr8n_server/app/controllers/home_controller.rb

@@ -0,0 +1,4 @@
+class HomeController < ApplicationController
+  def index
+  end
+end

data/{test/dummy → local/tr8n_server}/app/controllers/login_controller.rb

@@ -33,7 +33,7 @@ class LoginController < ApplicationController
 
   def out
     logout!
-    redirect_to("/tr8n/home") 
+    redirect_to("/home") 
   end
 
 private