rhoconnect 3.0.6 → 3.1.0.beta1

data/spec/source_sync_spec.rb

@@ -121,27 +121,27 @@ describe "SourceSync" do
 
       describe "create" do
         it "should do create where adapter.create returns nil" do
-          set_state(@c.docname(:create) => {'2'=>@product2})
-          @ss.create(@c.id)
+          set_zstate({@s.docname(:create) => {'2'=>@product2}}, @c.id, true)
+          @ss.create
+          verify_zresult(@s.docname(:create) => [])
           verify_result(@c.docname(:create_errors) => {},
-            @c.docname(:create_links) => {},
-            @c.docname(:create) => {})
+            @c.docname(:create_links) => {})
         end
 
         it "should do create where adapter.create returns object link" do
           @product4['link'] = 'test link'
-          set_state(@c.docname(:create) => {'4'=>@product4})
-          @ss.create(@c.id)
+          set_zstate({@s.docname(:create) => {'4'=>@product4}},@c.id,true)
+          @ss.create
+          verify_zresult(@s.docname(:create) => [])
           verify_result(@c.docname(:create_errors) => {},
-            @c.docname(:create_links) => {'4'=>{'l'=>'backend_id'}},
-            @c.docname(:create) => {})
+            @c.docname(:create_links) => {'4'=>{'l'=>'backend_id'}})
         end
 
         it "should raise exception on adapter.create" do
           msg = "Error creating record"
           data = add_error_object({'4'=>@product4,'2'=>@product2},msg)
-          set_state(@c.docname(:create) => data)
-          @ss.create(@c.id)
+          set_zstate({@s.docname(:create) => data},@c.id, true)
+          @ss.create
           verify_result(@c.docname(:create_errors) => 
             {"#{ERROR}-error"=>{"message"=>msg},ERROR=>data[ERROR]})
         end
@@ -149,44 +149,46 @@ describe "SourceSync" do
 
       describe "update" do
         it "should do update with no errors" do
-          set_state(@c.docname(:update) => {'4'=> { 'price' => '199.99' }})
-          @ss.update(@c.id)
-          verify_result(@c.docname(:update_errors) => {},
-            @c.docname(:update) => {})
+          set_zstate({@s.docname(:update) => {'4'=> { 'price' => '199.99' }}},@c.id,true)
+          @ss.update
+          verify_zresult(@s.docname(:update) => [])
+          verify_result(@c.docname(:update_errors) => {})
         end
 
         it "should do update with errors" do
           msg = "Error updating record"
           data = add_error_object({'4'=> { 'price' => '199.99' }},msg)
-          set_state(@c.docname(:update) => data,
-            @c.docname(:cd) => { ERROR => { 'price' => '99.99' } }
+          set_zstate({@s.docname(:update) => data},@c.id,true)
+          set_state(@c.docname(:cd) => { ERROR => { 'price' => '99.99' } }
           )
-          @ss.update(@c.id)
+          @ss.update
+          update_data,client_ids = Store.get_zdata(@s.docname(:update))
+          update_data.should == [{'4'=> { 'price' => '199.99'}}]
+          client_ids.should == [@c.id]
           verify_result(
             @c.docname(:update_errors) =>
               {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]},
-            @c.docname(:update) => {'4'=> { 'price' => '199.99'}},
             @c.docname(:update_rollback) => {ERROR=>{"price"=>"99.99"}})
         end
       end
 
       describe "delete" do
         it "should do delete with no errors" do
-          set_state(@c.docname(:delete) => {'4'=>@product4},
-            @s.docname(:md) => {'4'=>@product4,'3'=>@product3},
+          set_zstate({@s.docname(:delete) => {'4'=>@product4}}, @c.id, true)
+          set_state(@s.docname(:md) => {'4'=>@product4,'3'=>@product3},
             @c.docname(:cd) => {'4'=>@product4,'3'=>@product3})
-          @ss.delete(@c.id)
+          @ss.delete
+          verify_zresult(@s.docname(:delete) => [])
           verify_result(@c.docname(:delete_errors) => {},
             @s.docname(:md) => {'3'=>@product3},
-            @c.docname(:cd) => {'3'=>@product3},
-            @c.docname(:delete) => {})
+            @c.docname(:cd) => {'3'=>@product3})
         end
 
         it "should do delete with errors" do
           msg = "Error delete record"
           data = add_error_object({'2'=>@product2},msg)
-          set_state(@c.docname(:delete) => data)
-          @ss.delete(@c.id)
+          set_zstate({@s.docname(:delete) => data}, @c.id, true)
+          @ss.delete
 
           # FIXME: Failed for jruby, ruby 1.9.2
           # verify_result(@c.docname(:delete_errors) => 
