rhoconnect 3.1.0.beta1 → 3.1.0.beta2

data/doc/cud-conflicts.txt

@@ -1,11 +1,11 @@
-Resolving CUD conflicts
+Resolving Conflicts
 ===
 
-Rhoconnect CUD queue and potential conflicts
+Create,Update,Delete Queue and Potential Conflicts
 ---
 
-By design, your Rhoconnect application supports parallel dispatching of the multiple client's requests via the asynchronous Resque jobs. This scenario can lead to a situation where two or more clients will try to perform CUD operations at the same time, potentially creating the race condition. For example, this can happen when two users will try to insert or delete the same record simultaneously.
-To handle this situation , Rhoconnect uses the CUD queue, which is being dispatched continuously. You can inspect this queue before the CUD operation is called and mark the conflicting records for special processing. To do this, you need to override the Source Adapter `validate` method that is called before the CUD queue is dispatched. This method has the following parameters:
+By design, your RhoConnect application supports parallel dispatching of the multiple client's requests via the asynchronous Resque jobs. This scenario can lead to a situation where two or more clients will try to perform create,update, and delete operations at the same time, potentially creating the race condition. For example, this can happen when two users will try to insert or delete the same record simultaneously.
+To handle this situation, RhoConnect uses the create,update,delete (or CUD) queue, which is being dispatched continuously. You can inspect this queue before the CUD operation is called and mark the conflicting records for special processing. To do this, you need to override the Source Adapter `validate` method that is called before the CUD queue is dispatched. This method has the following parameters:
 
 <table border="1">
 	<tr>
@@ -16,12 +16,12 @@ To handle this situation , Rhoconnect uses the CUD queue, which is being dispatc
 	<tr>
 		<td>Array Of Record Hashes</td>
 		<td><code>cud_queue</code></td>
