rhoconnect 3.2.1 → 3.3.1.beta2

data/examples/simple/settings/settings.yml

@@ -12,6 +12,7 @@
   :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/api/application/
+  :push_server: http://appmike:appmikepwd@localhost:8675/
 :test:
   :licensefile: settings/license.key
   :redis: localhost:6379

data/generators/templates/application/Gemfile

@@ -8,9 +8,9 @@ gem 'win32-process', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby
 platforms :ruby, :ruby_19, :mingw, :mingw_19 do
-	gem "eventmachine", "~> 1.0.0.beta"
-	# using thin by default
-	gem 'thin'
+  gem "eventmachine", "~> 1.0.0.beta"
+  # using thin by default
+  gem 'thin'
 end
 
 # for async framework
@@ -36,7 +36,7 @@ group :development do
 end
 
 group :test do
+  gem 'rspec', '~> 2.10.0'
   gem 'rack-test', '>= 0.5.3', :require => "rack/test"
-  gem 'rspec', '~> 2.6.0'
   gem 'rhomobile-debug', ">= 1.0.2"
 end

data/generators/templates/application/application.rb

@@ -3,6 +3,10 @@ class Application < Rhoconnect::Base
     def authenticate(username,password,session)
       true # do some interesting authentication here...
     end
+
+    def ans_authenticate(username,password)
+      true # optionally handle rhoconnect push authentication...
+    end
     
     # Add hooks for application startup here
     # Don't forget to call super at the end!

data/generators/templates/application/settings/settings.yml

@@ -4,11 +4,14 @@
   :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/api/application/
+  :push_server: http://appname:secret@localhost:8675/
 :test:
   :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/api/application/
+  :push_server: http://appname:secret@localhost:8675/
 :production: 
   :licensefile: settings/license.key
   :redis: localhost:6379
-  :syncserver: http://localhost:9292/api/application/
+  :syncserver: http://localhost:9292/api/application/
+  :push_server: http://appname:secret@localhost:8675/

data/installer/unix-like/create_texts.rb

@@ -493,7 +493,45 @@ def nginx_readme
    - Thin configuration file (/etc/thin/rhoapp.yml)
    
    By default, init script start cluster of 2 servers running on UNIX domain sockets.
-   Nginx connected to cluster via upstream block in nginx config file.  
+   Nginx connected to cluster via upstream block in nginx config file.
+
+To deploy and develop your rhoconnect app on nginx and thin servers:
+   a) Copy your rhoconnect project to default location to `/opt/nginx/html` directory
+
+   b) Set up for it `nginx` owner
+         $ cd /opt/nginx/html
+         $ sudo chown -R nginx:nginx your_rhoconnect_app/
+
+   c) Make sure that your app is bundled properly
+         $ cd your_rhoconnect_app
+         $ sudo /opt/rhconnect/bin/bundle install
+
+   d) Configure Nginx virtual host for your rhoconnect application. For that edit the file 
+     `/opt/nginx/conf/conf.d/rhoconnect.conf`, so that it reflects your specifications (root directive)
+         # ...
+         server {
+           listen      80;
+           root  /opt/nginx/html/your_rhoconnect_app/public; # Be sure your app have 'public' folder and root directive 
+                                                             # point to it!
+           # ...
+         }
+
+   e) Edit Thin `/etc/thin/rhoapp.yml` configuration file directly 
+         ---
+         chdir: /opt/nginx/html/your_rhoconnect_app
+         # ...
+
+      or as root user generate a new one
+         $ env PATH=/opt/rhoconnect/bin:$PATH thin config -C /etc/thin/your_rhoconnect_app.yml \
+         -c /opt/nginx/html/your_rhoconnect_app/ \
+         --socket /tmp/thin.sock --servers 2 --log /opt/nginx/logs/thin.log \
+         --pid /var/run/thin.pid -e production
+
+   f) As root user restart Nginx, and Thin servers
+          /etc/init.d/nginx restart
+          /etc/init.d/thin restart
+
+   For monitoring and troubleshooting purposes visit web console of your app and look at log files in `/opt/nginx/logs`.
 _NGINX_README_
   readme
 end

data/installer/unix-like/rho_connect_install_constants.rb

@@ -11,7 +11,7 @@ module Constants
   RUBY                    = "ruby-1.9.3-p194"
   REDIS                   = "redis-2.4.13"
   SQLITE3                 = "sqlite-autoconf-3071000"
