rhodes 2.0.0.rc2 → 2.0.0

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyIO.java

@@ -26,7 +26,8 @@ import com.xruby.runtime.lang.RubyValue;
 
 import java.io.InputStream;
 //import java.io.ByteArrayOutputStream;
-import javolution.io.UTF8StreamReader;
+//import javolution.io.UTF8StreamReader;
+import com.rho.net.NetRequest;
 
 ////@RubyLevelClass(name="IO")
 public class RubyIO extends RubyBasic {
@@ -296,9 +297,10 @@ public class RubyIO extends RubyBasic {
     }*/
     
     //RHO_COMMENT
+/*    
     private static char[] buffer = new char[1024];
-	public static final RubyValue readFully(InputStream in) throws IOException {
-		RubyString str = ObjectFactory.createString();	
+	public static final RubyValue readFully(InputStream in, boolean bText) throws IOException {
+		RubyString str = ObjectFactory.createString();
 		UTF8StreamReader reader = new UTF8StreamReader();
 		reader.setInput(in);
 		while (true) {
@@ -311,9 +313,9 @@ public class RubyIO extends RubyBasic {
 			}
 		}
 		return str;
-	}
+	}*/
 
-    static RubyValue loadFromResources(String fileName){
+    static RubyValue loadFromResources(String fileName, boolean bText){
     	InputStream stream = null;
 		try {
 			//stream = RhoClassFactory.createFile().getResourceAsStream(fileName.getClass(), "/"+fileName);
@@ -326,8 +328,10 @@ public class RubyIO extends RubyBasic {
     		return null;
     	
     	try{
-    		return readFully(stream);
-    	}catch( IOException exc ){
+   			String res = NetRequest.readFully(stream, bText ? "=UTF-8" : "");
+   			
+   			return ObjectFactory.createString(res);
+    	}catch( Exception exc ){
     		throw new RubyException(RubyRuntime.RuntimeErrorClass,exc.getMessage());
     	}
     }
@@ -336,7 +340,35 @@ public class RubyIO extends RubyBasic {
     public static RubyValue read(RubyValue receiver, RubyArray args, RubyBlock block) {
         String fileName = ((RubyString) args.get(0)).toStr();
         //RHO_COMMENT
-        RubyValue r = loadFromResources(fileName);
+        RubyValue r = loadFromResources(fileName, true);
+        if ( r != null )
+        	return r;
+        
+        RubyIO io = ObjectFactory.createFile(fileName, "r");
+        int offset;
+        int length;
+
+        if (args.size() == 1) {
+            r = buildResult(io.read(), null);
+        } else {
+            length = ((RubyFixnum) args.get(1)).toInt();
+            if (args.size() == 2) {
+                r = buildResult(io.read(length), null);
+            } else {
+                offset = ((RubyFixnum) args.get(2)).toInt();
+                r = buildResult(io.read(length, offset), null);
+            }
+        }
+
+        io.close();
+        return r;
+    }
+    
+    //@RubyLevelMethod(name="read")
+    public static RubyValue binread(RubyValue receiver, RubyArray args, RubyBlock block) {
+        String fileName = ((RubyString) args.get(0)).toStr();
+        //RHO_COMMENT
+        RubyValue r = loadFromResources(fileName, false);
         if ( r != null )
         	return r;
         
@@ -359,4 +391,5 @@ public class RubyIO extends RubyBasic {
         io.close();
         return r;
     }
+    
 }

data/platform/wm/build/wm.rake

@@ -254,4 +254,23 @@ namespace "run" do
       exit 1
     end
   end
+ 
+  namespace "win32" do
+  
+    task :spec => ["build:win32"] do
+        Jake.before_run_spec
+        start = Time.now
+        
+        args = [' ']
+        Jake.run2( "bin\\win32\\rhodes\\Debug\\rhodes.exe", args, {:directory => $config["build"]["wmpath"], :nowait => false}) do |line|
+            Jake.process_spec_output(line)        
+        end
+        Jake.process_spec_results(start)        
+        
+        $stdout.flush
+        chdir $startdir
+    end
+    
+  end
+  
 end

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

@@ -5,15 +5,15 @@ body {
     height: 100%;
     width: inherit;
     font-family: "Droid",sans-serif;
-    background: white;
-    color: black;
+    background: black;
+    color: white;
 }
 h1 {
     font-size: 1em;
 }
 
 div#content {
-	background-color:#ffffff;
+	background-color:black;
 	width: 100%;
 	padding:0;
 	margin:0;
@@ -47,7 +47,7 @@ div#toolbar .regularButton,
 div#toolbar .blueButton,
 div#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: 1px;
+    -webkit-border-radius: 5px;
     font-size: .9em;
     border: 1px solid white;
 }
@@ -57,7 +57,7 @@ div#toolbar .backButton {
 
 div#pageTitle {
     height: 25px;
-		margin:0;
+	margin:0;
     width: 100%;
     display:none;
 }
@@ -79,24 +79,28 @@ div#pageTitle h1 {
 /* lists */
 
 div#content ul {
-	background: white;
+	background: black;
 }
 
 div#content ul li {
-    border-bottom: 1px solid #000;
+    border-bottom: 1px solid #666;
     font-size: 20px;
 }
 
 div#content ul li a {
     display: block;
     text-decoration: none;
-    color: black;
+    color: white;
     font-size: 20px;
     height: 100%;
     width: 100%;
     padding: 15px 0 15px 0;
+    background:url("../images/android/disclosure.png") no-repeat center right;
 }
 
