rhoconnect 3.4.5 → 4.0.0.beta.10

data/CHANGELOG.md

@@ -1,7 +1,61 @@
-## 3.4.5 (2013-05-14)
+## 4.0.0.beta.10 (2013-04-18)
+* B-103674 - Add specs for testing blank rhoconnect app (run "rhoconnect" from any directory)
+* B-103671 - RhoConnect JavaScript support added
+* D-05019 - fixed path detection issue on windows for node.js
+* D-05020 - fixed npm install on windows
+* TK-185016 - Initial round of documentation for model/controller framework
+* B-102914 - RhoConnect 4.0 migration guide
+* TK-18647 - Add controller spec template into source adapter generation
+* B-103294 - Update RMS install docs & RhoConnect install docs with RVM autolibs info
+
+## 4.0.0.beta.9 (skipped for RMS version parity)
+
+## 4.0.0.beta.8 (2013-04-02)
+* B-101472 - Validate and fix JRuby-1.7.3 support (in Ruby 1.9.x compatibility (default mode))
+* B-97594 - Model/Controller framework (All Sinatra extenstions, base model class)
+* B-103017 - Model/Controller generators
+* EMBPD00090124 - Rhom models are populated with sync data when page size is set to 0 (bug fix)
+
+## 4.0.0.beta.7 (skipped for RMS version parity)
+
+## 4.0.0.beta.6 (2013-03-19)
+* SPR 23631 - Document Nginx configuration for SSL with self-signed certificate
 * TK-182435 - Run platform validation in parallel (both nightly tests and release jobs)
-* D-04477 - Rack::Session::Cookie security warning printing on every http request
-* B-106356 - Update nginx package to 1.4.1 (CVE-2013-2028)
+* B-100239 - Implement QUERY rc_handler
+* B-101530 - Re-work CUD, Search, BulkData routes rc_handlers
+
+## 4.0.0.beta.5 (skipped for RMS version parity)
+
+## 4.0.0.beta.4 (2013-03-06)
+* B-97597 - Support multiple redis customizations, documentation & package installer updates
+* Updated production stack to ruby-1.9.3-p392, redis-2.6.10, and nginx-1.3.13.
+
+## 4.0.0.beta.3 (2013-02-19)
+* SPR 23549 - Reduce the amount of time it takes to delete users in RhoConnect
+* B-97593 - Rhoconnect Controller Base class for Source Adapters
+* B-98498 - Add specs to cover use-case with multiple Redis instances
+* B-99420 - Increased minimum rack version to 1.5.2. Resolves the following security advisories: CVE-2013-0262, CVE-2013-0263
+* B-03792 - Docs: Added a short section on multiple rhoconnect apps to the RhoConnect Deployment document.
+* B-91170 - Docs: Created RhoConnect API chapters with API information taken from the RhoConnect development chapters.
+
+## 4.0.0.beta.2 (2013-02-05)
+* B-97601 - Refactor rhoconnect redis cli commands
+* TK-173449 - Store support for multiple Redis instances
+* B-97596 - re-factor Store code to provide uniform interface
+* D-04565 - Fixed issue `"#<LoadError: cannot load such file -- rhoconnect/license> on rhoconnect-client"`
+* B-97840 - Documentation added for new rhoconnect cli options
+  * New command line options are available here: http://edgedocs.rhomobile.com/rhoconnect/command-line#rhoconnect-command-line-interface
+  * (See rhoconnect "start" and "restart" additions at end of the list)
+* B-97934 - New "rhoconnect-client" extension build process.  See https://github.com/rhomobile/rhoconnect-client for instructions on how to build it.
+
+## 4.0.0.beta.1 (2013-01-23)
+* Implemented check for valid client documents (from now on any client doc not declared upfront is considered invalid and exception is thrown - thus, making calls like flush_data(*) invalid)
+* Removed deprecation warning from SourceAdapter.initialize method (credential parameter is no longer supported)
+* Update rhoconnect prod stack to ruby-1.9.3-p362 and latest redis (2.6.7) and nginx (1.3.10) releases.
+* Unlocked 'fpm' gem to version >= 0.4.26 (release fixes broken rpm package build tools).
+* Revert prod stack to ruby-1.9.3-p327 due to issue #7629 (https://bugs.ruby-lang.org/issues/7629?utm_source=rubyweekly&utm_medium=email)
+* Update rhoconnect prod stack to ruby-1.9.3-p374
+* Updated RhoConnect CLI: server is capable to start from any directory and accepts parameters (port, redis URL, and others)
 
 ## 3.4.4 (2013-02-27)
 * Updated prod. stack to ruby-1.9.3-p392, redis-2.6.10, and nginx-1.3.13.

