rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/res/generators/rhogen.rb

@@ -293,14 +293,19 @@ module Rhogen
 
     first_argument :name, :required => true, :desc => "extension name"
 
+
+    def namefixed
+        return name.downcase.split(/[^a-zA-Z0-9]/).map{|w| w.downcase}.join("")
+    end    
+
     template :ext do |template|
       template.source = 'extensions/montana/ext.yml'
-      template.destination = "extensions/#{name.downcase}/ext.yml"
+      template.destination = "extensions/#{namefixed.downcase}/ext.yml"
     end
 
     template :extension_ruby do |template|
       template.source = 'extensions/montana/montana.rb'
-      template.destination = "extensions/#{name.downcase}/#{name.downcase}.rb"
+      template.destination = "extensions/#{namefixed.downcase}/#{namefixed.downcase}.rb"
     end
 
     $build_script_full_path = ''
@@ -312,138 +317,138 @@ module Rhogen
 
     template :build do |template|
       template.source = 'extensions/montana/ext/build'
-      template.destination = "extensions/#{name.downcase}/ext/build"
+      template.destination = "extensions/#{namefixed.downcase}/ext/build"
       $build_script_full_path = template.destination   
       template.options = { :after => :callback_after_make_build}  
     end
 
     template :build_bat do |template|
       template.source = 'extensions/montana/ext/build.bat'
-      template.destination = "extensions/#{name.downcase}/ext/build.bat"
+      template.destination = "extensions/#{namefixed.downcase}/ext/build.bat"
     end
 
     template :extension_i do |template|
       template.source = 'extensions/montana/ext/montana/shared/ruby/montana.i'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/shared/ruby/#{name.downcase}.i"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/shared/ruby/#{namefixed.downcase}.i"
     end
 
     template :extension_wrap do |template|
       template.source = 'extensions/montana/ext/montana/shared/ruby/montana_wrap.c'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/shared/ruby/#{name.downcase}_wrap.c"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/shared/ruby/#{namefixed.downcase}_wrap.c"
     end
 
     template :extension_c do |template|
       template.source = 'extensions/montana/ext/montana/shared/src/montana.c'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/shared/src/#{name.downcase}.c"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/shared/src/#{namefixed.downcase}.c"
     end
 
     template :extension_iphone_rakefile do |template|
       template.source = 'extensions/montana/ext/montana/platform/iphone/Rakefile'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/Rakefile"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/iphone/Rakefile"
     end
 
     file :extension_iphone_pch do |file|
       file.source = 'extensions/montana/ext/montana/platform/iphone/Montana_Prefix.pch'
-      file.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/#{name.camel_case}_Prefix.pch"
+      file.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/iphone/#{namefixed.camel_case}_Prefix.pch"
     end
 
     template :extension_iphone_project do |template|
       template.source = 'extensions/montana/ext/montana/platform/iphone/Montana.xcodeproj/project.pbxproj'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/#{name.camel_case}.xcodeproj/project.pbxproj"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/iphone/#{namefixed.camel_case}.xcodeproj/project.pbxproj"
     end
 
     template :extension_iphone_src_h do |template|
       template.source = 'extensions/montana/ext/montana/platform/iphone/Classes/Montana.h'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/Classes/#{name.camel_case}.h"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/iphone/Classes/#{namefixed.camel_case}.h"
     end
 
     template :extension_iphone_src_m do |template|
       template.source = 'extensions/montana/ext/montana/platform/iphone/Classes/Montana.m'
