rhodes 2.1.0 → 2.2.0.beta.1

data/spec/perfomance_spec/app/Benchmark/create_results.erb

@@ -0,0 +1,13 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		Benchmark
+	</h1>
+</div>
+
+<%@color = "#00ff00"%>
+
+    <ul id="perftest" title="PerfomanceTests" selected="true">
+        <li style="color:"
+            <%=@color%>">Controller Time (ms): <%=@time%>
+        </li>
+    </ul>

data/spec/perfomance_spec/app/Benchmark/customers.erb

@@ -0,0 +1,35 @@
+<div class="pageTitle">
+  <h1>Customers</h1>
+</div>
+
+<div class="toolbar">
+  <div class="leftItem regularButton">
+    <a href="<%= Rho::RhoConfig.start_path %>">Home</a>
+  </div>
+  <div class="rightItem regularButton">
+    <a href="<%= url_for :action => :new %>">New</a>
+  </div>
+</div>
+
+<div class="content">
+  <form method="POST" action="<%= url_for(:action => :search) %>">
+    <ul>
+      <li>
+        <label for="query" class="fieldLabel">Query</label>
+        <input type="text" name="query" <%= placeholder( "Query" ) %>/>
+      </li>
+    </ul>
+    <input type="submit" class="standardButton" value="Search"/>
+  </form>
+  <ul>
+    <% @customers.each do |customer| %>
+
+        <li>
+          <a href="<%= url_for :action => :show, :id => customer.object %>">
+            <%= customer.first %>
+          </a>
+        </li>
+
+    <% end %>
+  </ul>
+</div>

data/spec/perfomance_spec/app/Benchmark/index.erb

@@ -0,0 +1,9 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		Benchmark
+	</h1>
+</div>
+
+<pre>
+<%=$bench_results%>
+</pre>    

data/spec/perfomance_spec/app/Benchmark/products.erb

@@ -0,0 +1,25 @@
+<div class="pageTitle">
+  <h1>Products</h1>
+</div>
+
+<div class="toolbar">
+  <div class="leftItem regularButton">
+    <a href="<%= Rho::RhoConfig.start_path %>">Home</a>
+  </div>
+  <div class="rightItem regularButton">
+    <a href="<%= url_for :action => :new %>">New</a>
+  </div>
+</div>
+
+<div class="content">
+  <ul>
+    <% @products.each do |product| %>
+        <li>
+          <a href="<%= url_for :action => :async_show, :id => product.object, :query => {:product_id => product.object} %>">
+            <span class="title"><%= product.name %></span><span class="disclosure_indicator"></span>
+          </a>
+        </li>
+
+    <% end %>
+  </ul>
+</div>

data/spec/perfomance_spec/app/Benchmark/search_results.erb

@@ -0,0 +1,13 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		Benchmark
+	</h1>
+</div>
+
+<%@color = "#00ff00"%>
+
+<ul id="perftest" title="PerfomanceTests" selected="true">
+		<li style="color:<%=@color%>">Controller Time (ms): <%=@time%></li>
+</ul>
+
+<li><a href="/app/Product">Show products...</a></li>

data/spec/perfomance_spec/app/Customer/customer.rb

@@ -0,0 +1,6 @@
+# The model has already been created by the framework, and extends Rhom::RhomObject
+# You can add more methods here
+class Customer
+  include Rhom::PropertyBag
+  enable :sync
+end

data/spec/perfomance_spec/app/Perftest/index.erb

@@ -6,6 +6,11 @@
 
 <ul id="home" selected="true" title="System Tests">
     <li><a href="/app/Perftest/start">Start tests...</a></li>
+    <li><a href="/app/Benchmark/search_test">Bench search...</a></li>
+    <li><a href="/app/Benchmark/create_test">Bench create...</a></li>
+    <li><a href="/app/Benchmark/bulk_test">Bench bulk...</a></li>
+    <li><a href="/app/Benchmark/asynchttp_test">Bench asynchttp...</a></li>
+    
 </ul>
 
 <% if @test_results %>

data/spec/perfomance_spec/app/Product/index.erb

