rhoconnect 3.3.4 → 3.3.5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
+## 3.3.5 (2012-09-20)
+* merge changes from master to fix broken bench script helper
+* ZD-2866 - Issue with Apple Push when User has windows device as one of targeted devices 2 target devices
+* SPR 22764 - Add enqueue method to PingJob and fix specs
+
 ## 3.3.4 (2012-08-28)
-* flush_zdata was not properly cleaning the related Redis storage (which led to incorrect CUD queue states) 
+* flush_zdata was not properly cleaning the related Redis storage (which led to incorrect CUD queue states)
 
 ## 3.3.3 (2012-08-21)
 * allow selective bulk_sync source parameter to be sent as a comma-separated string
@@ -75,7 +80,7 @@
 * #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated)
 * #28855323 - Bulk Sync Associations from Zendesk ticket #2377
 * #28576723 - dpkg lock error on Ubuntu install
-* #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated) 
+* #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated)
 * #28865579 - Async dependencies are not properly initialized on Windows (need to add :mingw_19 to the list of platforms in Gemfile)
 * Rhoconnect production stack updated to latest stable version of ruby, redis, and nginx: ruby-1.9.3-p194, redis-2.4.12, nginx-1.2.0.
 
@@ -84,7 +89,7 @@
 * Async framework is introduced for rubies 1.9.x (no 1.8.7 or JRuby support)
 * 26384435 - Rhoconnect Linux installer should use ruby-1.9.3-p125 as a default ruby
 * 27612327 - Bulk Sync Not Returning Errors from Zendesk ticket #2336
-* Rhoconnect production stack is updated for full support of async framework (nginx as reverse proxy server, thin app server) 
+* Rhoconnect production stack is updated for full support of async framework (nginx as reverse proxy server, thin app server)
 * #28219647 - Schema Change Error from Zendesk ticket #2353
 * #28328057 - Feature Request: Adding a Bulk Data Job after_perform hook from Zendesk ticket #2367
 * #28330213 - Implementing fast_insert/update/delete API
@@ -93,7 +98,7 @@
 ## 3.1.2 (2012-04-02)
 * #19297819 - Refactor server middleware loading to be static
 * #25292219 - Ensure that Store.get_zdata always returns valid array (even if it is empty)
-* #26310661 - No test_search 
+* #26310661 - No test_search
 * #26868157 - bug in install.sh in rhoconnect installer
 * #26384435 - Replace in rhoconnect installer Ruby Enterprise by latest stable Ruby 1.9.3
 * #27184633 - Fixing error with recursive loading of application.rb in ruby-1.8.7 and ree
@@ -159,11 +164,11 @@
 
 ## 3.0.0 (2011-09-30)
 * #18888077 - implement Redis transactions optimization for push_objects and push_deletes
-* added 2 rake tasks (build:rpm and build:deb) to generate packaged software for popular linux servers   
-  (CentOS/Ubuntu). The package includes ruby enterprise, redis and nginx servers, passenger, 
-  and rhoconnect gem with all dependencies  
+* added 2 rake tasks (build:rpm and build:deb) to generate packaged software for popular linux servers
+  (CentOS/Ubuntu). The package includes ruby enterprise, redis and nginx servers, passenger,
+  and rhoconnect gem with all dependencies
 * #19116273 - created new redis:startbg task for Rhostudio
-  
+
 ## 3.0.0.rc1 (2011-09-27)
 * load sqlite3 gem on demand, fixes issue with generator requiring it
 * #18934311 - create :startbg task for Rhostudio
@@ -185,27 +190,27 @@
 * #4397476 wrapped login/logoff around cud spec helpers
 * backtrace logging in source adapter method exceptions
 * returning string in authenticate instead of true sets the current user login name (Useful for OAuth2)
-* #11904353 - fixed broken 'rake console' task, added new 'rhosync' namespace: 'rake rhosync:console'  
+* #11904353 - fixed broken 'rake console' task, added new 'rhosync' namespace: 'rake rhosync:console'
 * #12105115 - removed unnecessary log4r dependency
