rhoconnect 3.3.6 → 3.4.2

data/lib/rhoconnect/user.rb

@@ -32,6 +32,14 @@ module Rhoconnect
         return if current_user.nil?
         return current_user if User.encrypt(password, current_user.salt) == current_user.hashed_password
       end
+      
+      def ping(params)
+        if params['async']
+          PingJob.enqueue(params)
+        else
+          PingJob.perform(params)
+        end
+      end
     end
     
     def new_password=(pass)

data/lib/rhoconnect/utilities.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'rbconfig'
 
 module Utilities
   # Prints the command to be issued and then issues it to system
@@ -7,10 +8,6 @@ module Utilities
     system "#{cmd}"
   end #cmd
 
-  def redis_home
-    ENV['REDIS_HOME'] || File.join($redis_dest,$redis_ver)
-  end
-
   def mk_bin_dir(bin_dir)
     begin
       mkdir_p bin_dir unless File.exists?(bin_dir)
@@ -28,7 +25,7 @@ module Utilities
 
   def print_resp(resp,success=true)
     if success
-      puts "=> OK" 
+      puts "=> OK"
     else
       puts "=> FAILED"
     end
@@ -43,7 +40,7 @@ module Utilities
     print msg
     STDIN.gets.chomp
   end
-  
+
   def load_settings(file)
     begin
       $settings = YAML.load_file(file)
@@ -53,11 +50,11 @@ module Utilities
       raise e
     end
   end
-  
+
   def rhoconnect_socket
     '/tmp/rhoconnect.dtach'
   end
-  
+
   def rhoconnect_pid
     if windows?
   	  Dir.mkdir 'C:/TMP' unless File.directory? 'C:/TMP'
@@ -67,18 +64,23 @@ module Utilities
     end
   end
 
+  # See http://rbjl.net/35-how-to-properly-check-for-your-ruby-interpreter-version-and-os
   def windows?
-    RUBY_PLATFORM =~ /(win|w)32$/
+    RbConfig::CONFIG['host_os']  =~ /(win|w)32$/
   end
-  
+
+  def redis_home
+    ENV['REDIS_HOME'] || File.join($redis_dest,$redis_ver)
+  end
+
   def ruby19?
-    RUBY_VERSION =~ /1.9/ 
+    RUBY_VERSION =~ /1.9/
   end
 
   def jruby?
     defined?(JRUBY_VERSION)
   end
-    
+
   def thin?
     begin
       require 'thin'
@@ -87,7 +89,7 @@ module Utilities
       nil
     end
   end
-  
+
   def mongrel?
     begin
       require 'mongrel'
@@ -96,7 +98,7 @@ module Utilities
       nil
     end
   end
-  
+
   def report_missing_server
     msg =<<-EOF
 Could not find 'thin' or 'mongrel' on your system.  Please install one:

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.6'
+  VERSION = '3.4.2'
 end

data/lib/rhoconnect/web-console/models/client.js