@@ -0,0 +1,25 @@
+<div class="pageTitle">
+  <h1>Products</h1>
+</div>
+
+<div class="toolbar">
+  <div class="leftItem regularButton">
+    <a href="<%= Rho::RhoConfig.start_path %>">Home</a>
+  </div>
+  <div class="rightItem regularButton">
+    <a href="<%= url_for :action => :new %>">New</a>
+  </div>
+</div>
+
+<div class="content">
+  <ul>
+    <% $products.each do |product| %>
+        <li>
+          <a href="<%= url_for :action => :async_show, :id => product.object, :query => {:product_id => product.object} %>">
+            <span class="title"><%= product.name %></span><span class="disclosure_indicator"></span>
+          </a>
+        </li>
+
+    <% end %>
+  </ul>
+</div>

data/spec/perfomance_spec/app/Product/product.rb

@@ -0,0 +1,6 @@
+# The model has already been created by the framework, and extends Rhom::RhomObject
+# You can add more methods here
+class Product
+  include Rhom::PropertyBag
+  enable :sync
+end

data/spec/perfomance_spec/app/helpers/application_helper.rb

@@ -0,0 +1,126 @@
+require 'json'
+
+module ApplicationHelper
+  def strip_braces(str=nil)
+    str ? str.gsub(/\{/, "").gsub(/\}/, "") : nil
+  end
+
+  def strike_if(str, condition=true)
+    condition ? "<s>#{str}</s>" : str
+  end
+
+  def display_blanks(value)
+    if blank?(value)
+      "---"
+    else
+      value
+    end
+  end
+
+  def blank?(value)
+    value.nil? || value == "" || value.length==0
+  end
+
+  def display_blankstr(value)
+    if blank?(value)
+      " "
+    else
+      value
+    end
+  end
+
+  def display_newline()
+    "<br>"
+  end
+
+  def display_space()
+    " "
+  end
+
+  def display_dollars(value)
+    if blank?(value)
+      " "
+    else
+      number = "$" + sprintf("%.2f", value)
+
+      # use a commify algorithm -- http://snippets.dzone.com/tag/commify
+      number.reverse!
+      number.gsub!(/(\d\d\d)(?=\d)(?!\d*\.)/, '\1,')
+      number.reverse!
+    end
+  end
+
+  def display_number(value)
+    if blank?(value)
+      " "
+    else
+      sprintf("%.2f", value)
+    end
+  end
+
+  def both_items_present?(value1, value2)
+    !blank?(value1) && !blank?(value2)
+  end
+
+  def replace_newlines(value)
+    if blank?(value)
+      " "
+    else
+      value.gsub('\n', ' ')
+    end
+  end
+
+  def format_address_for_mapping(street, city, state, zip, tagforurl)
+    # handle case where fields could be nil
+    mystreet = !street.nil? ? street : ""
+    mycity = !city.nil? ? city : ""
+    mystate = !state.nil? ? state : ""
+    myzip = !zip.nil? ? zip : ""
+
+    result = ""
+    if !tagforurl
+      # build up address string
+      result += (mystreet + ", ") if mystreet.length > 0
+      result += (mycity + ", ") if mycity.length > 0
+      result += (mystate + " ") if mystate.length > 0
+      result += myzip if myzip.length > 0
+    else
+      # need to URL encode data too
+      result += ("&street=" + Rho::RhoSupport.url_encode(mystreet)) if mystreet.length > 0
+      result += ("&city=" + Rho::RhoSupport.url_encode(mycity)) if mycity.length > 0
+      result += ("&state=" + Rho::RhoSupport.url_encode(mystate)) if mystate.length > 0
+      result += ("&zip=" + Rho::RhoSupport.url_encode(myzip)) if myzip.length > 0
+    end
+    # remove any extraneous characters that could interfere with proper address matching
+    result = replace_newlines(result)
+  end
+
+  def has_valid_mapping_address(street, city, state, zip)
+    # at a minimum, an address must have a state or a zip
+    (!state.nil? && state.length > 0) || (!zip.nil? && zip.length > 0)
+  end
+
+  def format_latlon_for_mapping(latitude, longitude)
+    result = ""
+    result += ("&latitude=" + Rho::RhoSupport.url_encode(latitude)) if latitude.length > 0
+    result += ("&longitude=" + Rho::RhoSupport.url_encode(longitude)) if longitude.length > 0
+    result
+  end
+
+  def render_transition(params)
+    @params["rho_callback"] = nil
+    params[:layout] = false
+    # TODO: escape carriage returns instead of removing them altoegether
+    content = render(params).split('\'').join('\\\'').split(/[\r\n]/).join('')
+    WebView.execute_js("Rho.insertAsyncPage('<div>#{content}</div>')")
+  end
+
+  def caller_request_hash_to_query
+    'caller_request=' + Rho::RhoSupport.url_encode(::JSON.generate(@request))
+  end
+
+  def caller_request_query_to_hash
+    @caller_request = Rho::JSON.parse(@params['caller_request']) if @params['caller_request']
+  end
+  
+end