+div#content ul li a:hover {
+    background-color:#3399cc;
+}
 div#content ul li a img {
     float: left;
     height: 100%;
@@ -104,7 +108,7 @@ div#content ul li a img {
 }
 
 div#content ul li span.title {
-    padding: 0 10px 0 10px;
+    padding: 0 50px 0 10px;
 }
 
 div#content ul li span.disclosure_indicator {
@@ -141,7 +145,7 @@ div#content form ul {
 }
 
 div#content form ul li {
-    border-bottom: 1px solid black;
+    border-bottom: 1px solid #666;
     display: block;
     list-style-type: none;
 }
@@ -149,7 +153,7 @@ div#content form ul li {
 div#content form label {
     float: left;
     display:block;
-    color: black;
+    color: white;
     line-height: 64px;
     padding: 0 10px 0 5px;
     margin: 0;
@@ -169,9 +173,11 @@ div#content h2.groupTitle{
 	padding: 8px 0 8px 8px;
 	font-size:10px;
 	color:white;
-	background-color:black;
+	background-color:#666;
 }
-
+div#content form {
+    background-color: black;
+ }
 div#content form input[type="checkbox"] {
     -webkit-appearance: none;
     background: url(/public/images/android/btn_check_off.png) no-repeat;
@@ -214,6 +220,7 @@ div#content form select {
     width: 100%;
     padding-left: 20px;
     height: 60px;
+    color:white;
     background: url('/public/images/android/ic_menu_more.png') no-repeat center right;
 }
 
@@ -257,8 +264,10 @@ div#content ul#settings {
     margin: 0;
 }
 
+
 div#content div#reset h4 {
     margin:20px;
+    color:white;
 }
 
 div#content div.standardButton {

data/rhobuild.yml

@@ -0,0 +1,39 @@
+--- 
+excludedirs: 
+  bb: 
+  - public/js/iui
+  - public/js/jquery*
+  - public/jqtouch*
+  - public/js/prototype*
+  - public/css/iphone*
+  - public/iwebkit
+  - public/themes
+  - "**/*.db"
+  - "**/.*.swo"
+  - "**/.*.swn"
+  - "**/jquery*.js"
+  - "**/.DS_Store"
+env: 
+  app: /Users/lars/Dev/code/rhomobile/store
+  paths: 
+    android-ndk: /Users/lars/Dev/android-ndk-r4
+    android: /Users/lars/Dev/android-sdk-mac_86
+    java: /Library/Java/Home/bin
+    4.6: 
+      jde: 
+      sim: 9000
+      mds: 
+    4.2: 
+      jde: 
+      sim: 8100
+      mds: 
+    cabwiz: 
+android: 
+build: 
+  bbsignpwd: somepasswordhere
+  bb: 
+  symbianpath: platform/symbian
+  bbpath: platform/bb
+  androidpath: platform/android
+  wmpath: platform/wm
+  iphonepath: platform/iphone

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.0.0.rc2'
+  s.version = '2.0.0'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/phone_spec/app/Spec/controller.rb

