rhoconnect 3.0.2 → 3.0.3

data/doc/client.txt

@@ -121,6 +121,9 @@ Rhoconnect Client is a library to add sync data capability to your applications.
 	//find all objects by set of properties
 	- (NSMutableArray *) find_all: (NSDictionary *)cond;
 
+    //run sql query - result is array of hashes (string)
+    - (NSMutableArray *) find_bysql: (NSString*)sql args: (NSArray*) sql_args;
+
 	//save object represents by data to database
 	- (void) save: (NSDictionary *)data;
 
@@ -238,6 +241,13 @@ To create schema model tables edit database schema file:
 	
     [sclient addObjectNotify: [[item objectForKey:@"source_id"] intValue] szObject:[item valueForKey:@"object"] ];
 
+#### Run SQL query on Schema model
+
+	:::cplusplus
+    NSArray* params = [NSArray arrayWithObjects: @"Apple", nil];
+	NSMutableArray* items2 = [product find_bysql:@"SELECT * FROM Product_s WHERE name=?" args: params];	
+	//items2 is an Array of NSDictionary* (NSString* to NSString*)
+
 ## Android Java Client
 
 ### Getting started

data/doc/deploying.txt

@@ -80,3 +80,114 @@ Deploying the WAR container varies per J2EE App Server, for JBoss it is necessar
 to place the WAR file into the server's deploy directory.
 
 We recommend using the [phusion passenger](http://modrails.com/index.html) stack for deploying an on-premise RhoConnect application.  Please refer to the [section on rack applications](http://modrails.com/documentation/Users%20guide%20Apache.html#_deploying_a_rack_based_ruby_application) for information on deploying a RhoConnect sinatra application.
+
+## Deploying packaged RhoConnect software on Linux servers
+
+You can create RhoConnect production environment on Linux servers by installing software packages
+for Ubuntu and Cent OS respectively. At this moment supported formats are Debian (deb) and Red Hat (rpm) packages.
+
+Every package provides the following components:
+
+* Ruby 1.8.7, Ruby Enterprise Edition 2011.03
+ 
+* Nginx HTTP server (v. 1.0.6)
+
+* Passenger (v. 3.0.9)
+
+* Redis data store (v. 2.2.14)
+
+* Rhoconnect gem with all required dependencies 
+ 
+In addition, RPM package provides latest Sqlite3 headers and binaries, because standard Cent OS (5.x) libraries for Sqlite3 outdated.
+
+To create Debian package you need to have development version of RhoConnect software on Ubuntu (server, desktop. virtual machine) and execute the following rake task:
+<pre>
+rake build:deb  
+</pre>
+
+To create RPM package you need to have development version of RhoConnect software on Cent OS and execute the following rake task:
+<pre>
+rake build:rpm  
+</pre>
+
+After task is compete, either rhoconnect-x.y.z_all.deb or rhoconnect-x.y.z.noarch.rpm package will be created in the pkg/ directory. In the future, pre-built packages for latest RhoConnect software will be available for direct download.
+
+To install Deb package on Ununtu server (Ubuntu 11.4 server, Amazon EC2 Ubuntu server), you should run the following command:
+<pre>
+dpkg -i rhoconnect-x.y.z_all.deb
+</pre>
+
+To install RPM package on Cent OS server (tested for 5.x, 6.x, and basic 64-bit Amazon Linux AMI 2011.09):
+<pre>
+rpm -i rhoconnect-x.y.z.noarch.rpm
+</pre>
+
+In process of installation many of above components will be downloaded, configured and compiled on target platform.
+For practical usage, you should be familiar with and understand some of the provided settings.
+
+### Ruby Enterprise Edition
+By defaut all ruby binaries, libraries, and gems are installed into <b>/opt/rhoconnect</b> directory. 
+You may wish to have access to these items by adding to bash configuration files this command:
+<pre>
+export PATH=/opt/rhoconnect/bin:$PATH
+</pre>
+
+### Redis
+Rhoconnect installer configured redis server with the following settings:
+
+* Redis configuration file <b>/opt/rhoconnect/etc/redis.conf</b> has the following properties:
+  <pre>
+daemonize yes
+pidfile /var/run/redis.pid
+logfile /var/log/redis.log
+  </pre>
+
+* Redis logrotate settings for <b>/var/log/redis.log</b> files defined in <b>/etc/logrotate.d/redis</b> as: 
+  <pre>
+/var/log/redis.log {
+rotate 3
+missingok
+notifempty
+size 250k
+create 0644 root root
+compress
+}
+  </pre>
+
+* Redis start-up script <b>/etc/init.d/redis</b>. You can start/stop redis server by running the following commands:
+  <pre>
+/etc/init.d/redis {start|stop}
+  </pre>
+
+### Nginx
+Installer compiled Nginx web server (to <b>/opt/nginx</b> directory) with the following configuration files:
+
+* Nginx start-up script (<b>/etc/init.d/nginx</b>)
+
+* Nginx logrotate settings (<b>/etc/logrotate.d/nginx</b>)
+
+* Nginx configuration file (<b>/opt/nginx/conf/nginx.conf</b>) 
+
+* Passenger configuration file and virtual host template for RhoConnect application 
+  (<b>/opt/nginx/conf/conf.d/passenger.conf</b> and <b>/opt/nginx/conf/conf.d/rhoconnect.conf</b>)
+
+* user <b>nginx</b> added to system users list
+ 
+  
+### As a bonus  :-)
+Installer also created and configured RhoConnect <b>rhoapp</b> application in <b>/opt/nginx/html</b> directory.
+To test it you need to as a root user start redis and nginx servers:
+<pre>
+/etc/init.d/redis start
+/etc/init.d/nginx start
+</pre>
+
+And verify that it's up and running by visiting application web console in your browser:
+<pre>
+http://server_ip_address/console/
+</pre>
+ 
+
+
+
+ 

data/doc/heroku-addon.txt

@@ -4,7 +4,6 @@ Heroku Addon
 RhoConnect is now available for those using <a href='http://heroku.com' target='_blank'>Heroku</a> as an addon.  
 
 
-
 Adding RhoConnect from Heroku
 -----------------------
 To use RhoConnect from Heroku, install the RhoConnect add-on:
@@ -12,14 +11,14 @@ To use RhoConnect from Heroku, install the RhoConnect add-on:
 	:::term
 	$ heroku addons:add rhoconnect
 	
-###Setup
+##Setup
 
 From inside your heroku account, setup the url to your backend service that RhoConnect will connect to.
 
 First, click the addons drop down and select rhoconnect.
 <p><img src='https://s3.amazonaws.com/rhodocs/rhoconnect-service/addon_rhoconnect.png' width="479" height="319"/></p>
 
-You will be redirected to the admin console of your RhoConnect instance where you can set the backend app url.  Select Backend App Url from the right menu.
+You will be redirected to the admin console of your RhoConnect instance where you can set the backend app url.  Select Backend App URL from the right menu.
 <p><img src='https://s3.amazonaws.com/rhodocs/rhoconnect-service/console.png' width="800" height="280"/></p>
 
 
@@ -31,24 +30,26 @@ Connecting a simple rhodes app
 -------------------------------
 To view a full tutorial about creating a rhodes application and the features of rhodes see [Rhodes framework](http://docs.rhomobile.com/rhodes/tutorial).
 
-###Gem installation:
+##Gem installation:
 
-	:::ruby
-	[sudo] gem install rhodes
+	:::term
+	$ [sudo] gem install rhodes
 
 Next using the rhodes gem you can create a rhodes app.   
 
-	:::ruby
-    rhodes app sample_app url_of_rhoconnect_instance
+	:::term
+    $ rhodes app sample_app url_of_rhoconnect_instance
 	
 To get the value for the url_of_rhoconnect_instance argument, go to the RhoConnect console and click on the right Backend App URL link.  From there you can copy the syncserver url.
 
 <p><img src='https://s3.amazonaws.com/rhodocs/rhoconnect-service/console.png' width="800" height="280"/></p>  
  
 
-----
-[RhoConnect Introduction](http://docs.rhomobile.com/rhosync/introduction)
+##Other Resources
+[RhoConnect Introduction](http://docs.rhomobile.com/rhoconnect/introduction)
+
+[RhoConnect Installation](http://docs.rhomobile.com/rhoconnect/install)
 
-[RhoConnect Installation](http://docs.rhomobile.com/rhosync/install)
+[RhoConnect Tutorial](http://docs.rhomobile.com/rhoconnect/tutorial)
 
-[RhoConnect Tutorial](http://docs.rhomobile.com/rhosync/tutorial)
+[Using RhoConnect from Rails/Sinatra](http://docs.rhomobile.com/rhoconnect/rails-plugin)

data/doc/install.txt

@@ -3,9 +3,9 @@ Installing RhoConnect
 
 ## Windows
 
-If you're running Windows, download the latest [RhoConnect windows installer](http://github.com/rhomobile/rhoconnect/downloads).  This installs the [Ruby stack](http://www.ruby-lang.org/en/), [Redis](http://redis.io/), [Apache](http://httpd.apache.org/), and a default RhoConnect application so you don't need to generate one by hand.
+If you're running Windows, download the latest [RhoStudio for Windows](http://rhomobile.com/rhostudio-windows).  This installs the [Ruby stack](http://www.ruby-lang.org/en/), [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
 
-Your RhoConnect application folder will be located in C:\RhoConnect\rhoconnect by default so you can skip to the [generating a source instructions](/rhoconnect/command-line#rhoconnect-generator) in the next section.
+You can now skip to the [generating a new application instructions](/rhoconnect/command-line#generate-an-application) in the next section.
 
 ## Mac OS / Linux
 
@@ -17,7 +17,7 @@ Your RhoConnect application folder will be located in C:\RhoConnect\rhoconnect b
 
 3. Ruby Web Server - We test with [thin](http://code.macournoyer.com/thin/), and [passenger](http://www.modrails.com/).  WEBrick, the web server that ships with ruby, is known to cause issues with HTTP headers/cookies and is ***not*** recommended.
 
-4. [Redis 2.2.14+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the [Rake Tasks section](rhoconnect/command-line#rake-tasks). Alternatively, you can [install redis directly](http://redis.io/download).
+4. [Redis 2.2.14+](http://redis.io/) - RhoConnect includes a simple [rake task](/rhoconnect/command-line#rake-tasks) `redis:install` to install redis, covered in the [Rake Tasks section](/rhoconnect/command-line#rake-tasks). Alternatively, you can [install redis directly](http://redis.io/download).
 
 ### Installing RhoConnect Gem
 

data/doc/net-plugin.txt

@@ -1,9 +1,9 @@
 rhoconnect.NET
 ===
 
-A .NET 4 framework library for the [Rhoconnect](http://rhomobile.com/products/rhosync) App Integration Server.
+A .NET 4 framework library for the [Rhoconnect](http://rhomobile.com/products/rhoconnect) App Integration Server.
 
-Using rhoconnect.NET, your [ASP.NET MVC3](http://www.asp.net/mvc/mvc3) application's data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhosync/).
+Using rhoconnect.NET, your [ASP.NET MVC3](http://www.asp.net/mvc/mvc3) application's data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhoconnect/).
 
 ## Getting started
 
@@ -183,7 +183,7 @@ Each of the above methods have a partition key supplied with the CRUD request.	T
 For example, the `Product` model above might have a relationship to the User model.  This provides us a simple way to organize the `Product` dataset for rhoconnect by reusing this relationship.  
 In this case, your implementation might filter out data on a per user basis.
 	
-For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhosync/source-adapters#data-partitioning).
+For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhoconnect/source-adapters#data-partitioning).
 
 ## Implementing MVC callbacks
 All of the above methods are necessary to establish the communication from the Rhoconnect instance to your ASP.NET MVC application. 

data/doc/rails-plugin.txt

@@ -1,9 +1,9 @@
 rhoconnect-rb
 ===
 
-A ruby library for the [Rhoconnect](http://rhomobile.com/products/rhosync) App Integration Server.
+A ruby library for the [Rhoconnect](http://rhomobile.com/products/rhoconnect) App Integration Server.
 
-Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhosync/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
+Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhoconnect/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
 
 ## Getting started
 
@@ -13,7 +13,7 @@ Load the `rhoconnect-rb` library:
 
 Note, if you are using datamapper, install the `dm-serializer` library and require it in your application.  `rhoconnect-rb` depends on this utility to interact with Rhoconnect applications using JSON.
 	
-## Usage
+## Setup the Model
 Now include Rhoconnect::Resource in a model that you want to synchronize with your mobile application:
 
 	class Product < ActiveRecord::Base
@@ -27,7 +27,7 @@ Or, if you are using DataMapper:
 	  include Rhoconnect::Resource
 	end
 
-### Partitioning Datasets
+## Partitioning Datasets
 	
 Next, your models will need to declare a partition key for `rhoconnect-rb`.  This partition key is used by `rhoconnect-rb` to uniquely identify the model dataset when it is stored in a rhoconnect instance.  It is typically an attribute on the model or related model.  `rhoconnect-rb` supports two types of partitions:
 
@@ -52,9 +52,9 @@ Now all of the `Product` data synchronized by rhoconnect will organized by `self
 	  :app
 	end
 	
-For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhosync/source-adapters#data-partitioning).
+For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhoconnect/source-adapters#data-partitioning).
 
-### Querying Datasets
+## Querying Datasets
 
 `rhoconnect-rb` installs a `/rhoconnect/query` route in your application which the Rhoconnect instance invokes to query the dataset for the dataset you want to synchronize.  This route is mapped to a `rhoconnect_query` method in your model.  This method should return a collection of objects:
 
@@ -74,7 +74,7 @@ For more information about Rhoconnect partitions, please refer to the [Rhoconnec
 
 In this example, `self.rhoconnect_query` returns a list of products where the partition string (provided by the rhoconnect instance) matches the `user_id` field in the products table.  
 
-### Configuration and Authentication
+## Configuration and Authentication
 
 Configure Rhoconnect in an initializer like `config/initializers/rhoconnect.rb` (for Rails), or directly in your application (i.e. Sinatra).  Here you will setup the rhoconnect uri (the location of your rhoconnect instance), and app\_endpoint (the location of your ruby app):
 
@@ -109,6 +109,17 @@ Example with authentication:
 	  }
 	end
 	
+Example using the [RhoConnect Heroku Addon](/rhoconnect/heroku-addon):
+
+If you're using the [RhoConnect Heroku Addon](/rhoconnect/heroku-addon), then you can omit the config.uri (it is added for you):
+
+	Rhoconnect.configure do |config|
+	  config.token = "secrettoken"
+	  config.authenticate = lambda { |credentials| 
+	    User.authenticate(credentials[:login], credentials[:password]) 
+	  }
+	end
+	
 
 ## Meta
 Created and maintained by Lucas Campbell-Rossen, Vladimir Tarasov and Lars Burgess.

data/doc/web-console.txt

@@ -32,4 +32,4 @@ If you want to disable this web interface, you can do so by editing the rackup f
 
 Here is a screenshot of the web console:
 
-<img src="https://img.skitch.com/20110110-f81w9mr8ujegyep543bjsrkigj.jpg"/>
+<img src="https://img.skitch.com/20111007-c7agn6jqxnq2nne5srq1ijxk4g.png"/>

data/installer/utils/constants.rb

@@ -11,7 +11,6 @@ module Constants
   REMOTE_HOME     = '/home/ubuntu'
   PEM_FILE        = 'alexdevkey.pem'
   SSH_KEY         = "#{HOME_DIR}/.ssh/#{PEM_FILE}"
-  SCP_KEY         = "#{HOME_DIR}/.scp/#{PEM_FILE}"
   ACCESS_KEY_FILE = "#{HOME_DIR}/.ec2/credentials"
   UBUNTU_STACK    = { :image_id  => 'ami-3d491a78',
                       :flavor_id => 'm1.small',
@@ -25,8 +24,8 @@ module Constants
                       :groups    => 'load-test',
                       :user      => 'root'}
 
-  STACKS          = [ UBUNTU_STACK ]
-#                      CENTOS_STACK ]
+  STACKS          = [ UBUNTU_STACK, 
+                      CENTOS_STACK ]
 
   DEB_DEPS        = [ "build-essential",
                       "zlib1g-dev",

data/installer/utils/nix_install_test.rb

@@ -32,21 +32,23 @@ def compile_stack_info
   @stack.delete :user
 
   # This part of the package name will always be the same
-  local_file = "#{`pwd`.strip}/../../pkg/"
+  local_file = "#{`pwd`.strip}/pkg/"
 
   # Append the rest of the file name according to distribution
   if @user == 'ubuntu'
-    @dist = { :package    => "rhoconnect_#{Constants::RC_VERSION}_all.deb",
-              :local_file => "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
-              :pkg_mgr    => 'dpkg',
-              :pkg_repo   => 'apt-get -y',
-              :deps       => Constants::DEB_DEPS }
+    @dist = { :package     => "rhoconnect_#{Constants::RC_VERSION}_all.deb",
+              :local_file  => "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
+              :pkg_mgr     => 'dpkg',
+              :pkg_type    => 'DEB',
+              :pkg_repo    => 'apt-get -y',
+              :deps        => Constants::DEB_DEPS }
   elsif @user == 'root'
-    @dist = { :package    => "rhoconnect_#{Constants::RC_VERSION}_noarch.rpm",
-              :local_file => "#{local_file}rhoconnect_#{Constants::RC_VERSION}_noarch.rpm",
-              :pkg_mgr    => 'rpm',
-              :pkg_repo   => 'yes | yum',
-              :deps       => Constants::RPM_DEPS }
+    @dist = { :package     => "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
+              :local_file  => "#{local_file}rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
+              :pkg_mgr     => 'rpm',
+              :pkg_type    => 'RPM',
+              :pkg_repo    => 'yes | yum',
+              :deps        => Constants::RPM_DEPS }
   else
     puts "Incorrect user name"
     exit
@@ -122,7 +124,8 @@ end #create_scp_connection
 # transfer 
 # transfers given data to remote machine via scp
 def transfer(local_data, remote_data)
-  puts "Attempting to establish SCP connection..."
+  puts "Attempting file transfer via SCP"
+  puts "Transferring #{local_data} to #{remote_data}..."
   @scp.upload( local_data, remote_data ) do |cd, name, sent, total|
     print "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
   end #do
@@ -132,7 +135,7 @@ end #establish_scp_connection
 # transfer_rhoconnect
 # Transfers the rhoconnect package over SCP
 def transfer_rhoconnect
-  transfer @dist[:local_file], Constants::REMOTE_HOME
+  transfer @dist[:local_file], @dist[:remote_home]
 end #transfer_rhoconnect
 
 # destroy_ec2_instance
@@ -163,8 +166,20 @@ def install_package
 end #install_package
 
 def start_servers
-  ssh_cmd "sudo /etc/init.d/redis start"
-  ssh_cmd "sudo /etc/init.d/nginx start"
+  attempts = 0
+  while @ssh.run("pgrep redis")[0].stdout.strip == ""
+   ssh_cmd "sudo /etc/init.d/redis start"
+   attempts += 0
+  end #while
+  puts "Redis start took #{attempts} attempts"
+  puts
+  attempts = 0
+  while @ssh.run("pgrep nginx")[0].stdout.strip == ""
+    ssh_cmd "sudo /etc/init.d/nginx start"
+    attempts += 0
+  end #while
+  puts "Nginx start took #{attempts} attempts."
+  puts
   puts "Waiting #{Constants::SLEEP} seconds for servers to initialize"
   Constants::SLEEP.times do
     sleep 1
@@ -198,51 +213,35 @@ def compute_time(start_time, end_time)
     time_units = 'seconds'
   end #if
 
-"Test completed in #{time_delta} #{time_units}"
+"\nTest completed in #{time_delta} #{time_units}\n"
 end #compute_time
 
 # SCRIPT
 
-### This part has been set as a dependency in the :test rake task
-# Create Packages
-
-# Creating debian package
-#cmd "sudo rake build:deb"
-# Make sure package was created successfully
-#if $? != 0
-#  puts "Debian package was not created successfully" + 
-#       "Exiting..."
-#  exit 1
-#end #if
-
-# Keep commented until running on a machine with rpm
-# Creating RPM package
-#cmd "sudo rake build:rpm"
-# Make sure package was created successfully
-#if $? != 0
-#  puts "RPM package was not created successfully" + 
-#       "Exiting..."
-#  exit 1
-#end #if
-
 # Test Package installations
-start_time = Time.now
 Constants::STACKS.each do |stack|
+  start_time = Time.now
   begin
     @stack = stack 
     compile_stack_info
+    puts
+    puts "================================================"
+    puts "Now starting test of #{@dist[:pkg_type]} package"
+    puts "================================================"
+    puts
 
     create_ec2_instance
  
     # Establish connections
     establish_ssh_connection
+    @dist[:remote_home] = @ssh.run("echo ~")[0].stdout.strip
     establish_scp_connection
 
     # Transfer the Rhoconnect package to the remote machine
     transfer_rhoconnect
  
     puts "Installing rhoconnect package.\n" + 
-         "This may take a while..."
+         "This may take a while...\n\n"
     install_package
 
     # Start the redis and nginx servers on the remote machine
@@ -250,6 +249,9 @@ Constants::STACKS.each do |stack|
 
     # Check the status of the rhoconnect service
     check_rc_service
+
+    end_time = Time.now
+    puts compute_time(start_time, end_time)
   rescue => e
     puts "OH NOEZ, Exception!!"
     puts e.inspect
@@ -260,5 +262,3 @@ Constants::STACKS.each do |stack|
     end #if
   end #begin
 end #do
-end_time = Time.now
-puts compute_time(start_time, end_time)

data/installer/utils/nix_installation.rake

@@ -2,6 +2,6 @@ namespace :rc_pkg do
   desc 'Test creation and installation of both DEB and RPM rhoconnect packages.'
   task :test => ['build:deb', 'build:rpm'] do
     # Run installation test
-    sudo ruby "installer/utils/nix_install_test.rb"
+    ruby "installer/utils/nix_install_test.rb"
   end #:test
 end #:rc_pkg

data/lib/rhoconnect/client_sync.rb

@@ -49,7 +49,7 @@ module Rhoconnect
         return _resend_search_result if params[:token] and params[:resend]
         if params[:token] and !_ack_search(params[:token]) 
           formatted_result = _format_search_result
-          @client.flash_data('search*')
+          _delete_search
           return formatted_result
         end
       end
@@ -304,7 +304,7 @@ module Rhoconnect
     
     def _ack_search(search_token)
       if @client.get_value(:search_token) != search_token
-        @client.flash_data('search*')
+        _delete_search
         @client.put_data(:search_errors,
           {'search-error'=>{'message'=>'Search error - invalid token'}}
         )
@@ -313,13 +313,19 @@ module Rhoconnect
       true
     end
     
+    def _delete_search
+      [:search, :search_page, :search_token, :search_errors].each do |search_doc|
+     	  @client.flash_data(search_doc)
+     	end
+    end
+    
     def _do_search(params={})
       # call source adapter search unless client is sending token for ack
       search_params = params[:search] if params
       res = @source_sync.search(@client.id,search_params) if params.nil? or !params[:token]
       res,diffsize =  @source.is_pass_through? ? [res,res.size] : compute_search 
       formatted_res = _format_search_result(res,diffsize)      
-      @client.flash_data('search*') if diffsize == 0
+      _delete_search if diffsize == 0
       formatted_res
     end
     

data/lib/rhoconnect/read_state.rb

@@ -1,6 +1,7 @@
 module Rhoconnect  
   class ReadState < Model
     field :refresh_time, :integer
+    field :prev_refresh_time, :integer
     field :retry_counter, :integer
   
     def self.create(fields)
@@ -9,6 +10,7 @@ module Rhoconnect
       fields.delete(:user_id)
       fields.delete(:source_name)
       fields[:refresh_time] ||= Time.now.to_i
+      fields[:prev_refresh_time] ||= Time.now.to_i
       fields[:retry_counter] ||= 0
       super(fields,{})
     end

data/lib/rhoconnect/source.rb

@@ -266,11 +266,47 @@ module Rhoconnect
     def if_need_refresh(client_id=nil,params=nil)
       need_refresh = lock(:md) do |s|
         check = check_refresh_time
-        s.read_state.refresh_time = Time.now.to_i + s.poll_interval if check
+        self.read_state.prev_refresh_time = self.read_state.refresh_time if check
+        self.read_state.refresh_time = Time.now.to_i + self.poll_interval if check
         check
       end
       yield client_id,params if need_refresh
     end
+    
+    def rewind_refresh_time(query_failure)
+      return if self.poll_interval == 0
+      lock(:md) do |s|
+        rewind_time = false
+        # reset number of retries 
+        # and prev_refresh_time on succesfull query
+        # or if last refresh was more than 'poll_interval' time ago
+        if not query_failure or ((Time.now.to_i - self.read_state.prev_refresh_time) >= self.poll_interval)
+          # we need to reset the prev_refresh_time here
+          # otherwise in case of expired poll interval
+          # and repeating failures - it will reset the counter 
+          # on every error
+          self.read_state.prev_refresh_time = Time.now.to_i
+          self.read_state.retry_counter = 0
+        end
+      
+        # rewind the refresh time on failure
+        # if retry limit is not reached
+        if query_failure
+          if self.read_state.retry_counter < self.retry_limit
+            self.read_state.increment!(:retry_counter)
+            rewind_time = true
+            # we have reached the limit - do not rewind the refresh time
+            # and reset the counter
+          else
+            self.read_state.retry_counter = 0
+          end
+        end
+        
+        if rewind_time
+          self.read_state.refresh_time = self.read_state.prev_refresh_time
+        end
+      end 
+    end
         
     def is_pass_through?
       self.pass_through and self.pass_through == 'true'

data/lib/rhoconnect/source_sync.rb

@@ -92,10 +92,14 @@ module Rhoconnect
       result = nil
       @source.if_need_refresh do
         Stats::Record.update("source:query:#{@source.name}") do
-          return if _auth_op('login') == false
-          result = self.read(nil,params)
-          _auth_op('logoff')
-        end  
+          if _auth_op('login')
+            result = self.read(nil,params)
+            _auth_op('logoff')
+          end
+          # re-wind refresh time in case of error
+          query_failure = Store.exists?(@source.docname(:errors))
+          @source.rewind_refresh_time(query_failure)
+        end
       end
       result
     end