data/spec/perfomance_spec/app/helpers/browser_helper.rb

@@ -0,0 +1,18 @@
+module BrowserHelper
+
+  def placeholder(label=nil)
+    "placeholder='#{label}'" if platform == 'apple'
+  end
+
+  def platform
+    System::get_property('platform').downcase
+  end
+
+  def selected(option_value,object_value)
+    "selected=\"yes\"" if option_value == object_value
+  end
+
+  def checked(option_value,object_value)
+    "checked=\"yes\"" if option_value == object_value
+  end
+end

data/spec/perfomance_spec/rhoconfig.txt

@@ -11,7 +11,7 @@ rhobundle_zip_url = nil
 rhobundle_zip_pwd = nil
 
 # Rhodes runtime properties
-MinSeverity  = 3
+MinSeverity  = 1
 LogToOutput = 1
 LogCategories = *
 ExcludeLogCategories =

data/spec/phone_spec/app/Account_s/account_s.rb

@@ -2,7 +2,7 @@ class Account_s
     include Rhom::FixedSchema
 
     set :schema_version, '1.0'
-    
+
     property :billing_address_country, :string
     property :assigned_user_id, :string
     property :website, :string
@@ -46,5 +46,8 @@ class Account_s
     property :last_checked, :string
     property :acct_object,  :string
     
-     property :address,  :string
+    property :address,  :string
+     
+    property :propOne,  :string
+    property :TwoProps,  :string
 end

data/spec/phone_spec/app/Case/case.rb

@@ -3,4 +3,5 @@ require 'rhom'
 class Case
     include Rhom::PropertyBag
 
+    enable :full_update
 end

data/spec/phone_spec/app/Case_s/case_s.rb

@@ -1,6 +1,8 @@
 class Case_s
     include Rhom::FixedSchema
 
+    enable :full_update
+
     set :schema_version, '1.0'
 
     property :status, :string

data/spec/phone_spec/app/Data/perftest.json

