rhodes-framework 1.1.1 → 1.2.0

data/spec/app/spec/rhom_spec.rb

@@ -20,30 +20,41 @@
 require 'spec/spec_helper'
 
 describe "Rhom" do
+  
+  CLIENT_ID = '67320d31-e42e-4156-af91-5d9bd7175b08'
 
   it_should_behave_like "rhom initializer"
   
   it "should get client_id" do
-    Rhom::Rhom::client_id.should == '67320d31-e42e-4156-af91-5d9bd7175b08'
+    Rhom::Rhom::client_id.should == CLIENT_ID
   end
   
   it "should perform full reset of database" do
     Rhom::Rhom::database_full_reset
-    Rhom::RhomDbAdapter::select_from_table('object_values','*').length.should == 0
-    Rhom::RhomDbAdapter::select_from_table('client_info','*').length.should == 0
-    Rhom::Rhom::client_id.should be_nil
+    verify_reset
   end
   
   it "should perform full database reset and logout" do
     Rhom::Rhom::database_full_reset_and_logout
-    Rhom::RhomDbAdapter::select_from_table('object_values','*').length.should == 0
-    Rhom::RhomDbAdapter::select_from_table('client_info','*').length.should == 0
-    Rhom::Rhom::client_id.should be_nil
+    verify_reset
   end
   
   it "should call select_from_table with select array" do
     sel_arr = ['name','industry']
-    @res = Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME, '*', {'object' => '44e804f2-4933-4e20-271c-48fcecd9450d'}, nil, sel_arr)
+    @res = Rhom::RhomDbAdapter::select_from_table('object_values', '*', {'object' => '44e804f2-4933-4e20-271c-48fcecd9450d'}, nil, sel_arr)
     @res.length.should == 2
   end
+  
+  def verify_reset
+    Rhom::RhomDbAdapter::select_from_table('object_values','*').length.should == 0
+    res = Rhom::RhomDbAdapter::select_from_table('client_info','*')
+    res.length.should == 1
+    res[0]['reset'].should == 1
+    res[0]['client_id'].should == CLIENT_ID
+    
+    Rhom::RhomDbAdapter::select_from_table('sources','*').each do |source|
+      source['token'].should == 0
+    end
+    Rhom::Rhom::client_id.should == CLIENT_ID
+  end
 end

data/spec/app/spec/rhoruby_spec.rb

@@ -0,0 +1,31 @@
+#
+#  rhoruby_spec.rb
+#  rhodes
+#
+#  Copyright (C) 2008 Rhomobile, Inc. 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/>.
+#
+require 'spec/spec_helper'
+
+describe "RhoRuby" do
+  
+  it "should compute string to_f to test flt_rounds" do
+    "100.250".to_f.should == 100.25
+  end
+  
+  it "should compute == on float to test flt_rounds" do
+    1.0.should == 1
+  end
+end

data/spec/app/spec/spec_helper.rb

@@ -8,8 +8,9 @@ describe "rhom initializer", :shared => true do
   end
 
   after(:each) do
+    Rhom::RhomDbAdapter.start_transaction
     Rhom::RhomDbAdapter.delete_all_from_table('client_info')
     Rhom::RhomDbAdapter.delete_all_from_table('object_values')
-    #Rhom::RhomDbAdapter.delete_all_from_table('sources')
+    Rhom::RhomDbAdapter.commit
   end
 end

data/spec/app/spec/syncengine_spec.rb

@@ -0,0 +1,30 @@
+#
+#  syncengine_spec.rb
+#  rhodes
+#
+#  Copyright (C) 2008 Rhomobile, Inc. 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/>.
+#
+require 'spec/spec_helper'
+require 'rho/rho'
+
+describe "SyncEngine" do
+  
+  it "should update syncserver at runtime" do
+    SyncEngine.set_syncserver('http://example.com/sources/')
+    @rho = Rho::RHO.new
+    Rho::RhoConfig.syncserver.should == 'http://example.com/sources/'
+  end
+end

data/spec/app/spec_runner.rb

@@ -10,11 +10,15 @@ class SpecRunner < MSpecScript
     # turn on exception backtrace
     MSpec.backtrace = true
     
-    Dir.entries(File.join(File.dirname(__FILE__),'spec')).each do |x|
-      x = nil if not x =~ /.iseq/
-      puts "Adding spec file: #{x}" if x
-      config[:files] << File.join(File.dirname(__FILE__),'spec',File.basename(x,'.iseq')) if x
-    end
+    config[:files] << 'spec/rhom_spec'
+    config[:files] << 'spec/rhoruby_spec'
+    config[:files] << 'spec/rho_controller_spec'
+    config[:files] << 'spec/rhom_object_spec'
+    config[:files] << 'spec/rho_spec'
+    config[:files] << 'spec/spec_helper'
+    config[:files] << 'spec/webview_spec'
+    config[:files] << 'spec/syncengine_spec'
+    config[:files] << 'spec/rhom_db_adapter_spec'
   end
 
   def run

data/spec/build.yml

@@ -10,14 +10,15 @@ env:
     selfsignname: "CN=Anton OU=Development OR=RhoMobile CO=RU EM=anton@rhomobile.com"
     selfsignpwd: "1234"
   paths:
+    java: C:/Program Files/Java/jdk1.6.0_11/bin
+    android: C:/android-sdk-windows-1.5_r2
+  
     4.6:
       jde: C:/Program Files/Research In Motion/BlackBerry JDE 4.6.0