data/Gemfile

@@ -24,27 +24,29 @@ platforms :jruby do
   gem 'dbi', ">= 0.4.5"
   gem 'dbd-jdbc', ">= 0.1.4"
   gem 'jruby-openssl', ">= 0.7.4"
+  gem 'puma', "~> 1.6.3"
   gem 'warbler'
 end
 
 group :development do
+  # gem 'debugger'
   gem 'aws-s3', '>= 0.6.2', :require => 'aws/s3'
   gem 'sqlite3', ">= 1.3.3", :platforms => [:ruby, :mswin, :mingw]
   gem 'fog', '>= 1.1.0'
   gem 'ffaker', '~> 1.14.0'
-  gem 'webmock', '~> 1.8.6'
+  gem 'webmock', '~> 1.9.0'
   gem 'SystemTimer', '~> 1.2.3', :platforms => :ruby_18
 end
 
 group :test do
   gem 'rspec', '~> 2.10.0'
-  gem "rcov", '~> 1.0.0', :require => false, :platforms => :ruby_18
-  gem 'simplecov', '>= 0.7.1', :require => false, :platforms => [:ruby_19,:jruby]
-  gem 'rack-test', '>= 0.5.3', :require => 'rack/test'
-  gem 'jasmine', :platforms => :ruby_19
-  gem 'jasmine-headless-webkit', :platforms => :ruby_19
+  gem 'simplecov', '>= 0.7.1', :require => false
+  gem 'simplecov-rcov', '~> 0.2.3'
+  gem 'rack-test', '~> 0.6', :require => 'rack/test'
+  gem 'jasmine', :platforms => [:ruby_19,:jruby]
+  gem 'jasmine-headless-webkit', :platforms => [:ruby_19,:jruby]
 end
 
 group :build do
-  gem 'fpm', '>= 0.4.9'
+  gem 'fpm', '>= 0.4.26'
 end

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.4.5)
+    rhoconnect (4.0.0.beta.10)
       bundler (~> 1.0)
-      connection_pool (= 0.9.2)
+      connection_pool (~> 1.0.0)
       json (~> 1.7.7)
+      ohm (~> 0.1.3)
       rack (~> 1.5.2)
-      rake (~> 0.9.2.2)
+      rake (~> 10.0.0)
       redis (>= 3.0.1)
       resque (>= 1.22.0)
       rest-client (~> 1.6.1)
@@ -29,54 +30,47 @@ GEM
       builder
       mime-types
       xml-simple
-    backports (3.3.0)
+    backports (2.6.2)
     builder (3.2.0)
     cabin (0.6.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (0.6.0)
+    clamp (0.3.1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.2)
-    connection_pool (0.9.2)
+    connection_pool (1.0.0)
     crack (0.3.2)
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.3)
-    excon (0.21.0)
+    excon (0.20.1)
     execjs (1.4.0)
       multi_json (~> 1.0)
     extlib (0.9.16)
     ffaker (1.14.0)
-    ffi (1.8.1)
-    fog (1.11.1)
+    ffi (1.7.0)
+    fog (1.10.1)
       builder
       excon (~> 0.20)
       formatador (~> 0.2.0)
-      json (~> 1.7)
       mime-types
+      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    fpm (0.4.35)
+    fpm (0.4.33)
       arr-pm (~> 0.0.8)