@@ -0,0 +1,35 @@
+[{"employee":
+{"emp_number":"2","created_at":"2010-08-22T04:42:32Z","updated_at":"2010-08-22T08:24:39Z","id":
+2,"last_name":"CA","first_name":"AC"}},{"employee":
+{"emp_number":"1","created_at":"2010-08-22T04:42:17Z","updated_at":"2010-08-22T14:45:33Z","id":
+1,"last_name":"K","first_name":"D"}},{"employee":
+{"emp_number":"3","created_at":"2010-08-22T08:47:13Z","updated_at":"2010-08-22T15:03:15Z","id":
+3,"last_name":"P","first_name":"M"}},{"employee":
+{"emp_number":"35076","created_at":"2010-08-27T06:15:09Z","updated_at":"2010-08-27T06:15:09Z","id":
+4,"last_name":"M P","first_name":"Balllaji"}},{"employee":
+{"emp_number":"2355","created_at":"2010-08-29T07:05:52Z","updated_at":"2010-08-29T07:05:52Z","id":
+5,"last_name":"Malhotdas","first_name":"Mansssish"}},{"employee":
+{"emp_number":"2356","created_at":"2010-08-29T07:06:14Z","updated_at":"2010-08-29T07:06:14Z","id":
+6,"last_name":"Thakssa","first_name":"Sassschin"}},{"employee":
+{"emp_number":"2358","created_at":"2010-08-29T07:06:42Z","updated_at":"2010-08-29T07:06:42Z","id":
+7,"last_name":"Kumar","first_name":"Mansdks"}},{"employee":
+{"emp_number":"22359","created_at":"2010-08-29T07:06:55Z","updated_at":"2010-08-29T07:06:55Z","id":
+8,"last_name":"Tandss","first_name":"Vissy"}},{"employee":
+{"emp_number":"2361","created_at":"2010-08-29T07:07:47Z","updated_at":"2010-08-29T07:07:47Z","id":
+9,"last_name":"Para","first_name":"Praja"}},{"employee":
+{"emp_number":"2362","created_at":"2010-08-29T07:08:02Z","updated_at":"2010-08-29T07:08:02Z","id":
+10,"last_name":"Jath","first_name":"Progra"}},{"employee":
+{"emp_number":"2370","screated_at":"2010-08-29T07:08:18Z","updated_at":"2010-08-29T07:08:18Z","id":
+11,"last_name":"Patans","first_name":"Maoshh"}},{"employee":
+{"emp_number":"2363","created_at":"2010-08-29T07:08:46Z","updated_at":"2010-08-29T07:08:46Z","id":
+12,"last_name":"Dekhane","first_name":"Sachin"}},{"employee":
+{"emp_number":"2364","created_at":"2010-08-29T07:09:06Z","updated_at":"2010-08-29T07:09:06Z","id":
+13,"last_name":"Joshaai","first_name":"Advsss"}},{"employee":
+{"emp_number":"2365","created_at":"2010-08-29T07:09:25Z","updated_at":"2010-08-29T07:09:25Z","id":
+14,"last_name":"Kel","first_name":"Sands"}},{"employee":
+{"emp_number":"2366","created_at":"2010-08-29T07:09:44Z","updated_at":"2010-08-29T07:09:44Z","id":
+15,"last_name":"ddd","first_name":"Nitsessn"}},{"employee":
+{"emp_number":"2367","created_at":"2010-08-29T07:10:00Z","updated_at":"2010-08-29T07:10:00Z","id":
+16,"last_name":"Khadasasaikar","first_name":"Rassj"}},{"employee":
+{"emp_number":"2368","created_at":"2010-08-29T07:10:17Z","updated_at":"2010-08-29T07:10:17Z","id":
+17,"last_name":"Tadesss","first_name":"Rssaaj"}}]

data/spec/phone_spec/app/Data/testCDATA.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persons>
+    <person>
+        <firstname>Sample</firstname>
+        <lastname>Sample</lastname>
+    </person>
+    <person>
+        <firstname><![CDATA[Sample bold <b</b>Tag]]></firstname>
+        <lastname>Sample</lastname>
+    </person>
+</persons>

data/spec/phone_spec/app/Product/product.rb

@@ -8,7 +8,7 @@ class Product
     #set :partition, :application
     set :sync_priority, 1  #sync engine should reorder sources
     
-    belongs_to :quantity, 'Customer'
+    belongs_to :quantity, ['Customer']
     belongs_to :sku, 'Customer'
 
 

data/spec/phone_spec/app/{Spec → spec}/asynchttp_spec.rb

@@ -5,8 +5,11 @@ describe "AsyncHttp" do
     after(:all) do
         file_name = File.join(Rho::RhoApplication::get_base_app_path(), 'test.jpg')
         File.delete(file_name) if File.exists?(file_name)
-    end
 
+        file_name = File.join(Rho::RhoApplication::get_app_path('DataTemp'), 'test_log.txt')
+        File.delete(file_name) if File.exists?(file_name)		
+    end
+    
     it "should http get" do
         return unless $is_network_available
         
@@ -34,7 +37,7 @@ describe "AsyncHttp" do
         
         #TODO: post_test
     end
-    
+
     it "should http download" do
         return unless $is_network_available
 
@@ -52,7 +55,32 @@ describe "AsyncHttp" do
         res['headers']['content-type'].should == 'image/jpeg'
 
         File.exists?(file_name).should == true