-      java: C:/Program Files/Java/jdk1.6.0_11/bin
       mds: C:/Program Files/Research In Motion/BlackBerry JDE 4.6.0/MDS
       sim: 9000
     4.2:
       jde: C:/Program Files/Research In Motion/BlackBerry JDE 4.2.0 
-      java: C:/Install/Java/jdk1.6.0_11/bin
       mds: C:/Program Files/Research In Motion/BlackBerry Email and MDS Services Simulators 4.1.2/MDS
       sim: 8100
     cabwiz: C:/Program Files/Windows Mobile 6 SDK/Tools/CabWiz/cabwiz.exe

data/spec/rhoconfig.txt

@@ -17,3 +17,5 @@ LogCategories = *
 ExcludeLogCategories =
 KeepTrackOfLastVisitedPage = 0 
 LastVisitedPage = ''
+
+arbitrary_option = 'rhodes rocks!'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes-framework
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,79 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -07:00
+date: 2009-08-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -90,9 +20,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.2
     version: 
-description: 
+description: ""
 email: 
 - dev@rhomobile.com
 executables: []
@@ -100,14 +30,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- History.txt
 - Manifest.txt
-- spec/app/spec/fixtures/client_info.txt
-- spec/app/spec/fixtures/object_values.txt
-- spec/public/images/IUI_LICENSE.txt
-- spec/rhoconfig.txt
+- README.txt
 files: 
 - .gitignore
+- History.txt
 - Manifest.txt
+- README.txt
 - Rakefile
 - lib/ServeME.rb
 - lib/bsearch.rb
@@ -125,6 +55,7 @@ files:
 - lib/rho/rhoapplication.rb
 - lib/rho/rhocontact.rb
 - lib/rho/rhocontroller.rb
+- lib/rho/rhoerror.rb
 - lib/rho/rhofsconnector.rb
 - lib/rho/rhosupport.rb
 - lib/rho/rhoutils.rb
@@ -136,7 +67,6 @@ files:
 - lib/rhom.rb
 - lib/rhom/rhom.rb
 - lib/rhom/rhom_db_adapter.rb
-- lib/rhom/rhom_db_adapterME.rb
 - lib/rhom/rhom_object.rb
 - lib/rhom/rhom_object_factory.rb
 - lib/rhom/rhom_source.rb
@@ -263,11 +193,15 @@ files:
 - spec/app/mspec/version.rb
 - spec/app/spec/fixtures/client_info.txt
 - spec/app/spec/fixtures/object_values.txt
+- spec/app/spec/pagination/fixtures/object_values.txt
 - spec/app/spec/rho_controller_spec.rb
 - spec/app/spec/rho_spec.rb
-- spec/app/spec/rhom_object_factory_spec.rb
+- spec/app/spec/rhom_db_adapter_spec.rb
+- spec/app/spec/rhom_object_spec.rb
 - spec/app/spec/rhom_spec.rb
+- spec/app/spec/rhoruby_spec.rb
 - spec/app/spec/spec_helper.rb
+- spec/app/spec/syncengine_spec.rb
 - spec/app/spec/webview_spec.rb
 - spec/app/spec_runner.rb
 - spec/build.yml
@@ -304,6 +238,8 @@ files:
 - spec/rhoconfig.txt
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -325,9 +261,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rhodes-framework
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: rhodes-framework 1.1.1
+specification_version: 3
+summary: ""
 test_files: []
 

data/lib/rhom/rhom_db_adapterME.rb

@@ -1,92 +0,0 @@
-#
-#  rhom_db_adapter.rb
-#  rhodes
-#
-#  Copyright (C) 2008 Rhomobile, Inc. 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/>.
-#
-require 'rhodes'
-
-module Rhom
-  class RhomDbAdapter
-    
-    @@database = nil
-    
-    class << self
-      def open(dbfile=nil)
-        puts "DB name = " + dbfile.inspect
-        unless @@database or dbfile.nil?
-			    db = DbAdapter.new(Rhodes::DBVERSION)
-			    @@database = db
-        end
-      end
-    
-      def close
-        if @@database and not @@database.closed?
-          @@database.close
-          @@database = nil
-        else
-          return false
-        end
-        return true
-      end   
-    
-      # execute a sql statement
-      # optionally, disable the factory processing 
-      # which returns the result array directly
-      def execute_sql
-        result = []
-		  # Make sure we lock the sync engine's mutex
-		  # before we perform a database transaction.
-		  # This prevents concurrency issues.
-		  begin
-			SyncEngine::lock_sync_mutex
-			result = yield
-			SyncEngine::unlock_sync_mutex
-		  rescue Exception => e
-			puts "exception when running query: #{e}"
-			# make sure we unlock even if there's an error!
-			SyncEngine::unlock_sync_mutex
-		  end
-        puts "returned #{result.length.to_s} records..."
-        result
-      end
-    
-      def select_from_table(table=nil,columns=nil,condition=nil,params=nil)
-	    execute_sql { @@database.selectFromTable(table, columns, condition, params) }
-      end
-    
-      def insert_into_table(table=nil,values=nil)
-	    execute_sql { @@database.insertIntoTable(table, values) }
-      end
-    
-      def delete_from_table(table=nil,condition=nil)
-	    execute_sql { @@database.deleteFromTable(table, condition) }
-	  end
-    
-      def delete_all_from_table(table=nil)
-	    execute_sql { @@database.deleteAllFromTable(table) }
-	  end
-    
-      def update_into_table(table=nil,values=nil,condition=nil)
-		execute_sql { @@database.updateIntoTable(table, values, condition) }
-	  end
-    end # class methods
-  end # RhomDbAdapter
-end # Rhom
-
-at_exit do
-	Rhom::RhomDbAdapter::close
-end