rhoconnect 3.2.0.beta5 → 3.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.2.0.beta5)
+    rhoconnect (3.2.0)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2)
@@ -23,7 +23,7 @@ GEM
       cabin (> 0)
     async-rack (0.5.1)
       rack (~> 1.1)
-    aws-s3 (0.6.2)
+    aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
@@ -37,13 +37,13 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.2)
+    coffee-script-source (1.3.3)
     crack (0.3.1)
     daemons (1.1.8)
     diff-lcs (1.1.3)
     eventmachine (1.0.0.beta.4)
     excon (0.13.4)
-    execjs (1.3.2)
+    execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
@@ -58,8 +58,8 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.1)
-    fpm (0.4.9)
+    formatador (0.2.3)
+    fpm (0.4.10)
       arr-pm (~> 0.0.7)
       backports (= 2.3.0)
       cabin (~> 0.4.3)
@@ -83,10 +83,10 @@ GEM
     libwebsocket (0.1.3)
       addressable
     mime-types (1.18)
-    multi_json (1.3.5)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     nokogiri (1.5.2)
     rack (1.4.1)
     rack-fiber_pool (0.9.2)
@@ -117,7 +117,7 @@ GEM
     rspec-mocks (2.9.0)
     ruby-hmac (0.4.0)
     rubyzip (0.9.8)
-    selenium-webdriver (2.21.2)
+    selenium-webdriver (2.22.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
@@ -131,7 +131,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.4.2)
+    sprockets (2.4.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -150,7 +150,7 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.8.7)
+    webmock (1.8.6)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xml-simple (1.1.1)

data/doc/deploying.txt

@@ -93,7 +93,7 @@ To test it you need to as a root user start redis, nginx, and thin servers:
 	:::term
 	$ sudo /etc/init.d/redis start
 	$ sudo /etc/init.d/nginx start
-    $ sudo /etc/init.d/thin start
+    	$ sudo /etc/init.d/thin start
 
 And verify that it's up and running by visiting application web console in your browser:
 
@@ -169,3 +169,64 @@ to place the WAR file into the server's deploy directory.
 
 
  
+* Rhoconnect gem version >= 3.2.0
+
+#### Create Rhoconnect application
+Create your Rhoconnect app and make sure that it's up and running in your development environment using thin:
+
+    :::term
+    $ cd your_rhoconnect_app
+    $ bundle exec thin start
+    
+#### Declare `Procfile`
+This step is optional, but it will give you more control and flexibility when application deployed on Heroku.
+Create in your rhoconnect project file named `Procfile`:
+
+    :::term
+    web: bundle exec thin start -p $PORT
+
+If your application is using resque worker, then you should specify it in the `Procfile` as well:
+
+    :::term
+    web: bundle exec thin start -p $PORT
+    worker: bundle exec rake resque:work 
+
+Now you can run your app locally 
+
+    :::term
+    $ gem install foreman
+    $ foreman start
+
+
+#### Deploy to Heroku
+Before moving your code to Git you need comment in your project's `Gemfile` declaration of `sqlite3` gem, because target 
+Heroku server has no devel libraries required to build that gem.
+
+	:::term
+	$ git init
+	$ git add .
+	$ git commit -m ' ... '
+	$ heroku create --stack cedar
+	$ heroku addons:add redistogo:nano
+	$ git push heroku master
+    	$ heroku open
+     
+#### Monitoring app on Heroku
+Use `heroku ps` to determine the number of processes that are executing.
+Use `heroku logs` to view an aggregated list of log messages from all process types.
+
+	:::term
+    	$ heroku ps
+    	$ heroku logs
+ 
+#### Get connected with Rhodes client
+If you have rhodes client and wanted to sync it with rhoconnect app on Heroku, then set proper sync server URL in `rhoconfig.txt` file
+
+	:::term
+ 	syncserver = 'http://<your-app-here>.herokuapp.com/application'
+
+
+
+
+
+ 

data/doc/install.txt

@@ -8,17 +8,19 @@ On Linux, you install the RhoConnect gem from the command line; you can also do
 
 ## Mac OS
 
