rhoconnect 3.2.1 → 3.3.1.beta2

data/spec/{stats/middleware_spec.rb → server/stats_spec.rb}

@@ -6,7 +6,6 @@ STATS_RECORD_RESOLUTION = 2 unless defined? STATS_RECORD_RESOLUTION
 STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE
 
 include Rhoconnect
-include Rhoconnect::Stats
 
 describe "Middleware" do
   
@@ -17,7 +16,7 @@ describe "Middleware" do
     app.stub!(:call)
     Rhoconnect.stats = true
     Rhoconnect::Server.enable :stats
-    @middleware_new_routes = Middleware.new(app)
+    @middleware_new_routes = Rhoconnect::Middleware::Stats.new(app)
     Store.stub!(:lock).and_yield
   end
   
@@ -37,20 +36,20 @@ describe "Middleware" do
     }
     10.times { @middleware_new_routes.call(env) }
     metric = 'http:GET:/api/application/query:SampleAdapter'
-    Record.key(metric).should == "stat:#{metric}"
+    Rhoconnect::Stats::Record.key(metric).should == "stat:#{metric}"
 
     # The conversion algorithm (float to string) currently checks two precisions. 
     # In Ruby 1.9, it tries 16 digits and if that's not enough it then uses 17. 
     # In 1.8, it's the same but with 15 and 16.
     if RUBY_VERSION =~ /1.9/      