-      backports (>= 2.6.2)
+      backports (= 2.6.2)
       cabin (>= 0.6.0)
-      clamp (= 0.6.0)
-      ftw (~> 0.0.30)
+      clamp (= 0.3.1)
       json (~> 1.7.7)
       open4
-    ftw (0.0.33)
-      addressable
-      backports (>= 2.6.2)
-      cabin (> 0)
-      http_parser.rb (= 0.5.3)
-    highline (1.6.19)
+    highline (1.6.18)
     hike (1.2.2)
-    http_parser.rb (0.5.3)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -90,13 +84,17 @@ GEM
       rainbow
       sprockets (~> 2)
     json (1.7.7)
-    mime-types (1.23)
+    mime-types (1.22)
     mono_logger (1.0.1)
-    multi_json (1.7.3)
-    net-scp (1.1.1)
+    multi_json (1.7.2)
+    nest (1.1.2)
+      redis
+    net-scp (1.1.0)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.7)
     nokogiri (1.5.9)
+    ohm (0.1.5)
+      nest (~> 1.0)
     open4 (1.3.0)
     rack (1.5.2)
     rack-fiber_pool (0.9.3)
@@ -105,10 +103,9 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rainbow (1.1.4)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
+    rake (10.0.4)
+    redis (3.0.3)
+    redis-namespace (1.2.1)
       redis (~> 3.0.0)
     resque (1.24.1)
       mono_logger (~> 1.0)
@@ -137,11 +134,13 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     sinatra (1.4.2)
       rack (~> 1.5, >= 1.5.2)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.9.3)
+    sprockets (2.9.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -156,13 +155,13 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.15.4)
-    tilt (1.4.1)
-    uuidtools (2.1.4)
+    tilt (1.3.7)
+    uuidtools (2.1.3)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    webmock (1.8.11)
+    webmock (1.9.3)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
     websocket (1.0.7)
     xml-simple (1.1.2)
 
@@ -178,19 +177,20 @@ DEPENDENCIES
   eventmachine (~> 1.0.0)
   ffaker (~> 1.14.0)
   fog (>= 1.1.0)
-  fpm (>= 0.4.9)
+  fpm (>= 0.4.26)
   jasmine
   jasmine-headless-webkit
   jdbc-sqlite3 (>= 3.7.2)
   jruby-openssl (>= 0.7.4)
+  puma (~> 1.6.3)
   rack-fiber_pool
-  rack-test (>= 0.5.3)
-  rcov (~> 1.0.0)
+  rack-test (~> 0.6)
   rhoconnect!
   rspec (~> 2.10.0)
   simplecov (>= 0.7.1)
+  simplecov-rcov (~> 0.2.3)
   sqlite3 (>= 1.3.3)
   thin
   warbler
-  webmock (~> 1.8.6)
+  webmock (~> 1.9.0)
   win32-process

data/Rakefile

@@ -12,12 +12,12 @@ require 'rhoconnect'
 
 include Rake::DSL
 #task :default => 'spec:all'
-task :default => ["spec:all","jasmine:headless"]
+task :default => ["npm_install","spec:all","jasmine:headless"]
 task :spec => 'spec:spec'
 
 begin
   require 'rspec/core/rake_task'
-         
+
   TYPES = {
     :spec => 'spec/*_spec.rb',
     :perf => 'spec/perf/*_spec.rb',
@@ -28,9 +28,13 @@ begin
     :stats => 'spec/stats/*_spec.rb',
     :ping => 'spec/ping/*_spec.rb',
     :generator => 'spec/generator/*_spec.rb',
-    :bench     => 'bench/spec/*_spec.rb'
+    :bench     => 'bench/spec/*_spec.rb',
+    :models    => 'spec/models/*_spec.rb',
+    :controllers => 'spec/controllers/**/*_spec.rb',
+    :models    => 'spec/models/**/*_spec.rb',
+    :cli => 'spec/cli/*_spec.rb'
   }
- 
+
   TYPES.each do |type,files|
     desc "Run specs in #{files}"
     RSpec::Core::RakeTask.new("spec:#{type}") do |t|