@@ -49,7 +49,7 @@ var Client = Backbone.Model.extend({
 				var r = JSON.parse(resp)
 				data = ""
 				$.each(r,function(index,value){
-					data += "<tr><td><a href='#doc/"+value+"/source_id="+source_id+"'>"+value+"</a></td></tr>";
+					data += "<tr><td colspan='2'><a href='#doc/"+value+"/source_id="+source_id+"'>"+value+"</a></td></tr>";
 				})
 				$('tr.remove-tr-docs').remove();
 				$('#sourcedocs-table tr:last').after(data);

data/lib/rhoconnect/web-console/public/bootstrap.css

@@ -62,6 +62,12 @@ img {
   -ms-interpolation-mode: bicubic;
   vertical-align: middle;
 }
+@font-face {
+  font-family: Motofont;
+  src: url("UNVR67bold.ttf") format("truetype"); /* For IE */
+  src: local("Motofont"), url("UNVR67bold.ttf") format("truetype"); /* For non-IE */
+}
+
 button,
 input,
 select,

data/lib/rhoconnect/web-console/server.rb

@@ -60,18 +60,20 @@ module RhoconnectConsole
     end
     
     get '/get_http_routes' do
-      keys = get_user_count("http:*:*")
-      sources = get_sources('all')
+      # keys = get_user_count("http:*:*")
+      #   sources = get_sources('all')
+      #   
+      #   #loop through arrays and remove any regex matches
+      #   keysf = keys.inject([]) do |keys_final, element|
+      #     found = true
+      #     sources.each do |s|
+      #       found = false if element.match(s)
+      #     end
+      #     keys_final << element.strip if found
+      #     keys_final
+      #   end
       
-      #loop through arrays and remove any regex matches
-      keysf = keys.inject([]) do |keys_final, element|
-        found = true
-        sources.each do |s|
-          found = false if element.match(s)
-        end
-        keys_final << element.strip if found
-        keys_final
-      end
+      keysf = get_http_routes()
       
       keysf.to_json
     end

data/lib/rhoconnect/web-console/templates/index.erb

@@ -45,11 +45,11 @@
 	<div id='nav_menu' class="navbar navbar-fixed-top" style="<%@heroku ? 'display:none' : 'display:block'%>"> 
 		  <div class='navbar-inner'>
 			<div class='container'>
-				<div class="brand" style='padding-bottom:8px'>
-					<!--<img src='public/logo.png' alt='image' height='40' width='40'/>-->
-					RhoConnect
+				<div class="brand" style='padding:5px 0 0 0;margin-left:0;font-size:26px'>
+					<img src='public/logo.png' alt='image' height='40' width='40'/>
+					<div style='font-family:Motofont;display:inline-block'>RHO<div style='color:#c91a1d;display:inline'>CONNECT</div></div>
 				</div> 
-				<ul class='nav pull-right'> 
+				<ul class='nav pull-right' style='margin-top:10px'> 
 				    <li class=""><a href="/resque/" >Resque</a></li>
 				    <li class="active"><a href="#" >Console</a></li> 
 					<li><a href='http://docs.rhomobile.com/rhoconnect/introduction' target='_blank'>Docs</a></li>
@@ -61,7 +61,7 @@
 	</div><!-- END navbar -->
 		<div class='container'>
 			<!-- secondary nav after login         -->
-			<div id='secondary-nav' class='span12' style='display:none;margin-top:50px;margin-left:0'>
+			<div id='secondary-nav' class='span12' style='display:none;margin-top:70px;margin-left:0'>
 				<ul class='nav nav-tabs'>
 					<li id='info_home'><a href='#'>Home</a></li>
 					<li id='server_doc'><a href='#docselect'>Server Doc</a></li>

data/lib/rhoconnect/web-console/templates/jqplot.erb

@@ -5,6 +5,7 @@
 <script language="javascript" type="text/javascript" src="public/jqplot/jqplot.canvasTextRenderer.js"></script>
 <script language="javascript" type="text/javascript" src="public/jqplot/jqplot.canvasAxisLabelRenderer.js"></script>
 <script language="javascript" type="text/javascript" src="public/jqplot/jqplot.canvasAxisTickRenderer.js"></script>
+<script language="javascript" type="text/javascript" src="public/jqplot/jqplot.pointLabels.min.js"></script>
 <script language="javascript" type="text/javascript" src="public/jqplot/jqplot.cursor.js"></script>
 <style type='text/css'>
 	.jqplot-yaxis-label{

data/lib/rhoconnect/web-console/views/doc.js

@@ -49,10 +49,6 @@ App.Views.Doc = Backbone.View.extend({
         $('#secondary-nav').css('display','block');
 		out  = "<div class='page-header'><h2>Document&nbsp;"+dbkey+"</h2></div>";
 		out += "<div id='docalert' class='alert alert-error' style='display:none'></div>";
-		//out += "<form 'string_s' class='form-horizontal'>";
-		//out += "<input type='text' name='data' value='' class='input-xlarge' placeholder='Upload string'/>";
-		//out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'>";
-		//out += "</form>";
 		out += "<table id='docdata-table' class='table table-bordered'><tr></tr>";
 		out += "<tr class='remove-tr-doc'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 		out += "</table>"

data/lib/rhoconnect/web-console/views/home.js

@@ -26,7 +26,8 @@ App.Views.Home = Backbone.View.extend({
     reset: function(){
 	    var session = new Session();
 		if(confirm("Are you sure you want to reset?")){
-			session.reset()
+			session.reset();
+			this.model.get_license_info();
 		}
 	},
 	

data/lib/rhoconnect/web-console/views/new_ping.js

@@ -1,9 +1,9 @@
 App.Views.NewPing = Backbone.View.extend({
-	
+
 	events:{
 		"submit form" : "ping"
 	},
-	
+
     initialize: function() {
 	    var name = this.model.get('name');
 		this.render(name);
@@ -19,7 +19,12 @@ App.Views.NewPing = Backbone.View.extend({
 		var vibrate = $('#pingvibrate').val();
 		var sound = $('#pingsound').val();
 		var badge = $('#pingbadge').val();
-		var sources = $('#sources').val().split(',');
+		var sources = $('#sources').val();
+		if(sources.length > 0) {
+			sources = sources.split(',');
+		} else {
+			sources = [];
+		}
 		var token = this.model.get('api_token');
 		$.ajax({
 			type: 'POST',
@@ -47,7 +52,7 @@ App.Views.NewPing = Backbone.View.extend({
 			}
 		})
 	},
-    
+
     render: function(name) {
         $('#secondary-nav').css('display','block');
 		out  = "<div class='page-header'><h2>Ping User/s</h2></div>";
@@ -62,11 +67,11 @@ App.Views.NewPing = Backbone.View.extend({
 		out += "<td>allows you to play audio file if it exists on client</td></tr>"
 		out += "<tr><td>Badge</td><td><input id='pingbadge' type='text' name='badge' value='1' class='input-small'/></td>";
 		out += "<td>Number displayed on device next to app when push notification arrives. Available for iPhone</td></tr>"
-		out += "<tr><td>Vibrate</td><td><input id='pingvibrate' type='text' name='vibrate' value='2' class='input-small'/>&nbsp;(seconds)</td>"
+		out += "<tr><td>Vibrate</td><td><input id='pingvibrate' type='text' name='vibrate' value='2' class='input-small'/>&nbsp;(milliseconds)</td>"
 		out += "<td>Duration of vibration when push notification is received</td></tr>"
 	    out += "<tr><td colspan=3><input type='submit' class='btn btn-primary' value='Ping!' /></td></tr>"
 	    out += "</table></form>";
-	   
+
         $(this.el).html(out);
         $('#main_content').html(this.el);
     }

data/lib/rhoconnect/web-console/views/stats.js

@@ -24,12 +24,14 @@ App.Views.Stats = Backbone.View.extend({
 	},
 
     device_count: function(){
+	$('#stats_main').html("<i>Loading...</i>")
 		$("#user_count").attr('class','');
 		$('#device_count').attr('class','label label-info');
 		this.model.device_count();
 	},
 	
 	http_timing: function(ev){
+		$('#stats_main').html("<i>Loading...</i>")
 		var display_name = ev.currentTarget.id;
 		$('.http_timing').attr('class','http_timing');
 		ev.currentTarget.className = "http_timing label label-info"
@@ -37,6 +39,7 @@ App.Views.Stats = Backbone.View.extend({
 	},
 	
 	http_timing_key: function(ev){
+		$('#stats_main').html("<i>Loading...</i>")
 		var display_name = ev.currentTarget.id;
 		$('.http_timing_key').attr('class','http_timing_key');
 		ev.currentTarget.className = "http_timing_key label label-info"
@@ -44,6 +47,7 @@ App.Views.Stats = Backbone.View.extend({
 	},
 	
 	source_timing_display: function(ev){
+		$('#stats_main').html("<i>Loading...</i>")
 		var display_name = ev.currentTarget.id;
 		
 		$(".source_timing_display").attr('class','source_timing_display');
@@ -83,11 +87,11 @@ App.Views.Stats = Backbone.View.extend({
 		out += "<div id='collapseTwo' class='accordion-body collapse'>";
 		out += "</div></div>"
 		
-		// out += "<div class='accordion-group'>"
-		// 	out += "<div class='accordion-heading' style='font-weight:bold'>"
-		// 	out += "<a class='accordion-toggle' data-toggle='collapse' data-parent='#accordion2' href='#collapseFour'>HTTP Route Timing</a></div>"
-		// 	out += "<div id='collapseFour' class='accordion-body collapse'>";
-		// 	out += "</div></div>"
+		out += "<div class='accordion-group'>"
+		out += "<div class='accordion-heading' style='font-weight:bold'>"
+		out += "<a class='accordion-toggle' data-toggle='collapse' data-parent='#accordion2' href='#collapseFour'>HTTP Route Timing</a></div>"
+		out += "<div id='collapseFour' class='accordion-body collapse'>";
+		out += "</div></div>"
 		
 		out += "<div class='accordion-group'>"
 		out += "<div class='accordion-heading' style='font-weight:bold'>"

data/rhoconnect.gemspec

@@ -14,15 +14,16 @@ Gem::Specification.new do |s|
   s.description = %q{RhoConnect App Integration Server and related command-line utilities}
 
   s.rubyforge_project = nil
-
-  s.files        = %w(
-    CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec
+  
+  s.files        = %w( 
+    CHANGELOG.md CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec 
   )
   s.files       += Dir.glob("bench/**/*")
   s.files       += Dir.glob("commands/**/*")
   s.files       += Dir.glob("doc/**/*")
   s.files       += Dir.glob("examples/**/*")
   s.files       += Dir.glob("generators/**/*")
+  s.files       += Dir.glob("generators/templates/application/.rcgemfile")
   s.files       += Dir.glob("installer/**/*")
   s.files       += Dir.glob("lib/**/*")
   s.files       += Dir.glob("tasks/**/*")
@@ -37,12 +38,13 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
-  s.add_dependency('bundler', '~> 1.0')
+  s.add_dependency('bundler', '~> 1.0')  
   s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '~> 0.9.2.2')
   s.add_dependency('json', '~> 1.6.0')
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')
+  s.add_dependency('connection_pool', '>= 0.9.2')
   s.add_dependency('redis', '>= 3.0.1')
   s.add_dependency('resque', '>= 1.22.0')
   s.add_dependency('rest-client', '~> 1.6.1')

data/spec/api/app/fast_update_spec.rb

@@ -49,7 +49,7 @@ describe "RhoconnectApiFastUpdate" do
       verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
     end
     
-    it "should remove all attributes , but leave the count incorrect (because fast_update doesn't check if the whole object is deleted)" do
+    it "should remove all attributes , and properly adjust md_size" do
       data = {'1' => @product1, '2' => @product2, '3' => @product3}
       @s = Source.load(@s_fields[:name],@s_params)
       set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
@@ -61,7 +61,7 @@ describe "RhoconnectApiFastUpdate" do
         {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
       last_response.should be_ok
       data.delete('3')
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'3')
+      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'2')
     end
   end  
 end

data/spec/api/source/get_source_params_spec.rb

@@ -21,6 +21,7 @@ describe "RhoconnectApiGetSourceParams" do
         {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
         {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
+        {"name"=>"push_notify", "value"=>"false", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
         {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},

data/spec/apps/rhotestapp/settings/settings.yml

@@ -9,24 +9,24 @@
     :poll_interval: 300
     :priority: 5
     sync_type: 'incremental'
-    belongs_to: 
+    belongs_to:
       - brand: 'SampleAdapter'
   OtherAdapter:
     partition_type: 'app'
     :force_default: true
     :poll_interval: 300
-    
+
 :development:
   :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-:test: 
+:test:
   :licensefile: settings/license.key
   :iphonecertfile: settings/apple_fake_cert.pem
   :iphonepassphrase: certpassword
   :iphoneserver: gateway.sandbox.push.apple.com
-  :iphoneport: 2195  
+  :iphoneport: 2195
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
@@ -34,7 +34,7 @@
   :push_server: http://user:pwd@localhost:8675
   :cookie_expire: 9999999
   :poll_interval_default: 201
-:production: 
+:production:
   :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379

data/spec/client_sync_spec.rb

@@ -518,7 +518,7 @@ describe "ClientSync" do
         Store.get_data(@c.docname(:cd)).should == @expected
       end
 
-      it "should return deleted objects in the client document" do
+      it "should delete objects from the client document and return deleted objects in the page" do
         Store.put_data(@s.docname(:md),@data).should == true
         Store.get_data(@s.docname(:md)).should == @data
 
@@ -527,22 +527,11 @@ describe "ClientSync" do
         Store.get_data(@cs.client.docname(:cd)).should == @cd
 
         @expected = {'4'=>@product4}
-        @cs.compute_deleted_page.should == @expected
+        @cs.send_new_page
         Store.get_data(@cs.client.docname(:delete_page)).should == @expected
+        Store.get_data(@cs.client.docname(:cd)).should == @data
       end  
 
-      it "should delete objects from client document" do
-        Store.put_data(@s.docname(:md),@data).should == true
-        Store.get_data(@s.docname(:md)).should == @data
-
-        @cd = {'1'=>@product1,'2'=>@product2,'3'=>@product3,'4'=>@product4}  
-        Store.put_data(@cs.client.docname(:cd),@cd)
-        Store.get_data(@cs.client.docname(:cd)).should == @cd
-
-        Store.delete_data(@cs.client.docname(:cd),@cs.compute_deleted_page).should == true
-        Store.get_data(@cs.client.docname(:cd)).should == @data 
-      end
-
       it "should resend page if page exists and no token provided" do
         expected = {'1'=>@product1}
         set_test_data('test_db_storage',{'1'=>@product1,'2'=>@product2,'4'=>@product4})