-* added bundler to manage gem's dependencies, migrated from rspec1 to rspec2  
-* #5687948 - fixed issue "iPhone push specs failed" 
-* use redis 2.2.14 by default	
-* added SystemTimer gem dependency (used only on posix systems)					
+* added bundler to manage gem's dependencies, migrated from rspec1 to rspec2
+* #5687948 - fixed issue "iPhone push specs failed"
+* use redis 2.2.14 by default
+* added SystemTimer gem dependency (used only on posix systems)
 * #13616807 - Rake task spec:all fails for enterprise ruby (ree)
 * #13776713 - Rake -v 0.9.0 breaks rhosync rake tasks
-* #14514773 - REST API push_object, push_deletes :md_size count fix  
+* #14514773 - REST API push_object, push_deletes :md_size count fix
 * #5687948  - fixed issue "iPhone push specs failed"
 * #12854737 - string vs. symbol problem in ruby 1.9 model.rb (contribute to ruby 1.9 support)
 * #11692191 - ruby 1.9 support
 * #2020980  - Test on JRuby. Code reworked to fully support JRuby platform.
-* #14087743 - Merging the /login and /get_api_token methods.  
-* #14713569 - Moving all Server REST API calls into namespaces. 
+* #14087743 - Merging the /login and /get_api_token methods.
+* #14713569 - Moving all Server REST API calls into namespaces.
 * #14284841 - Merge ruby_19 branch into master
-* #14784949 - Suppress rake -v 0.9.2 warning messages while running tasks. 
+* #14784949 - Suppress rake -v 0.9.2 warning messages while running tasks.
 * #3174947  - RESTful routes for client management
 * #14968209 - Generated Specs are failing on 2nd generated source
 * #15270505 - sqlite3 is not listed as a dependency of rhosync gem (3.0.0)
-* #15143911 - Schema Changed message from Zendesk ticket #1035 (merge from branch 2-1-stable 2.1.9) 
+* #15143911 - Schema Changed message from Zendesk ticket #1035 (merge from branch 2-1-stable 2.1.9)
 * #14950665 - Benchmark application and libraries: rework REST calls to match new API restful routes.
 * #14860303 - In bench tests x_domain_session_wrapper middleware not working under ruby 1.9.2.
 * #15615327 - Rhoconnect migration
@@ -230,7 +235,7 @@
 * #1018 - added functionality to delete user source data on user delete
 * updated to rake 0.9.2
 * #14911833 - Add support for rolling back updates on sync errors
- 
+
 ## 2.1.7 (2011-05-31)
 * #14021681 - check for client on client_sync class methods
 * #14082861 - expose Store.lock timeout to high-level functions
@@ -252,7 +257,7 @@
 * #13022667 - settings.yml doesn't work for setting external Redis instances
 
 ## 2.1.2 (2011-03-18)
-* Use server-dir/redis.conf if not found at RedisRunner.prefix (via artemk) 
+* Use server-dir/redis.conf if not found at RedisRunner.prefix (via artemk)
 * #8471337 - switch client user if it is not equal to current_user
 * Upgrade rest-client dependency which includes cookie escape fix
 * #10097347 - generate cryptographically secure secret key by default

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.3.4)
+    rhoconnect (3.3.5)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2.2)
@@ -28,7 +28,7 @@ GEM
       mime-types
       xml-simple
     backports (2.6.2)
-    builder (3.0.0)
+    builder (3.1.3)
     cabin (0.4.4)
       json
     childprocess (0.3.5)
@@ -41,14 +41,14 @@ GEM
     crack (0.3.1)
     daemons (1.1.9)
     diff-lcs (1.1.3)
-    eventmachine (1.0.0.rc.4)
-    excon (0.16.1)
+    eventmachine (1.0.0)
+    excon (0.16.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.15)
     ffaker (1.14.0)
     ffi (1.1.5)
-    fog (1.5.0)
+    fog (1.6.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -59,13 +59,13 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.3)
-    fpm (0.4.13)
+    fpm (0.4.17)
       arr-pm (~> 0.0.7)
       backports (= 2.6.2)
       cabin (~> 0.4.3)
       clamp (= 0.3.1)
       json (= 1.6.6)
-    highline (1.6.14)
+    highline (1.6.15)
     hike (1.2.1)
     jasmine (1.2.1)
       jasmine-core (>= 1.2.0)
@@ -79,6 +79,7 @@ GEM
       multi_json
       rainbow
       sprockets (~> 2)
+    jruby-pageant (1.1.1)
     json (1.6.6)
     libwebsocket (0.1.5)
       addressable