-        File.size(file_name).should == res['headers']['content-length'].to_i
+        orig_len = File.size(file_name)
+        orig_len.should == res['headers']['content-length'].to_i
+
+        #check that in case of one more download, files keeps the same        
+        res = Rho::AsyncHttp.download_file(
+          :url => 'http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21.jpg',
+          :filename => file_name )
+        #puts "res : #{res}"  
+        
+        res['status'].should == 'ok'
+        res['headers']['content-length'].to_i.should ==  0
+        #res['headers']['content-type'].should == 'image/jpeg'
+
+        File.exists?(file_name).should == true
+        File.size(file_name).should == orig_len
+
+        #check that in case of network error, files keeps the same        
+        res = Rho::AsyncHttp.download_file(
+          :url => 'http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21__BAD.jpg',
+          :filename => file_name )
+        #puts "res : #{res}"  
+        res['status'].should == 'error'
+        res['http_error'].should == '404'
+
+        File.exists?(file_name).should == true
+        File.size(file_name).should == orig_len
     end
 
     it "should http upload" do
@@ -60,7 +88,7 @@ describe "AsyncHttp" do
         
         server = 'http://rhologs.heroku.com'
         
-        file_name = File.join(Rho::RhoApplication::get_app_path('app'), 'Data/test_log.txt')
+        file_name = File.join(Rho::RhoApplication::get_app_path('DataTemp'), 'test_log.txt')
         File.exists?(file_name).should ==  true
 
         res = Rho::AsyncHttp.upload_file(
@@ -76,9 +104,12 @@ describe "AsyncHttp" do
         return unless $is_network_available
         
         server = 'http://rhologs.heroku.com'
+		dir_name = Rho::RhoApplication::get_app_path('DataTemp')
+		Dir.mkdir(dir_name) unless Dir.exists?(dir_name)
         
-        file_name = File.join(Rho::RhoApplication::get_app_path('app'), 'Data/test_log.txt')
-        File.open(file_name, "w"){|f| f.write("******************THIS IS TEST! REMOVE THIS FILE! *******************")}
+        file_name = File.join(dir_name, 'test_log.txt')
+        puts " file_name : #{file_name}"
+        File.open(file_name, "w"){|f| puts "OK"; f.write("******************THIS IS TEST! REMOVE THIS FILE! *******************")}
 
         res = Rho::AsyncHttp.upload_file(
           :url => server + "/client_log?client_id=&device_pin=&log_name=uptest",
@@ -94,18 +125,36 @@ describe "AsyncHttp" do
     it "should decode chunked body" do
       return unless $is_network_available
 
-      if System.get_property('platform') == 'APPLE' || System.get_property('platform') == 'ANDROID'        
-          host = SPEC_LOCAL_SERVER_HOST
-          port = SPEC_LOCAL_SERVER_PORT
-          puts "+++++++++++++++++++ chunked test: #{host}:#{port}"
-          res = Rho::AsyncHttp.get :url => "http://#{host}:#{port}/chunked"
-          res['status'].should == 'ok'
-          res['body'].should_not be_nil
-          res['body'].should == "1234567890"
-      end
+      host = SPEC_LOCAL_SERVER_HOST
+      port = SPEC_LOCAL_SERVER_PORT
+      puts "+++++++++++++++++++ chunked test: #{host}:#{port}"
+      res = Rho::AsyncHttp.get :url => "http://#{host}:#{port}/chunked"
+      res['status'].should == 'ok'
+      res['body'].should_not be_nil
+      res['body'].should == "1234567890"
     end
 
-=begin
+    it "should send custom command" do
+        return unless $is_network_available
+        
+        res = Rho::AsyncHttp.get(
+          :url => 'http://www.apache.org/licenses/LICENSE-2.0',
+          :http_command => 'PUT' )
+        
+        #puts "res : #{res}"  
+        res['http_error'].should == '405'
+        res['body'].index('The requested method PUT is not allowed for the URL').should_not be_nil
+        
+        res = Rho::AsyncHttp.post(
+          :url => 'http://www.apache.org/licenses/LICENSE-2.0',
+          :http_command => 'PUT' )
+        
+        #puts "res : #{res}"  
+        res['http_error'].should == '405'
+        res['body'].index('The requested method PUT is not allowed for the URL').should_not be_nil
+        
+    end    
+    
     def upload_withbody_test
         return unless $is_network_available
         
@@ -159,7 +208,7 @@ describe "AsyncHttp" do
         res['status'].should == 'ok'
         File.exists?(file_name).should == true
     end
-=end  
+
 # TODO: Fix this test!
 =begin
     def httpsget_test