-  NGINX                   = "nginx-1.2.0"
+  NGINX                   = "nginx-1.3.0"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]

data/installer/utils/package_upload/repos.rake

@@ -105,12 +105,14 @@ task "build:repos", :build_type, :build_number do |t, args|
         file_to_rename = File.open(file, 'r')
         old_name = File.expand_path(file)
         new_name = old_name.gsub(/(#{arch})$/, "#{build_number}.\\1" )
-        File.rename(old_name, new_name)
+        #File.rename(old_name, new_name)
+        log = `sudo mv #{old_name} #{new_name} 2>&1`
+        raise "#{log}" if $? != 0
         @deb_pkg = File.basename(new_name) if arch == 'deb'
-      end #if
-    end #do
-  end #do
- end #if
+      end
+    end
+  end
+ end
 
   # REPOIFY!
   cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"

data/lib/rhoconnect.rb

@@ -11,14 +11,13 @@ require 'rhoconnect/lock_ops'
 require 'rhoconnect/model'
 require 'rhoconnect/source'
 require 'rhoconnect/store'
-require 'rhoconnect/stats/record'
-require 'rhoconnect/stats/middleware'
 require 'rhoconnect/user'
 require 'rhoconnect/api_token'
 require 'rhoconnect/app'
 require 'rhoconnect/client'
 require 'rhoconnect/read_state'
 require 'rhoconnect/client_sync'
+require 'rhoconnect/stats/record'
 require 'rhoconnect/source_adapter'
 require 'rhoconnect/source_sync'
 require 'rhoconnect/rho_indifferent_access'
@@ -41,6 +40,8 @@ module Rhoconnect
   # Used by application authenticate to indicate login failure
   class LoginException < RuntimeError; end
   
+  API_VERSION = 'v1'.freeze
+  
   extend self
     
   class << self

data/lib/rhoconnect/api/app/ans_login.rb

@@ -0,0 +1,3 @@
+Server.api4 :ans_login, :get, "/rc/#{Rhoconnect::API_VERSION}/app/ans_login", false, nil do |params,user,server|
+  server.do_ans_login  
+end

data/lib/rhoconnect/api/app/bulk_data.rb

@@ -0,0 +1,6 @@
+Server.api4 :bulk_data, :post, "/rc/#{Rhoconnect::API_VERSION}/app/bulk_data", \
+            false, {:verb => :get, :url => ['/application/bulk_data', '/api/application/bulk_data']} do |params,user,server|
+  server.content_type :json
+  data = ClientSync.bulk_data(params[:partition].to_sym,server.current_client)
+  data.to_json
+end

data/lib/rhoconnect/api/{source → app}/fast_delete.rb

@@ -1,4 +1,4 @@
-Server.api :fast_delete, :source do |params,user|
+Server.api4 :fast_delete, :post, "/app/#{Rhoconnect::API_VERSION}/:source_id/fast_delete", true, {:verb => :post, :url => ['/api/fast_delete', '/api/source/fast_delete']} do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   # if source does not exist create one for dynamic adapter
   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source

data/lib/rhoconnect/api/{source → app}/fast_insert.rb

@@ -1,4 +1,4 @@
-Server.api :fast_insert, :source do |params,user|
+Server.api4 :fast_insert, :post, "/app/#{Rhoconnect::API_VERSION}/:source_id/fast_insert", true, {:verb => :post, :url => ['/api/fast_insert', '/api/source/fast_insert']} do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   # if source does not exist create one for dynamic adapter
   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
@@ -7,4 +7,4 @@ Server.api :fast_insert, :source do |params,user|
   raise_on_expire = params[:raise_on_expire] || false
   source_sync.fast_insert(params[:data], timeout,raise_on_expire)
   'done'
-end
+end

data/lib/rhoconnect/api/{source → app}/fast_update.rb

@@ -1,4 +1,4 @@
-Server.api :fast_update, :source do |params,user|
+Server.api4 :fast_update, :post, "/app/#{Rhoconnect::API_VERSION}/:source_id/fast_update", true, {:verb => :post, :url => ['/api/fast_update', '/api/source/fast_update']} do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   # if source does not exist create one for dynamic adapter
   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source
@@ -7,4 +7,4 @@ Server.api :fast_update, :source do |params,user|
   raise_on_expire = params[:raise_on_expire] || false
   source_sync.fast_update(params[:delete_data], params[:data],timeout,raise_on_expire)
   'done'
-end
+end

data/lib/rhoconnect/api/app/login.rb

@@ -0,0 +1,5 @@
+Server.api4 :clientlogin, :post, "/rc/#{Rhoconnect::API_VERSION}/app/login", \
+                        false, {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']} do |params,user,server|
+  server.logout
+  server.do_login
+end

data/lib/rhoconnect/api/{source → app}/push_deletes.rb

@@ -1,4 +1,4 @@
-Server.api :push_deletes, :source do |params,user|
+Server.api4 :push_deletes, :post, "/app/#{Rhoconnect::API_VERSION}/:source_id/push_deletes", true, {:verb => :post, :url => ['/api/push_deletes', '/api/source/push_deletes']} do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   # if source does not exist create one for dynamic adapter
   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source

data/lib/rhoconnect/api/{source → app}/push_objects.rb

@@ -1,4 +1,4 @@
-Server.api :push_objects, :source do |params,user|
+Server.api4 :push_objects, :post, "/app/#{Rhoconnect::API_VERSION}/:source_id/push_objects", true, {:verb => :post, :url => ['/api/push_objects', '/api/source/push_objects']} do |params,user|
   source = Source.load(params[:source_id],{:app_id=>APP_NAME,:user_id=>params[:user_id]})
   # if source does not exist create one for dynamic adapter
   source = Source.create({:name => params[:source_id]},{:app_id => APP_NAME,:user_id=>params[:user_id]}) unless source

data/lib/rhoconnect/api/app/query.rb

@@ -0,0 +1,4 @@
+Server.api4 :query, :get, "/app/#{Rhoconnect::API_VERSION}/:source_name", false, {:verb => :get, :url => ['/api/application', '/application', '/api/application/query']} do |params,user,server|
+  server.content_type :json
+  res = server.current_client_sync.send_cud(params[:token],params[:query]).to_json
+end

data/lib/rhoconnect/api/app/queue_updates.rb

@@ -0,0 +1,94 @@
+Server.api4 :queue_updates, :post, "/app/#{Rhoconnect::API_VERSION}/:source_name/queue_updates", false, {:verb => :post, :url => ['/api/application', '/application', '/api/application/queue_updates']} do |params,user,server|
+  begin
+    if params["cud"]
+      cud = JSON.parse(params["cud"])
+      params.delete("cud")
+      params.merge!(cud)
+    end     
+  rescue JSON::ParserError => jpe
+    log jpe.message + jpe.backtrace.join("\n")
+    throw :halt, [500, "Server error while processing client data"]
+  rescue Exception => e
+    log e.message + e.backtrace.join("\n")
+    throw :halt, [500, "Internal server error"]
+  end
+
+  server.catch_all do
+    server.current_client_sync.receive_cud(params)
+    server.status 200
+  end
+end
+
+Server.api4 :queue_creates, :post, "/app/#{Rhoconnect::API_VERSION}/:source_name", false, nil do |params,user,server|
+  begin
+    if params["cud"]
+      cud = JSON.parse(params["cud"])
+      params.delete("cud")
+      params.merge!(cud)
+    end     
+  rescue JSON::ParserError => jpe
+    log jpe.message + jpe.backtrace.join("\n")
+    throw :halt, [500, "Server error while processing client data"]
+  rescue Exception => e
+    log e.message + e.backtrace.join("\n")
+    throw :halt, [500, "Internal server error"]
+  end
+  
+  server.catch_all do
+    server.current_client_sync.receive_cud(params)
+    server.status 200
+  end
+end
+
+Server.api4 :queue_update, :put, "/app/#{Rhoconnect::API_VERSION}/:source_name/:id", false, nil do |params,user,server|
+  begin
+    if params["cud"]
+      cud = JSON.parse(params["cud"])
+      params.delete("cud")
+      params.merge!(cud)
+    end     
+  rescue JSON::ParserError => jpe
+    log jpe.message + jpe.backtrace.join("\n")
+    throw :halt, [500, "Server error while processing client data"]
+  rescue Exception => e
+    log e.message + e.backtrace.join("\n")
+    throw :halt, [500, "Internal server error"]
+  end
+
+  begin
+    if params["update"]
+      cud = params["update"]
+      params.delete("update")
+      params.merge!("update" => {params[:id] => cud})
+    end     
+  rescue JSON::ParserError => jpe
+    log jpe.message + jpe.backtrace.join("\n")
+    throw :halt, [500, "Server error while processing client data"]
+  rescue Exception => e
+    log e.message + e.backtrace.join("\n")
+    throw :halt, [500, "Internal server error"]
+  end
+
+  server.catch_all do
+    server.current_client_sync.receive_cud(params)
+    server.status 200
+  end
+end
+
+Server.api4 :queue_delete, :delete, "/app/#{Rhoconnect::API_VERSION}/:source_name/:id", false, nil do |params,user,server|
+  begin
+    obj = server.current_client.get_object(:cd, params[:id])
+    params.merge!("delete" => { params[:id] => obj } )     
+  rescue JSON::ParserError => jpe
+    log jpe.message + jpe.backtrace.join("\n")
+    throw :halt, [500, "Server error while processing client data"]
+  rescue Exception => e
+    log e.message + e.backtrace.join("\n")
+    throw :halt, [500, "Internal server error"]
+  end
+
+  server.catch_all do
+    server.current_client_sync.receive_cud(params)
+    server.status 200
+  end
+end

data/lib/rhoconnect/api/app/search.rb

@@ -0,0 +1,4 @@
+Server.api4 :search, :post, "/rc/#{Rhoconnect::API_VERSION}/app/search", false, {:verb => :get, :url => ['/application/search', '/api/application/search']} do |params,user,server|
+  server.content_type :json
+  ClientSync.search_all(server.current_client,params).to_json
+end  

data/lib/rhoconnect/api/client/client_get_db_doc.rb

@@ -0,0 +1,5 @@
+Server.api4 :client_get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/sources/:source_id/docs/:doc", true, nil do |params,user|
+  c = Client.load(params[:client_id],{:source_name => params[:source_id]})
+  db_key = c.docname(params[:doc])
+  Store.get_db_doc(db_key)
+end

data/lib/rhoconnect/api/client/client_set_db_doc.rb

@@ -0,0 +1,8 @@
+Server.api4 :client_set_db_doc, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/sources/:source_id/docs/:doc", true, nil do |params,user|
+  c = Client.load(params[:client_id],{:source_name => params[:source_id]})
+  db_key = c.docname(params[:doc])
+  append_to_doc = params[:append]
+  append_to_doc ||= false
+  Store.set_db_doc(db_key,params[:data],append_to_doc)
+  ''
+end

data/lib/rhoconnect/api/client/create.rb

@@ -0,0 +1,7 @@
+Server.api4 :clientcreate, :post, "/rc/#{Rhoconnect::API_VERSION}/clients", \
+                      false, {:verb => :get, :url => ['/application/clientcreate', '/api/application/clientcreate']} do |params,user,server|
+  server.content_type :json
+  client = Client.create(:user_id => server.current_user.id,:app_id => server.current_app.id)
+  client.update_fields(params)
+  { "client" => { "client_id" =>  client.id.to_s } }.to_json
+end

data/lib/rhoconnect/api/client/get_client_params.rb

@@ -1,3 +1,4 @@
-Server.api :get_client_params, :client do |params,user|
+Server.api4 :get_client_params, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id", \
+                true, {:verb => :post, :url => ['/api/get_client_params', '/api/client/get_client_params']} do |params,user|
   Client.load(params[:client_id],{:source_name => '*'}).to_array.to_json
 end

data/lib/rhoconnect/api/client/list_client_docs.rb

@@ -1,4 +1,5 @@
-Server.api :list_client_docs, :client do |params,user|
+Server.api4 :list_client_docs, :get, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/sources/:source_id/docnames", \
+                true, {:verb => :post, :url => ['/api/list_client_docs', '/api/client/list_client_docs']} do |params,user|
   c = Client.load(params[:client_id],{:source_name => params[:source_id]})
   res = {}
   [:cd,:cd_size,:create,:update,:delete,

data/lib/rhoconnect/api/client/register.rb

@@ -0,0 +1,12 @@
+Server.api4 :clientregister, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/register", \
+              false, {:verb => :post, :url => ['/application/clientregister', '/api/application/clientregister'] } do |params,user,server|
+  current_client = server.current_client
+  if current_client.nil? and server.current_user and server.current_app
+    fields = {:user_id => server.current_user.id}
+    fields[:id] = params[:client_id].to_s
+    fields[:app_id] = server.current_app.id
+    current_client = Client.create(fields)
+  end
+  current_client.update_fields(params)
+  server.status 200
+end

data/lib/rhoconnect/api/client/reset.rb

@@ -0,0 +1,5 @@
+Server.api4 :clientreset, :post, "/rc/#{Rhoconnect::API_VERSION}/clients/:client_id/reset", \
+            false, {:verb => :get, :url => ['/application/clientreset', '/api/application/clientreset']} do |params,user,server|
+  ClientSync.reset(server.current_client, params)
+  server.status 200
+end

data/lib/rhoconnect/api/{source → readstate}/set_refresh_time.rb

@@ -1,4 +1,5 @@
-Server.api :set_refresh_time, :source do |params,user|
+Server.api4 :set_refresh_time, :put, "/rc/#{Rhoconnect::API_VERSION}/readstate/users/:user_name/sources/:source_name", \
+            true, {:verb => :post, :url => ['/api/set_refresh_time', '/api/source/set_refresh_time']} do |params,user|
   source = Source.load(params[:source_name],
     {:app_id => APP_NAME, :user_id => params[:user_name]})
   source.poll_interval = params[:poll_interval] if params[:poll_interval]

data/lib/rhoconnect/api/source/get_source_params.rb

@@ -1,3 +1,4 @@
-Server.api :get_source_params, :source do |params,user|
-  Source.load(params[:source_id],{:app_id => APP_NAME,:user_id => "*"}).to_array.to_json
+Server.api4 :get_source_params, :get, "/rc/#{Rhoconnect::API_VERSION}/sources/:source_id", \
+            true, {:verb => :post, :url => ['/api/get_source_params', '/api/source/get_source_params']} do |params,user|
+  Source.load(params[:source_id],{:app_id => APP_NAME,:user_id => '*'}).to_array.to_json
 end

data/lib/rhoconnect/api/source/list_sources.rb

@@ -1,4 +1,5 @@
-Server.api :list_sources, :source  do |params,user|
+Server.api4 :list_sources, :get, "/rc/#{Rhoconnect::API_VERSION}/sources/type/:partition_type", \
+            true, {:verb => :post, :url => ['/api/list_sources', '/api/source/list_sources']}  do |params,user|
   sources = App.load(APP_NAME).sources
   if params['partition_type'].nil? or params['partition_type'] == 'all'
     sources.to_json 

data/lib/rhoconnect/api/source/update_source_params.rb

@@ -1,6 +1,6 @@
-Server.api :update_source_params, :source do |params,user|
-  source = Source.load(params[:source_name],
-    {:app_id => APP_NAME, :user_id => params[:user_name]})
+Server.api4 :update_source_params, :put, "/rc/#{Rhoconnect::API_VERSION}/sources/:source_id", true, nil do |params,user|
+  source = Source.load(params[:source_id],
+    {:app_id => APP_NAME, :user_id => '*'})
   source.update_fields(params[:data])
   ''
 end

data/lib/rhoconnect/api/store/get_db_doc.rb

@@ -0,0 +1,4 @@
+Server.api4 :get_db_doc, :get, "/rc/#{Rhoconnect::API_VERSION}/store/:doc", \
+          true, {:verb => :post, :url => ['/api/get_db_doc', '/api/source/get_db_doc']} do |params,user|
+  Store.get_db_doc(params[:doc])
+end

data/lib/rhoconnect/api/store/set_db_doc.rb

@@ -0,0 +1,7 @@
+Server.api4 :set_db_doc, :post, "/rc/#{Rhoconnect::API_VERSION}/store/:doc", \
+            true, {:verb => :post, :url => ['/api/set_db_doc', '/api/source/set_db_doc'] } do |params,user|
+  append_to_doc = params[:append]
+  append_to_doc ||= false
+  Store.set_db_doc(params[:doc],params[:data],append_to_doc)
+  ''
+end

data/lib/rhoconnect/api/system/get_adapter.rb

@@ -0,0 +1,4 @@
+Server.api4 :get_adapter, :get, "/rc/#{Rhoconnect::API_VERSION}/system/appserver", \
+              true, {:verb => :post, :url => ['/api/get_adapter', '/api/source/get_adapter']} do |params,user|
+   {:adapter_url => Rhoconnect.appserver}.to_json
+end