-      template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/iphone/Classes/#{name.camel_case}.m"
+      template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/iphone/Classes/#{namefixed.camel_case}.m"
     end
 
     template :extension_android_ext_build do |template|
         template.source = 'extensions/montana/ext/montana/platform/android/ext_build.files'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/ext_build.files"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/android/ext_build.files"
     end
 
     template :extension_android_rakefile do |template|
         template.source = 'extensions/montana/ext/montana/platform/android/Rakefile'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/Rakefile"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/android/Rakefile"
     end
 
     template :extension_android_cpp do |template|
         template.source = 'extensions/montana/ext/montana/platform/android/jni/src/montana.cpp'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/jni/src/#{name.downcase}.cpp"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/android/jni/src/#{namefixed.downcase}.cpp"
     end
 
     template :extension_android_java do |template|
         template.source = 'extensions/montana/ext/montana/platform/android/src/com/montana/Montana.java'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/android/src/com/#{name.downcase}/#{name.camel_case}.java"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/android/src/com/#{namefixed.downcase}/#{namefixed.camel_case}.java"
     end
 
 
     template :extension_wm_rakefile do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/Rakefile'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/Rakefile"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/wm/Rakefile"
     end
 
     template :extension_wm_vcsol do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/Montana.sln'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/#{name.camel_case}.sln"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/wm/#{namefixed.camel_case}.sln"
     end
 
     template :extension_wm_vcproject do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/Montana.vcproj'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/#{name.camel_case}.vcproj"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/wm/#{namefixed.camel_case}.vcproj"
     end
 
     template :extension_wm_vcproject do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/Montana.vsprops'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/#{name.camel_case}.vsprops"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/wm/#{namefixed.camel_case}.vsprops"
     end
 
     template :extension_wm_h do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/src/montana_wm.h'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/src/#{name.downcase}_wm.h"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/wm/src/#{namefixed.downcase}_wm.h"
     end
 
     template :extension_wm_cpp do |template|
         template.source = 'extensions/montana/ext/montana/platform/wm/src/montana_wm.cpp'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/wm/src/#{name.downcase}_wm.cpp"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/wm/src/#{namefixed.downcase}_wm.cpp"
     end
 
 
     template :extension_bb_files do |template|
         template.source = 'extensions/montana/ext/montana/platform/bb/Montana.files'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/#{name.camel_case}.files"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/bb/#{namefixed.camel_case}.files"
     end
 
     template :extension_bb_jgp do |template|
         template.source = 'extensions/montana/ext/montana/platform/bb/montana.jdp'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/#{name.downcase}.jdp"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/bb/#{namefixed.downcase}.jdp"
     end
 
     template :extension_bb_Rakefile do |template|
         template.source = 'extensions/montana/ext/montana/platform/bb/Rakefile'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/Rakefile"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/bb/Rakefile"
     end
 
     template :extension_bb_java do |template|
         template.source = 'extensions/montana/ext/montana/platform/bb/src/com/montana/Montana.java'
-        template.destination = "extensions/#{name.downcase}/ext/#{name.downcase}/platform/bb/src/com/#{name.downcase}/#{name.camel_case}.java"
+        template.destination = "extensions/#{namefixed.downcase}/ext/#{namefixed.downcase}/platform/bb/src/com/#{namefixed.downcase}/#{namefixed.camel_case}.java"
     end
 
 
 
     template :extension_test_controller do |template|
       template.source = 'app/MontanaTest/controller.rb'
-      template.destination = "app/#{name.camel_case}Test/controller.rb"
+      template.destination = "app/#{namefixed.camel_case}Test/controller.rb"
     end
 
     template :extension_test_index do |template|
       template.source = 'app/MontanaTest/index.erb'
-      template.destination = "app/#{name.camel_case}Test/index.erb"
+      template.destination = "app/#{namefixed.camel_case}Test/index.erb"
     end
 
 

data/res/generators/templates/application/app/layout.erb

@@ -20,8 +20,9 @@
 
     <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || System::get_property('platform') == 'WP7' || is_bb6 || System::get_property('webview_framework') =~ /^WEBKIT/ %>
         <script src="/public/jquery/jquery-1.6.4.min.js" type="text/javascript"></script>
+        <script src="/public/jquery/jquery.json-2.3.min.js" type="text/javascript"></script>
 
-        <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0.min.css">
+        <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0.1.min.css">
         <link rel="stylesheet" href="/public/css/jqmobile-patch.css">
         <%% if System::get_property('platform') == 'APPLE' %>
             <link href="/public/jqmobile/jquery-mobile-iphone.css" type="text/css" rel="stylesheet"/>
@@ -38,7 +39,7 @@
                 //$.mobile.loadingMessage = "loading"; // it is default value
 
                 // For documented init options look here:
-                // http://jquerymobile.com/demos/1.0/docs/api/globalconfig.html
+                // http://jquerymobile.com/demos/1.0.1/docs/api/globalconfig.html
 
                 // For poorly documented options search for ".prototype.options"
                 // in the jQuery Mobile source code
@@ -48,10 +49,10 @@
                 $.mobile.loadingMessageDelay = 300; // in ms
             });
         </script>
-        <%% if System::get_property('platform') == 'WP7'%>
+        <%% if System::get_property('platform') == 'WP7' %>
           <script type="text/javascript" charset="utf-8" src="/public/js/jquery-wp7-patch.js"></script>
         <%% end %>
-        <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.0.min.js"></script>
+        <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.0.1.min.js"></script>
         <script type="text/javascript" charset="utf-8" src="/public/js/jqmobile-patch.js"></script>
 
     <%% end %>
@@ -65,7 +66,7 @@
     <%% elsif System::get_property('platform') == 'Blackberry' %>
         <link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>
     <%% elsif System::get_property('platform') == 'WP7' %>