@@ -86,7 +87,8 @@ GEM
     multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.5.2)
+    net-ssh (2.6.0)
+      jruby-pageant (>= 1.1.1)
     nokogiri (1.5.5)
     rack (1.4.1)
     rack-fiber_pool (0.9.2)
@@ -130,7 +132,7 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.4.5)
+    sprockets (2.6.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -149,7 +151,7 @@ GEM
     uuidtools (2.1.3)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.8.9)
+    webmock (1.8.10)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     xml-simple (1.1.1)

data/bench/scripts/helpers.rb

@@ -72,7 +72,7 @@ module BenchHelpers
     end
     sleep rand(timeout)
     token = JSON.parse(session.last_result.body)[1]['token']
-    progress_count = JSON.parse(session.last_result.body)[3]['progress_count']
+    progress_count = JSON.parse(session.last_result.body)[4]['total_count']    
     return progress_count if token == ''
     
     verify_count(session,caller+"\n"+current_line)
@@ -92,7 +92,7 @@ module BenchHelpers
       verify_links(session,create_objs,caller+"\n"+current_line) if create_objs
       
       token = JSON.parse(session.last_result.body)[1]['token']
-      progress_count = JSON.parse(session.last_result.body)[3]['progress_count']
+      progress_count = JSON.parse(session.last_result.body)[4]['total_count']
     end
     progress_count
   end

data/doc/web-console.txt

@@ -4,7 +4,7 @@ Web Console
 Your RhoConnect application exposes a web interface which runs on http://localhost:9292/console/ (port 80 on Windows) by default.  You can open the console by running the following in your application directory:
 
 	:::term
-  	$ rake rhoconnect:web
+	$ rhoconnect web
 
 To login to the console:
 
@@ -13,12 +13,16 @@ To login to the console:
 3. Default username is 'rhoadmin' and the password is empty
 4. Now you will be presented with a page showing your current license, for example:
 
-  		
-		Licensed to Rhomobile on Fri Apr 23 17:20:13 -0700 2010, 
+
+		Licensed to Rhomobile on Fri Apr 23 17:20:13 -0700 2010,
 			available 9 of 10 devices
 
 It will also show a link to "Application Users" where you can view users of the system as well as devices they have registered.
 
+To reset the server, you can click on the "Reset" button at the bottom.
+
+**NOTE: Resetting the server will remove all data from redis including registered devices, this cannot be undone.**
+
 If you want to disable this web interface, you can do so by editing the rackup file, config.ru:
 
 	:::ruby

data/installer/unix-like/rho_connect_install_constants.rb

@@ -21,7 +21,7 @@ module Constants
   NGINX_URL               = "http://nginx.org/download/#{NGINX}.tar.gz"
   EVENTMACHINE_URL        = "https://github.com/rhomobile/eventmachine/tarball/master"
   URLS                    = [ REDIS_URL, SQLITE3_URL, NGINX_URL]
-  GEMS                    = ["bundler", "thin"] #, foreman"
+  GEMS                    = ["bundler"] # foreman"
     
   SUPPORTED_PKG_MGRS      = ["apt-get", "yum"]
   SUPPORTED_WEB_SERVERS   = ["apache2", "nginx"]

data/lib/rhoconnect/jobs/ping_job.rb

@@ -3,6 +3,11 @@ require 'rhoconnect/ping'
 module Rhoconnect
   module PingJob
     @queue = :ping
+
+    # Enqueue a ping job
+    def self.enqueue(params)
+      Resque.enqueue(PingJob, params)
+    end
     
     # Perform a ping for all clients registered to a user
     def self.perform(params)
@@ -52,7 +57,12 @@ module Rhoconnect
             end
             if send_push
               type = client.device_push_type || client.device_type
-              klass = Object.const_get(camelize(type.downcase))
+              klass = nil
+              begin
+                klass = Object.const_get(camelize(type.downcase))
+              rescue Exception => e
+                log "Dropping ping request for unsupported platform '#{type}'"
+              end
               if klass
                 params['vibrate'] = params['vibrate'].to_s
                 begin

data/lib/rhoconnect/ping/android.rb

@@ -50,8 +50,8 @@ module Rhoconnect
             raise AndroidPingError.new("Android ping error: #{$1 || ''}")
           else
             # store new token in redis for future calls