-      Record.range(metric, 0, -1).should == [
+      Rhoconnect::Stats::Record.range(metric, 0, -1).should == [
         "2.0,0.6000000000000014:12", 
         "2.0,0.6000000000000014:14", 
         "2.0,0.6000000000000014:16", 
         "2.0,0.6000000000000014:18"
       ]
     else
-      Record.range(metric, 0, -1).should == [
+      Rhoconnect::Stats::Record.range(metric, 0, -1).should == [
         "2.0,0.600000000000002:12", 
         "2.0,0.600000000000002:14", 
         "2.0,0.600000000000002:16", 

data/spec/server/x_domain_session_wrapper_spec.rb

@@ -1,4 +1,4 @@
-require 'rhoconnect/x_domain_session_wrapper'
+require 'rhoconnect/middleware/x_domain_session_wrapper'
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
 require "cgi"
@@ -30,13 +30,13 @@ describe "XDomainSessionWrapper middleware" do
   before(:each) do
     app ||= StubApp.new
 
-    @middleware_new_routes = XDomainSessionWrapper.new(app, {
+    @middleware_new_routes = Rhoconnect::Middleware::XDomainSessionWrapper.new(app, {
         :session_cookie => COOKIE_NAME,
         :api_uri_regexp => /\A\/api\/application/,
         :login_uri_regexp => /\A\/api\/application\/clientlogin/
     })
 
-    @middleware_old_routes = XDomainSessionWrapper.new(app, {
+    @middleware_old_routes = Rhoconnect::Middleware::XDomainSessionWrapper.new(app, {
         :session_cookie => COOKIE_NAME,
         :api_uri_regexp => /\A\/application/,
         :login_uri_regexp => /\A\/application\/clientlogin/

data/spec/source_spec.rb

@@ -12,7 +12,7 @@ describe "Source" do
       @s.url.should == @s_fields[:url]
       @s.login.should == @s_fields[:login]
       @s.app.name.should == @a_fields[:name]
-      @s.priority.should == 3
+      @s.priority.should == 1
       @s.callback_url.should be_nil
       @s.queue.should be_nil
       @s.query_queue.should be_nil
@@ -28,7 +28,7 @@ describe "Source" do
       @s1.url.should == @s_fields[:url]
       @s1.login.should == @s_fields[:login]
       @s1.app.name.should == @a_fields[:name]
-      @s1.priority.should == 3
+      @s1.priority.should == 1
       @s1.callback_url.should be_nil
       @s1.poll_interval.should == 300
       @s1.app_id.should == @s_params[:app_id]

data/spec/source_sync_spec.rb

@@ -294,6 +294,7 @@ describe "SourceSync" do
         
         it "should detect delete conflict and skip the duplicate record delete" do
           set_state(@c.docname(:cd) => {'4'=> {'name' => 'Apple'}})
+          set_state(@c.docname(:cd_size) => 1)
           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
@@ -306,6 +307,7 @@ describe "SourceSync" do
         
         it "should detect delete conflict and force an error on duplicate record delete" do
           set_state(@c.docname(:cd) => {'4'=> {'name' => 'Apple'}})
+          set_state(@c.docname(:cd_size) => 1)
           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

data/spec/spec_helper.rb

@@ -60,8 +60,14 @@ module TestHelpers
     File.expand_path(File.join(File.dirname(__FILE__),'apps','emptyapp'))
   end
   
-  def do_post(url,params)
-    post url, params.to_json, {'CONTENT_TYPE'=>'application/json'}
+  def do_post(url,params,headers = {})
+    headers.merge!('CONTENT_TYPE'=>'application/json')
+    post url, params.to_json, headers
+  end
+
+  def do_put(url,params,headers = {})
+    headers.merge!('CONTENT_TYPE'=>'application/json')
+    put url, params.to_json, headers
   end
   
   def bulk_data_docname(app_id,user_id)
@@ -113,6 +119,14 @@ module TestHelpers
   def json_clone(data)
     JSON.parse(data.to_json)
   end
+
+  def setup_post_yield(response)
+    if RUBY_VERSION =~ /1.9/ or defined?(JRUBY_VERSION)
+      RestClient.stub!(:post).and_yield(response, nil, nil)
+    else
+      RestClient.stub!(:post).and_yield(response)
+    end
+  end
       
   def set_state(state,append=false)
     state.each do |dockey,data|
@@ -171,7 +185,7 @@ module TestHelpers
   end
   
   def validate_db(bulk_data,data)
-    validate_db_file(bulk_data.dbfile,bulk_data.sources.members,data)  
+    validate_db_file(bulk_data.dbfile,bulk_data.sources[0, -1],data)  
   end
     
   def validate_db_file(dbfile,sources,data)  

data/spec/stats/record_spec.rb

@@ -5,7 +5,6 @@ STATS_RECORD_RESOLUTION = 2 unless defined? STATS_RECORD_RESOLUTION
 STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE
 
 include Rhoconnect
-include Rhoconnect::Stats
 
 describe "Record" do
   
@@ -17,42 +16,42 @@ describe "Record" do
   
   it "should add metric to the record and trim record size" do
     Time.stub!(:now).and_return { @now += 1; @now }
-    10.times { Record.add('foo') }
+    10.times { Rhoconnect::Stats::Record.add('foo') }
     Store.db.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
   end
   
   it "should add single record" do
     Time.stub!(:now).and_return { @now += 1; @now }
-    Record.add('foo')
+    Rhoconnect::Stats::Record.add('foo')
     Store.db.zrange('stat:foo', 0, -1).should == ["1:10"]
   end
   
   it "should return type of metric" do
-    Record.add('foo')
-    Record.rtype('foo').should == 'zset'
+    Rhoconnect::Stats::Record.add('foo')
+    Rhoconnect::Stats::Record.rtype('foo').should == 'zset'
   end
   
   it "should set string metric" do
-    Record.set_value('foo', 'bar')
+    Rhoconnect::Stats::Record.set_value('foo', 'bar')
     Store.db.get('stat:foo').should == 'bar'
   end
   
   it "should get string metric" do
     Store.db.set('stat:foo', 'bar')
-    Record.get_value('foo').should == 'bar'
+    Rhoconnect::Stats::Record.get_value('foo').should == 'bar'
   end
   
   it "should get keys" do
-    Record.add('foo')
-    Record.add('bar')
-    Record.keys.sort.should == ['bar','foo']
+    Rhoconnect::Stats::Record.add('foo')
+    Rhoconnect::Stats::Record.add('bar')
+    Rhoconnect::Stats::Record.keys.sort.should == ['bar','foo']
   end
   
   it "should add absolute metric value" do
     Time.stub!(:now).and_return { @now += 1; @now }
     time = 0
     4.times do 
-      Record.save_average('foo',time)
+      Rhoconnect::Stats::Record.save_average('foo',time)
       time += 1
     end
     Store.db.zrange('stat:foo', 0, -1).should == ["2.0,1.0:10", "2.0,5.0:12"]
@@ -62,7 +61,7 @@ describe "Record" do
     Rhoconnect.stats = true
     Time.stub!(:now).and_return { @now += 1; @now }
     4.times do
-      Record.update('foo') do
+      Rhoconnect::Stats::Record.update('foo') do
         # something interesting
       end
     end
@@ -72,22 +71,22 @@ describe "Record" do
   
   it "should get range of metric values" do
     Time.stub!(:now).and_return { @now += 1; @now }
-    10.times { Record.add('foo') }
-    Record.range('foo', 0, 1).should == ["2:12", "2:14"]
+    10.times { Rhoconnect::Stats::Record.add('foo') }
+    Rhoconnect::Stats::Record.range('foo', 0, 1).should == ["2:12", "2:14"]
   end
   
   it "should reset metric" do
     Time.stub!(:now).and_return { @now += 1; @now }
-    10.times { Record.add('foo') }
+    10.times { Rhoconnect::Stats::Record.add('foo') }
     Store.db.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
-    Record.reset('foo')
+    Rhoconnect::Stats::Record.reset('foo')
     Store.db.zrange('stat:foo', 0, -1).should == []
   end
   
   it "should reset all metrics" do
-    Record.add('foo')
-    Record.add('bar')
-    Record.reset_all
+    Rhoconnect::Stats::Record.add('foo')
+    Rhoconnect::Stats::Record.add('bar')
+    Rhoconnect::Stats::Record.reset_all
     Store.db.keys('stat:*').should == []
   end
 end

data/spec/store_spec.rb

@@ -59,11 +59,11 @@ describe "Store" do
       it "should update_objects with simple data and one changed attribute" do
         data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
         update_data = { '1' => {'attr1' => 'value2'}}
-        Store.put_data('mydata', data)
-        Store.get_data('mydata').should == data
-        Store.update_objects('mydata', update_data)        
+        Store.put_data(:md, data)
+        Store.get_data(:md).should == data
+        Store.update_objects(:md, update_data)        
         data['1'].merge!(update_data['1'])
-        Store.get_data('mydata').should == data
+        Store.get_data(:md).should == data
       end
       
       it "should update_objects with simple data and verify that srem and sadd is called only on affected fields" do
@@ -91,10 +91,16 @@ describe "Store" do
         Store.delete_objects('mydata', ['1'])        
       end
       
-      it "should add simple array data to new set" do
+      it "should add simple array data to new list" do
+        @data = ['1','2','3']
+        Store.put_list(@s.docname(:md),@data).should == true
+        Store.get_list(@s.docname(:md)).should == @data
+      end
+      
+      it "should add simple array data to new list using *_data methods" do
         @data = ['1','2','3']
         Store.put_data(@s.docname(:md),@data).should == true
-        Store.get_data(@s.docname(:md),Array).sort.should == @data
+        Store.get_data(@s.docname(:md),Array).should == @data
       end
 
       it "should replace simple data to existing set" do
@@ -118,13 +124,6 @@ describe "Store" do
         Store.decr('foo').should == 9
       end
 
-      it "should return true/false if element ismember of a set" do
-        Store.put_data('foo',['a'])
-        Store.ismember?('foo','a').should == true
-
-        Store.ismember?('foo','b').should == false
-      end
-
       it "should return attributes modified in doc2" do
         Store.put_data(@s.docname(:md),@data).should == true
         Store.get_data(@s.docname(:md)).should == @data
@@ -135,7 +134,7 @@ describe "Store" do
 
         Store.put_data(@c.docname(:cd),@data1)
         Store.get_data(@c.docname(:cd)).should == @data1
-        Store.get_diff_data(@s.docname(:md),@c.docname(:cd)).should == [expected,1]
+        Store.get_diff_data(@s.docname(:md),@c.docname(:cd)).should == expected
       end
 
       it "should return attributes modified and missed in doc2" do
@@ -148,7 +147,7 @@ describe "Store" do
 
         Store.put_data(@c.docname(:cd),@data1)
         Store.get_data(@c.docname(:cd)).should == @data1
-        Store.get_diff_data(@c.docname(:cd),@s.docname(:md)).should == [expected,2]
+        Store.get_diff_data(@c.docname(:cd),@s.docname(:md)).should == expected
       end  
 
       it "should ignore reserved attributes" do
@@ -183,25 +182,22 @@ describe "Store" do
         key = 'test_flash_data'
         Store.put_data(key,@data)
         Store.db.should_not_receive(:keys)
-        Store.db.should_receive(:del).once.with(key).and_return(true)
+        Store.db.should_receive(:del).once.with("#{key}:#{get_sha1('1')[0..1]}").and_return(true)
+        Store.db.should_receive(:del).once.with("#{key}:#{get_sha1('2')[0..1]}").and_return(true)
+        Store.db.should_receive(:del).once.with("#{key}:#{get_sha1('3')[0..1]}").and_return(true)
+        Store.db.should_receive(:del).once.with("#{key}:indices").and_return(true)
         Store.flash_data(key)
       end
 
       it "should flash_data and call KEYS when there are pattern matching characters in the provided keymask" do
         keys = ['test_flash_data1','test_flash_data2']
         keys.each {|key| Store.put_data(key,@data)}
-        Store.db.should_receive(:keys).exactly(1).times.with("test_flash_data*").and_return(keys)
-        Store.db.should_receive(:del).exactly(2).times.with(/^test_flash_data[12]$/).and_return(true)
+        docs = Store.db.keys("test_flash_data*")
+        Store.db.should_receive(:keys).exactly(1).times.with("test_flash_data*").and_return(docs)
+        Store.db.should_receive(:del).exactly(8).times.and_return(true)
         Store.flash_data("test_flash_data*")
       end
 
-      it "should get_keys" do
-        expected = ["doc1:1:1:1:source1", "doc1:1:1:1:source2"]
-        Store.put_data(expected[0],@data)
-        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'
@@ -350,7 +346,36 @@ describe "Store" do
           Store.put_data('somedoc',{'foo'=>'bar'}) 
         }.to raise_exception(ArgumentError, "Invalid value object: #{foobar['foo'].inspect}. Hash is expected.")
       end
-
+      
+      it "should put_object into the bucketed md" do
+        key1 = '1'
+        data1 = {'foo' => 'bar'}
+        key2 = '2'
+        data2 = {'one' => 'two', 'three' => 'four'}
+        docindex1 = get_sha1(key1)[0..1]
+        docindex2 = get_sha1(key2)[0..1]
+        Store.put_object(:md, key1, data1)
+        Store.put_object(:md, key2, data2)
+        Store.db.exists(:md).should be_false
+        Store.db.exists("#{:md}:#{docindex1}").should be_true
+        Store.db.exists("#{:md}:#{docindex2}").should be_true
+        Store.db.exists("#{:md}:indices").should be_true
+        Store.db.hkeys("#{:md}:indices").should == ["#{docindex1}", "#{docindex2}"]
+        Store.db.hvals("#{:md}:indices").should == ["#{:md}:#{docindex1}", "#{:md}:#{docindex2}"]
+      end
+      
+      it "should get_object from the bucketed md" do
+        key1 = '1'
+        data1 = {'foo' => 'bar'}
+        key2 = '2'
+        data2 = {'one' => 'two', 'three' => 'four'}
+        docindex1 = get_sha1(key1)[0..1]
+        docindex2 = get_sha1(key2)[0..1]
+        Store.put_object(:md, key1, data1)
+        Store.put_object(:md, key2, data2)
+        obj2 = Store.get_object(:md, key2)
+        obj2.should == data2
+      end
     end
   end  
 end

data/spec/support/shared_examples.rb

@@ -37,12 +37,14 @@ shared_examples_for "SharedRhoconnectHelper" do |params|
       :url => 'http://example.com',
       :login => 'testuser',
       :password => 'testpass',
+      :priority => '1'
     }
     @s1_fields = {
       :name => 'FixedSchemaAdapter',
       :url => 'http://example.com',
       :login => 'testuser',
       :password => 'testpass',
+      :priority => '5'
     }
     @s_params = {
       :user_id => @u.id,
@@ -130,12 +132,14 @@ shared_examples_for "ApiHelper" do
       :url => 'http://example.com',
       :login => 'testuser',
       :password => 'testpass',
+      :priority => '1'
     }
     @s1_fields = {
       :name => 'FixedSchemaAdapter',
       :url => 'http://example.com',
       :login => 'testuser',
       :password => 'testpass',
+      :priority => '5'
     }
     @s_params = {
       :user_id => @u.id,

data/spec/sync_states_spec.rb

@@ -40,8 +40,8 @@ describe "Sync Server States" do
           @c.docname(:create_links) => {'1'=>{'l'=>'backend_id'}},
           @s.docname(:md) => backend_data)
         res = @cs.send_cud
-        res.should == [{"version"=>3}, {"token"=>res[1]['token']}, 
-          {"count"=>0}, {"progress_count"=>1}, {"total_count"=>1}, 
+        res.should == [{'version'=>ClientSync::SYNC_VERSION},{"token"=>res[1]['token']}, 
+          {"count"=>0}, {"progress_count"=>0}, {"total_count"=>1}, 
           {"links"=> {'1'=>{'l'=>'backend_id'}}}]
 
       end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
+  hash: 62196479
+  prerelease: 6
   segments: 
   - 3
-  - 2
+  - 3
   - 1
-  version: 3.2.1
+  - beta
+  - 2
+  version: 3.3.1.beta2
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-21 00:00:00 Z
+date: 2012-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -181,12 +183,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 35
         segments: 
         - 0
-        - 14
-        - 6
-        version: 0.14.6
+        - 15
+        - 0
+        version: 0.15.0
   requirement: *id011
   prerelease: false
   name: thor
@@ -239,7 +241,6 @@ files:
 - bench/lib/testdata/images/icon.ico
 - bench/lib/testdata/images/loading.png
 - bench/lib/testdata/100-data.txt
-- bench/lib/testdata/5-data.txt
 - bench/benchapp/application.rb
 - bench/benchapp/sources/queue_mock_adapter.rb
 - bench/benchapp/sources/mock_adapter.rb
@@ -250,7 +251,6 @@ files:
 - bench/benchapp/spec/sources/mock_adapter_spec.rb
 - bench/benchapp/spec/spec_helper.rb
 - bench/benchapp/config.ru
-- bench/benchapp/Gemfile.lock
 - bench/benchapp/Rakefile
 - bench/run_query_only_script.sh
 - bench/spec/bench_spec_helper.rb
@@ -280,7 +280,6 @@ files:
 - bench/blobapp/spec/sources/blob_adapter_spec.rb
 - bench/blobapp/spec/spec_helper.rb
 - bench/blobapp/config.ru
-- bench/blobapp/Gemfile.lock
 - bench/blobapp/Rakefile
 - bench/run_blob_script.sh
 - bench/distr_bench/run_test_query_script.sh
@@ -307,6 +306,7 @@ files:
 - commands/commands/rhoconnect/start.rb
 - commands/commands/rhoconnect/attach.rb
 - commands/commands/rhoconnect/console_helper.rb
+- commands/commands/rhoconnect/version.rb
 - commands/commands/rhoconnect/spec.rb
 - commands/commands/rhoconnect/flushdb.rb
 - commands/commands/rhoconnect/set_admin_password.rb
@@ -337,7 +337,6 @@ files:
 - doc/migration.txt
 - doc/client-objc.txt
 - doc/push-server-setup.txt
-- doc/release.txt
 - doc/settings.txt
 - doc/tutorial.txt
 - doc/benchmarks.txt
@@ -377,6 +376,7 @@ files:
 - examples/simple/settings/license.key
 - examples/simple/settings/settings.yml
 - examples/simple/Gemfile
+- examples/simple/my_server.rb
 - examples/simple/config.ru
 - examples/simple/Rakefile
 - generators/rhoconnect.rb
@@ -424,13 +424,11 @@ files:
 - lib/rhoconnect/source_sync.rb
 - lib/rhoconnect/server.rb
 - lib/rhoconnect/stats/record.rb
-- lib/rhoconnect/stats/middleware.rb
 - lib/rhoconnect/document.rb
 - lib/rhoconnect/async.rb
 - lib/rhoconnect/db_adapter.rb
 - lib/rhoconnect/client.rb
 - lib/rhoconnect/lock_ops.rb
-- lib/rhoconnect/body_content_type_parser.rb
 - lib/rhoconnect/console/server.rb
 - lib/rhoconnect/utilities.rb
 - lib/rhoconnect/web-console/server.rb
@@ -477,44 +475,47 @@ files:
 - lib/rhoconnect/web-console/controllers/admins.js
 - lib/rhoconnect/web-console/templates/jqplot.erb
 - lib/rhoconnect/web-console/templates/index.erb
+- lib/rhoconnect/api/client/client_get_db_doc.rb
 - lib/rhoconnect/api/client/get_client_params.rb
-- lib/rhoconnect/api/client/list_clients.rb
-- lib/rhoconnect/api/client/create_client.rb
+- lib/rhoconnect/api/client/register.rb
+- lib/rhoconnect/api/client/client_set_db_doc.rb
+- lib/rhoconnect/api/client/reset.rb
 - lib/rhoconnect/api/client/list_client_docs.rb
-- lib/rhoconnect/api/client/delete_client.rb
-- lib/rhoconnect/api/client/ping.rb
-- lib/rhoconnect/api/application/clientlogin.rb
-- lib/rhoconnect/api/application/clientcreate.rb
-- lib/rhoconnect/api/application/clientregister.rb
-- lib/rhoconnect/api/application/queue_updates.rb
-- lib/rhoconnect/api/application/query.rb
-- lib/rhoconnect/api/application/search.rb
-- lib/rhoconnect/api/application/bulk_data.rb
-- lib/rhoconnect/api/application/clientreset.rb
+- lib/rhoconnect/api/client/create.rb
+- lib/rhoconnect/api/system/save_adapter.rb
+- lib/rhoconnect/api/system/get_adapter.rb
+- lib/rhoconnect/api/system/login.rb
+- lib/rhoconnect/api/system/stats.rb
+- lib/rhoconnect/api/system/get_license_info.rb
+- lib/rhoconnect/api/system/reset.rb
+- lib/rhoconnect/api/user/user_get_db_doc.rb
 - lib/rhoconnect/api/user/create_user.rb
 - lib/rhoconnect/api/user/list_users.rb
 - lib/rhoconnect/api/user/delete_user.rb
+- lib/rhoconnect/api/user/list_clients.rb
+- lib/rhoconnect/api/user/list_source_docs.rb
+- lib/rhoconnect/api/user/show_user.rb
+- lib/rhoconnect/api/user/user_set_db_doc.rb
+- lib/rhoconnect/api/user/delete_client.rb
 - lib/rhoconnect/api/user/update_user.rb
-- lib/rhoconnect/api/source/fast_delete.rb
-- lib/rhoconnect/api/source/upload_file.rb
-- lib/rhoconnect/api/source/fast_insert.rb
-- lib/rhoconnect/api/source/set_refresh_time.rb
+- lib/rhoconnect/api/user/ping.rb
+- lib/rhoconnect/api/readstate/set_refresh_time.rb
 - lib/rhoconnect/api/source/update_source_params.rb
-- lib/rhoconnect/api/source/save_adapter.rb
-- lib/rhoconnect/api/source/get_adapter.rb
-- lib/rhoconnect/api/source/push_objects.rb
-- lib/rhoconnect/api/source/fast_update.rb
-- lib/rhoconnect/api/source/get_db_doc.rb
-- lib/rhoconnect/api/source/push_deletes.rb
-- lib/rhoconnect/api/source/set_db_doc.rb
-- lib/rhoconnect/api/source/list_source_docs.rb
 - lib/rhoconnect/api/source/list_sources.rb
 - lib/rhoconnect/api/source/get_source_params.rb
-- lib/rhoconnect/api/admin/get_api_token.rb
-- lib/rhoconnect/api/admin/login.rb
-- lib/rhoconnect/api/admin/stats.rb
-- lib/rhoconnect/api/admin/get_license_info.rb
-- lib/rhoconnect/api/admin/reset.rb
+- lib/rhoconnect/api/store/get_db_doc.rb
+- lib/rhoconnect/api/store/set_db_doc.rb
+- lib/rhoconnect/api/app/fast_delete.rb
+- lib/rhoconnect/api/app/fast_insert.rb
+- lib/rhoconnect/api/app/push_objects.rb
+- lib/rhoconnect/api/app/fast_update.rb
+- lib/rhoconnect/api/app/queue_updates.rb
+- lib/rhoconnect/api/app/push_deletes.rb
+- lib/rhoconnect/api/app/query.rb
+- lib/rhoconnect/api/app/login.rb
+- lib/rhoconnect/api/app/search.rb
+- lib/rhoconnect/api/app/bulk_data.rb
+- lib/rhoconnect/api/app/ans_login.rb
 - lib/rhoconnect/graph_helper.rb
 - lib/rhoconnect/bulk_data/syncdb.index.schema
 - lib/rhoconnect/bulk_data/bulk_data.rb
@@ -528,12 +529,11 @@ files:
 - lib/rhoconnect/ping/apple.rb
 - lib/rhoconnect/ping/blackberry.rb
 - lib/rhoconnect/ping/android.rb
+- lib/rhoconnect/ping/rhoconnect_push.rb
 - lib/rhoconnect/source_adapter.rb
-- lib/rhoconnect/cors.rb
 - lib/rhoconnect/generator.rb
 - lib/rhoconnect/version.rb
 - lib/rhoconnect/rho_indifferent_access.rb
-- lib/rhoconnect/x_domain_session_wrapper.rb
 - lib/rhoconnect/credential.rb
 - lib/rhoconnect/test_methods.rb
 - lib/rhoconnect/bulk_data.rb
@@ -545,6 +545,16 @@ files:
 - lib/rhoconnect/app.rb
 - lib/rhoconnect/model.rb
 - lib/rhoconnect/source.rb
+- lib/rhoconnect/middleware/current_request.rb
+- lib/rhoconnect/middleware/current_user.rb
+- lib/rhoconnect/middleware/current_app.rb
+- lib/rhoconnect/middleware/body_content_type_parser.rb
+- lib/rhoconnect/middleware/login_required.rb
+- lib/rhoconnect/middleware/admin_user.rb
+- lib/rhoconnect/middleware/helpers.rb
+- lib/rhoconnect/middleware/cors.rb
+- lib/rhoconnect/middleware/stats.rb
+- lib/rhoconnect/middleware/x_domain_session_wrapper.rb
 - lib/rhoconnect/console.rb
 - lib/rhoconnect/read_state.rb
 - lib/rhoconnect.rb
@@ -555,44 +565,46 @@ files:
 - spec/license_spec.rb
 - spec/user_spec.rb
 - spec/stats/record_spec.rb
-- spec/stats/middleware_spec.rb
 - spec/spec_helper.rb
 - spec/read_state_spec.rb
 - spec/spec.opts
 - spec/dynamic_adapter_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
+- spec/server/stats_spec.rb
 - spec/server/server_spec.rb
 - spec/api/client/get_client_params_spec.rb
-- spec/api/client/ping_spec.rb
-- spec/api/client/delete_client_spec.rb
+- spec/api/client/client_get_db_doc_spec.rb
 - spec/api/client/list_client_docs_spec.rb
-- spec/api/client/create_client_spec.rb
-- spec/api/client/list_clients_spec.rb
+- spec/api/client/client_set_db_doc_spec.rb
+- spec/api/system/login_spec.rb
+- spec/api/system/get_license_info_spec.rb
+- spec/api/system/reset_spec.rb
+- spec/api/system/stats_spec.rb
+- spec/api/system/adapter_spec.rb
+- spec/api/user/ping_spec.rb
 - spec/api/user/delete_user_spec.rb
+- spec/api/user/user_set_db_doc_spec.rb
 - spec/api/user/create_user_spec.rb
 - spec/api/user/list_users_spec.rb
+- spec/api/user/delete_client_spec.rb
+- spec/api/user/user_get_db_doc_spec.rb
+- spec/api/user/show_user_spec.rb
 - spec/api/user/update_user_spec.rb
+- spec/api/user/list_source_docs_spec.rb
+- spec/api/user/list_clients_spec.rb
+- spec/api/readstate/set_refresh_time_spec.rb
 - spec/api/source/update_source_params_spec.rb
-- spec/api/source/set_db_doc_spec.rb
-- spec/api/source/set_refresh_time_spec.rb
-- spec/api/source/upload_file_spec.rb
-- spec/api/source/fast_delete_spec.rb
 - spec/api/source/list_sources_spec.rb
-- spec/api/source/push_objects_spec.rb
-- spec/api/source/fast_update_spec.rb
-- spec/api/source/adapter_spec.rb
-- spec/api/source/list_source_docs_spec.rb
-- spec/api/source/push_deletes_spec.rb
-- spec/api/source/get_db_doc_spec.rb
-- spec/api/source/fast_insert_spec.rb
 - spec/api/source/get_source_params_spec.rb
-- spec/api/admin/get_license_info_spec.rb
-- spec/api/admin/reset_spec.rb
-- spec/api/admin/api_token_spec.rb
-- spec/api/admin/get_api_token_spec.rb
-- spec/api/admin/stats_spec.rb
 - spec/api/api_helper.rb
+- spec/api/store/set_db_doc_spec.rb
+- spec/api/store/get_db_doc_spec.rb
+- spec/api/app/fast_delete_spec.rb
+- spec/api/app/push_objects_spec.rb
+- spec/api/app/fast_update_spec.rb
+- spec/api/app/push_deletes_spec.rb
+- spec/api/app/fast_insert_spec.rb
 - spec/bulk_data/bulk_data_spec.rb
 - spec/api_token_spec.rb
 - spec/app_spec.rb
@@ -603,6 +615,7 @@ files:
 - spec/jobs/bulk_data_job_spec.rb
 - spec/store_spec.rb
 - spec/ping/blackberry_spec.rb
+- spec/ping/rhoconnect_push_spec.rb
 - spec/ping/apple_spec.rb
 - spec/ping/android_spec.rb
 - spec/rhoconnect_spec.rb
@@ -708,44 +721,46 @@ test_files:
 - spec/license_spec.rb
 - spec/user_spec.rb
 - spec/stats/record_spec.rb
-- spec/stats/middleware_spec.rb
 - spec/spec_helper.rb
 - spec/read_state_spec.rb
 - spec/spec.opts
 - spec/dynamic_adapter_spec.rb
 - spec/server/cors_spec.rb
 - spec/server/x_domain_session_wrapper_spec.rb
+- spec/server/stats_spec.rb
 - spec/server/server_spec.rb
 - spec/api/client/get_client_params_spec.rb
-- spec/api/client/ping_spec.rb
-- spec/api/client/delete_client_spec.rb
+- spec/api/client/client_get_db_doc_spec.rb
 - spec/api/client/list_client_docs_spec.rb
-- spec/api/client/create_client_spec.rb
-- spec/api/client/list_clients_spec.rb
+- spec/api/client/client_set_db_doc_spec.rb
+- spec/api/system/login_spec.rb
+- spec/api/system/get_license_info_spec.rb
+- spec/api/system/reset_spec.rb
+- spec/api/system/stats_spec.rb
+- spec/api/system/adapter_spec.rb
+- spec/api/user/ping_spec.rb
 - spec/api/user/delete_user_spec.rb
+- spec/api/user/user_set_db_doc_spec.rb
 - spec/api/user/create_user_spec.rb
 - spec/api/user/list_users_spec.rb
+- spec/api/user/delete_client_spec.rb
+- spec/api/user/user_get_db_doc_spec.rb
+- spec/api/user/show_user_spec.rb
 - spec/api/user/update_user_spec.rb
+- spec/api/user/list_source_docs_spec.rb
+- spec/api/user/list_clients_spec.rb
+- spec/api/readstate/set_refresh_time_spec.rb
 - spec/api/source/update_source_params_spec.rb
-- spec/api/source/set_db_doc_spec.rb
-- spec/api/source/set_refresh_time_spec.rb
-- spec/api/source/upload_file_spec.rb
-- spec/api/source/fast_delete_spec.rb
 - spec/api/source/list_sources_spec.rb
-- spec/api/source/push_objects_spec.rb
-- spec/api/source/fast_update_spec.rb
-- spec/api/source/adapter_spec.rb
-- spec/api/source/list_source_docs_spec.rb
-- spec/api/source/push_deletes_spec.rb
-- spec/api/source/get_db_doc_spec.rb
-- spec/api/source/fast_insert_spec.rb
 - spec/api/source/get_source_params_spec.rb
-- spec/api/admin/get_license_info_spec.rb
-- spec/api/admin/reset_spec.rb
-- spec/api/admin/api_token_spec.rb
-- spec/api/admin/get_api_token_spec.rb
-- spec/api/admin/stats_spec.rb
 - spec/api/api_helper.rb
+- spec/api/store/set_db_doc_spec.rb
+- spec/api/store/get_db_doc_spec.rb
+- spec/api/app/fast_delete_spec.rb
+- spec/api/app/push_objects_spec.rb
+- spec/api/app/fast_update_spec.rb
+- spec/api/app/push_deletes_spec.rb
+- spec/api/app/fast_insert_spec.rb
 - spec/bulk_data/bulk_data_spec.rb
 - spec/api_token_spec.rb
 - spec/app_spec.rb
@@ -756,6 +771,7 @@ test_files:
 - spec/jobs/bulk_data_job_spec.rb
 - spec/store_spec.rb
 - spec/ping/blackberry_spec.rb
+- spec/ping/rhoconnect_push_spec.rb
 - spec/ping/apple_spec.rb
 - spec/ping/android_spec.rb
 - spec/rhoconnect_spec.rb