rhoconnect 3.0.1 → 3.0.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.2 (2011-10-05)
+* #19143845 - support sinatra 1.3.x
+
 ## 3.0.1 (2011-10-04)
 * fix to lock in sinatra 1.2.7
 

data/Gemfile

@@ -15,6 +15,7 @@ gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
 
 group :development do
   gem 'fpm', '>= 0.3.8'
+  gem 'fog', '>= 1.0.0' 
   gem 'ffaker', '~> 1.8.0'
   gem 'thor', '>= 0.13.6'
   gem 'webmock', '~> 1.6.4'

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.0.1)
+    rhoconnect (3.0.2)
       bundler (~> 1.0)
       json (~> 1.5.0)
       rake (= 0.9.2)
       redis (>= 2.2.0)
-      resque (~> 1.17.0)
+      resque (~> 1.18.0)
       rest-client (~> 1.6.1)
       rubyzip (~> 0.9.4)
-      sinatra (= 1.2.7)
+      sinatra (~> 1.3)
       templater (~> 1.0.0)
       uuidtools (>= 2.1.1)
 
@@ -17,37 +17,45 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
-    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.0)
     crack (0.3.1)
-    dbd-jdbc (0.1.4)
-    dbi (0.4.5)
-      deprecated (= 2.0.1)
-    deprecated (2.0.1)
     diff-lcs (1.1.3)
+    excon (0.7.6)
     extlib (0.9.15)
     ffaker (1.8.1)
+    fog (1.0.0)
+      builder
+      excon (~> 0.7.3)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0.3)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.1.4)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.1)
     fpm (0.3.9)
       json
     highline (1.6.2)
-    jdbc-sqlite3 (3.7.2)
-    jruby-jars (1.6.4)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    jruby-rack (1.0.10)
     json (1.5.4)
-    json (1.5.4-java)
     mime-types (1.16)
-    rack (1.3.3)
+    multi_json (1.0.3)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.1.4)
+    nokogiri (1.5.0)
+    rack (1.3.4)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2)
     rcov (0.9.10)
-    rcov (0.9.10-java)
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.17.1)
-      json (< 1.6, >= 1.4.6)
+    resque (1.18.6)
+      multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
@@ -61,10 +69,12 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    ruby-hmac (0.4.0)
     rubyzip (0.9.4)
-    sinatra (1.2.7)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    sinatra (1.3.1)
+      rack (>= 1.3.4, ~> 1.3)
+      rack-protection (>= 1.1.2, ~> 1.1)
+      tilt (>= 1.3.3, ~> 1.3)
     sqlite3 (1.3.4)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
@@ -75,23 +85,18 @@ GEM
     uuidtools (2.1.2)
     vegas (0.1.8)
       rack (>= 1.0.0)
-    warbler (1.3.2)
-      jruby-jars (>= 1.4.0)
-      jruby-rack (>= 1.0.0)
-      rake (>= 0.8.7)
-      rubyzip (>= 0.9.4)
     webmock (1.6.4)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   dbd-jdbc (>= 0.1.4)
   dbi (>= 0.4.5)
   ffaker (~> 1.8.0)
+  fog (>= 1.0.0)
   fpm (>= 0.3.8)
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 load 'tasks/redis.rake'
+load 'installer/utils/nix_installation.rake'
 
 require 'bundler'
 Bundler.setup(:default, :development, :test)
@@ -34,6 +35,7 @@ begin
     RSpec::Core::RakeTask.new("spec:#{type}") do |t|
       t.rspec_opts = ["-b", "-c", "-fd"]
       t.pattern = FileList[TYPES[type]]
+      t.rcov = false
     end
   end
 
@@ -91,8 +93,8 @@ end
 
 # Debian and RPM package building tasks
 def build_pkg(dist, arch, deps)
-  curr_dir       = `pwd`.strip
-  workspace      = "#{curr_dir}/pkg/workspace" 
+  start_dir       = `pwd`.strip
+  workspace      = "#{start_dir}/pkg/workspace" 
   version        = Rhoconnect::VERSION
   description    = '"Rhoconnect production environment"'
   post_install   = "#{workspace}/unix-like/post-install.sh"
@@ -129,6 +131,8 @@ def build_pkg(dist, arch, deps)
   system(fpm_cmd)
   # Leave no trace...
   system("rm -rf #{workspace}")
+
+  Dir.chdir(start_dir)
 end #build_pkg
 
 desc "Build Debian DEB rhoconnect-#{Rhoconnect::VERSION}_all.deb package into the pkg directory"

