rhoconnect 3.2.0.beta2 → 3.2.0.beta3

data/installer/unix-like/rho_connect_install_installers.rb

@@ -29,8 +29,17 @@ module Installers
     @gem_path = "#{@options[:prefix]}/bin/gem"
 
     # Update the RubyGems system software 
-    cmd "#{@gem_path} update --system" 
+    cmd "#{@gem_path} update --system"
 
+    # FIXME:
+    #install eventmachine 1.0.0.0.beta4 
+    `wget https://github.com/rhomobile/eventmachine/tarball/master`
+    `tar xzfv master`
+    `cd rhomobile-eventmachine-6858b3b`
+    `/opt/rhoconnect/bin/gem build eventmachine.gemspec`
+    `/opt/rhoconnect/bin/gem install eventmachine-1.0.0.beta.4.gem --no-ri --no-rdoc`    
+    `cd ../;rm -rf master rhomobile-eventmachine-6858b3b`
+    
     Constants::GEMS.each do |gem|
       install_gem gem
     end

data/installer/utils/package_upload/repos.rake

@@ -78,7 +78,7 @@ task "build:repos", :build_type, :build_number do |t, args|
     Find.find('./pkg') do |file|
       if !FileTest.directory?(file)
         dest_dir = File.extname(file)
-        # get rid of '.' before extension name
+        # Get rid of '.' before extension name
         dest_dir[0] = ''
         if dest_dir == 'deb' || dest_dir == 'rpm'
           if dest_dir == 'deb'
@@ -95,22 +95,19 @@ task "build:repos", :build_type, :build_number do |t, args|
   
   copy_files
   
- # if build_type != "release" &&
- #    build_type != "test"
- #   # Change name of packages to include build number
- #   ['deb', 'rpm'].each do |arch|
- #     Find.find("#{PKG_DIR}") do |file|
- #       if !File.directory?(file) &&
- #          file =~ /#{arch}$/
- #         file_to_rename = File.open(file, 'r')
- #         old_name = File.expand_path(file)
- #         puts "Old Name:\t#{old_name}"
- #         new_name = old_name.gsub(/(#{arch})$/, "build-#{build_number.to_s}.\\1" )
- #         File.rename(old_name, new_name)
- #       end #if
- #     end #do
- #   end #do
- # end #if
+ if !build_number.empty?
+   # Change name of packages to include build number
+   ['deb', 'rpm'].each do |arch|
+     Find.find("#{PKG_DIR}") do |file|
+       if !File.directory?(file) and file =~ /#{arch}$/
+         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)
+       end #if
+     end #do
+   end #do
+ end #if
 
   # REPOIFY!
   cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"
@@ -125,4 +122,4 @@ task "build:repos", :build_type, :build_number do |t, args|
     cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{PKG_DIR}/#{dir} #{BUCKET}" 
   end #do
   cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{PKG_DIR}/SHA1 #{BUCKET}"
-end #build:repos
+end #build:repos

data/installer/utils/package_upload/s3_single_file.rb

@@ -33,7 +33,7 @@ def upload
                            :access => :public_read )
 
   # display the URL of the file just uploaded
-  puts AWS::S3::S3Object.url_for((file), BUCKET)[/[^?]+/]
+  puts AWS::S3::S3Object.url_for((FILE), BUCKET)[/[^?]+/]
 end #upload
 
 # Script

data/lib/rhoconnect/cors.rb

@@ -23,19 +23,8 @@ module Rack
       end
       cors_headers = nil
       if env['HTTP_ORIGIN']
-        debug(env) do
-          [ 'Incoming Headers:',
-            "  Origin: #{env['HTTP_ORIGIN']}",
-            "  Access-Control-Request-Method: #{env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']}",
-            "  Access-Control-Request-Headers: #{env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}"
-            ].join("\n")
-        end
         if env['REQUEST_METHOD'] == 'OPTIONS'
           if headers = process_preflight(env)
-            debug(env) do
-              "Preflight Headers:\n" +
-                  headers.collect{|kv| "  #{kv.join(': ')}"}.join("\n")
-            end
             return [200, headers, ['']]
           end
         else
@@ -48,16 +37,6 @@ module Rack
     end
 
     protected
-      def debug(env, message = nil, &block)
-        logger = @logger || env['rack.logger'] || begin
-          @logger = ::Logger.new(STDOUT).tap {|logger| logger.level = ::Logger::Severity::INFO}
-        end
-        logger.debug(message, &block)
-        #TODO: remove debug output from code!
-        message = yield
-        puts message
-      end
-
       def all_resources
         @all_resources ||= []
       end