@@ -50,13 +54,13 @@ begin
       t.rcov_opts = ['--exclude', 'spec/*,gems/*,apps/*,bench/spec/*,json/*']
     end
   end
-  
+
   desc "Run doc generator - dumps out doc/protocol.html"
   RSpec::Core::RakeTask.new('doc') do |t|
     t.pattern = FileList['spec/doc/*_spec.rb']
     t.rcov = false
   end
-  
+
 rescue LoadError => e
   # Array of groups whose gems are not installed
   # if bundle install called with the --without option
@@ -73,6 +77,13 @@ end
 
 # desc "Build rhoconnect gem"
 # task :gem => [ 'spec:all', 'clobber_spec:all', :gemspec, :build ]
+task :build => :npm_install
+
+desc "install npm dependency packages"
+task :npm_install do
+  system "npm install"
+end
+
 
 desc "Run benchmark scripts"
 task :bench do
@@ -128,7 +139,7 @@ def build_pkg(dist, arch, deps)
 
   # cd into the pkg dir so that fpm will create the package into the pkg dir.
   Dir.chdir("./pkg") # it created by build task and should already exist
-   
+
   # Construct fpm command
   fpm_cmd = "fpm -s dir -t #{dist} -n rhoconnect -v #{version} -a #{arch} -C #{build_dir} " +
     "--before-install #{before_install_script} --after-install #{after_install_script} " +

data/bench/benchapp/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rhoconnect', :path => '../../'
 
-gemfile_path = File.join(File.dirname(__FILE__), '..', '..', 'generators','templates', 'application', ".rcgemfile")
+gemfile_path = File.join(File.dirname(__FILE__), '..', '..', 'generators','templates', 'application', "rcgemfile")
 begin 
   eval(IO.read(gemfile_path)) 
 rescue Exception => e

data/bench/benchapp/config.ru

@@ -8,9 +8,6 @@ Rhoconnect::Server.set     :secret,      'cf8e8a1d3653fcfb2332d8b1af9f6762c3c45e
 #Rhoconnect::Server.enable  :stats
 Rhoconnect::Server.disable :logging
 
-# Load RhoConnect application
-require './application'
-
 # Setup the url map
 # run RhoConnect Application
 run Rhoconnect.app

data/bench/benchapp/controllers/ruby/application.rb

@@ -0,0 +1,17 @@
+class ApplicationController < Rhoconnect::Controller::AppBase
+  register Rhoconnect::EndPoint
+
+  post "/login", :rc_handler => :authenticate,
+                 :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']} do
+    login = params[:login]
+    password = params[:password]
+    true # do some interesting authentication here...
+  end
+
+  get "/rps_login", :rc_handler => :rps_authenticate, 
+                    :login_required => true do
+    login = params[:login]
+    password = params[:password]
+    true # optionally handle rhoconnect push authentication...
+  end
+end

data/bench/benchapp/controllers/ruby/application_controller.rb

@@ -0,0 +1,17 @@
+class ApplicationController < Rhoconnect::Controller::AppBase
+  register Rhoconnect::EndPoint
+
+  post "/login", :rc_handler => :authenticate,
+                 :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']} do
+    login = params[:login]
+    password = params[:password]
+    true # do some interesting authentication here...
+  end
+
+  get "/rps_login", :rc_handler => :rps_authenticate, 
+                    :login_required => true do
+    login = params[:login]
+    password = params[:password]
+    true # optionally handle rhoconnect push authentication...
+  end
+end

data/bench/benchapp/controllers/ruby/mock_adapter_controller.rb

@@ -0,0 +1,8 @@
+class MockAdapterController < Rhoconnect::Controller::Base
+  register Rhoconnect::EndPoint
+
+  # register SYNC routes
+  register Rhoconnect::Handler::Sync
+
+  # add your custom routes here
+end

data/bench/benchapp/controllers/ruby/queue_mock_adapter_controller.rb