-		<td>CUD queue consisting of CUD request hashes, ordered from oldest to newest. Each entry in the queue contains a hash of CUD records to process. (Each CUD client request can contain more than one record</td>
+		<td>CUD queue consisting of CUD request hashes, ordered from oldest to newest. Each entry in the queue contains a hash of CUD records to process. (Each CUD client request can contain more than one record)</td>
 	</tr>
 	<tr>
 		<td>Array Of Client Ids</td>
 		<td><code>client_queue</code></td>
-		<td>This array is used to map the CUD request in the above queue to a corresponding client ID. i.e. CUD_queue[N] request was issued by client_queue[N] client. Please note that there may be several entries from the same client - if they came separately in time</td>
+		<td>This array is used to map the CUD request in the above queue to a corresponding client ID. i.e. cud_queue[n] request was issued by client_queue[n] client. Please note that there may be several entries from the same client - if they came separately in time</td>
 	</tr>
 </table>
 
@@ -37,32 +37,32 @@ Below you can see the example of the `validate` method parameters indicating two
 	cud_queue = [ cud_request_1, cud_request_2 ]
 	client_ids = [ client_1, client_2 ]
 
-Detecting the conflict and forcing an error
+Detecting the Conflict and Forcing an Error
 ---
 
 Using the above `validate` method you can iterate through the queue and detect CUD conflicts based on the desired application logic. Once the conflicting record is found (for example, duplicate create request), you need to mark it by inserting the conflicting record parameters into the special hash structure that is returned by the `validate` method:
 
 	:::ruby
 	def validate(operation, cud_queue, client_ids)
-		resulting_meta_hash = {}
+	  resulting_meta_hash = {}
 	
-		# iterating through the queue
-		cud_queue.each_with_index do |cud_request, index|
-			cud_request_client = client_ids[index]
+	  # iterating through the queue
+	  cud_queue.each_with_index do |cud_request, index|
+	    cud_request_client = client_ids[index]
 			
-			# iterating through the request records
-			cud_request.each do |record_id, record_hash|
-				# ... detecting the conflict here ....
-				# !!! found a conflict - force an error
-				error_record_id = record_id
-			 	record_meta_data = { error_record_id => { :error => 'my_error_string: conflict is detected!!!' }}
-				resulting_meta_hash[index] ||= {}
-				resulting_meta_hash[index].merge!(record_meta_data)
-			end
+		# iterating through the request records
+		cud_request.each do |record_id, record_hash|
+		  # ... detecting the conflict here ....
+				
+		  # !!! found a conflict - force an error
+		  error_record_id = record_id
+		  record_meta_data = { error_record_id => { :error => 'my_error_string: conflict is detected!!!' }}
+	      resulting_meta_hash[index] ||= {}
+		  resulting_meta_hash[index].merge!(record_meta_data)
 		end
-		
-		resulting_meta_hash
+	  end	
+      resulting_meta_hash
 	end
 				
-Once the `validate` method returns non-empty validation metadata hash structure, it will be used in processing the CUD queue. All marked records will not be processed, but instead an error will be sent back to the originating client with the user-provided error message.
+Once the `validate` method returns a non-empty validation metadata hash structure, it will be used in processing the CUD queue. All marked records will not be processed, but instead an error will be sent back to the originating client with the user-provided error message.
  

data/doc/java-plugin.txt

@@ -10,17 +10,17 @@ Using the RhoConnect-Java plugin, your [Spring 3 MVC](http://www.springsource.or
 * Java (1.6)
 * Maven2 (2.2.1)
 * Git
-* [Rhoconncect-java](https://github.com/downloads/rhomobile/rhoconnect-java/rhoconnect-java-1.0-SNAPSHOT.jar) plugin jar file
+* [Rhoconncect-java](https://github.com/downloads/rhomobile/rhoconnect-java/rhoconnect-java-1.0.1.jar) plugin jar file
 
 ## Getting started
 
 We assume that you have a complete java end-to-end application using Spring 3.0 MVC as the front end technology and Hibernate as backend ORM. For this application we will also use Maven2 for build and dependency management and some database to persist the data. The database is accessed by a Data Access (DAO) layer.
 
-Copy [Rhoconncect-java](https://github.com/downloads/rhomobile/rhoconnect-java/rhoconnect-java-1.0-SNAPSHOT.jar) plugin jar file to your PC.
+Copy [Rhoconncect-java](https://github.com/downloads/rhomobile/rhoconnect-java/rhoconnect-java-1.0.1.jar) plugin jar file to your PC.
 You can also create target rhoconnect-java plugin jar from sources by cloning rhoconnect-java repository 
 
     :::term
-    $ git clone git@github.com:rhomobile/rhoconnect-java.git
+    $ git clone https://github.com/rhomobile/rhoconnect-java.git
 
 and executing in cloned project directory the following commands:
 
@@ -64,7 +64,7 @@ You must also add the rhoconnect-java jar to your Maven 2 project. At this momen
 Download the `rhoconnect-java-1.0-SNAPSHOT.jar` jar file and put it into your hard drive, and issue the following Maven's command:
 
     :::term
-	$ mvn install:install-file -Dfile=/path-to-jar/rhoconnect-java-1.0-SNAPSHOT.jar -DgroupId=com.rhomobile.rhoconnect  -DartifactId=rhoconnect-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
+	$ mvn install:install-file -Dfile=/path-to-jar/rhoconnect-java-1.0.1.jar -DgroupId=com.rhomobile.rhoconnect  -DartifactId=rhoconnect-java -Dversion=1.0.1 -Dpackaging=jar
 
 Now, the `rhoconnect-java` jar library is included into your Maven local repository.
 In the RhoconnectJavaSample application, you would add this code to the pom.xml file.
@@ -74,7 +74,7 @@ In the RhoconnectJavaSample application, you would add this code to the pom.xml
 	<dependency>
     	<groupId>com.rhomobile.rhoconnect</groupId>
     	<artifactId>rhoconnect-java</artifactId>
-    	<version>1.0-SNAPSHOT</version>
+    	<version>1.0.1</version>
     	<type>jar</type>
 	</dependency>
 
@@ -147,7 +147,7 @@ The `authenticate` bean will be called by rhoconnect server to authenticate user
     import java.util.Map;
 
     public interface Rhoconnect {
-        boolean authenticate(String login, String password, Map<String, Object> attributes);    
+        String authenticate(String userName, String password, Map<String, Object> attributes);
     }
 
 For example:
@@ -163,10 +163,17 @@ For example:
         private static final Logger logger = Logger.getLogger(ContactAuthenticate.class);
 
         @Override
-        public boolean authenticate(String login, String password, Map<String, Object> attributes) {
-            logger.info("ContactAuthenticate#authenticate: implement your authentication code!");
-            // TODO: your authentication code goes here ...
-            return true;
+        public String authenticate(String login, String password, Map<String, Object> attributes) {
+            logger.debug("ContactAuthenticate#authenticate: implement your authentication code!");
+            // TODO: your authentication code goes here ...     
+            // Return null value if authentication fails.
+
+            // Otherwise, returned value is data partitioning: i.e. user name for filtering data on per user basis
+            //return login;
+
+            // But if you want your data to be partitioned by 'app' (i.e. the data will be shared among all users),
+            // you should return string "app": it will instruct Rhoconnect to partition the data accordingly.
+            return "app";
         }
     }
 
@@ -184,7 +191,6 @@ You need to establish communication from the RhoConnect instance to your java ba
 		Integer rhoconnectCreate(String partition, Map<String, Object> attributes);
 		Integer rhoconnectUpdate(String partition, Map<String, Object> attributes);
 		Integer rhoconnetDelete(String partition, Map<String, Object> attributes);
-		String getPartition();
 	}
 
 To help rhoconnect-java plugin correctly do mapping of model name to service bean you should take into account the following conventions:
@@ -200,9 +206,9 @@ For more information about RhoConnect partitions, please refer to the [RhoConnec
 You also must to establish the communication from your java back-end application to the RhoConnect instance by auto-wiring `RhoconnectClient` bean into your DAO service class and inserting notifications hooks into data access (create/update/delete) methods. 
 `RhoconnectClient` bean is provided by rhoconnect-java plugin and responds to the following methods you have to call:
 
-* boolean notifyOnCreate(String sourceName, String partition, Object objId, Object object)
-* boolean notifyOnUpdate(String sourceName, String partition, Object objId, Object object)
-* boolean notifyOnDelete(String sourceName, String partition, Object objId)
+* boolean notifyOnCreate(String sourceName, Object objId, Object object)
+* boolean notifyOnUpdate(String sourceName, Object objId, Object object)
+* boolean notifyOnDelete(String sourceName, Object objId)
 
 Example for `RhoconnectJavaSample` application:
 
@@ -238,20 +244,20 @@ Example for `RhoconnectJavaSample` application:
 	    @Transactional
 	    public int addContact(Contact contact) {
 	        int id = contactDAO.addContact(contact);
-	        client.notifyOnCreate(sourceName, getPartition(), Integer.toString(id), contact);
+	        client.notifyOnCreate(sourceName, Integer.toString(id), contact);
 	        return id;
 	    }
 
 	    @Transactional
 	    public void updateContact(Contact contact) {
 	        contactDAO.updateContact(contact);
-	        client.notifyOnUpdate(sourceName, getPartition(), Integer.toString(contact.getId()), contact);       
+	        client.notifyOnUpdate(sourceName, Integer.toString(contact.getId()), contact);       
 	    }
 
 	    @Transactional
 	    public void removeContact(Integer id) {
 	        contactDAO.removeContact(id);
-	        client.notifyOnDelete(sourceName, getPartition(), Integer.toString(id));
+	        client.notifyOnDelete(sourceName, Integer.toString(id));
 	    }
 
 	    @Transactional
@@ -315,12 +321,6 @@ Example for `RhoconnectJavaSample` application:
 	        removeContact(id);       
 	        return id;
 	    }
-
-	    @Override
-	    public String getPartition() {
-	        // Data partitioning: i.e. your user name for filtering data on per user basis 
-	        return "alexb";
-	    }
 	 }
 
 Click [here](https://github.com/shurab/RhoconnectJavaPluginDemo) to download full source code of Contact manager application with rhoconnect-java plugin.

data/doc/net-plugin.txt

@@ -9,12 +9,12 @@ Using rhoconnect.NET, your [ASP.NET MVC](http://www.asp.net/mvc/mvc4) applicatio
 
 Copy the [`rhoconnect.NET`](https://github.com/rhomobile/rhoconnect.NET) github repository to your PC:
 
-	$ git clone git@github.com:rhomobile/rhoconnect.NET.git
+	$ git clone https://github.com/rhomobile/rhoconnect.NET.git
 
 By default, the `rhoconnect.NET` repository contains the pre-built `RhoconnectNET.dll` library in the `bin/Release` subdirectory.
 However, you can build your own library using the provided Microsoft Visual Studio .NET solution file and the source code files. 
 
-You can download and use the sample [`ASP.NET MVC4`](https://github.com/rhomobile/RhoconnectNET_MVC4_App) application to repeat the steps described below.
+You can download and use the sample [`ASP.NET MVC4`](https://github.com/rhomobile/RhoconnectNET_MVC4_App) application to repeat the steps described below. In addition, the above sample also contains the final code in `ContactsApp_final` subdirrectory. You can just use it (you will still need to modify the `set_app_point` with your app endpoints and add the RhoconnectNET library reference to your project.)
 
 In order to use `Rhoconnect.NET` functionality in your `ASP.NET MVC` application, first you need to include the `Rhoconnect.NET` library 
 as a dependency to your application. Click `Project => Add Reference` menu item in the Visual Studio and navigate to the `RhoconnectNET.dll` library.
@@ -58,10 +58,12 @@ and call them from the `Application_Start` method:
 											  rhoconnect_authenticate);
 	}
 	
-	private bool rhoconnect_authenticate(String username, String password, Hashtable auth_attrs)
+	private bool rhoconnect_authenticate(ref String username, String password, Hashtable auth_attrs)
 	{
-		// perform your authentication here
-		return true;
+		// uncomment the following line, if you want to replace the default partitioning to 'app'
+        // username = "app";
+        // perform your authentication here
+        return true;
 	}
 	
 `RhoconnectNET.Client.set_app_point` method is a main point
@@ -85,7 +87,7 @@ and it has the following parameters:
 		<td>rhoconnect server's api_token, for example <code>secrettoken</code>.</td>
 	</tr>
 	<tr>
-		<td>Func&lt;String, String, Hashtable, bool&gt;</td>
+		<td>delegate rhoAuthHandler(ref String, String, Hashtable, bool)</td>
 		<td><code>Authenticating_Routine</code></td>
 		<td>handle to the application's authenticating routine (if null, <code>true</code> is returned by default).</td>
 	</tr>
@@ -95,11 +97,17 @@ and it has the following parameters:
 By providing the `rhoconnect_authenticate` method and registering it with the `Rhoconnect.NET` in the `set_app_endpoint`
 method, you map your application specific authentication to the Rhoconnect `authenticate` requests:
 
-	const bool rhoconnect_authenticate(String username, String password, Hashtable params)
+	private bool rhoconnect_authenticate(ref String username, String password, Hashtable auth_attrs)
 	{
-		// perform real authentication here
-		return true;
+		// uncomment the following line, if you want to replace the default partitioning to 'app'
+        // username = "app";
+        // perform your authentication here
+        return true;
 	}
+	
+If you want your data to be partitioned by 'app' (i.e. the data will be shared among all users), you can replace
+the provided `username` parameter (which is passed by reference) to `app` - which will instruct Rhoconnect to partition
+the data accordingly. 
 
 ## Implementing CRUD functionality
 `Rhoconnect.NET` lib installs `/rhoconnect/<CRUD>` routes in your application which the Rhoconnect instance 
@@ -211,9 +219,12 @@ For this reason, `RhoconnectNET` library provides three callback routines for CU
 The above example will look like this after inserting the corresponding callback routine:
 
 		// This method is used to access current partition
-		// in Rhoconnect notification callbacks
+		// in Rhoconnect notification callback
         private String partition()
         {
+			// If you're using 'app' partition
+			// uncomment the following line
+			// return "app";
             return "testuser";
         }
 		

data/doc/rhoconnect-redis-stack.txt

@@ -1,4 +1,4 @@
-# Creating a RhoConnect Stack in Amazon Web Services
+# Deploying RhoConnect with High Availability on Amazon Web Services
 
 This tutorial will guide you through setting up a Redis stack and a RhoConnect application stack in the Amazon Web Service (AWS) cloud.
 
@@ -45,7 +45,7 @@ Click the Launch Classic Wizard radio button. Click Continue.
 
 ### Requesting the Instance
 
-In the Choose an AMI section click the Community AMIs tab.
+In the Choose an AMI section, click the Community AMIs tab.
 Then paste in the AMI `ami-65e4bb20`. When the preconfigured RhoConnect AMI appears, click Select.
 
 <img src="http://rhodocs.s3.amazonaws.com/rhoconnect-redis-aws/request-instances-wizard-community-AMIs.png" alt="request instances - choose AMI" />
@@ -70,7 +70,7 @@ In the Create Key Pair section, select your existing key pair or create a new ke
 
 In the Configure Firewall section, click the Create New Security Group radio button.
 
-CLick the Add Rule button to add each port.
+Click the Add Rule button to add each port.
 
  * Add port 22 for SSH.
  * Add port 80 for HTTP.
@@ -90,7 +90,7 @@ In the window titled "Launch Instance Wizard", click Close and wait for your ins
 
 <img src="http://rhodocs.s3.amazonaws.com/rhoconnect-redis-aws/instances-instances.png" alt="instances - instances" />
 
-In the EC2 tab, Click on Instances.
+In the EC2 tab, click on Instances.
 
 For Viewing, select Running Instances. Select your newly created RhoConnect instance and scroll down to see Private DNS in the lower section of the My Instances screen. 
 

data/doc/supported-platforms.txt

@@ -0,0 +1,77 @@
+Supported Platforms
+===
+## Support Matrix
+
+<table class="device-caps">
+  <tr>
+    <th>OS</th>
+    <th>Distribution</th>
+    <th>Ruby 1.8.7</th>
+    <th>Ruby Enterprise</th>
+    <th>Ruby 1.9.2</th>
+    <th>Ruby 1.9.3</th>
+    <th>JRuby</th>
+    <th>Environment</th>    
+  </tr>
+  <tr>
+    <td class='cap'>Linux</td>
+    <td> CentOS 5 & 6,<br/>Ubuntu 11,<br/>Amazon Linux</td>
+    <td> ruby-1.8.7-p352 </td>
+    <td> ree-1.8.7-2011.03 </td>
+    <td> ruby-1.9.2-p290 </td>
+    <td> ruby-1.9.3-p0 </td>
+    <td> jruby-1.6.4 </td>
+    <td>Development &<br/>Production</td>
+  </tr>
+  <tr>
+    <td class='cap'>Mac OS </td>
+    <td> Mac OS X 10.6/10.7 </td>
+    <td> ruby-1.8.7-p352 </td>
+    <td> ree-1.8.7-2011.03 </td>
+    <td> ruby-1.9.2-p290 </td>
+    <td> ruby-1.9.3-p0 </td>
+    <td> jruby-1.6.4 </td>
+    <td>Development &<br/>Production</td>
+  </tr>
+  <tr>
+    <td class='cap'>Windows</td>
+    <td> Windows 7 </td>
+    <td> ruby-1.8.7-p352 </td>
+    <td class='tbd'> TBD </td>
+    <td class='tbd'> TBD </td>
+    <td> ruby-1.9.3-p0 </td>
+    <td class='tbd'> TBD </td>
+    <td>Development</td>
+  </tr>
+</table>
+
+Other Ruby versions and releases might work with RhoConnect gem, but there are no guarantees.   
+ 
+## Release Notes
+
+RhoConnect for Windows is supported only in development environment as a part of RhoStudio bundle:
+
+* Ruby 1.8.7
+* Redis 2.4.x
+* Latest RhoConnect and Rhodes gems
+* Eclipse 3.6 with latest rhostudio plugin
+* Make 3.18
+* DevKit for Windows  
+
+RhoConnect for Linux and Mac OS X is supported for both development and production environments.
+
+Production environment for Linux servers is provided as pre-packaged software bundle and includes the following components:
+
+* Ruby 1.8.7 (ree)
+* Nginx HTTP server (1.0.x)
+* Redis data store (2.4.x)
+* Phusion Passenger
+* RhoConnect gem with all required dependencies
+  
+
+## Known Issues
+
+* Latest gem <b>rack</b> ver. 1.4.0 is buggy, rhoconnect gemset locked to <b>rack</b> ver. 1.3.6 
+* Windows platform: only pre-release (~> 1.0.0.beta) of <b>eventmachine</b> is working on Windows  
+* Examples for <b>RSpec</b> (~> 2.8.0) fail for Ruby 1.8.7, gemset locked to ver. >= 2.6.0
+* Release <b>JRuby-1.6.5</b> is broken, use <b>JRuby-1.6.4</b> instead

data/doc/tutorial.txt

@@ -60,17 +60,17 @@ Once RhoConnect is installed we're ready to build a RhoConnect source to integra
 
 ### Generating the Source Adapter from RhoStudio
 
-To generate a RhoConnect source adapter and create the associated Controller templates, right-click on the application project in the Project Explorer and select New->Rhodes model.
+To generate a RhoConnect source adapter and create the associated Controller templates, right-click on the application project in the Project Explorer and select New->Rhoconnect Source Adapter.
 
 <img src="http://rhodocs.s3.amazonaws.com/rhoconnect-tutorial/menu-new-rhoconnect_source-adapter.png"/>
 
-In the Model Information window, enter the name for your source adapter: in this case, product.
+In the Source Adapter Information window, enter the name for your source adapter: in this case, "product".
 
 Click the Finish button to create the source adapter.
 
 <img src="http://rhodocs.s3.amazonaws.com/rhoconnect-tutorial/source-adapter-information.png"/>
 
-After pressing the Finish button, you'll see the RhoConnect source adapter generator script output in the output console (Rhodes build log console).
+After pressing the Finish button, you'll see the RhoConnect source adapter generator script output in the output console (Rhomobile build console).
 
 <img src="http://rhodocs.s3.amazonaws.com/rhoconnect-tutorial/rhoconnect-source-generator-output.png"/>
 
@@ -79,11 +79,13 @@ You should now have files for the source adapter in your storeserver application
 * product.rb -> This is the source adapter file which contains the login, query, create, update, delete and logoff methods to call a backend service. You will add code to implement these methods.
 * product_spec.rb -> This file contains the spec with tests which relate to our source adapter.
 
+You can open these files for editing by clicking on them in the Project Explorer.
+
 ### Generating the Source Adapter from the Command Line
 
 From the command line, navigate to the main folder for your RhoConnect app: in this case, storeserver. 
 
-Then run the command to generate a source adapter for the product model. The product model is used as an example for a Rhodes storemanager in the [RhoStudio tutorial](rhostudio.tutorial) and the [documentation to generate a Rhodes application](rhodes/generator).
+Then run the command to generate a source adapter for the product model. The product model is used as an example for a Rhodes storemanager in the [RhoStudio tutorial](/rhostudio.tutorial) and the [documentation to generate a Rhodes application](/rhodes/generator).
 
 	:::term
 	$ rhoconnect source product
@@ -94,13 +96,11 @@ which generates two files, the product adapter and the product spec:
      	[ADDED]  sources/product.rb
      	[ADDED]  spec/sources/product_spec.rb
 
-In RhoStudio, you can open the sources/product.rb file and edit it. 
-
-<img src="http://rhodocs.s3.amazonaws.com/rhoconnect-tutorial/rhostudio-rhoconnect-product-rb.png"/>
+You can use the command line to navigate to the sources/product.rb file in your RhoConnect application folder.
 
-You can also use the command line to navigate to the sources/product.rb file in your RhoConnect application folder.
+### Understanding the Source Adapter File
 
-You'll see a product.rb file similar to the code listing below. The generated source adapter has code to raise an exception for any required method. Note that you don't need to use the source generator; you can create a Ruby file and place it into your lib directory. The class name (in this case, product) of the RhoConnect source adapter must match that of the Rhodes client model.
+The generated source adapter file (in this case, product.rb) is similar to the code listing below. It has code to raise an exception for any required method. Note that you don't need to use the source generator; you can create a Ruby file and place it into your lib directory. The class name (in this case, product) of the RhoConnect source adapter must match that of the Rhodes client model.
 
 	:::ruby
 	class Product < SourceAdapter
@@ -161,15 +161,13 @@ The generator will also edit settings/settings.yml and add the product adapter t
   	  Product: 
         :poll_interval: 300
 
-The next step is for you to fill in the login, query, create, update, delete and logoff methods with your own code to call a backend service.
-
-The description below shows what such code might look like.  
+The next step is for you to fill in the login, query, create, update, delete and logoff methods with your own code to call a backend service.  
 
 ## A RhoConnect Query
 
 If you're doing a readonly non-authenticated source adapter, you can just write one method, query, to retrieve records as we describe here. The following is a sample query method to interact with a simple product catalog (available at http://rhostore.heroku.com) that exposes a REST interface.  Note that RhoConnect can work with any protocol. This example shows JSON over HTTP with a REST interface, since that is common. The RhoConnect source adapter is Ruby code and there are ruby libraries (aka gems) that will make it easy to connect to and parse whatever you need -- the query code would just be slightly different.
 
-For a more complete example of rewriting the source adapter methods (such as create, update, and delete), refer to the [source adapter example](rhoconnect/source-adapters#sample-adapter) in the RhoConnect Developer Reference.
+For a more complete example of rewriting the source adapter methods (such as create, update, and delete), refer to the [source adapter example](/rhoconnect/source-adapters#sample-adapter) in the RhoConnect Developer Reference.
 
 Our sample web service for returning all products in the catalog (http://rhostore.heroku.com/products.json) returns data like this:
 	

data/generators/rhoconnect.rb

@@ -146,4 +146,4 @@ _BUNDLE_INSTALL_
   
   add :app, AppGenerator
   add :source, SourceGenerator
-end
+end

data/generators/templates/application/Gemfile

@@ -4,21 +4,22 @@ gem 'rhoconnect', '<%=gem_version%>'
 
 # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
 gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
+gem 'win32-process', :platforms => [:mswin, :mingw]
 
 platforms :jruby do
   gem 'jdbc-sqlite3', ">= 3.7.2"
   gem 'dbi', ">= 0.4.5"
   gem 'dbd-jdbc', ">= 0.1.4"
   gem 'jruby-openssl', ">= 0.7.4"
+  gem 'trinidad'
   gem 'warbler'
 end
 
 gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
 
-# For jruby trinidad JRuby web server is used
-gem 'trinidad',  :platforms => :jruby
-
 group :development do
+  # FIXME: At this moment (01/10/2012) only pre release of 'eventmachine' is working on Windows
+  gem 'eventmachine', '~> 1.0.0.beta', :platforms => [:mswin, :mingw]
   # By default to run application thin web server is used
   gem 'thin', :platforms => [:ruby, :mswin, :mingw]
   gem 'rhomobile-debug', ">= 1.0.2"
@@ -27,6 +28,5 @@ end
 group :test do
   gem 'rack-test', '>= 0.5.3', :require => "rack/test"
   gem 'rspec', '~> 2.6.0'
-  gem 'rcov', '>= 0.9.8'
   gem 'rhomobile-debug', ">= 1.0.2"
 end

data/generators/templates/application/spec/spec_helper.rb

@@ -12,7 +12,7 @@ rescue LoadError
   require 'rhoconnect'
 end
 
-$:.unshift File.join(File.dirname(__FILE__), "..") # FIXME:
+$:.unshift File.join(File.dirname(__FILE__), "..")
 # Load our rhoconnect application
 require 'application'
 include Rhoconnect
@@ -20,13 +20,15 @@ include Rhoconnect
 require 'rhoconnect/test_methods'
 
 # Monkey patch to fix the following issue:
-# /Library/Ruby/Gems/1.8/gems/rspec-core-2.5.1/lib/rspec/core/shared_example_group.rb:45:
-# in `ensure_shared_example_group_name_not_taken': Shared example group '...' already exists (ArgumentError)
-module RSpec
-  module Core
-    module SharedExampleGroup
-    private
-      def ensure_shared_example_group_name_not_taken(name)
+# /usr/local/rvm/gems/ruby-1.8.7-p352/gems/rspec-core-2.6.4/lib/rspec/core/shared_example_group.rb:59:
+# in `ensure_shared_example_group_name_not_taken': Shared example group 'SharedRhoconnectHelper' already exists (ArgumentError)
+if RUBY_VERSION =~ /1.8/ 
+  module RSpec
+    module Core
+      module SharedExampleGroup
+      private
+        def ensure_shared_example_group_name_not_taken(name)
+        end
       end
     end
   end

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,10 +8,10 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  REDIS                   = "redis-2.4.5"
+  REDIS                   = "redis-2.4.6"
   SQLITE3                 = "sqlite-autoconf-3070701"
   RUBY                    = "ruby-enterprise-1.8.7-2011.03"
-  Nginx                   = "nginx-1.0.10"
+  Nginx                   = "nginx-1.0.11"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, Nginx ]
 

data/installer/utils/package_upload/repos.rake

@@ -1,11 +1,12 @@
 desc 'Creates and uploads apt and rpm repos.'
 task "build:repos" => ['build:deb', 'build:rpm'] do
   require 'find'
+  require 'fileutils'
 
   # CONSTANTS
 
   PKG_DIR = '/packages'
-  START_DIR = PKG_DIR
+  BETA_PKG_DIR = '/beta-packages'
   BUCKET = 'rhoconnect'
 
   def cmd(cmd)
@@ -40,7 +41,7 @@ task "build:repos" => ['build:deb', 'build:rpm'] do
                     "Codename: rhoconnect\n" +
                     "Architectures: i386 amd64\n" +
                     "Components: main\n" +
-                    "Description: Rhoconnect APT Repository"
+                    "Description: Rhoconnect APT Repository\n"
     cmd "sudo touch #{filename}/distributions"
     cmd "sudo chmod 777 #{filename}/distributions"
 
@@ -57,16 +58,16 @@ task "build:repos" => ['build:deb', 'build:rpm'] do
   def copy_files
     # Copy the packages to their respective directory
     Find.find('./pkg') do |file|
+      puts "File: #{file}"
       if !FileTest.directory?(file)
         dest_dir = File.extname(file)
-        #get rid of '.' before extension name
-        dest_dir[0] = ''
+        dest_dir[0] = ''                                 #get rid of '.' before extension name
         if dest_dir == 'deb' || dest_dir == 'rpm'
           if dest_dir == 'deb'
             @deb_pkg = File.basename(file)
           end #if
           file_path = File.expand_path(file)
-          cmd "sudo cp -rf #{file_path} #{PKG_DIR}/#{dest_dir}"
+          cmd "sudo cp -r #{file_path} #{PKG_DIR}/#{dest_dir}"
         end #if
       end #if
     end #do
@@ -83,6 +84,20 @@ task "build:repos" => ['build:deb', 'build:rpm'] do
   cmd "sudo createrepo #{PKG_DIR}/rpm"
 
   # Call S3 upload script
-  cmd "ruby ./installer/utils/package_upload/s3_upload.rb #{START_DIR} #{BUCKET} #{@raked}"
-
+  ['deb', 'rpm'].each do |dir|
+    beta = 0
+    pkg_dir = PKG_DIR
+    Find.find("#{PKG_DIR}/#{dir}") do |file|
+      if File.extname(file) =~ /deb|rpm/
+        file =~ /.*beta.*/ ? beta += 1 : beta = beta
+        pkg_dir = BETA_PKG_DIR
+        cmd "sudo mkdir #{BETA_PKG_DIR}" unless File.directory? BETA_PKG_DIR
+        cmd "sudo chmod 777 #{BETA_PKG_DIR}"
+        # If one beta pkg is found, break. 
+        break
+      end #if
+    end #do
+    cmd "sudo cp -rf #{PKG_DIR}/#{dir} #{BETA_PKG_DIR}/#{dir}"
+    cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{pkg_dir}/#{dir} #{BUCKET} #{@raked}" 
+  end #do
 end #build:repos