rhodes 1.5.2 → 1.5.3

data/spec/framework_spec/app/spec/rhom_object_spec.rb

@@ -26,7 +26,7 @@ describe "Rhom::RhomObject" do
   before do
     SyncEngine.stub!(:dosync).and_return(true)
   end
-  
+
   #it "should set source_id attributes" do
     #Account.get_source_id.should == "2"
     #Case.get_source_id.should == "1"
@@ -71,7 +71,7 @@ describe "Rhom::RhomObject" do
   it "should have correct number of attributes" do
     @account = Account.find(:all).first
   
-    @account.vars.size.should == 38
+    @account.vars.size.should == 17
   end
   
   it "should get count of objects" do
@@ -184,6 +184,57 @@ describe "Rhom::RhomObject" do
     end
     ids.uniq.length.should == 10
   end
+
+  it "should create a record, then update" do
+    vars = {"name"=>"some new record", "industry"=>"electronics"}
+    @account1 = Account.new(vars)
+    new_id = @account1.object
+    @account1.save
+    @account2 = Account.find(new_id)
+    @account2.object.should =="{#{@account1.object}}"
+    @account2.name.should == vars['name']
+    @account2.industry.should == vars['industry']
+    
+    update_attributes = {"industry"=>"electronics2"}
+    @account2.update_attributes(update_attributes)
+
+    @account3 = Account.find(new_id)    
+    @account3.object.should =="{#{@account1.object}}"
+    @account3.name.should == vars['name']
+    @account3.industry.should == update_attributes['industry']
+
+    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 2
+    
+    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'update')
+    records.length.should == 0
+  end
+  
+  it "should create a record, then update 2" do
+    vars = {"name"=>"some new record"}
+    @account1 = Account.new(vars)
+    new_id = @account1.object
+    @account1.save
+    
+    @account2 = Account.find(new_id)
+    @account2.object.should =="{#{@account1.object}}"
+    @account2.name.should == vars['name']
+    
+    update_attributes = {"industry"=>"electronics2"}
+    @account2.industry = update_attributes['industry']
+    @account2.save
+    
+    @account3 = Account.find(new_id)    
+    @account3.object.should =="{#{@account1.object}}"
+    @account3.name.should == vars['name']
+    @account3.industry.should == update_attributes['industry']
+
+    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'create')
+    records.length.should == 2
+    
+    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'update')
+    records.length.should == 0
+  end
   
   it "should destroy a record" do
     count = Account.find(:all).size
@@ -323,80 +374,7 @@ describe "Rhom::RhomObject" do
     
     @acct.foobar.should be_nil
   end
-=begin  
-  it "should respond to ask" do
-    question = 'Rhodes'
-    Account.ask(question)
-    res = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'ask')
-    res.length.should == 1
-    
-    res[0]['attrib'].should == 'question'
-    res[0]['value'].should == question
-  end
-  
-  it "should respond to ask with last question only" do
-    question = 'Rhodes'
-    Account.ask(question)
-    res = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'ask')
-    res.length.should == 1
-    
-    res[0]['attrib'].should == 'question'
-    res[0]['value'].should == question
-    
-    question = 'Ruby on Rails'
-    question_encoded = 'Ruby%20on%20Rails'
-    Account.ask(question)
-    res = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'ask')
-    res.length.should == 1
-    
-    res[0]['attrib'].should == 'question'
-    res[0]['value'].should == question_encoded
-  end
-  
-  it "should encode ask params" do
-    question = 'where am i?'
-    question_encoded = 'where%20am%20i%3F'
-    Account.ask(question)
-    @res = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'ask')
-    @res.length.should == 1
-    
-    @res[0]['attrib'].should == 'question'
-    @res[0]['value'].should == question_encoded
-  end
   
-  it "should store all ask db operations as query" do
-    question = 'where am i?'
-    question_encoded = 'where%20am%20i%3F'
-    Question.ask(question) 
-   
-    @question = Question.find(:first)
-    @question.update_attributes({"question"=>"i am here"})
-
-    @res = Rhom::RhomDbAdapter::select_from_table('object_values','*', {'source_id' => @question.get_source_id.to_i()})
-    @res.length.should == 1
-    @res[0]['attrib'].should == 'question'
-    @res[0]['value'].should == 'i am here'
-    
-    ['create','update','delete'].each do |u_type|
-      @res = Rhom::RhomDbAdapter::select_from_table('changed_values','*', {'update_type' =>u_type, 'source_id' => @question.get_source_id.to_i()})
-      @res.length.should == 0
-    end
-  end
-  
-  it "should delete ask records without delete sync operation" do
-    question = 'where am i?'
-    question_encoded = 'where%20am%20i%3F'
-    Question.ask(question) 
-   
-    @question = Question.find(:first)
-    @question.destroy
-    
-    ['query','create','update','delete'].each do |u_type|
-      @res = Rhom::RhomDbAdapter::select_from_table('changed_values','*', {'update_type' =>u_type, 'source_id' => 400})
-      @res.length.should == 0
-    end
-  end
-=end  
   it "should find with conditions" do
     @accts = Account.find(:all, :conditions => {'industry' => 'Technology'})
     @accts.length.should == 2
@@ -659,4 +637,5 @@ describe "Rhom::RhomObject" do
       @accts[0].industry.should == @expected[0][:industry]
     end
   end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Rhomobile
@@ -394,7 +394,9 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
-- platform/android/Rhodes/src/com/rhomobile/rhodes/MainView.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
@@ -409,13 +411,11 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
-- platform/android/Rhodes/src/com/rhomobile/rhodes/SimpleMainView.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
-- platform/android/Rhodes/src/com/rhomobile/rhodes/TabbedMainView.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
@@ -3365,6 +3365,7 @@ files:
 - README.textile
 - res/build-tools/build_inf.js
 - res/build-tools/cygwin1.dll
+- res/build-tools/cygz.dll
 - res/build-tools/db/syncdb.schema
 - res/build-tools/db/syncdb.triggers
 - res/build-tools/insertRhoBundle2pkg.rb

data/platform/android/Rhodes/src/com/rhomobile/rhodes/SimpleMainView.java

@@ -1,67 +0,0 @@
-/*
- ============================================================================
- Author	    : Dmitry Moskalchuk
- Version	: 1.5
- Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ============================================================================
- */
-package com.rhomobile.rhodes;
-
-import android.view.View;
-import android.webkit.WebView;
-
-public class SimpleMainView implements MainView {
-
-	private WebView webView;
-	
-	public View getView() {
-		return webView;
-	}
-	
-	public SimpleMainView() {
-		webView = RhodesInstance.getInstance().createWebView();
-		webView.setId(Rhodes.RHO_MAIN_VIEW);
-	}
-	
-	public void back(int index) {
-		webView.goBack();
-	}
-
-	public void forward(int index) {
-		webView.goForward();
-	}
-
-	public void navigate(String url, int index) {
-		webView.loadUrl(url);
-	}
-	
-	public void reload(int index) {
-		webView.reload();
-	}
-	
-	public String currentLocation(int index) {
-		return webView.getUrl();
-	}
-
-	public void switchTab(int index) {
-		// Nothing
-	}
-	
-	public int activeTab() {
-		return 0;
-	}
-
-}