rhosync 2.0.0.beta1 → 2.0.0.beta2

data/spec/api/list_clients_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiListUsers" do
   it_should_behave_like "ApiHelper"
   
   it "should list clients" do
-    post "/api/list_clients", {:app_name => @test_app_name, :api_token => @api_token,
+    post "/api/list_clients", {:api_token => @api_token,
       :user_id => @u_fields[:login]}
     res = JSON.parse(last_response.body)
     res.is_a?(Array).should == true
@@ -15,7 +15,7 @@ describe "RhosyncApiListUsers" do
   
   it "should handle empty client's list" do
     @u.clients.delete(@c.id)
-    post "/api/list_clients", {:app_name => @test_app_name, :api_token => @api_token, 
+    post "/api/list_clients", {:api_token => @api_token, 
       :user_id => @u_fields[:login]}
     JSON.parse(last_response.body).should == []    
   end

data/spec/api/list_source_docs_spec.rb

@@ -4,7 +4,7 @@ describe "RhosyncApiListSourceDocs" do
   it_should_behave_like "ApiHelper"
   
   it "should list of shared source documents" do
-    post "/api/list_source_docs", {:app_name => @test_app_name, :api_token => @api_token,
+    post "/api/list_source_docs", {:api_token => @api_token,
       :source_id => "SimpleAdapter", :user_id => '*'}
     JSON.parse(last_response.body).should == {
       "md"=>"source:application:__shared__:SimpleAdapter:md", 
@@ -14,7 +14,7 @@ describe "RhosyncApiListSourceDocs" do
   end
 
   it "should list user source documents" do
-    post "/api/list_source_docs", {:app_name => @test_app_name, :api_token => @api_token,
+    post "/api/list_source_docs", {:api_token => @api_token,
       :source_id => "SampleAdapter", :user_id => @u.id}
     JSON.parse(last_response.body).should == {
       "md"=>"source:application:testuser:SampleAdapter:md", 

data/spec/api/list_sources_spec.rb

@@ -4,23 +4,23 @@ describe "RhosyncApiListSources" do
   it_should_behave_like "ApiHelper"
   
   it "should list all application sources" do
-    post "/api/list_sources", {:app_name => @test_app_name, :api_token => @api_token}
+    post "/api/list_sources", {:api_token => @api_token}
     JSON.parse(last_response.body).should == ["SimpleAdapter", "SampleAdapter"]
   end
 
   it "should list all application sources using partition_type param" do
     post "/api/list_sources", 
-      {:app_name => @test_app_name, :api_token => @api_token, :partition_type => 'all'}
+      {:api_token => @api_token, :partition_type => 'all'}
     JSON.parse(last_response.body).should == ["SimpleAdapter", "SampleAdapter"]
   end
   
   it "should list app partition sources" do
-    post "/api/list_sources", {:app_name => @test_app_name, :api_token => @api_token, :partition_type => :app}
+    post "/api/list_sources", {:api_token => @api_token, :partition_type => :app}
     JSON.parse(last_response.body).should == ["SimpleAdapter"]
   end
 
   it "should list user partition sources" do
-    post "/api/list_sources", {:app_name => @test_app_name, :api_token => @api_token, :partition_type => :user}
+    post "/api/list_sources", {:api_token => @api_token, :partition_type => :user}
     JSON.parse(last_response.body).should == ["SampleAdapter"]
   end
   

data/spec/api/list_users_spec.rb

@@ -4,17 +4,17 @@ describe "RhosyncApiListUsers" do
   it_should_behave_like "ApiHelper"
   
   it "should list users" do
-    params = {:app_name => @test_app_name, :api_token => @api_token,
+    params = {:api_token => @api_token,
       :attributes => {:login => 'testuser1', :password => 'testpass1'}}
     post "/api/create_user", params
     last_response.should be_ok
-    post "/api/list_users", {:app_name => @test_app_name, :api_token => @api_token}
+    post "/api/list_users", {:api_token => @api_token}
     JSON.parse(last_response.body).should == ["testuser", "testuser1"]
   end
   
   it "should handle empty user's list" do
     @a.delete; @a = App.create(@a_fields)
-    post "/api/list_users", {:app_name => @test_app_name, :api_token => @api_token}
+    post "/api/list_users", {:api_token => @api_token}
     JSON.parse(last_response.body).should == []    
   end
   

data/spec/api/set_refresh_time_spec.rb

@@ -5,8 +5,8 @@ describe "RhosyncApiSetRefreshTime" do
   
   it "should set refresh time to 100s from 'now'" do
     before = Time.now.to_i
-    post "/api/set_refresh_time", :api_token => @api_token, :source_name => @s_fields[:name],
-      :app_name => @a_fields[:name], :user_name => @u_fields[:login], :refresh_time => 100
+    post "/api/set_refresh_time", :api_token => @api_token, 
+      :source_name => @s_fields[:name], :user_name => @u_fields[:login], :refresh_time => 100
     after = Time.now.to_i
     last_response.should be_ok
     @s = Source.load(@s.id,@s_params)
@@ -16,8 +16,8 @@ describe "RhosyncApiSetRefreshTime" do
   
   it "should set refresh time to 'now' if no refresh_time provided" do
     before = Time.now.to_i
-    post "/api/set_refresh_time", :api_token => @api_token, :source_name => @s_fields[:name],
-      :app_name => @a_fields[:name], :user_name => @u_fields[:login]
+    post "/api/set_refresh_time", :api_token => @api_token, 
+      :source_name => @s_fields[:name], :user_name => @u_fields[:login]
     after = Time.now.to_i
     last_response.should be_ok
     @s = Source.load(@s.id,@s_params)
@@ -26,16 +26,16 @@ describe "RhosyncApiSetRefreshTime" do
   end
   
   it "should set poll interval" do
-    post "/api/set_refresh_time", :api_token => @api_token, :source_name => @s_fields[:name],
-      :app_name => @a_fields[:name], :user_name => @u_fields[:login], :poll_interval => 100
+    post "/api/set_refresh_time", :api_token => @api_token, 
+      :source_name => @s_fields[:name], :user_name => @u_fields[:login], :poll_interval => 100
     last_response.should be_ok
     @s = Source.load(@s.id,@s_params)
     @s.poll_interval.should == 100
   end
   
   it "should should not set nil poll interval" do
-    post "/api/set_refresh_time", :api_token => @api_token, :source_name => @s_fields[:name],
-      :app_name => @a_fields[:name], :user_name => @u_fields[:login], :poll_interval => nil
+    post "/api/set_refresh_time", :api_token => @api_token, 
+      :source_name => @s_fields[:name], :user_name => @u_fields[:login], :poll_interval => nil
     last_response.should be_ok
     @s = Source.load(@s.id,@s_params)
     @s.poll_interval.should == 300

data/spec/api/upload_file_spec.rb

@@ -7,7 +7,7 @@ describe "RhosyncApiUploadFile" do
     file = File.join(File.dirname(__FILE__),'..','testdata','compressed')    
     compress(file)
     zipfile = File.join(file,"compressed.zip")
-    post "/api/upload_file", :app_name => @test_app_name, :api_token => @api_token,
+    post "/api/upload_file", :api_token => @api_token,
       :upload_file => Rack::Test::UploadedFile.new(zipfile, "application/octet-stream")
     FileUtils.rm zipfile
     expected = File.join(Rhosync.app_directory,'compress-data.txt')
@@ -18,7 +18,7 @@ describe "RhosyncApiUploadFile" do
   
   it "should fail to upload a non-zip file" do
     file = File.join(File.dirname(__FILE__),'..','testdata','compressed','compress-data.txt')    
-    post "/api/upload_file", :app_name => @test_app_name, :api_token => @api_token,
+    post "/api/upload_file", :api_token => @api_token,
       :upload_file => Rack::Test::UploadedFile.new(file, "application/octet-stream")
     last_response.status.should == 500
     File.exists?(File.join(Rhosync.app_directory,'compress-data.txt')).should == false

data/spec/apps/rhotestapp/sources/simple_adapter.rb

@@ -16,10 +16,11 @@ class SimpleAdapter < SourceAdapter
   end
   
   def search(params=nil,txt='')
-    params[:foo] = 'bar'
+    params[:foo] = 'bar' # this is for 'chaining' test
     if params['search'] == 'bar'
       @result = {'obj'=>{'foo'=>'bar'}} 
-      params['name'] = 'iPhone'
+      # this is for 'chaining' test, addind 'iPhone' to trogger Sample adapter search result
+      params['name'] = 'iPhone'  
     end
     @result
   end

data/spec/client_spec.rb

@@ -31,7 +31,7 @@ describe "Client" do
   it "should raise exception if license seats exceeded" do
     Store.put_value(License::CLIENT_DOCKEY,100)
     lambda { Client.create(@c_fields,{}) }.should raise_error(
-      LicenseSeatsExceededException, "WARNING: Maximum # of clients exceeded for this license."
+      LicenseSeatsExceededException, "WARNING: Maximum # of devices exceeded for this license."
     )
   end
   

data/spec/client_sync_spec.rb

@@ -152,7 +152,7 @@ describe "ClientSync" do
       set_state('test_db_storage' => @data)
       res = @cs.search(params)
       token = @c.get_value(:search_token)
-      res.should == [{'version'=>ClientSync::VERSION},{'search_token'=>token},
+      res.should == [{'version'=>ClientSync::VERSION},{'token'=>token},
         {'source'=>@s.name},{'count'=>1},{'insert'=>{'1'=>@product1}}]
       verify_result(@c.docname(:search) => {'1'=>@product1},
         @c.docname(:search_errors) => {})
@@ -170,8 +170,8 @@ describe "ClientSync" do
       @source = @s
       set_state({@c.docname(:search) => {'1'=>@product1}})
       token = compute_token @cs.client.docname(:search_token)
-      @cs.search({:resend => true,:search_token => token}).should == [{'version'=>ClientSync::VERSION},
-        {'search_token'=>token},{'source'=>@s.name},{'count'=>1},{'insert'=>{'1'=>@product1}}]
+      @cs.search({:resend => true,:token => token}).should == [{'version'=>ClientSync::VERSION},
+        {'token'=>token},{'source'=>@s.name},{'count'=>1},{'insert'=>{'1'=>@product1}}]
       verify_result(@c.docname(:search) => {'1'=>@product1},
         @c.docname(:search_errors) => {},
         @cs.client.docname(:search_token) => token)
@@ -181,42 +181,42 @@ describe "ClientSync" do
       @source = @s
       set_state({@c.docname(:search) => {'1'=>@product1}})
       token = compute_token @cs.client.docname(:search_token)
-      @cs.search({:search_token => token}).should == []
+      @cs.search({:token => token}).should == []
       verify_result(@c.docname(:search) => {},
         @c.docname(:search_errors) => {},
         @cs.client.docname(:search_token) => nil)
     end
     
     it "should handle search all" do
-      sources = ['SampleAdapter']
+      sources = [{'name'=>'SampleAdapter'}]
       set_state('test_db_storage' => @data)
       res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
       token = Store.get_value(@cs.client.docname(:search_token))
-      res.should == [[{'version'=>ClientSync::VERSION},{'search_token'=>token},
-        {'source'=>sources[0]},{'count'=>1},{'insert'=>{'1'=>@product1}}]]
+      res.should == [[{'version'=>ClientSync::VERSION},{'token'=>token},
+        {'source'=>sources[0]['name']},{'count'=>1},{'insert'=>{'1'=>@product1}}]]
       verify_result(@c.docname(:search) => {'1'=>@product1},
         @c.docname(:search_errors) => {})
     end
     
     it "should handle search all error" do
-      sources = ['SampleAdapter']
+      sources = [{'name'=>'SampleAdapter'}]
       msg = "Error during search"
       error = set_test_data('test_db_storage',@data,msg,'search error')
       res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
       token = Store.get_value(@cs.client.docname(:search_token))
       res.should == [[{'version'=>ClientSync::VERSION},
-        {'source'=>sources[0]},{'search-error'=>{'search-error'=>{'message'=>msg}}}]]
+        {'source'=>sources[0]['name']},{'search-error'=>{'search-error'=>{'message'=>msg}}}]]
       verify_result(@c.docname(:search) => {},
         @c.docname(:search_errors) => {'search-error'=>{'message'=>msg}})
     end
     
     it "should handle search all login error" do
       @u.login = nil
-      sources = ['SampleAdapter']
+      sources = [{'name'=>'SampleAdapter'}]
       msg = "Error logging in"
       error = set_test_data('test_db_storage',@data,msg,'search error')
       ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}}).should == [
-        [{'version'=>ClientSync::VERSION},{'source'=>sources[0]},
+        [{'version'=>ClientSync::VERSION},{'source'=>sources[0]['name']},
         {'search-error'=>{'login-error'=>{'message'=>msg}}}]]
       verify_result(@c.docname(:search) => {},
         @c.docname(:search_errors) => {'login-error'=>{'message'=>msg}},
@@ -225,27 +225,55 @@ describe "ClientSync" do
     
     it "should handle multiple source search all" do
       set_test_data('test_db_storage',@data)
-      sources = ['SampleAdapter','SimpleAdapter']
+      sources = [{'name'=>'SimpleAdapter'},{'name'=>'SampleAdapter'}]
       res = ClientSync.search_all(@c,{:sources => sources,:search => {'name' => 'iPhone'}})
       @c.source_name = 'SampleAdapter'
       token = Store.get_value(@c.docname(:search_token))
-      res.should == [[{"version"=>ClientSync::VERSION},{'search_token'=>token},
-        {"source"=>"SampleAdapter"},{"count"=>1},{"insert"=>{'1'=>@product1}}],[]]
+      res.sort.should == [[{"version"=>ClientSync::VERSION},{'token'=>token},
+        {"source"=>"SampleAdapter"},{"count"=>1},{"insert"=>{'1'=>@product1}}],[]].sort
     end
     
     it "should handle search and accumulate params" do
       set_test_data('test_db_storage',@data)
-      sources = ['SimpleAdapter','SampleAdapter']
+      sources = [{'name'=>'SimpleAdapter'},{'name'=>'SampleAdapter'}]
       res = ClientSync.search_all(@c,{:sources => sources,:search => {'search'=>'bar'}})
       @c.source_name = 'SimpleAdapter'
       token = Store.get_value(@c.docname(:search_token))
       @c.source_name = 'SampleAdapter'
       token1 = Store.get_value(@c.docname(:search_token))
-      res.should == [[{"version"=>ClientSync::VERSION}, {'search_token'=>token},
+      res.should == [[{"version"=>ClientSync::VERSION}, {'token'=>token},
         {"source"=>"SimpleAdapter"},{"count"=>1},{"insert"=>{'obj'=>{'foo'=>'bar'}}}],
-        [{"version"=>ClientSync::VERSION},{'search_token'=>token1},{"source"=>"SampleAdapter"}, 
+        [{"version"=>ClientSync::VERSION},{'token'=>token1},{"source"=>"SampleAdapter"}, 
          {"count"=>1}, {"insert"=>{'1'=>@product1}}]]      
     end
+    
+    it "should handle search and ack of search results" do
+      set_test_data('test_db_storage',@data)
+      sources = [{'name'=>'SimpleAdapter'},{'name'=>'SampleAdapter'}]
+      ClientSync.search_all(@c,{:sources => sources,:search => {'search'=>'bar'}})
+      @c.source_name = 'SimpleAdapter'
+      token = Store.get_value(@c.docname(:search_token))
+      token.should_not be_nil
+      sources[0]['token'] = token
+      Store.get_data(@c.docname(:search)).should == {'obj'=>{'foo'=>'bar'}}
+      @c.source_name = 'SampleAdapter'
+      token1 = Store.get_value(@c.docname(:search_token))
+      token1.should_not be_nil
+      sources[1]['token'] = token1
+      Store.get_data(@c.docname(:search)).should == {'1'=>@product1}
+      # do ask on multiple sources
+      res = ClientSync.search_all(@c,{:sources => sources})
+      puts "res: #{res.inspect}"
+      @c.source_name = 'SimpleAdapter'
+      token = Store.get_value(@c.docname(:search_token))
+      token.should be_nil
+      Store.get_data(@c.docname(:search)).should == {}
+      @c.source_name = 'SampleAdapter'
+      token1 = Store.get_value(@c.docname(:search_token))
+      token1.should be_nil
+      Store.get_data(@c.docname(:search)).should == {}
+    end
+    
   end
   
   describe "page methods" do

data/spec/doc/doc_spec.rb

@@ -7,14 +7,13 @@ require 'spec/interop/test'
 require File.join(File.dirname(__FILE__),'..','..','lib','rhosync','server.rb')
 
 describe "Protocol" do
+  it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
-  it_should_behave_like "TestappHelper"
   
   include Rack::Test::Methods
   include Rhosync
   
   Rhosync.log_disabled = true
-  it_should_behave_like "SourceAdapterHelper"
   
   before(:each) do
     $rand_id ||= 0
@@ -231,7 +230,7 @@ eol
   end
   
   it "server send search results" do
-    sources = ['SampleAdapter']
+    sources = [{:name=>'SampleAdapter'}]
     Store.put_data('test_db_storage',@data)
     params = {:client_id => @c.id,:sources => sources,:search => {'name' => 'iPhone'},
       :version => ClientSync::VERSION}
@@ -240,7 +239,7 @@ eol
   end
   
   it "should get search results with error" do
-    sources = ['SampleAdapter']
+    sources = [{:name=>'SampleAdapter'}]
     msg = "Error during search"
     error = set_test_data('test_db_storage',@data,msg,'search error')
     params = {:client_id => @c.id,:sources => sources,:search => {'name' => 'iPhone'},
@@ -250,16 +249,31 @@ eol
   end
   
   it "should get multiple source search results" do
-    @s_fields[:name] = 'SimpleAdapter'
-    @s1 = Source.load(@s_fields,@s_params)
     Store.put_data('test_db_storage',@data)
-    sources = ['SimpleAdapter','SampleAdapter']
+    sources = [{:name=>'SimpleAdapter'},{:name=>'SampleAdapter'}]
     params = {:client_id => @c.id,:sources => sources,:search => {'search' => 'bar'},
       :version => ClientSync::VERSION}
     get "/#{@a.name}/search",params
     @title,@description = 'multi source search', 'send multiple sources in search results'
   end  
   
+  it "should ack multiple sources search results" do
+    set_test_data('test_db_storage',@data)
+    sources = [{'name'=>'SimpleAdapter'},{'name'=>'SampleAdapter'}]
+    ClientSync.search_all(@c,{:sources => sources,:search => {'search'=>'bar'}})
+    @c.source_name = 'SimpleAdapter'
+    token = Store.get_value(@c.docname(:search_token))
+    sources[0]['token'] = token
+    Store.get_data(@c.docname(:search)).should == {'obj'=>{'foo'=>'bar'}}
+    @c.source_name = 'SampleAdapter'
+    token = Store.get_value(@c.docname(:search_token))
+    sources[1]['token'] = token
+    params = {:client_id => @c.id,:sources => sources,
+      :version => ClientSync::VERSION}
+    get "/#{@a.name}/search",params
+    @title,@description = 'multi source search ack', 'acknowledge search result on multiple sources'
+  end
+  
   private
   def _print_markdown
     $content_table << {$rand_id => "#{@title} - #{@description}"}

data/spec/license_spec.rb

@@ -29,7 +29,7 @@ describe "License" do
   it "should raise exception when seats are exceeded" do
     Store.put_value(License::CLIENT_DOCKEY,10)
     lambda { License.new.check_and_use_seat }.should raise_error(
-      LicenseSeatsExceededException, "WARNING: Maximum # of clients exceeded for this license."
+      LicenseSeatsExceededException, "WARNING: Maximum # of devices exceeded for this license."
     )
   end
   

data/spec/perf/bulk_data_perf_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__),'..','spec_helper')
 require File.join(File.dirname(__FILE__),'perf_spec_helper')
 
 describe "BulkData Performance" do

data/spec/perf/perf_spec_helper.rb

@@ -1,6 +1,8 @@
+require File.join(File.dirname(__FILE__),'..','spec_helper')
 require 'faker'
 
 describe "PerfSpecHelper", :shared => true do
+  it_should_behave_like "SpecBootstrapHelper"
   
   def get_test_data(num=1000)
     file = File.join("spec","testdata","#{num}-data.txt")

data/spec/perf/store_perf_spec.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__),'..','spec_helper')
 require File.join(File.dirname(__FILE__),'perf_spec_helper')
 
 describe "Rhosync Performance" do

data/spec/server/server_spec.rb

@@ -223,7 +223,7 @@ describe "Server" do
     end
     
     it "should get search results" do
-      sources = ['SampleAdapter']
+      sources = [{:name=>'SampleAdapter'}]
       cs = ClientSync.new(@s,@c,1)
       Store.put_data('test_db_storage',@data)
       params = {:client_id => @c.id,:sources => sources,:search => {'name' => 'iPhone'},
@@ -231,26 +231,24 @@ describe "Server" do
       get "/application/search",params
       last_response.content_type.should == 'application/json'
       token = @c.get_value(:search_token)
-      JSON.parse(last_response.body).should == [[{'version'=>ClientSync::VERSION},{'search_token'=>token},
-        {'source'=>sources[0]},{'count'=>1},{'insert'=>{'1'=>@product1}}]]
+      JSON.parse(last_response.body).should == [[{'version'=>ClientSync::VERSION},{'token'=>token},
+        {'source'=>sources[0][:name]},{'count'=>1},{'insert'=>{'1'=>@product1}}]]
     end
     
     it "should get search results with error" do
-      sources = ['SampleAdapter']
+      sources = [{:name=>'SampleAdapter'}]
       msg = "Error during search"
       error = set_test_data('test_db_storage',@data,msg,'search error')
       params = {:client_id => @c.id,:sources => sources,:search => {'name' => 'iPhone'},
         :version => ClientSync::VERSION}
       get "/application/search",params
       JSON.parse(last_response.body).should == [[{'version'=>ClientSync::VERSION},
-        {'source'=>sources[0]},{'search-error'=>{'search-error'=>{'message'=>msg}}}]]
+        {'source'=>sources[0][:name]},{'search-error'=>{'search-error'=>{'message'=>msg}}}]]
     end
     
     it "should get multiple source search results" do
-      @s_fields[:name] = 'SimpleAdapter'
-      @s1 = Source.load(@s_fields,@s_params)
       Store.put_data('test_db_storage',@data)
-      sources = ['SimpleAdapter','SampleAdapter']
+      sources = [{:name=>'SimpleAdapter'},{:name=>'SampleAdapter'}]
       params = {:client_id => @c.id,:sources => sources,:search => {'search' => 'bar'},
         :version => ClientSync::VERSION}
       get "/application/search",params
@@ -259,9 +257,9 @@ describe "Server" do
       @c.source_name = 'SampleAdapter'
       token = @c.get_value(:search_token)
       JSON.parse(last_response.body).should == [
-        [{"version"=>ClientSync::VERSION},{'search_token'=>token1},{"source"=>"SimpleAdapter"}, 
+        [{"version"=>ClientSync::VERSION},{'token'=>token1},{"source"=>"SimpleAdapter"}, 
          {"count"=>1}, {"insert"=>{'obj'=>{'foo'=>'bar'}}}],
-        [{"version"=>ClientSync::VERSION},{'search_token'=>token},{"source"=>"SampleAdapter"}, 
+        [{"version"=>ClientSync::VERSION},{'token'=>token},{"source"=>"SampleAdapter"}, 
          {"count"=>1}, {"insert"=>{'1'=>@product1}}]]
     end
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - beta1
-  version: 2.0.0.beta1
+  - beta2
+  version: 2.0.0.beta2
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 4
         - 2
-        - 3
-        version: 1.2.3
+        version: 1.4.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -96,10 +96,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 2
-        - 0
-        version: 0.2.0
+        - 7
+        version: 1.0.7
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -138,10 +138,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 9
-        - 2
-        version: 0.9.2
+        version: "1.0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -159,21 +158,21 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rake
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 4
         - 0
-        version: 1.4.0
-  type: :development
+        - 8
+        - 7
+        version: 0.8.7
+  type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jeweler
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
@@ -181,27 +180,27 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 3
+        - 4
         - 0
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 3
         - 0
-        - 9
-        - 8
-        version: 0.9.8
+        version: 1.3.0
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: faker
+  name: rcov
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     requirements: 
@@ -209,13 +208,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        - 9
+        - 8
+        version: 0.9.8
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: faker
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     requirements: 
@@ -223,27 +222,27 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
         - 3
-        version: 0.5.3
+        - 1
+        version: 0.3.1
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: mechanize
+  name: rack-test
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        - 5
+        - 3
+        version: 0.5.3
   type: :development
   version_requirements: *id016
-description: Rhosync Server and related command-line utilities for using Rhosync
-email: 
+description: Rhosync library and related command-line utilities for using Rhosync
+email: dev@rhomobile.com
 executables: 
 - rhosync
 extensions: []
@@ -343,12 +342,15 @@ files:
 - lib/rhosync/console/app/routes/user.rb
 - lib/rhosync/console/app/views/client.erb
 - lib/rhosync/console/app/views/doc.erb
+- lib/rhosync/console/app/views/docdata.erb
 - lib/rhosync/console/app/views/docs.erb
 - lib/rhosync/console/app/views/index.erb
 - lib/rhosync/console/app/views/layout.erb
 - lib/rhosync/console/app/views/newuser.erb
 - lib/rhosync/console/app/views/ping.erb
 - lib/rhosync/console/app/views/result.erb
+- lib/rhosync/console/app/views/select_doc.erb
+- lib/rhosync/console/app/views/upload_doc.erb
 - lib/rhosync/console/app/views/user.erb
 - lib/rhosync/console/app/views/users.erb
 - lib/rhosync/console/rhosync_api.rb