-If you're running Mac OS, download the latest [Motorola RhoMobile Suite Installer for Macintosh](http://rhomobile.com/rhostudio-mac). This contains [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
+If you're running Mac OS, download the latest [MotorolaRhoMobileSuite Installer for Macintosh](http://rhomobile.com/rhostudio-mac). This contains [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
 
-Mac OS has [Ruby](http://www.ruby-lang.org/en/) installed. It is recommended that you install [Ruby Version Manager](https://rvm.io//) and install Ruby version 1.9.3, latest patch.
+Although Mac OS has [Ruby](http://www.ruby-lang.org/en/) installed, the official way to install Ruby for RhoStudio is to install [Ruby Version Manager](https://rvm.io//) and then install Ruby version 1.9.3.
 
-Click on the RhoStudioInstaller for Mac download file to open it. You will get a window similar to this:
+Click on the MotorolaRhoMobileSuite Installer for Mac download file to open it. You will get a window similar to this:
 
 <img src="http://rhodocs.s3.amazonaws.com/rhodes-devel/rhostudio-mac-install.png" alt="RhoStudioInstaller Mac" />
 
-Run the install gems script appropriate for you. If you have Ruby Version Manager, you can run "Install gems on rvm." A terminal window will open; wait for the gems install process to complete.
+Run "Install gems on rvm" (this requires that you have installed Ruby Version Manager). A terminal window will open; wait for the gems install process to complete.
 
-Then drag RhoStudio to the Applications folder. 
+Then drag Motorola RhoStudio to the Applications folder.
+
+**NOTE: Installing Ruby into the System folder is not supported by RhoMobile; the official RhoMobile way to install and use Ruby on the Macintosh is with Ruby Version Manager. If you do not use Ruby Version Manager and instead install Ruby into the System folder, you will need to start and run RhoStudio from the command line using sudo.**
 
 ## Windows
 
@@ -40,7 +42,7 @@ For Mac OS 10.6 and earlier, the JDK is already installed. For Mac OS 10.7, Java
 
 ### Setting the JDK Path
 
-On Windows installs for RhoMobile, go to RhoStudio Preferences (Windows -> Preferences) and set the JDK path in the rhobuild.yml file. On Windows 64-bit installations, you must set this path to the 32-bit version of the JDK, such as `C:/Program Files (x86)/Java/jdk1.7.0_01/bin`.
+On Windows installs for RhoMobile, go to RhoStudio Preferences (Windows -> Preferences) and set the JDK path in the rhobuild.yml file. On Windows 64-bit installations, you must set this path to the 32-bit version of the JDK, such as `C:/Program Files (x86)/Java/jdk<version number>/bin`.
 
 On Mac OS, the path to the JDK is automatically set once Java is installed.
 
@@ -56,7 +58,9 @@ To install RhoConnect on Linux, and to install RhoConnect on Windows or Mac OS u
 
 3. [Redis](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. Install the RhoConnect Gem. Run this command to install.
+4. Install the RhoConnect Gem. 
+
+Run this command to install the RhoConnect Gem.
 
 	:::term
 	$ [sudo] gem install rhoconnect
@@ -67,4 +71,12 @@ NOTE: Windows doesn't come with the necessary build tools to install gems ('make
 
 You can [install RhoStudio as a plugin for Eclipse](rhostudio-eclipse).
 
-RhoSimulator, which comes with RhoStudio for Mac and Windows, does not work with Linux.
+RhoSimulator, which comes with RhoStudio for Mac and Windows, does not work with Linux.
+
+## Setting the Location of the RhoStudio Workspace Directory
+
+When you start RhoStudio, you can set the location of the workspace directory. The path to the workspace directory should not contain space symbols: if the path has spaces, a RhoConnect application created with RhoStudio will not work properly.
+
+## Standalone Ruby Installation and Ruby Version Manager
+
+Do not install Ruby as a standalone if you also use Ruby Version Manager (rvm) to install Ruby. If you need only one version of Ruby, you can install Ruby as a standalone. If you need more than one version of Ruby, you should uninstall standalone Ruby and then install Ruby with Ruby Version Manager. Mixed standalone Ruby and rvm-controlled Ruby installations can conflict and cause runtime issues in Rhodes applications.

data/doc/rest-api.txt

@@ -35,6 +35,19 @@ All API calls will return http 200 and requested data (if applied). Otherwise, A
 
 ## API Methods
 
+### `login`
+Login to the RhoConnect server.
+
+	:::ruby
+	require 'rest_client'
+	require 'json'
+
+	server = "http://localhost:9292"
+	login = "rhoadmin"
+	password = ""
+
+	res = RestClient.post("#{server}/login", { :login => login, :password => password }.to_json, :content_type => :json)
+
 ### `get_api_token`
 Before you can use RhoConnect API you should get API token:
 
@@ -117,7 +130,7 @@ Push new objects or object updates to RhoConnect. These changes will be sent to
 **NOTE: Normally, `push_objects` method will refresh the whole :md document in Redis. However, in case of large-size
 documents, `push_objects` method can be optimized by invoking only the necessary updates. This can help reducing
 the number of transactions with Redis. To force the optimization, user can use the `:rebuild_md => false` flag
-in the `push_objects` parameters hash.
+in the `push_objects` parameters hash.**
 
 ### `push_deletes`
 Delete objects from RhoConnect. These objects will be deleted from the device the next time it synchronizes.
@@ -223,6 +236,44 @@ Push object deletes to RhoConnect. This method doesn't involve pulling the exist
 	  :content_type => :json
 	)
 
+### `get_adapter`
+Returns the url of the source adapter from the RhoConnect server.
+
+	:::ruby
+	adapter_url = RestClient.post(
+	  "#{server}/api/get_adapter",
+      {
+        :api_token => token
+      }.to_json, 
+      :content_type => :json
+    ).body
+
+### `save_adapter`
+Saves the url of the source adapter to the RhoConnect server.
+
+	:::ruby
+	RestClient.post(
+	  "#{server}/api/save_adapter",
+      {
+        :api_token => token,
+        :adapter_url => url
+      }.to_json,
+      :content_type => :json
+    )
+
+### `upload_file`
+Upload a file to the RhoConnect server.
+
+	:::ruby
+	RestClient.post(
+	  "#{server}/api/upload_file",
+	  {
+	    :api_token => token,
+	    :upload_file => path_to_file
+	  }.to_json,
+	  :content_type => :json
+	)
+
 ### `list_users`
 List users registered with this RhoConnect application.
 
@@ -261,6 +312,22 @@ Delete User and all associated devices from the RhoConnect application.
 	 :content_type => :json
 	)
 
+### `update_user`
+Update attributes for a user on this RhoConnect application.
+
+	:::ruby
+	RestClient.post(
+	  "#{server}/api/update_user",
+	  { 
+		:api_token => token,
+		:user_id => user_id 
+		:attributes => {
+		  :a_user_specific_attribute => a_user_specific_attribute_value
+		} 
+	  }.to_json, 
+	 :content_type => :json
+	)
+
 ### `list_clients`
 List clients (devices) associated with given user.
 
@@ -367,7 +434,7 @@ Return attributes associated with a given source:
 ### `update_source_params`
 Updates attributes associated with a given source:
 
-* `poll_interval` - query poll interval; defines how often RhoConnect will call source adapter to query for new data, set to -1 to disable polling, 0 to always poll
+`poll_interval` - query poll interval; defines how often RhoConnect will call source adapter to query for new data, set to -1 to disable polling, 0 to always poll.
 
 	:::ruby
 	attributes = RestClient.post("#{server}/api/update_source_params", 

data/examples/simple/Gemfile.lock

@@ -0,0 +1,97 @@
+PATH
+  remote: ../../
+  specs:
+    rhoconnect (3.2.0.beta1)
+      bundler (~> 1.0)
+      json (~> 1.6.0)
+      rake (~> 0.9.2)
+      redis (>= 2.2.0)
+      resque (~> 1.20.0)
+      rest-client (~> 1.6.1)
+      rubyzip (~> 0.9.4)
+      sinatra (~> 1.3)
+      templater (~> 1.0.0)
+      thor (~> 0.14.6)
+      uuidtools (>= 2.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    SystemTimer (1.2.3)
+    async-rack (0.5.1)
+      rack (~> 1.1)
+    daemons (1.1.8)
+    diff-lcs (1.1.3)
+    eventmachine (0.12.10)
+    extlib (0.9.15)
+    highline (1.6.11)
+    json (1.6.6)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    rack (1.4.1)
+    rack-fiber_pool (0.9.2)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    redis (2.2.2)
+    redis-namespace (1.0.3)
+      redis (< 3.0.0)
+    resque (1.20.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0.2)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rhomobile-debug (1.0.6)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rubyzip (0.9.7)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    sqlite3 (1.3.5)
+    templater (1.0.0)
+      diff-lcs (>= 1.1.2)
+      extlib (>= 0.9.5)
+      highline (>= 1.4.0)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    uuidtools (2.1.2)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  SystemTimer (~> 1.2.3)
+  async-rack
+  dbd-jdbc (>= 0.1.4)
+  dbi (>= 0.4.5)
+  eventmachine (~> 1.0.0.beta)
+  jdbc-sqlite3 (>= 3.7.2)
+  jruby-openssl (>= 0.7.4)
+  rack-fiber_pool
+  rack-test (>= 0.5.3)
+  rhoconnect!
+  rhomobile-debug (>= 1.0.2)
+  rspec (~> 2.6.0)
+  sqlite3 (>= 1.3.3)
+  thin
+  trinidad
+  warbler
+  win32-process

data/installer/unix-like/create_texts.rb

@@ -373,6 +373,7 @@ _NGINX_CONF_
   Dir.mkdir "/opt/nginx/conf/conf.d" unless File.exist? "/opt/nginx/conf/conf.d"
   rho_vhost_conf = <<_VHOST_CONF_
 upstream thin_cluster {
+  ip_hash;
   server unix:/tmp/thin.0.sock;
   server unix:/tmp/thin.1.sock;
 #  server unix:/tmp/thin.2.sock;

data/installer/utils/verify_checksum.rb

@@ -25,9 +25,11 @@ cmd "ruby ./installer/utils/create_sha1.rb #{dir_to_compare} ."
 old_sha1 = File.open(checksum_file) { |f| f.readline }
 new_sha1 = File.open('./checksum')  { |f| f.readline }
 
+puts Dir.ls_la dir_to_compare
+
 if !new_sha1.eql?(old_sha1)
   puts "Checksums do not match!"
   exit 2
 else
   puts "Checksums match!"
-end #if
+end #if

data/lib/rhoconnect/store.rb

@@ -332,8 +332,9 @@ module Rhoconnect
       
       private
       def _get_redis(server=nil)
-        if ENV[REDIS_URL]
-          Redis.connect(:url => ENV[REDIS_URL])
+        url = ENV[REDIS_URL] || ENV[REDISTOGO_URL] || nil
+        if url
+          Redis.connect(:url => url)
         elsif server and server.is_a?(String)
           host,port,db,password = server.split(':')
           Redis.new(:thread_safe => true, :host => host,

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.2.0.beta5'
+  VERSION = '3.2.0'
 end

data/lib/rhoconnect.rb

@@ -29,6 +29,7 @@ require 'rhoconnect/db_adapter'
 require 'rhoconnect/dynamic_adapter'
 
 REDIS_URL = 'REDIS' unless defined? REDIS_URL
+REDISTOGO_URL = 'REDISTOGO_URL' unless defined? REDISTOGO_URL
   
 # Various module utilities for the store
 module Rhoconnect

data/spec/store_spec.rb

@@ -32,6 +32,14 @@ describe "Store" do
         ENV.delete(REDIS_URL)
       end
 
+      it "should create redis connection based on REDISTOGO_URL ENV" do
+        ENV[REDISTOGO_URL] = 'redis://localhost:6379'
+        Redis.should_receive(:connect).with(:url => 'redis://localhost:6379').and_return { Redis.new }
+        Store.db = nil
+        Store.db.should_not == nil
+        ENV.delete(REDISTOGO_URL)
+      end
+
       it "should add simple data to new set" do
         Store.put_data(@s.docname(:md),@data).should == true
         Store.get_data(@s.docname(:md)).should == @data