@@ -211,10 +213,89 @@ describe "SourceSync" do
       describe "cud" do
         it "should do process_cud" do
           @ss.should_receive(:_auth_op).twice.and_return(true)
-          @ss.should_receive(:create).once.with(@c.id)
-          @ss.should_receive(:update).once.with(@c.id)
-          @ss.should_receive(:delete).once.with(@c.id)
-          @ss.process_cud(@c.id)
+          @ss.should_receive(:create).once
+          @ss.should_receive(:update).once
+          @ss.should_receive(:delete).once
+          @ss.process_cud
+        end
+      end
+      
+      describe "cud conflicts" do
+        it "should detect create conflict and skip the duplicate record creation, but properly update the links" do
+          set_zstate({@s.docname(:create) => {'4'=> { 'name' => 'Android', 'link' => '1' }}},@c.id,true)
+          set_zstate({@s.docname(:create) => {'5'=> { 'name' => 'Android', 'link' => '1', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0' }}},@c.id,true)
+          @ss.process_cud
+          
+          verify_zresult(@s.docname(:create) => [])
+          verify_result(@c.docname(:create_errors) => {})
+          verify_result(@c.docname(:create_links) => {'4'=> { 'l' => 'backend_id' }, '5' => { 'l' => 'backend_id'}})
+        end
+        
+        it "should detect create conflict and skip the duplicate record creation, but properly update the errors page" do
+          create_doc1 = { 'name' => 'wrongname', 'link' => '1', 'an_attribute' => "Create Sample Adapter Error" }
+          create_doc2 = { 'name' => 'wrongname', 'link' => '1', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0'}
+          set_zstate({@s.docname(:create) => {'4' => create_doc1}},@c.id,true)
+          set_zstate({@s.docname(:create) => {'5' => create_doc2}},@c.id,true)
+          @ss.process_cud
+          
+          verify_zresult(@s.docname(:create) => [])
+          verify_result(@c.docname(:create_errors) => {"4-error"=>{"message"=>"Create Sample Adapter Error"}, 
+                                                       '4' => create_doc1,
+                                                       "5-error"=>{"message"=>"Create Sample Adapter Error"}, 
+                                                       '5' => create_doc2})
+          verify_result(@c.docname(:create_links) => {})
+        end
+        
+        it "should detect create conflict and force and error" do
+          set_zstate({@s.docname(:create) => {'4'=> { 'name' => 'Android', 'link' => true }}},@c.id,true)
+          set_zstate({@s.docname(:create) => {'5'=> { 'name' => 'Android', 'link' => '1', 'force_duplicate_error' => '1' }}},@c.id,true)
+          @ss.process_cud
+          verify_zresult(@s.docname(:create) => [])
+          verify_result(@c.docname(:create_errors) => {"5-error"=>{"message"=>"Error during create: object confict detected"}, "5"=>{"name"=>"Android", "link"=>"1", 'force_duplicate_error' => '1'}} )
+        end
+        
+        it "should detect update conflict and skip the duplicate record update" do
+          set_state(@c.docname(:cd) => {'4'=> {'name' => 'Apple'}})
+          set_zstate({@s.docname(:update) => {'4'=> { 'name' => 'Android' }}},@c.id,true)
+          set_zstate({@s.docname(:update) => {'4'=> { 'name' => 'InvalidName', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0'}}},@c.id,true)
+          @ss.process_cud
+          
+          verify_zresult(@s.docname(:update) => [])
+          verify_result(@c.docname(:update_errors) => {})
+          verify_result(@c.docname(:update_rollback) => {})
+        end
+        
+        it "should detect update conflict and force an error on duplicate record update" do
+          set_state(@c.docname(:cd) => {'4'=> {'name' => 'Apple'}})
+          set_zstate({@s.docname(:update) => {'4'=> { 'name' => 'Android' }}},@c.id,true)
+          set_zstate({@s.docname(:update) => {'4'=> { 'name' => 'ErrorName', 'force_duplicate_error' => '1' }}},@c.id,true)
+          @ss.process_cud
+          
+          verify_zresult(@s.docname(:update) => [])
+          verify_result(@c.docname(:update_errors) => {"4-error"=>{"message"=>"Error during update: object confict detected"}, "4"=>{"name"=>"ErrorName", 'force_duplicate_error' => '1'}})
+          verify_result(@c.docname(:update_rollback) => {'4'=> {'name' => 'Apple'}})
+        end
+        
+        it "should detect delete conflict and skip the duplicate record delete" do
+          set_state(@c.docname(:cd) => {'4'=> {'name' => 'Apple'}})
+          set_zstate({@s.docname(:delete) => {'4'=> { 'name' => 'Apple' }}},@c.id,true)
+          set_zstate({@s.docname(:delete) => {'4'=> { 'name' => 'Apple', 'duplicate_of_cid' => @c.id, 'duplicate_of_key' => '4', 'duplicate_of_queue_index' => '0'}}},@c.id,true)
+          @ss.process_cud
+          
+          verify_zresult(@s.docname(:delete) => [])
+          verify_result(@c.docname(:cd) => {})
+          verify_result(@c.docname(:cd_size) => '0')
+          verify_result(@c.docname(:delete_errors) => {})
+        end
+        
+        it "should detect delete conflict and force an error on duplicate record delete" do
+          set_state(@c.docname(:cd) => {'4'=> {'name' => 'Apple'}})
+          set_zstate({@s.docname(:delete) => {'4'=> { 'name' => 'Apple' }}},@c.id,true)
+          set_zstate({@s.docname(:delete) => {'4'=> { 'name' => 'Apple', 'force_duplicate_error' => '1'}}},@c.id,true)
+          @ss.process_cud
+          
+          verify_zresult(@s.docname(:delete) => [])
+          verify_result(@c.docname(:delete_errors) => {"4-error"=>{"message"=>"Error during delete: object confict detected"}, "4"=>{"name"=>"Apple", 'force_duplicate_error' => '1'}})
         end
       end
 
@@ -334,7 +415,7 @@ describe "SourceSync" do
           @s.read_state.refresh_time.should > prev_refresh_time
         end
       end
-
+      
       describe "search" do
         it "should do search with no exception" do
           verify_read_operation('search')
@@ -418,16 +499,16 @@ describe "SourceSync" do
 
     it "should enqueue process_cud SourceJob" do
       @s.cud_queue = :cud
-      @ss.process_cud(@c.id)
+      @ss.process_cud
       Resque.peek(:cud).should == {"args"=>
-        ["cud", @s.name, @a.name, @u.login, @c.id, nil], "class"=>"Rhoconnect::SourceJob"}
+        ["cud", @s.name, @a.name, @u.login, nil], "class"=>"Rhoconnect::SourceJob"}
     end
 
     it "should enqueue process_query SourceJob" do
       @s.query_queue = :abc
       @ss.process_query({'foo'=>'bar'})
       Resque.peek(:abc).should == {"args"=>
-        ["query", @s.name, @a.name, @u.login, nil, {'foo'=>'bar'}], "class"=>"Rhoconnect::SourceJob"}
+        ["query", @s.name, @a.name, @u.login, {'foo'=>'bar'}], "class"=>"Rhoconnect::SourceJob"}
     end
   end
 end

data/spec/spec_helper.rb

@@ -83,16 +83,22 @@ module TestHelpers
     JSON.parse(data.to_json)
   end
       
-  def set_state(state)
+  def set_state(state,append=false)
     state.each do |dockey,data|
       if data.is_a?(Hash) or data.is_a?(Array)
-        Store.put_data(dockey,data)
+        Store.put_data(dockey,data,append)
       else
         Store.put_value(dockey,data)
       end
     end
   end
   
+  def set_zstate(state,assoc_key,append=false)
+    state.each do |dockey,data|
+      Store.put_zdata(dockey,assoc_key,data,append)
+    end
+  end
+  
   def set_test_data(dockey,data,error_message=nil,error_name='wrongname')
     if error_message
       error = {'an_attribute'=>error_message,'name'=>error_name} 
@@ -120,6 +126,19 @@ module TestHelpers
     end
   end
   
+  def verify_zresult(result)
+    result.keys.sort.each do |dockey|
+      expected = result[dockey]
+      begin
+        data,assoc_keys = Store.get_zdata(dockey)
+        data.should == expected
+      rescue RSpec::Expectations::ExpectationNotMetError => e
+        message = "\nVerifying `#{dockey}`\n\n" + e.to_s
+        Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
+      end
+    end
+  end
+  
   def validate_db(bulk_data,data)
     validate_db_file(bulk_data.dbfile,bulk_data.sources.members,data)  
   end

data/spec/store_spec.rb

@@ -194,6 +194,35 @@ describe "Store" do
         Store.put_data(expected[1],@data)
         Store.get_keys('doc1:1:1:1:*').sort.should == expected
       end
+      
+      it "should put_zdata and get_zdata" do
+        create_doc = {'1' => {'foo' => 'bar'}}
+        assoc_key = 'my_assoc_key'
+        Store.put_zdata('doc1',assoc_key,create_doc)
+        zdata,keys = Store.get_zdata('doc1')
+        zdata.should == [create_doc]
+        keys.should == [assoc_key]
+      end
+      
+      it "should append duplicate data in put_zdata" do
+        create_doc = {'1' => {'foo' => 'bar'}}
+        assoc_key = 'my_assoc_key'
+        Store.put_zdata('doc1',assoc_key,create_doc)
+        Store.put_zdata('doc1',assoc_key,create_doc, true)
+        zdata,keys = Store.get_zdata('doc1')
+        zdata.should == [create_doc,create_doc]
+        keys.should == [assoc_key,assoc_key]
+      end
+      
+      it "should flush_zdata" do
+        create_doc = {'1' => {'foo' => 'bar'}}
+        assoc_key = 'my_assoc_key'
+        Store.put_zdata('doc1',assoc_key,create_doc)
+        Store.flush_zdata('doc1')
+        zdata,keys = Store.get_zdata('doc1')
+        zdata.should == []
+        keys.should == []
+      end
 
       if defined?(JRUBY_VERSION)
         # FIXME:

data/spec/support/shared_examples.rb

@@ -62,7 +62,7 @@ shared_examples_for "SharedRhoconnectHelper" do |params|
     @a.sources << @s3.id
     Source.update_associations(@a.sources)
     @a.users << @u.id
-    
+      
     # "RhoconnectDataHelper"  
     if params && params[:rhoconnect_data] 
       @source = 'Product'

data/spec/test_methods_spec.rb

@@ -86,14 +86,14 @@ describe "TestMethods" do
     it "should include test_update helper" do
       record = {'4'=> { 'price' => '199.99' }}
       test_update(record)
-      verify_result(@c.docname(:update) => {})
+      verify_zresult(@s.docname(:update) => [])
     end
     
     it "should include test_update helper when pass through" do
       record = {'4'=> { 'price' => '199.99' }}
       @s.pass_through = 'true'
       test_update(record).should == {'processed' => ["4"]}.to_json
-      verify_result(@c.docname(:update) => {})
+      verify_zresult(@s.docname(:update) => [])
     end
 
     it "should include update_errors helper" do
@@ -105,14 +105,14 @@ describe "TestMethods" do
     it "should include test_delete helper" do
       record = {'4'=> { 'price' => '199.99' }}
       test_delete(record)
-      verify_result(@c.docname(:delete) => {})
+      verify_zresult(@s.docname(:delete) => [])
     end
     
     it "should include test_delete helper when pass through" do
       record = {'4'=> { 'price' => '199.99' }}
       @s.pass_through = 'true'
       test_delete(record).should == {'processed' => ["4"]}.to_json
-      verify_result(@c.docname(:delete) => {})
+      verify_zresult(@s.docname(:delete) => [])
     end
 
     it "should include delete_errors helper" do

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-2.4.2"
+	$redis_ver = "redis-2.4.5"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
@@ -181,7 +181,7 @@ namespace :redis do
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.4.2"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.4.5"
     end
   end
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 62196433
+  prerelease: 6
   segments: 
   - 3
+  - 1
   - 0
-  - 6
-  version: 3.0.6
+  - beta
+  - 1
+  version: 3.1.0.beta1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,12 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 Z
+date: 2011-12-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +32,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id001
-  name: bundler
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: sinatra
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +47,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  version_requirements: *id002
-  name: sinatra
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +63,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  version_requirements: *id003
-  name: rake
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: json
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +79,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  version_requirements: *id004
-  name: json
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rubyzip
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +95,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  version_requirements: *id005
-  name: rubyzip
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: uuidtools
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,12 +111,12 @@ dependencies:
         - 1
         - 1
         version: 2.1.1
-  version_requirements: *id006
-  name: uuidtools
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: redis
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,12 +127,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id007
-  name: redis
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: resque
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,12 +143,12 @@ dependencies:
         - 19
         - 0
         version: 1.19.0
-  version_requirements: *id008
-  name: resque
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: rest-client
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -157,12 +159,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  version_requirements: *id009
-  name: rest-client
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: templater
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -173,8 +175,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id010
-  name: templater
+  type: :runtime
+  requirement: *id010
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables: 
@@ -201,8 +203,6 @@ files:
 - bench/benchapp/config.ru
 - bench/benchapp/Gemfile
 - bench/benchapp/Gemfile.lock
-- bench/benchapp/log/passenger.3000.log
-- bench/benchapp/log/passenger.9292.log
 - bench/benchapp/Rakefile
 - bench/benchapp/settings/license.key
 - bench/benchapp/settings/settings.yml
@@ -211,8 +211,6 @@ files:
 - bench/benchapp/spec/sources/mock_adapter_spec.rb
 - bench/benchapp/spec/sources/queue_mock_adapter_spec.rb
 - bench/benchapp/spec/spec_helper.rb
-- bench/benchapp/tmp/pids/passenger.3000.pid.lock
-- bench/benchapp/tmp/pids/passenger.9292.pid.lock
 - bench/blobapp/application.rb
 - bench/blobapp/config.ru
 - bench/blobapp/Gemfile
@@ -227,8 +225,10 @@ files:
 - bench/distr_bench/distr_bench_main
 - bench/distr_bench/run_distr_client.sh
 - bench/distr_bench/run_test_query_script.sh
+- bench/lib/bench/aws_utils.rb
 - bench/lib/bench/bench_result_processor.rb
 - bench/lib/bench/cli.rb
+- bench/lib/bench/distr_runner.rb
 - bench/lib/bench/logging.rb
 - bench/lib/bench/mock_client.rb
 - bench/lib/bench/result.rb
@@ -239,17 +239,8 @@ files:
 - bench/lib/bench/timer.rb
 - bench/lib/bench/utils.rb
 - bench/lib/bench.rb
-- bench/lib/testdata/0-data.txt
-- bench/lib/testdata/1-data.txt
-- bench/lib/testdata/10-data.txt
 - bench/lib/testdata/100-data.txt
-- bench/lib/testdata/2-data.txt
-- bench/lib/testdata/25-data.txt
-- bench/lib/testdata/250-data.txt
-- bench/lib/testdata/3-data.txt
 - bench/lib/testdata/5-data.txt
-- bench/lib/testdata/50-data.txt
-- bench/lib/testdata/500-data.txt
 - bench/lib/testdata/images/icon.ico
 - bench/lib/testdata/images/icon.png
 - bench/lib/testdata/images/loading-Landscape.png
@@ -286,16 +277,20 @@ files:
 - doc/adapters-intro.txt
 - doc/async-jobs.txt
 - doc/authentication.txt
+- doc/benchmarks-running.txt
 - doc/benchmarks.txt
 - doc/blob-sync.txt
 - doc/bulk-sync.txt
+- doc/client-java.txt
 - doc/client-objc.txt
 - doc/client.txt
 - doc/command-line.txt
 - doc/contributing.txt
+- doc/cud-conflicts.txt
 - doc/deploying.txt
 - doc/extending-rhoconnect-server.txt
 - doc/heroku-addon.txt
+- doc/hosting-rhohub.txt
 - doc/install.txt
 - doc/introduction.txt
 - doc/java-plugin.txt
@@ -304,6 +299,7 @@ files:
 - doc/migration.txt
 - doc/net-plugin.txt
 - doc/plugin-intro.txt
+- doc/preparing-production.txt
 - doc/public/css/print.css
 - doc/public/css/screen.css
 - doc/public/css/style.css
@@ -311,6 +307,7 @@ files:
 - doc/rails-plugin.txt
 - doc/release.txt
 - doc/rest-api.txt
+- doc/rhoconnect-redis-stack.txt
 - doc/settings.txt
 - doc/source-adapters.txt
 - doc/stats-middleware.txt
@@ -319,6 +316,7 @@ files:
 - doc/web-console.txt
 - examples/simple/application.rb
 - examples/simple/config.ru
+- examples/simple/dump.rdb
 - examples/simple/Rakefile
 - examples/simple/settings/license.key
 - examples/simple/settings/settings.yml
@@ -352,6 +350,7 @@ files:
 - installer/utils/constants.rb
 - installer/utils/nix_install_test.rb
 - installer/utils/nix_installation.rake
+- installer/utils/package_upload/auto-repo.rb
 - installer/utils/package_upload/repos.rake
 - installer/utils/package_upload/s3_upload.rb
 - installer/windows/configUi.ini
@@ -479,6 +478,7 @@ files:
 - lib/rhoconnect/ping/apple.rb
 - lib/rhoconnect/ping/blackberry.rb
 - lib/rhoconnect/ping.rb
+- lib/rhoconnect/predefined_adapters/bench_adapter.rb
 - lib/rhoconnect/read_state.rb
 - lib/rhoconnect/rho_indifferent_access.rb
 - lib/rhoconnect/server/views/index.erb
@@ -617,7 +617,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: RhoConnect App Integration Server

data/bench/benchapp/log/passenger.3000.log

@@ -1 +0,0 @@
-2011/10/24 15:33:01 [error] 35864#0: *4 "/Users/mzverev/Projects/master/rhoconnect/bench/benchapp/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "HEAD / HTTP/1.1", host: "0.0.0.0"