-	    <link href="/public/css/iphone.css" type="text/css" rel="stylesheet"/>
+	    <link href="/public/css/windows_phone7.css" type="text/css" rel="stylesheet"/>
 		<script src="/public/js/wp7.js" type="text/javascript"></script>
     <%% elsif System::get_property('webview_framework') =~ /^WEBKIT/ %>
         <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>

data/res/generators/templates/application/public/css/android.css

@@ -2,36 +2,6 @@ a {
     text-decoration: none;
 }
 
-.content {
-    width: inherit;
-    height: 100%;
-}
-
-.toolbar .noButton {
-    display: none;
-}
-
-.content ul {
-    -webkit-padding-start: 0;
-    margin: 0;
-    padding: 0;
-    list-style-type: none;
-}
-
-.content ul li {
-    overflow: hidden;
-    clear: both;
-}
-
-.content ul li span {
-    display: block;
-}
-
-.content ul.settings li div.itemLabel span.title {
-    padding: 0;
-    margin: 0;
-}
-
 body {
     margin: 0;
     height: 100%;
@@ -45,290 +15,40 @@ h1 {
     font-size: 1em;
 }
 
-.content {
-    background-color: black;
-    width: 100%;
-    padding: 0;
-    margin: 0;
-}
-
-/* Toolbar */
-
-.toolbar {
-    height: 60px;
-    width: 100%;
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #2B2B2B), color-stop(0.2, #585858), color-stop(1.0, #2B2B2B));
-    display: table;
-    text-align: center;
-    border-spacing: 10px;
-}
-
-.toolbar .leftItem,
-.toolbar .centerItem,
-.toolbar .rightItem {
-    display: table-cell;
-}
-
-.toolbar a {
-    line-height: 40px;
-    color: black;
-    display: block;
-}
-
-.toolbar .deleteButton,
-.toolbar .regularButton,
-.toolbar .blueButton,
-.toolbar .backButton {
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, white), color-stop(0.5, #ccc), color-stop(1.0, #bdbebd));
-    -webkit-border-radius: 5px;
-    font-size: .9em;
-    border: 1px solid white;
-}
-
-/* Header */
-
-.pageTitle {
-    height: 25px;
-    margin: 0;
-    width: 100%;
-    display: none;
+div.itemLabel {
+    font-weight: bold;
 }
-
-.pageTitle h1 {
-    position: absolute;
-    top: 0;
-    text-align: left;
-    width: 100%;
-    margin: 0;
-    padding-left: 5px;
-    color: white;
-    text-shadow: 1px 1px 1px #000;
-    line-height: 25px;
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #999), color-stop(0.5, #848684));
+div.itemValue {
+    font-weight: normal;
 }
 
-/* lists */
-
-.content ul {
+/*
+.ui-page,
+.ui-content,
+.ui-content ul li,
+.ui-content form,
+.ui-btn a.ui-link-inherit {
+    font-family: "Droid", sans-serif;
     background: black;
-}
-
-.content ul li {
-    border-bottom: 1px solid #666;
-    font-size: 20px;
-}
-
-.content ul li a {
-    display: block;
-    text-decoration: none;
     color: white;
-    font-size: 20px;
-    height: 100%;
-    width: 100%;
-    padding: 15px 0 15px 0;
-    background: url("../images/android/disclosure.png") no-repeat center right;
 }
 
-.content ul li a:hover {
-    background-color: #3399cc;
-}
-
-.content ul li a img {
-    float: left;
-    height: 100%;
-    max-width: 100px;
-}
-
-.content ul li span.title {
-    padding: 0 50px 0 10px;
-}
-
-.content ul li span.disclosure_indicator {
-    display: none;
-}
-
-.content ul li div.itemLabel {
-    float: left;
-    width: 45%;
-    padding: 15px 0 15px 10px;
-}
+.ui-header h1 {
+    font-size: 2em;
 
-.content ul li div.itemValue {
-    float: right;
-    width: 45%;
-    padding: 15px 10px 15px 0;
-}
-
-/* Forms */
-
-.content form button {
-    -webkit-appearance: push-button;
-    width: 300px;
-    height: 40px;
-    margin-left: 10px;
-}
-
-.content form ul {
-    font-size: 20px;
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-}
-
-.content form ul li {
-    border-bottom: 1px solid #666;
-    display: block;
-    list-style-type: none;
 }
 
-.content form label {
-    float: left;
-    display: block;
-    color: white;
-    line-height: 64px;
-    padding: 0 10px 0 5px;
-    margin: 0;
-    width: 40%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.content h2 {
-    margin: 0;
-}
-
-.content h2.groupTitle {
-    width: inherit;
-    margin: 0;
-    padding: 8px 0 8px 8px;
-    font-size: 10px;
-    color: white;
-    background-color: #666;
-}
-
-.content form {
-    background-color: black;
-}
-
-.content form input[type="checkbox"] {
-    -webkit-appearance: none;
-    background: url(/public/images/android/btn_check_off.png) no-repeat;
-    float: right;
-    height: 31px;
-    width: 31px;
-    margin-top: 15px;
-    margin-right: 20px;
-}
-
-.content form input[type="checkbox"]:checked {
-    background: url(/public/images/android/btn_check_on.png) no-repeat;
-    float: right;
-    height: 31px;
-    width: 31px;
-    margin-top: 15px;
-    margin-right: 20px;
-}
-
-.content form input[type="radio"] {
-    background: url(/public/images/android/btn_radio_off.png) no-repeat;
-    -webkit-appearance: none;
-    -webkit-box-sizing: border-box;
-    border: none;
-    height: 32px;
-    margin: 0px;
-    width: 32px;
-    float: right;
-    margin-right: 20px;
-    margin-top: 15px;
-}
-
-.content form input[type="radio"]:checked {
-    background: url(/public/images/android/btn_radio_on.png) no-repeat;
-    margin-top: 15px;
-    margin-right: 20px;
-}
-
-.content form select {
-    -webkit-appearance: none;
-    border: 0px;
-    width: 100%;
-    padding-left: 20px;
-    height: 60px;
-    color: white;
-    background: url('/public/images/android/ic_menu_more.png') no-repeat center right;
-}
-
-.content form textarea {
-    -webkit-appearance: none;
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0125, #d6d7d6), color-stop(0.25, #efefef), color-stop(0.95, #f7f7f7), color-stop(1.0, #f7f3f7));
-    border: 1px solid #d6d7d6;
-    -webkit-border-radius: 4px;
-    margin: 10px 0 2px 10px;
-    font-size: 0.9em;
-    padding: 5px 0 2px 2px;
-    box-shadow: 0 -1px 3px #000000;
-}
-
-.content form input[type="text"],
-.content form input[type="number"],
-.content form input[type="password"] {
-    float: right;
-    height: 40px;
-    margin: 10px 10px 10px 0;
-    padding-left: 5px;
-    font-size: 26px;
-    width: 150px;
-    -webkit-appearance: none;
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0125, #d6d7d6), color-stop(0.25, #efefef), color-stop(0.95, #f7f7f7), color-stop(1.0, #f7f3f7));
-    border: 1px solid #d6d7d6;
-    -webkit-border-radius: 4px;
-    box-shadow: 0 -1px 3px #000000;
-}
-
-.content form input.standardButton {
-    height: 45px;
-    margin: 2px 0 2px 0;
-    -webkit-border: 2px;
-    width: 100%;
-}
-
-/* Settings */
-
-.content ul.settings {
-    padding: 0;
-    margin: 0;
+.ui-header {
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #2B2B2B), color-stop(0.2, #585858), color-stop(1.0, #2B2B2B));
 }
 
-.content .reset h4 {
-    margin: 20px;
+.ui-header h1 {
     color: white;
+    line-height: 25px;
+    text-shadow: 1px 1px 1px #000;
 }
 
-.content div.standardButton {
-    margin: 10px 10px 10px 10px;
-    height: 45px;
-    width: 284px;
-    line-height: 45px;
-    -webkit-appearance: push-button;
-}
-
-.content div.standardButton a {
-    display: block;
-    width: 100%;
-    color: black;
-    text-align: center;
-}
-
-.content ul.settings li.alertMessage {
-    text-align: center;
-    height: 45px;
-    line-height: 45px;
-}
-
-.content ul.settings li.alertMessage span.message {
-    color: red;
-}
+*/
 
 /* ---------- JQM theme customization ------------- */
 
@@ -359,7 +79,7 @@ h1 {
 }
 .ui-body-c {
 	border: 1px solid 		#2A2A2A;
-	background: 			#black;
+	background: 			#000;
 	color: 					#fff;
 	text-shadow: 0 1px 0 	#000;
 	font-weight: normal;
@@ -678,14 +398,6 @@ li.ui-btn-up-c {
 	border-radius: 						5px;
 }
 
-/* ---------- Custom fixes ------------- */
-
-div.itemLabel {
-    font-weight: bold;
-}
-div.itemValue {
-    font-weight: normal;
-}
 
 @media all and (min-width: 320px){
     .ui-content ul li div.itemLabel {
@@ -702,11 +414,5 @@ div.itemValue {
 
 .errorMessage {
     color: red;
-    text-align: center
-}
-
-.ui-page {
--webkit-transform-style: flat;
--webkit-backface-visibility: hidden;
--webkit-perspective: 800;
+    text-align: center;
 }