data/doc/benchmarks.txt

@@ -1,10 +1,13 @@
 RhoConnect Benchmarks
 ===
 
-Note, these numbers reflect synchronization performance using the rhoconnect bench utility (see the rhoconnect/bench folder for more information).  
+Note, these numbers reflect synchronization performance using the rhoconnect bench utilities (see the rhoconnect/bench folder for more information).  
 We will be adding more results as we test across different server environments.
 
-
+## Single-core Amazon EC2 server environment
+ 
+### Configuration
+ 
 Servers configuration (Amazon EC2 'm1.small' instances) :
 
 * CPU Units - 1 ECU
@@ -15,7 +18,6 @@ Servers configuration (Amazon EC2 'm1.small' instances) :
 
 * Platform - Ubuntu (2.6.38-8-virtual)
 
-
 Environment (instance #1):
 
 * Nginx 1.0.0
@@ -77,7 +79,7 @@ Environment (instance #2):
 Server instance #1 is running rhoconnect bench applications, 
 the 2nd one executes rhoconnect bench scripts. 
 
-## Bench application #1
+### Bench application #1 (benchapp)
 * Simulates creating multiple objects
 
 * 100 concurrent users
@@ -100,7 +102,7 @@ Throughput(req/s)      : 7.13629650622702
 Throughput(req/min)    : 428.177790373621
 </pre>
 
-## Bench application #2
+### Bench application #2 (blobapp)
 * Simulates creating multiple objects
 
 * 100 concurrent users
@@ -123,7 +125,7 @@ Throughput(req/s)  : 7.22833609137099
 Throughput(req/min): 433.700165482259
 </pre>
 
-## Prepare bench applications for running on server #1
+### Prepare bench applications for running on server #1
 
 Go to rhoconnect/bench directory and configure benchapp application: 
 
@@ -149,7 +151,7 @@ running by visiting its web concole, i.e. :
 http://server_dns_public_name/console/ 
 </pre>
 
-## How to execute bench scripts on server #2
+### How to execute bench scripts on server #2
 Before running bench scripts you need configure bench application settings properly. 
 
 Edit rhoconnect/bench/benchapp/settings/settings.yml and set redis and syncserver properties:
@@ -164,5 +166,107 @@ Do the same for blobapp settings.yml file.
 
 Then from rhoconnect/becnh directory execute run_cud_script.sh and run_blob_script.sh scripts respectively.
 
+## Multi-core Amazon EC2 server environments
+
+### Configuration
+ 
+Server configurations:
+
+* Large (m1.large, 2 cores, 7.5GB memory)
+
+* Extra Large (m1.xlarge, 4 cores, 15GB memory)
+
+* High-CPU Extra Large (c1.xlarge, 8 cores, 7GB memory)
+
+* Platform - Basic 64-bit Amazon Linux AMI 2011.09 (Red Hat based)
+
+Software environment:
+
+* Nginx 1.0.6
+
+* Ruby 1.8.7 (2011-02-18 patchlevel 334) [i686-linux], Ruby Enterprise Edition 2011.03
+ 
+* Passenger 3.0.9
+
+* Redis 2.2.14
+
+* Rhoconnect 3.0.0 
+
+All above software are installed on servers by executing the following commands:
+<pre>
+sudo yum install make patch gcc-c++ zlib-devel curl-devel pcre-devel readline-devel openssl-devel
+sudo rpm -i rhoconnect-3.0.0.noarch.rpm
+</pre>
+
+### Tested bench application (benchapp)
+
+* Simulates creating multiple objects
+
+* 100 concurrent users
+
+* 1 device per user
+
+* 20 object dataset
+
+* each object has 7 attributes 
+
+### Prepare bench application for running on servers
  
+1. Go to rhoconnect/bench directory and configure benchapp application: 
+   <pre>
+sudo cp -R benchapp /opt/nginx/html
+cd /opt/nginx/html/benchapp
+sudo /opt/rhoconnect/bin/bundle install --without=test development
+sudo mkdir public
+sudo chown -R nginx:nginx /opt/nginx/html/benchapp
+   </pre> 
+
+2. Edit '/opt/nginx/conf/conf.d/rhoconnect.conf' file and point root entry to <b>/opt/nginx/html/benchapp/public</b> directory: 
+   <pre>
+server {
+  listen      80;
+  root  /opt/nginx/html/benchapp/public;
+  passenger_enabled on;
+}
+   </pre>
+
+3. Start redis and nginx servers:
+   <pre>
+sudo /etc/init.d/redis start
+sudo /etc/init.d/nginx start
+   </pre> 
+
+### Benchmark results for large (2 cores) server
+<pre>
+Request clientcreate   : min: 0.0058, max: 1.0360, avg: 0.1138, err: 0, verification err: 0
+Request ack-cud        : min: 0.0258, max: 0.1998, avg: 0.0642, err: 0, verification err: 0
+Request clientlogin    : min: 0.0056, max: 0.0958, avg: 0.0128, err: 0, verification err: 0
+Request get-cud        : min: 0.0234, max: 0.1777, avg: 0.0476, err: 0, verification err: 0
+Request create-object  : min: 0.0526, max: 0.3074, avg: 0.1242, err: 0, verification err: 0
+Throughput(req/s)  : 8.40951725551376
+Throughput(req/min): 504.571035330826
+</pre>
+
+### Benchmark results for extra large (4 cores) server
+<pre>
+Request clientcreate   : min: 0.0080, max: 1.0194, avg: 0.0944, err: 0, verification err: 0
+Request ack-cud        : min: 0.0298, max: 0.1381, avg: 0.0573, err: 0, verification err: 0
+Request clientlogin    : min: 0.0091, max: 0.0591, avg: 0.0152, err: 0, verification err: 0
+Request get-cud        : min: 0.0259, max: 0.1679, avg: 0.0443, err: 0, verification err: 0
+Request create-object  : min: 0.0618, max: 0.2778, avg: 0.1112, err: 0, verification err: 0
+Throughput(req/s)  : 8.19117682939103
+Throughput(req/min): 491.470609763462
+</pre>
+
+### Benchmark results for high-cpu extra large (8 cores) server
+<pre>
+Request clientcreate   : min: 0.0083, max: 1.0162, avg: 0.0741, err: 0, verification err: 0
+Request ack-cud        : min: 0.0277, max: 0.1803, avg: 0.0525, err: 0, verification err: 0
+Request clientlogin    : min: 0.0092, max: 0.0681, avg: 0.0147, err: 0, verification err: 0
+Request get-cud        : min: 0.0259, max: 0.1729, avg: 0.0474, err: 0, verification err: 0
+Request create-object  : min: 0.0599, max: 0.2850, avg: 0.1102, err: 0, verification err: 0
+Throughput(req/s)  : 8.08355941878833
+Throughput(req/min): 485.0135651273
+</pre>
 
+All above results produced by bench script <b>cud_script</b> hosted by large (2 cores) EC2 server.

data/examples/simple/config.ru

@@ -25,7 +25,7 @@ Rhoconnect::Server.disable :run
 Rhoconnect::Server.disable :clean_trace
 Rhoconnect::Server.enable  :raise_errors
 Rhoconnect::Server.set     :root,        ROOT_PATH
-Rhoconnect::Server.enable  :stats
+#Rhoconnect::Server.enable  :stats
 Rhoconnect::Server.set     :secret, '3ddaa72a36466bae3fc5e54c09324db50cfc30588d8dee1a2700e61195bdbbb5eeb65da2a184d274ce644b20b0e986046c2447730c85555ce18a4eb2fce7ebf5'
 Rhoconnect::Server.use     Rack::Static, :urls => ["/data"], :root => Rhoconnect::Server.root
                      

data/generators/templates/application/config.ru

@@ -3,9 +3,12 @@ require 'rubygems'
 require 'bundler'
 Bundler.require
 
+ROOT_PATH = File.expand_path(File.dirname(__FILE__))
+
 if ENV['DEBUG'] == 'yes'
-  ENV['APP_TYPE'] = 'rhosync'
-  require 'debugger'
+ ENV['APP_TYPE'] = 'rhosync'
+ ENV['ROOT_PATH'] = ROOT_PATH
+ require 'debugger'
 end
 
 # Try to load vendor-ed rhoconnect, otherwise load the gem
@@ -20,7 +23,6 @@ end
 # By default, turn on the resque web console
 require 'resque/server'
 
-ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 
 # Rhoconnect server flags
 Rhoconnect::Server.disable :run

data/installer/utils/nix_install_test.rb

@@ -1,9 +1,10 @@
-#! /usr/bin/env ruby
+$:.unshift File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'installer', 'utils'))
 