@@ -15,6 +15,7 @@ class SpecController < Rho::RhoController
   def index
     @exc_count = 0
     @count = 0
+    @errorMessages = ""
     $is_network_available = System.get_property('has_network')
     
     run_all_tests()
@@ -44,6 +45,8 @@ class SpecController < Rho::RhoController
                 testObj.send meth
             rescue Exception => e
                 @exc_count += 1
+                @errorMessages += "<br/>FAIL: '#{name}:#{meth}' failed: Error: #{e}\n" + 
+                    "#{e.backtrace[1]}" if e.backtrace && e.backtrace.length > 0
                 puts "FAIL: '#{name}:#{meth}' failed: Error: #{e}\n" + 
                     "#{e.backtrace[1]}" if e.backtrace && e.backtrace.length > 0
                 #e.backtrace.each do |item|

data/spec/phone_spec/app/Spec/index.erb

@@ -12,4 +12,6 @@
     <li style="color:<%=@color%>">Total: <%=@count%></li>
     <li style="color:<%=@color%>">Passed: <%=@count - @exc_count%></li>
     <li style="color:<%=@color%>">Failed: <%=@exc_count%></li>
+    <li style="color:<%=@color%>">Errors: <%=@errorMessages%></li>
+    
 </ul>

data/spec/phone_spec/app/Spec/rhofile_spec.rb

@@ -29,6 +29,23 @@ class RhoFileTest
         
     end
 
+    def binary_readwrite_test
+        file_testname = File.join(Rho::RhoApplication::get_model_path('app','Data'), 'test.png')
+        test_content = File.binread(file_testname)
+        Test_equal(File.size(file_testname), test_content.length)
+    
+        file_name = File.join(Rho::RhoApplication::get_model_path('app','Data'), 'temp.png')
+        File.delete(file_name) if File.exists?(file_name)
+        Test_equal(File.exists?(file_name), false)
+
+        f = File.new(file_name, "wb")
+        f.write(test_content)
+        f.close        
+        
+        content = File.binread(file_name)
+        Test_equal( content, test_content )
+    end
+
     def create_file_in_cache(dir_name, file, ext)
 	    # get full file path
 	    f = File.join(dir_name, "#{file}"+ "#{ext}")

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 977940591
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc2
-  version: 2.0.0.rc2
+  version: 2.0.0
 platform: ruby
 authors: 
 - Rhomobile
@@ -350,6 +349,7 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
+- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/androidcommon.rb
 - platform/android/build/libcurl_build.files
@@ -3500,6 +3500,7 @@ files:
 - res/generators/templates/application/public/images/android/btn_check_on.png
 - res/generators/templates/application/public/images/android/btn_radio_off.png
 - res/generators/templates/application/public/images/android/btn_radio_on.png
+- res/generators/templates/application/public/images/android/disclosure.png
 - res/generators/templates/application/public/images/android/ic_menu_more.png
 - res/generators/templates/application/public/images/backButton.png
 - res/generators/templates/application/public/images/blueButton.png
@@ -3662,6 +3663,7 @@ files:
 - res/generators/templates/spec/app/spec_runner.rb
 - res/generators/templates/spec/app/SpecRunner/controller.rb
 - res/generators/templates/spec/app/SpecRunner/index.erb
+- rhobuild.yml
 - rhobuild.yml.example
 - rhodes.gemspec
 - spec/framework_spec/app/Account/account.rb
@@ -5417,6 +5419,7 @@ files:
 - spec/phone_spec/app/Data/circtest.json
 - spec/phone_spec/app/Data/septest.json
 - spec/phone_spec/app/Data/test.json
+- spec/phone_spec/app/Data/test.png
 - spec/phone_spec/app/Data/test.xml
 - spec/phone_spec/app/Data/test_log.txt
 - spec/phone_spec/app/index.erb