-            if response[:update_client_auth]
-              Store.put_value(C2DM_AUTHTOKEN_KEY, response[:update_client_auth])
+            if response.headers[:update_client_auth]
+              Store.put_value(C2DM_AUTHTOKEN_KEY, response.headers[:update_client_auth])
             end
             response.return!(request, result, &block)
           end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.4'
+  VERSION = '3.3.5'
 end

data/spec/api/user/ping_spec.rb

@@ -5,6 +5,7 @@ describe "RhoconnectApiPing" do
     it "should do ping synchronously" do
       params = {"user_id" => @u.id, "sources" => [@s.name], "message" => 'hello world', 
         "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      PingJob.should respond_to :perform
       PingJob.should_receive(:perform).once.with(params)
       post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
@@ -13,6 +14,8 @@ describe "RhoconnectApiPing" do
     it "should do ping asynchronously" do
       params = {"user_id" => @u.id, "async" => "true","sources" => [@s.name], "message" => 'hello world', 
         "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+
+      PingJob.should respond_to :enqueue
       PingJob.should_receive(:enqueue).once.with(params)
       post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok

data/spec/jobs/ping_job_spec.rb

@@ -63,6 +63,15 @@ describe "PingJob" do
         'device_port' => @c.device_port}.merge!(params))
       PingJob.perform(params)
     end
+    
+    it "should skip ping for the unknown platform" do
+      params = {"user_id" => @u.id, "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', 
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3',"phone_id"=>nil}
+      @c.device_type = 'unknown_device_type'
+      PingJob.should_receive(:log).once.with("Dropping ping request for unsupported platform '#{@c.device_type}'")
+      PingJob.perform(params)
+    end
 
     it "should skip ping for empty device_type" do
       params = {"user_id" => @u.id, "api_token" => @api_token,

data/spec/ping/android_spec.rb

@@ -15,7 +15,7 @@ describe "Ping Android" do
       result = 'id=0:34234234134254%abc123\n'
      	@response.stub!(:code).and_return(200)
      	@response.stub!(:body).and_return(result)
-     	@response.stub!(:[]).and_return(false)
+     	@response.stub!(:headers).and_return({})
      	@response.stub!(:return!).and_return(@response)
      	setup_post_yield(@response)
      	Android.ping(@params).body.should == result
@@ -34,7 +34,7 @@ describe "Ping Android" do
       error = 'Error=QuotaExceeded'
       @response.stub!(:code).and_return(200)
       @response.stub!(:body).and_return(error)
-      @response.stub!(:[]).and_return(nil)
+      @response.stub!(:headers).and_return(nil)
      	setup_post_yield(@response)
       Android.should_receive(:log).twice
       lambda { Android.ping(@params) }.should raise_error(Android::AndroidPingError, "Android ping error: QuotaExceeded")
@@ -44,7 +44,7 @@ describe "Ping Android" do
       error = 'Error=BadAuthentication'
       @response.stub!(:code).and_return(403)
       @response.stub!(:body).and_return(error)
-      @response.stub!(:[]).and_return(nil)
+      @response.stub!(:headers).and_return({})
      	setup_post_yield(@response)
       Android.should_receive(:log).twice
       lambda { Android.ping(@params) }.should raise_error(Android::InvalidAuthToken, "Can not obtain auth token from C2DM service. Make sure that your C2DM credentials are valid.: Error=BadAuthentication")
@@ -54,7 +54,7 @@ describe "Ping Android" do
       result = "SID=somesid\nAuth=myauthtoken\n"
       @response.stub!(:code).and_return(200)
       @response.stub!(:body).and_return(result)
-      @response.stub!(:[]).and_return(nil)
+      @response.stub!(:headers).and_return({})
      	setup_post_yield(@response)
      	
      	Android.get_c2dm_token
@@ -79,7 +79,7 @@ describe "Ping Android" do
       Store.put_value(Android::C2DM_AUTHTOKEN_KEY, 'ValidAuthToken')
       @response.stub!(:code).and_return(200)
       @response.stub!(:body).and_return('')
-      @response.stub!(:[]).and_return(:update_client_auth => 'abc123')
+      @response.stub!(:headers).and_return(:update_client_auth => 'abc123')
      	@response.stub!(:return!).and_return(@response)
      	setup_post_yield(@response)
      	Android.ping(@params)