-require 'net/http'
-require 'constants'
 require 'rubygems'
 require 'fog'
+require 'net/http'
+require 'constants'
 require 'readline'
 
 # METHODS
@@ -202,6 +203,7 @@ end #compute_time
 
 # SCRIPT
 
+### This part has been set as a dependency in the :test rake task
 # Create Packages
 
 # Creating debian package

data/installer/utils/nix_installation.rake

@@ -1,3 +1,7 @@
-#! /usr/bin/env ruby
-
-
+namespace :rc_pkg do
+  desc 'Test creation and installation of both DEB and RPM rhoconnect packages.'
+  task :test => ['build:deb', 'build:rpm'] do
+    # Run installation test
+    sudo ruby "installer/utils/nix_install_test.rb"
+  end #:test
+end #:rc_pkg

data/lib/rhoconnect/body_content_type_parser.rb

@@ -0,0 +1,29 @@
+module Rhoconnect
+  class BodyContentTypeParser
+
+    # Constants
+    #
+    CONTENT_TYPE = 'CONTENT_TYPE'.freeze
+    POST_BODY = 'rack.input'.freeze
+    FORM_INPUT = 'rack.request.form_input'.freeze
+    FORM_HASH = 'rack.request.form_hash'.freeze
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env['CONTENT_TYPE'] && env['CONTENT_TYPE'].match(/^application\/json/) 
+        begin
+          if (body = env[POST_BODY].read).length != 0
+            env.update(FORM_HASH => JSON.parse(body), FORM_INPUT => env[POST_BODY])
+          end
+        rescue JSON::ParserError => jpe
+          log jpe.message + jpe.backtrace.join("\n")
+          return [500, {'Content-Type' => 'text/plain'}, ["Server error while processing client data"]]
+        end
+      end
+      @app.call(env)
+    end
+  end
+end