@@ -0,0 +1,8 @@
+class QueueMockAdapterController < Rhoconnect::Controller::Base
+  register Rhoconnect::EndPoint
+
+  # register SYNC routes
+  register Rhoconnect::Handler::Sync
+
+  # add your custom routes here
+end

data/bench/benchapp/{sources → models/ruby}/mock_adapter.rb

@@ -1,4 +1,4 @@
-class MockAdapter < SourceAdapter
+class MockAdapter < Rhoconnect::Model::Base
   def initialize(source) 
     super(source)
   end

data/bench/benchapp/spec/{sources → models/ruby}/mock_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','spec_helper')
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "MockAdapter" do
   it_should_behave_like "SpecHelper" do

data/bench/benchapp/spec/{sources → models/ruby}/queue_mock_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','spec_helper')
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "QueueMockAdapter" do
   it_should_behave_like "SpecHelper" do

data/bench/benchapp/spec/spec_helper.rb

@@ -14,7 +14,7 @@ end
 
 $:.unshift File.join(File.dirname(__FILE__), "..")
 # Load our rhoconnect application
-require 'application'
+require 'rhoconnect/application/init'
 include Rhoconnect
 
 require 'rhoconnect/test_methods'
@@ -23,7 +23,7 @@ shared_examples_for "SpecHelper" do
   include Rhoconnect::TestMethods
   
   before(:each) do
-    Store.db.flushdb
+    Store.flush_all
     Application.initializer(ROOT_PATH)
   end  
 end

data/bench/blobapp/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rhoconnect', :path => '../../'
 
-gemfile_path = File.join(File.dirname(__FILE__), '..', '..', 'generators','templates', 'application', ".rcgemfile")
+gemfile_path = File.join(File.dirname(__FILE__), '..', '..', 'generators','templates', 'application', "rcgemfile")
 begin 
   eval(IO.read(gemfile_path)) 
 rescue Exception => e

data/bench/blobapp/config.ru

@@ -7,9 +7,6 @@ Rhoconnect::Server.set     :secret, '096a8a4212b18d2b281d377f2c350421898a21fec78
 # For example, uncomment the following line to enable Stats
 #Rhoconnect::Server.enable  :stats
 
-# Load RhoConnect application
-require './application'
-
 # Setup the url map
 # run RhoConnect Application
 run Rhoconnect.app

data/bench/blobapp/controllers/ruby/application_controller.rb

@@ -0,0 +1,17 @@
+class ApplicationController < Rhoconnect::Controller::AppBase
+  register Rhoconnect::EndPoint
+
+  post "/login", :rc_handler => :authenticate,
+                 :deprecated_route => {:verb => :post, :url => ['/application/clientlogin', '/api/application/clientlogin']} do
+    login = params[:login]
+    password = params[:password]
+    true # do some interesting authentication here...
+  end
+
+  get "/rps_login", :rc_handler => :rps_authenticate, 
+                    :login_required => true do
+    login = params[:login]
+    password = params[:password]
+    true # optionally handle rhoconnect push authentication...
+  end
+end

data/bench/blobapp/controllers/ruby/blob_adapter_controller.rb

@@ -0,0 +1,8 @@
+class BlobAdapterController < Rhoconnect::Controller::Base
+  register Rhoconnect::EndPoint
+
+  # register SYNC routes
+  register Rhoconnect::Handler::Sync
+
+  # add your custom routes here
+end

data/bench/blobapp/{sources → models/ruby}/blob_adapter.rb

@@ -1,4 +1,4 @@
-class BlobAdapter < SourceAdapter
+class BlobAdapter < Rhoconnect::Model::Base
   def initialize(source) 
     super(source)
   end
@@ -58,6 +58,14 @@ class BlobAdapter < SourceAdapter
     # TODO: Logout from the data source if necessary
   end
 
+  def store_blob(object, field_name, blob)
+    # Pass to BlobAdapter path to image and its original name 
+    if blob
+      object['filename']  = blob[:filename]
+      object['image_uri'] = blob[:tempfile].path
+    end      
+  end
+
   private
   
   def db_name