data/lib/rhoconnect/jobs/bulk_data_job.rb

@@ -26,8 +26,8 @@ module Rhoconnect
       do_bulk_job(params) do |bulk_data|
         bulk_data.state = :completed
         bulk_data.refresh_time = Time.now.to_i + Rhoconnect.bulk_sync_poll_interval
-        log "BulkDataJob.after_perform_x hook set data state to complete."
       end
+      log "BulkDataJob.after_perform_x hook set data state to complete."
     end
 
     def self.do_bulk_job(params)

data/lib/rhoconnect/server.rb

@@ -206,9 +206,33 @@ module Rhoconnect
       
       @dispatch_framework_initialized ||=true
       if RUBY_VERSION =~ /1.9/ and not defined?(JRUBY_VERSION)
-        require 'rhoconnect/async' 
-        register Rhoconnect::Synchrony
-        helpers Rhoconnect::AsyncHelpers
+        begin 
+          require 'rhoconnect/async' 
+          register Rhoconnect::Synchrony
+          helpers Rhoconnect::AsyncHelpers
+        rescue LoadError => e
+          # if it fails here - Async can not be used
+          settings.use_async_model = false
+          warning_for_async_gems = <<_INSTALL_ASYNC_GEMS
+          
+***** WARNING *****
+Rhoconnect has detected that Ruby 1.9.x is used and tried to initialize Async Framework, but failed:
+
+  #{e.inspect}
+
+Make sure to include the following dependencies into your application's Gemfile:
+
+platforms :ruby_19, :mingw_19 do
+  gem 'rack-fiber_pool'
+  gem 'async-rack'
+end
+
+After that, run 'bundle install' to install the necassary dependency gems.
+***** WARNING *****
+
+_INSTALL_ASYNC_GEMS
+          puts warning_for_async_gems
+        end
       else
         settings.use_async_model = false
       end

data/lib/rhoconnect/version.rb

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

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