data/lib/rhoconnect/console/server.rb

@@ -14,9 +14,9 @@ module RhoconnectConsole
   end  
 
   class Server < Sinatra::Base
-    set :views,  RhoconnectConsole::root_path("app","views")
-    set :public, RhoconnectConsole::root_path("app","public")
-    set :static, true    
+    set :views,         RhoconnectConsole::root_path("app","views")
+    set :public_folder, RhoconnectConsole::root_path("app","public")
+    set :static,        true    
     use Rack::Session::Cookie
     HEROKU_NAV = ENV['INSTANCE_ID'] ? RestClient.get('http://nav.heroku.com/v1/providers/header') : nil
     before do

data/lib/rhoconnect/cors.rb

@@ -18,7 +18,7 @@ module Rack
         env['HTTP_ORIGIN'] = 'file://'
       end
       if env['HTTP_X_ORIGIN'] and not env['HTTP_ORIGIN']
-        puts 'ORIGIN header is empty, X-ORIGIN workaround header applied.'
+        log 'ORIGIN header is empty, X-ORIGIN workaround header applied.'
         env['HTTP_ORIGIN'] = env['HTTP_X_ORIGIN']
       end
       cors_headers = nil

data/lib/rhoconnect/server.rb

@@ -3,8 +3,10 @@ require 'sinatra/base'
 require 'erb'
 require 'json'
 require 'fileutils'
+#require 'rack/contrib'
 require 'rhoconnect'
 require 'rhoconnect/x_domain_session_wrapper'
+require 'rhoconnect/body_content_type_parser'
 require 'rhoconnect/cors'
 
 module Rhoconnect
@@ -19,15 +21,13 @@ module Rhoconnect
     
   class Server < Sinatra::Base
     libdir = File.dirname(File.expand_path(__FILE__))
-    set :views,  "#{libdir}/server/views"
-    set :public, "#{libdir}/server/public"
-    set :static, true
-    
+    set :views,         "#{libdir}/server/views"
+    set :public_folder, "#{libdir}/server/public"
+    set :static,        true
+    set :stats,         false
+
     # default secret
     @@secret = '<changeme>'
-    
-    # stats middleware disabled by default
-    @@stats = false
                                                                                          
     # Setup route and mimetype for bulk data downloads
     # TODO: Figure out why "mime :data, 'application/octet-stream'" doesn't work
@@ -62,7 +62,7 @@ module Rhoconnect
       def login
         if params[:login] == 'rhoadmin'
           user = User.authenticate(params[:login], params[:password])
-        elsif current_app and current_app.can_authenticate?
+        elsif current_app and current_app.can_authenticate? and params[:login]
           user = current_app.authenticate(params[:login], params[:password], session)
         end
         if user
@@ -151,7 +151,7 @@ module Rhoconnect
       def mark_deprecated_call_and_reroute(name, namespace, *params)
         namespace_val = namespace.nil? ? "<namespace>" : "#{namespace}"
         http_method = request.get? ? "GET" : "POST"