@@ -67,5 +75,4 @@ class BlobAdapter < SourceAdapter
   def lock_name
     "lock:#{db_name}"
   end
-
 end

data/bench/blobapp/spec/{sources → models/ruby}/blob_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'..','spec_helper')
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "BlobAdapter" do
   it_should_behave_like "SpecHelper" do

data/bench/blobapp/spec/spec_helper.rb

@@ -23,7 +23,7 @@ shared_examples_for "SpecHelper" do
   include Rhoconnect::TestMethods
   
   before(:each) do
-    Store.db.flushdb
+    Store.flush_all
     Application.initializer(ROOT_PATH)
   end  
 end

data/bench/lib/bench/cli.rb

@@ -21,7 +21,7 @@ module Bench
       Statistics.new(Bench.concurrency,Bench.iterations,
         Bench.total_time,Bench.start_time,Bench.end_time,Bench.sessions).process.print_stats.save_results
       bench_log "Bench completed..."
-      Bench.reset_app
+      #Bench.reset_app
     end
   end
   

data/bench/scripts/blob_cud_script.rb

@@ -50,7 +50,7 @@ Bench.test do |config, session|
   body = { :cud =>  {:source_name => 'BlobAdapter',
     :blob_fields => ['img_file-rhoblob'], :create => create_objs}.to_json 
   }
-  session.post "create-object", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}/queue_updates",
+  session.post "create-object", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
     {:content_type => :json, 'X-RhoConnect-CLIENT-ID' => session.client_id} do
       body.merge!(Bench.get_image_data(create_objs)) # Add images to miltipart post
     end

data/bench/scripts/query_md_script.rb

@@ -47,5 +47,5 @@ Bench.test do |config,session|
     end
   session.last_result.verify_code(200)
   session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
-    {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)
+    {:progress_count => 0},{:total_count => @datasize},{}].to_json)
 end  

data/bench/scripts/query_only_script.rb

@@ -55,5 +55,5 @@ Bench.test do |config,session|
     end
   session.last_result.verify_code(200)
   session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
-    {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)
+    {:progress_count => 0},{:total_count => @datasize},{}].to_json)
 end  

data/bench/scripts/query_script.rb

@@ -45,5 +45,5 @@ Bench.test do |config,session|
     end
   session.last_result.verify_code(200)
   session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
-    {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)
+    {:progress_count => 0},{:total_count => @datasize},{}].to_json)
 end

data/bench/scripts/test_query_script.rb

@@ -28,10 +28,16 @@ Bench.config do |config|
       data_to_create = data_to_create - nobjects
     end
     # also, simulate load for incremental syncs
-    @incr_expected = 25
+    @incr_expected = 130
+    incr_data_page = Bench.get_test_data(@incr_expected, true)
+    config.set_server_state("test_db_storage:application:mquser",incr_data_page)
+    
+    @incr_expected = 250
     incr_data_page = Bench.get_test_data(@incr_expected, true)
     config.set_server_state("test_db_storage:application:nquser",incr_data_page)
     
+    #exit(1)
+
     #config.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
     config.set_simulate_time('RhoInternalBenchmarkAdapter', Bench.simtime)
   end

data/bench/spec/mock_adapter_spec.rb

@@ -1,6 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__))
 require 'bench_spec_helper'
-require 'benchapp/sources/mock_adapter'
+require 'benchapp/models/ruby/mock_adapter'
 
 describe "MockAdapter" do
   # it_should_behave_like "BenchSpecHelper" 

data/bench/spec/result_spec.rb

@@ -21,15 +21,15 @@ describe "ResultSpec" do
 
     describe "test @last_response wrapper" do
 
-      it "shold return 'code'" do
+      it "should return 'code'" do
         @result.code.should == 200
       end
 
-      it "shold return 'body'" do
+      it "should return 'body'" do
         JSON.parse(@result.body).should == @s1
       end
 
-      it "shold return 'cookies'" do
+      it "should return 'cookies'" do
         @result.cookies.should == {'session1'=>'sessval1'}
       end