@@ -21,6 +21,7 @@ var Client = Backbone.Model.extend({
 				$.each(r,function(index,value){
 					data += "<tr><td><a href='#device/"+value+"/"+user_id+"'>"+value+"</a></td></tr>";
 				})
+				$('tr.remove-tr-device').remove();
 				$('#device-table tr:last').after(data);
 			},
 			error: function(resp){
@@ -44,6 +45,7 @@ var Client = Backbone.Model.extend({
 				$.each(r,function(index,value){
 					data += "<tr><td><a href='#doc/"+value+"/source_id="+source_id+"'>"+value+"</a></td></tr>";
 				})
+				$('tr.remove-tr-docs').remove();
 				$('#sourcedocs-table tr:last').after(data);
 			},
 			error: function(resp){
@@ -68,7 +70,7 @@ var Client = Backbone.Model.extend({
 					if(value.value != null && value.value != "")
 						data += "<tr><td width='25%'>" + value.name + "</td><td>" + value.value + "</td></tr>"
 				})
-				
+				$('tr.remove-tr-client').remove();
 				$('#deviceattr-table tr:last').after(data);
 			},
 			error: function(resp){

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

@@ -44,11 +44,12 @@ var Doc = Backbone.Model.extend({
 				if(resp != ''){
 					data += "<tr><th colspan=3><h3 style='display:inline'>Data</h3><span class='pull-right'>" + 
 							"<a id='clear' class='btn btn-danger'>clear document</a></span></th></tr>" +
-							"<tr><td id='doc_data'>" + r+ "</td></tr>";
+							"<tr><td id='doc_data'><pre>" + r+ "</pre></td></tr>";
 				}
 				else{
 					data += "<tr><th>Document is Empty</th></tr>";
 				}
+				$('tr.remove-tr-doc').remove();
 				$('#docdata-table tr:last').after(data);
 				$(".query-status")[0].firstChild.className = "label label-success";
 				$(".query-status")[0].firstChild.innerHTML = "success";

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

@@ -50,6 +50,7 @@ var Source = Backbone.Model.extend({
 					adapters += "<tr><td colspan='2'><a href='#sources/"+value+"/"+user+"/"+doctype+"/"+client_id+"'>"+ value + "</a></td></tr>"
 				}
 			})
+			$('tr.remove-tr-user').remove();
 			$('#source-table tr:last').after(adapters);
 		}
 		else{
@@ -75,6 +76,7 @@ var Source = Backbone.Model.extend({
 				$.each(r, function(index,value){
 					docs += "<tr><td width='25%'>" + index + "</td><td><a href='#doc/"+value+"/source_id="+source_id+"'>" + value + "</a></td></tr>"
 				})
+				$('tr.remove-tr-docs').remove();
 				$('#sourcedocs-table tr:last').after(docs);
 			},
 			error: function(resp){
@@ -100,6 +102,7 @@ var Source = Backbone.Model.extend({
 					if(value.value != null && value.value != "")
 						params += "<tr><td width='25%'>" + value.name + "</td><td>" + value.value + "</td></tr>"
 				})
+				$('tr.remove-tr-src').remove();
 				$('#sourceparams-table tr:last').after(params);
 			},
 			error: function(resp){

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

@@ -30,6 +30,7 @@ var User = Backbone.Model.extend({
 				if(tble_name == 'ping')
 					$('#pinguser').val(names);
 				else
+				    $('tr.remove-tr-users').remove();
 					$('#users_table tr:last').after(data);
 			},
 			error: function(resp){

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

@@ -55,7 +55,9 @@ App.Views.Doc = Backbone.View.extend({
 		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></table>";
+		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>"
 		
         $(this.el).html(out);
         $('#main_content').html(this.el);

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

@@ -52,22 +52,22 @@ App.Views.Home = Backbone.View.extend({
 		out += "<div class='span12' style='margin-top:20px'><h2>Getting Started with RhoConnect</h2>";
 		out += "<ol style='font-size:18px;margin-top:20px'><li>The Home Screen</li>";
 		out += "<ul style='margin:20px'>"
-		out += "<li>Sync Server URL<p style='margin-top:5px'> This url is the domain of this page appended with 'application'.  This is a convenience function as you will need to paste this url into your rhodes app to sync with rhoconnect</p></li>"
+		out += "<li>Sync Server URL<p style='margin-top:5px'>Use this url in your client application to sync with RhoConnect</p></li>"
 		out += "<li>App partition sources</li><p style='margin-top:5px'>This is a list of all your source adapters partitioned by :app.  Click on the source links to view the attributes and document key/values stored in redis</p>"
 		out += "<li><a class='btn btn-danger'>Reset</a> button</li>"
-		out += "<p style='margin-top:5px'>The reset button will clear the redis db of all data.  <b><em>Be careful when reseting the db as you will lose all your user information and document data.</em></b></p>"
+		out += "<p style='margin-top:5px'>The reset button will clear the redis db of all data.  <b><em>Be careful when resetting the db as you will lose all your user information and document data!</em></b></p>"
 		out += "</ul>"
 		out += "<li>Server Doc</li>";
-		out += 	"<p style='margin:10px'>Enter a dbkey to view the stored value in redis.  You can also set and delete doc values here.</p>"
+		out += 	"<p style='margin:10px'>Enter a key to view the stored value in the database.  You can also set and delete keys here.</p>"
 		out += "<li>Users</li>"
-		out += "<p style='margin:10px'>View a list of registered users here.  You can also create,delete and ping users.  Viewing a particular user will allow you to view source apdapters partitioned by user as well as that users registered devices."
+		out += "<p style='margin:10px'>View a list of registered users here.  You can also create,delete, and ping users.  Viewing a particular user will allow you to view source adapters partitioned by user as well as that user's registered devices."
 		out += "<li>Settings</li><ul style='margin:20px'><li>Change Admin Password</li><p style='margin-top:10px'>By default the admin password is blank.  Here you can change the admin password.</p>"
 		out += "<li>API Token</li><p>View your RhoConnect API Token.  This token needs to be included in all API calls made to RhoConnect</p>"
 		out += "<li>Plugin Settings</li><p style='margin-top:10px'>If you are using Dynamic Adapters (opposed to source adapters) with <a href='http://docs.rhomobile.com/rhoconnect/plugin-intro' target='_blank'>RhoConnect Plugins</a>, you will need to "
 		out += "define your backend app URL here.  For example, if I am using the plugin rhoconnect-rb with my rails app, I would put the URL http://myrailsapp.com here. <em><b>This value needs to be set in order to use RhoConnect Plugins.</b></em></p></ul>"
 		out += "<li>Statistics</li>"
 		out += "<p style='margin-top:10px'>If you do not see a link to Statistics, it is not enabled in your config.ru file.  By default Rhoconnect apps will have this line <code>Rhoconnect::Server.enable  :stats</code> commented out. "
-		out += "Older versions of Rhoconnect will not have this line in the config.ru file at all.  Uncomment or add the line above to enable Statistics.  The Statistics tab will have different graphs to measure metrics/performance for Rhoconnect.</p>"
+		out += "Older versions of RhoConnect will not have this line in the config.ru file at all.  Uncomment or add the line above to enable Statistics.  The Statistics tab will have different graphs to measure metrics/performance for RhoConnect.</p>"
 		out += "</ol></div>"
 		
         $(this.el).html(out);

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

@@ -10,7 +10,7 @@ App.Views.ShowDevice = Backbone.View.extend({
 		this.model.get_client_params(device_id);
 		//this.model.list_client_docs(device_id,'Product');
 		source = new Source();
-		source.set('partition_type','user');
+		source.set('partition_type','all');
 		source.set('user_id',this.model.get('user_id'));
 	    source.set('client_id',device_id);
 		source.set('doctype','client');
@@ -46,8 +46,10 @@ App.Views.ShowDevice = Backbone.View.extend({
 		out += "<div id='showdevice-alert' class='alert alert-error' style='display:none'></div>";
 	    out += "<table id='deviceattr-table' class='table table-bordered'>";
 	    out += "<tr><th><h3>Attributes</h3></th></tr>";
+	    out += "<tr class='remove-tr-client'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 	    out += "</table>";
 		out += "<table id='source-table' class='table table-bordered'><tr><th><h3>Sources for device</h3></th></tr>";
+		out += "<tr class='remove-tr-user'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 		out += "</table>"
 	   
         $(this.el).html(out);

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

@@ -28,8 +28,10 @@ App.Views.ShowUser = Backbone.View.extend({
 		out += "<div id='showuser-alert' class='alert alert-error' style='display:none'></div>";
 	    out += "<table id='source-table' class='table table-bordered'>";
 	    out += "<tr><th><h3>Sources</h3></th></tr>";
+	    out += "<tr class='remove-tr-user'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 	    out += "</table>";
 		out += "<table id='device-table' class='table table-bordered'><tr><th><h3>Registered Devices</h3></th></tr>";
+		out += "<tr class='remove-tr-device'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 		out += "</table>"
 	   
         $(this.el).html(out);

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

@@ -21,8 +21,10 @@ App.Views.SourceDocs = Backbone.View.extend({
 		out  = "<div class='page-header well'><h1>"+source_id+"</h1></div>";
 		out += "<div class='docalert alert-error' style='display:none'></div>";
 	    out += "<table id='sourceparams-table' class='table table-bordered'><thead><tr><th><h3>Attributes</h3></th></tr></thead>";
+	    out += "<tr class='remove-tr-src'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 		out += "</table>";
 	    out += "<table id='sourcedocs-table' class='table table-bordered'><tr><th class='span5'><h3>Documents</h3></th></tr>";
+	    out += "<tr class='remove-tr-docs'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 	    out += "</table>";
         $(this.el).html(out);
         $('#main_content').html(this.el);

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

@@ -1,6 +1,5 @@
 App.Views.Users = Backbone.View.extend({
 	
-	
     initialize: function() {
 		this.render();
 		this.model.get_users('user_table');
@@ -12,6 +11,7 @@ App.Views.Users = Backbone.View.extend({
 	    out += "<table id='users_table' class='table table-bordered'>";
 	    out += "<tr><th><div style='display:inline;font-size:18px'>Registered Users<div class='pull-right'><a href='#users/new' class='btn btn-primary'>Create User</a>";
 	    out += "<a href='#users/newping' class='btn btn-primary' style='margin-left:10px'>Ping Users</a></div></th></tr>";
+	    out += "<tr class='remove-tr-users'><td colspan='2' style='text-align:center'>Loading...</td></tr>"
 	    out += "</table></form>";
 	   
         $(this.el).html(out);

data/rhoconnect.gemspec

@@ -49,5 +49,4 @@ Gem::Specification.new do |s|
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')
   s.add_dependency('thor', '~> 0.14.6')
-  s.add_dependency('thin', '~> 1.3.1')
 end

data/spec/generator/generator_spec.rb

@@ -48,6 +48,9 @@ describe "Generator" do
       FileUtils.rm_rf "/tmp/#{appname}"
       @app_generator = Rhoconnect::AppGenerator.new('/tmp',{},appname)
       @app_generator.invoke!
+      Bundler.with_clean_env do
+        @app_generator.after_run
+      end
       @generator = Rhoconnect::SourceGenerator.new("/tmp/#{appname}",{},source)
     end
     

data/spec/spec_helper.rb

@@ -298,11 +298,8 @@ module TestHelpers
   end
 
   def do_bulk_data_job(params)
-    begin
-      BulkDataJob.perform(params)
-    ensure
-      BulkDataJob.after_perform_x(params)
-    end
+    BulkDataJob.perform(params)
+    BulkDataJob.after_perform_x(params) if BulkData.is_exist?(params["data_name"])
   end
      
 end #TestHelpers