-        warning_message = "Use of the #{http_method} #{request.route} is deprecated. Use #{http_method} /api/#{namespace_val}/#{name} instead."
+        warning_message = "Use of the #{http_method} #{request.path} is deprecated. Use #{http_method} /api/#{namespace_val}/#{name} instead."
         response.headers['Warning'] = warning_message
         Rhoconnect.log warning_message
         if namespace != nil  
@@ -177,17 +177,10 @@ module Rhoconnect
       end
     end
     
+    # TODO: Load middleware statically
     # hook into new so we can enable middleware
     def self.new
-      if @@stats == true
-        use Rhoconnect::Stats::Middleware 
-        Rhoconnect.stats = true
-      end
       use XDomainSessionWrapper
-      use Rack::Session::Cookie,
-            :key => 'rhoconnect_session',
-            :expire_after => Rhoconnect.cookie_expire,
-            :secret => @@secret     
       use Rack::Cors do |cfg|
         cfg.allow do |allow|
           allow.origins /.*/
@@ -197,18 +190,27 @@ module Rhoconnect
           allow.resource '/api/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
         end
       end
-      super
-    end
-    
-    def self.set(option, value=self, &block)
-      @@stats = value if option == :stats and (value.is_a?(TrueClass) or value.is_a?(FalseClass))
-      @@secret = value if option == :secret and value.is_a?(String)
+      use Rhoconnect::BodyContentTypeParser
+      
+      if settings.respond_to?(:stats) and settings.send(:stats) == true
+        use Rhoconnect::Stats::Middleware 
+        Rhoconnect.stats = true
+      else
+        Rhoconnect::Server.disable :stats
+        Rhoconnect.stats = false
+      end
+
+      Rhoconnect::Server.set :secret, @@secret unless settings.respond_to?(:secret)
+      use Rack::Session::Cookie,
+            :key => 'rhoconnect_session',
+            :expire_after => Rhoconnect.cookie_expire,
+            :secret => Rhoconnect::Server.secret
       super
     end
         
     def initialize
       # Whine about default session secret
-      check_default_secret!(@@secret)
+      check_default_secret!(Rhoconnect::Server.secret)
       super
     end
     
@@ -223,12 +225,7 @@ module Rhoconnect
           cud = JSON.parse(params["cud"])
           params.delete("cud")
           params.merge!(cud)
-        end
-        #application/json; charset=UTF-8
-        if request.env['CONTENT_TYPE'] && request.env['CONTENT_TYPE'].match(/^application\/json/)
-          params.merge!(JSON.parse(request.body.read))
-          request.body.rewind
-        end      
+        end     
       rescue JSON::ParserError => jpe
         log jpe.message + jpe.backtrace.join("\n")
         throw :halt, [500, "Server error while processing client data"]
@@ -239,7 +236,6 @@ module Rhoconnect
       if params[:version] and params[:version].to_i < 3
         throw :halt, [404, "Server supports version 3 or higher of the protocol."]
       end
-      #log "request params: #{params.inspect}"
     end
 
     %w[get post].each do |verb|
@@ -272,12 +268,12 @@ module Rhoconnect
     def self.api(name, namespace = nil, verb = :post, &block)
       old_api_prefix = (namespace == :application) ? :application : :api
       client_call = (namespace == :application) ? true : false
-      send verb, "/#{old_api_prefix}/#{name}" do
-        mark_deprecated_call_and_reroute(name, namespace, &block)
+      send verb, "/#{old_api_prefix}/#{name}" do 
+        mark_deprecated_call_and_reroute(name, namespace, params, &block)
       end
       
       send verb, "/api/#{namespace}/#{name}" do
-        execute_api_call client_call, &block
+        execute_api_call(client_call, &block)
       end
     end
   end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/rhoconnect.gemspec

@@ -37,13 +37,13 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency('bundler', '~> 1.0')  
-  s.add_dependency("sinatra", '= 1.2.7')
+  s.add_dependency("sinatra", '~> 1.3')
   s.add_dependency('rake', '0.9.2')
   s.add_dependency('json', '~> 1.5.0')
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')
   s.add_dependency('redis', '>= 2.2.0')
-  s.add_dependency('resque', '~> 1.17.0')
+  s.add_dependency('resque', '~> 1.18.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')  
 end

data/spec/api/admin/stats_spec.rb

@@ -2,12 +2,17 @@ require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiStats" do
   it_should_behave_like "ApiHelper" do
+    
+    def app
+      @app ||= Rhoconnect::Server.new
+    end
+    
     before(:each) do
-      Rhoconnect.stats = true
+      Rhoconnect::Server.set :stats, true
     end
-
+    
     after(:each) do
-      Rhoconnect.stats = false
+      Rhoconnect::Server.set :stats, false
     end
 
     it "should retrieve metric names" do
@@ -54,7 +59,7 @@ describe "RhoconnectApiStats" do
     end
 
     it "should raise error if stats not enabled" do
-      Rhoconnect.stats = false
+      Rhoconnect::Server.set :stats, false
       post "/api/admin/stats", {
         :api_token => @api_token, 
         :metric => 'foo'

data/spec/api/api_helper.rb

@@ -6,6 +6,7 @@ require File.join(File.dirname(__FILE__),'..','spec_helper')
 require File.join(File.dirname(__FILE__), '..', 'support', 'shared_examples')
 
 def app
+  Rhoconnect::Server.set :stats, false
   @app ||= Rhoconnect::Server.new
 end
 

data/spec/server/cors_spec.rb

@@ -28,7 +28,7 @@ describe "CORS middleware" do
   end
 
   before(:each) do
-    @app ||= StubApp.new
+    @app = StubApp.new
 
     @middleware = Rack::Cors.new @app, {} do |cfg|
         cfg.allow do |allow|

data/spec/server/server_spec.rb

@@ -32,7 +32,7 @@ describe "Server" do
     end
 
     it "should login if content-type contains extra parameters" do
-      post "/api/admin/login", {"login" => 'rhoadmin', "password" => ''}.to_json, {'CONTENT_TYPE'=>'application/json; charset=UTF-8'} 
+      post "/api/admin/login", {"login" => 'rhoadmin', "password" => ''}.to_json, {'CONTENT_TYPE'=>'application/json; charset=UTF-8'}       
       last_response.should be_ok
     end
 
@@ -56,11 +56,13 @@ describe "Server" do
     end
 
     it "should use Stats::Middleware if stats enabled" do
+      Rhoconnect::Server.server = nil
       Rhoconnect::Server.enable :stats
       Rhoconnect::Server.new
       Rhoconnect.stats.should == true
       Rhoconnect.stats = nil
       Rhoconnect::Server.disable :stats
+      Rhoconnect::Server.server = nil
     end
 
     it "should update session secret to default" do
@@ -253,11 +255,10 @@ describe "Server" do
         last_response.body.should == "Server error while processing client data"
       end
 
-      it "should handle client posting broken body" do
-        broken_json = ['foo']
-        post "/api/application/queue_updates", broken_json, {'CONTENT_TYPE'=>'application/json'}
-        last_response.status.should == 500
-        last_response.body.should == "Internal server error"
+      it "should not login if login is empty" do
+        post "/api/application/clientlogin", ''
+        last_response.status.should == 401
+        last_response.body.should == ""
       end
 
       it "should get inserts json" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -38,14 +38,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 9
         segments: 
         - 1
-        - 2
-        - 7
-        version: 1.2.7
+        - 3
+        version: "1.3"
   version_requirements: *id002
   name: sinatra
 - !ruby/object:Gem::Dependency 
@@ -136,12 +135,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 83
+        hash: 95
         segments: 
         - 1
-        - 17
+        - 18
         - 0
-        version: 1.17.0
+        version: 1.18.0
   version_requirements: *id008
   name: resque
 - !ruby/object:Gem::Dependency 
@@ -369,6 +368,7 @@ files:
 - lib/rhoconnect/api/user/update_user.rb
 - lib/rhoconnect/api_token.rb
 - lib/rhoconnect/app.rb
+- lib/rhoconnect/body_content_type_parser.rb
 - lib/rhoconnect/bulk_data/bulk_data.rb
 - lib/rhoconnect/bulk_data/syncdb.index.schema
 - lib/rhoconnect/bulk_data/syncdb.schema
@@ -538,7 +538,7 @@ files:
 - spec/ping/apple_spec.rb
 - spec/ping/blackberry_spec.rb
 - spec/read_state_spec.rb
-- spec/rhosync_spec.rb
+- spec/rhoconnect_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/server_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
@@ -663,7 +663,7 @@ test_files:
 - spec/ping/apple_spec.rb
 - spec/ping/blackberry_spec.rb
 - spec/read_state_spec.rb
-- spec/rhosync_spec.rb
+- spec/rhoconnect_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/server_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb