rhosync 2.0.3 → 2.0.4

data/spec/api/rhosync_api_spec.rb

@@ -0,0 +1,306 @@
+require File.join(File.dirname(__FILE__),'..','..','lib','rhosync','console','rhosync_api.rb')
+require File.join(File.dirname(__FILE__),'api_helper')
+
+describe "RhosyncApi" do
+  it_should_behave_like "ApiHelper"
+  
+  it "should return api token using direct api call" do
+    RhosyncApi::get_token('','rhoadmin','').should == @api_token
+  end
+  
+  it "should return api token using rest call" do
+    response = {'set-cookie'=>"rhosync_session=c21...42b64; path=/; expires=Tue, 02-Aug-2011 23:55:19 GMT"}
+    res = mock('HttpResponse')
+    res.stub!(:response).and_return(response)
+    http = mock('NetHttp')
+    http.stub!(:post).and_return(res)
+    Net::HTTP.stub!(:new).and_return(http)
+    RestClient.stub(:post).and_return(@api_token)
+    
+    Net::HTTP.should_receive(:new).once
+    RestClient.should_receive(:post).once
+    RhosyncApi::get_token('some_url','rhoadmin','').should == @api_token
+  end
+  
+  it "should list users using direct api call" do
+    RhosyncApi::list_users('',@api_token).should == ['testuser']
+  end
+  
+  it "should list users using rect call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(['testuser'].to_json)
+    RestClient.stub(:post).and_return(res)
+    RestClient.should_receive(:post).once
+    RhosyncApi::list_users('some_url',@api_token).should == ['testuser']
+  end
+  
+  it "should create user using direct api call" do
+    RhosyncApi::create_user('',@api_token,'testuser1','testpass1')
+    User.load('testuser1').login.should == 'testuser1'
+    User.authenticate('testuser1','testpass1').login.should == 'testuser1'
+    @a.users.members.sort.should == [@u.login, 'testuser1']    
+  end 
+  
+  it "should create user using rect call" do
+    RestClient.stub(:post).and_return("User created")
+    RestClient.should_receive(:post).once
+    RhosyncApi::create_user('some_url',@api_token,'testuser1','testpass1').should == "User created"
+  end
+  
+  it "should delete user direct api call" do
+    RhosyncApi::create_user('',@api_token,'testuser1','testpass1').should == "User created"
+    User.is_exist?('testuser1').should == true
+    RhosyncApi::delete_user('',@api_token,'testuser1').should == "User deleted"
+    User.is_exist?('testuser1').should == false
+    App.load(@test_app_name).users.members.should == ["testuser"]
+  end
+
+  it "should delete user using rect call" do
+    RestClient.stub(:post).and_return("User deleted")
+    RestClient.should_receive(:post).once
+    RhosyncApi::delete_user('some_url',@api_token,'testuser1').should == "User deleted"
+  end
+  
+  it "should list clients using direct api call" do
+    res = RhosyncApi::list_clients('',@api_token,@u_fields[:login])
+    res.is_a?(Array).should == true
+    res.size.should == 1
+    res[0].is_a?(String) == true
+    res[0].length.should == 32
+  end
+  
+  it "should handle empty client's list" do
+    @u.clients.delete(@c.id)
+    RhosyncApi::list_clients('',@api_token,@u_fields[:login]).should == []
+  end  
+  
+  it "should create user using rect call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(["21325fd9911044c6ad974785bf23c173"].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::list_clients('some_url',@api_token,'testuser1').should == ["21325fd9911044c6ad974785bf23c173"]
+  end
+  
+  it "should create client for a user using direct api call" do
+    RhosyncApi::create_client('',@api_token,@u_fields[:login])
+    clients = User.load(@u_fields[:login]).clients.members
+    clients.size.should == 2
+  end  
+  
+  it "should create client using rect call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return("")
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::create_client('some_url',@api_token,'testuser1')
+  end
+  
+  it "should delete client using direct api call" do
+    RhosyncApi::delete_client('',@api_token,@u_fields[:login],@c.id).should == "Client deleted"
+    Client.is_exist?(@c.id).should == false
+    User.load(@u_fields[:login]).clients.members.should == []
+  end
+  
+  it "should delete client using rect call" do
+    RestClient.stub(:post).and_return("Client deleted")
+    RestClient.should_receive(:post).once
+    RhosyncApi::delete_client('some_url',@api_token,@u_fields[:login],@c.id).should == "Client deleted"
+  end
+  
+  it "should list client attributes using direct api call" do
+    res = RhosyncApi::get_client_params('',@api_token,@c.id)
+    res.delete_if { |attrib| attrib['name'] == 'rho__id' }
+    res.sort{|x,y| x['name']<=>y['name']}.should == [
+      {"name"=>"device_type", "value"=>"iPhone", "type"=>"string"}, 
+      {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
+      {"name"=>"device_port", "value"=>"3333", "type"=>"string"}, 
+      {"name"=>"user_id", "value"=>"testuser", "type"=>"string"}, 
+      {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
+  end
+  
+  it "should list client attributes using rest call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(["blah"].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::get_client_params('some_url',@api_token,'client_id')  
+  end
+  
+  it "should list all application sources using direct api call" do
+    RhosyncApi::list_sources('',@api_token).sort.should == 
+      ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].sort
+  end  
+  
+  it "should list all application sources using rest call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::list_sources('some_url',@api_token)
+  end
+  
+  it "should list source attributes using direct api call" do
+    RhosyncApi::get_source_params('',@api_token,"SampleAdapter").should == [
+      {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"}, 
+      {"name"=>"source_id", "value"=>nil, "type"=>"integer"}, 
+      {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"}, 
+      {"name"=>"url", "value"=>"", "type"=>"string"}, 
+      {"name"=>"login", "value"=>"", "type"=>"string"}, 
+      {"name"=>"password", "value"=>"", "type"=>"string"}, 
+      {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
+      {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
+      {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
+      {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
+      {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
+      {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
+      {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
+      {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
+      {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
+      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"},
+      {"name"=>"schema", "value"=>nil, "type"=>"string"}]
+  end
+ 
+  it "should list source attributes using rest call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(["SimpleAdapter"].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::get_source_params('some_url',@api_token,"SimpleAdapter")
+  end
+  
+  it "should list of shared source documents using direct api call" do
+    RhosyncApi::list_source_docs('',@api_token,"SimpleAdapter","*").sort.should == {
+      "md"=>"source:application:__shared__:SimpleAdapter:md", 
+      "errors"=>"source:application:__shared__:SimpleAdapter:errors", 
+      "md_size"=>"source:application:__shared__:SimpleAdapter:md_size", 
+      "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}.sort
+  end
+  
+  it "should list of shared source documents using rest call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(["SimpleAdapter"].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::list_source_docs('some_url',@api_token,"SimpleAdapter",'*')
+  end
+  
+  it "should list client documents using direct api call" do
+    RhosyncApi::list_client_docs('',@api_token,"SimpleAdapter",@c.id).should == {
+      "cd"=>"client:application:testuser:#{@c.id}:SimpleAdapter:cd", 
+      "cd_size"=>"client:application:testuser:#{@c.id}:SimpleAdapter:cd_size", 
+      "create"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create", 
+      "update"=>"client:application:testuser:#{@c.id}:SimpleAdapter:update", 
+      "delete"=>"client:application:testuser:#{@c.id}:SimpleAdapter:delete", 
+
+      "page"=>"client:application:testuser:#{@c.id}:SimpleAdapter:page", 
+      "page_token"=>"client:application:testuser:#{@c.id}:SimpleAdapter:page_token", 
+      "delete_page"=>"client:application:testuser:#{@c.id}:SimpleAdapter:delete_page", 
+      "create_links"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create_links", 
+      "create_links_page"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create_links_page", 
+
+      "delete_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:delete_errors", 
+      "login_error"=>"client:application:testuser:#{@c.id}:SimpleAdapter:login_error", 
+      "create_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:create_errors", 
+      "update_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:update_errors", 
+      "logoff_error"=>"client:application:testuser:#{@c.id}:SimpleAdapter:logoff_error", 
+
+      "search"=>"client:application:testuser:#{@c.id}:SimpleAdapter:search",
+      "search_token"=>"client:application:testuser:#{@c.id}:SimpleAdapter:search_token", 
+      "search_errors"=>"client:application:testuser:#{@c.id}:SimpleAdapter:search_errors"}
+  end
+  
+  it "should list client documents using rest call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(["SimpleAdapter"].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::list_client_docs('some_url',@api_token,"SimpleAdapter",'*')
+  end
+  
+  it "should return db document by name using direct api call" do
+    data = {'1' => {'foo' => 'bar'}}
+    set_state('abc:abc' => data)
+    RhosyncApi::get_db_doc('',@api_token,'abc:abc').should == data
+  end
+
+  it "should return db document by name and data_type using direct api call" do
+    data = 'some string'
+    set_state('abc:abc' => data)
+    RhosyncApi::get_db_doc('',@api_token,'abc:abc','string').should == data
+  end    
+
+  it "should return db document using rest call" do
+    data = 'some string'
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(data)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::get_db_doc('some_url',@api_token,'abc:abc','string').should == data
+  end  
+
+  it "should set db document by doc name and data using direct api call" do
+    data = {'1' => {'foo' => 'bar'}}
+    RhosyncApi::set_db_doc('',@api_token,'abc:abc',data)
+    verify_result('abc:abc' => data)
+  end
+
+  it "should set db document by doc name, data type, and data using direct api call" do
+    data = 'some string'
+    RhosyncApi::set_db_doc('',@api_token,'abc:abc:str',data,'string')
+    verify_result('abc:abc:str' => data)
+  end
+
+  it "should set db document using rest call" do
+    data = 'some string'
+    RestClient.stub(:post)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::set_db_doc('some_url',@api_token,'abc:abc:str',data,'string')
+  end  
+
+  it "should reset and re-create rhoadmin user with bootstrap using direct api call" do
+    Store.put_data('somedoc',{'foo'=>'bar'})
+    RhosyncApi::reset('',@api_token).should == "DB reset"
+    App.is_exist?(@test_app_name).should == true
+    Store.get_data('somedoc').should == {}
+    User.authenticate('rhoadmin','').should_not be_nil
+  end
+  
+  it "should reset db using rest call" do
+    RestClient.stub(:post).and_return("DB reset")    
+    RestClient.should_receive(:post).once
+    RhosyncApi::reset('some_url',@api_token).should == "DB reset"
+  end
+  
+  it "should do ping asynchronously using direct api call" do
+    params = {"user_id" => @u.id, "api_token" => @api_token, 
+      "async" => "true","sources" => [@s.name], "message" => 'hello world', 
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    PingJob.should_receive(:enqueue).once.with(params)
+    RhosyncApi::ping('',@api_token,@u.id,params)
+  end
+  
+  it "should do ping using rest call" do
+    RestClient.stub(:post)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::ping('some_url',@api_token,@u.id,{})
+  end
+    
+  it "should get license info using direct api call" do
+    RhosyncApi::get_license_info('',@api_token).should == {
+      "available" => 9, 
+      "issued" => "Fri Apr 23 17:20:13 -0700 2010", 
+      "seats" => 10, 
+      "rhosync_version" => "Version 1",
+      "licensee" => "Rhomobile" }
+  end 
+
+  it "should get license info using rest call" do
+    res = mock('HttpResponse')
+    res.stub!(:body).and_return(['data'].to_json)
+    RestClient.stub(:post).and_return(res)    
+    RestClient.should_receive(:post).once
+    RhosyncApi::get_license_info('some_url',@api_token)
+  end
+   
+end  

data/spec/doc/doc_spec.rb

@@ -23,7 +23,7 @@ describe "Protocol" do
     Rhosync.bootstrap(get_testapp_path) do |rhosync|
       rhosync.vendor_directory = File.join(rhosync.base_directory,'..','..','..','vendor')
     end
-    Server.set( 
+    Rhosync::Server.set( 
       :environment => :test,
       :run => false,
       :secret => "secure!"
@@ -37,7 +37,7 @@ describe "Protocol" do
   end
   
   def app
-    @app ||= Server.new
+    @app ||= Rhosync::Server.new
   end
   
   after(:each) do

data/spec/model_spec.rb

@@ -187,6 +187,10 @@ describe Rhosync::Model do
       @x.set_date.diff('x', 'y')[0].should be_kind_of(DateTime)
     end
 
+    it "should handle empty members" do
+      @xRedisMock.stub!(:smembers).and_return(nil)
+      @x.set_date.members.should == []
+    end
   end
   
   context "increment/decrement" do

data/spec/server/server_spec.rb

@@ -20,17 +20,17 @@ describe "Server" do
     Rhosync.bootstrap(get_testapp_path) do |rhosync|
       rhosync.vendor_directory = File.join(rhosync.base_directory,'..','..','..','vendor')
     end
-    Server.set( 
+    Rhosync::Server.set( 
       :environment => :test,
       :run => false,
       :secret => "secure!"
     )
-    Server.use Rack::Static, :urls => ["/data"], 
+    Rhosync::Server.use Rack::Static, :urls => ["/data"], 
       :root =>  File.expand_path(File.join(File.dirname(__FILE__),'..','apps','rhotestapp'))
   end
 
   def app
-    @app ||= Server.new
+    @app ||= Rhosync::Server.new
   end
   
   it "should show status page" do
@@ -54,20 +54,20 @@ describe "Server" do
   end
   
   it "should have default session secret" do
-    Server.secret.should == "secure!"
+    Rhosync::Server.secret.should == "secure!"
   end
   
   it "should update session secret to default" do
-    Server.set :secret, "<changeme>"
-    Server.secret.should == "<changeme>"
-    Server.should_receive(:log).any_number_of_times.with(any_args())
+    Rhosync::Server.set :secret, "<changeme>"
+    Rhosync::Server.secret.should == "<changeme>"
+    Rhosync::Server.should_receive(:log).any_number_of_times.with(any_args())
     check_default_secret!("<changeme>")
-    Server.set :secret, "secure!"
+    Rhosync::Server.set :secret, "secure!"
   end
   
   it "should complain about hsqldata.jar missing" do
     Rhosync.vendor_directory = 'missing'
-    Server.should_receive(:log).any_number_of_times.with(any_args())
+    Rhosync::Server.should_receive(:log).any_number_of_times.with(any_args())
     check_hsql_lib!
   end
   

data/spec/store_spec.rb

@@ -1,7 +1,8 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe "Store" do
-  
+    
+  it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
   describe "store methods" do
@@ -10,12 +11,10 @@ describe "Store" do
     end
     
     it "should set redis connection" do
-      begin
-        Store.db = 'localhost:5555'
-        Store.db.server.should == 'localhost:5555'
-      ensure
-        Store.db = ''
-      end
+      Store.db = nil
+      Store.db = 'localhost:6379'
+      Store.db.client.host.should == 'localhost'
+      Store.db.client.port.should == 6379
     end
     
     it "should create default redis connection" do
@@ -23,10 +22,12 @@ describe "Store" do
       Store.db.class.name.should match(/Redis/)
     end
     
-    it "should create Redis::Distributed if redis array is provided" do
-      Store.db = ['localhost:5555','localhost:5556']
-      Store.db.class.should == Redis::Distributed
-      Store.db = ''
+    it "should create redis connection based on ENV" do
+      ENV[REDIS_URL] = 'redis://localhost:6379'
+      Redis.should_receive(:connect).with(:url => 'redis://localhost:6379').and_return { Redis.new }
+      Store.db = nil
+      Store.db.should_not == nil
+      ENV.delete(REDIS_URL)
     end
     
     it "should add simple data to new set" do
@@ -39,7 +40,7 @@ describe "Store" do
       Store.put_data(@s.docname(:md),@data).should == true
       Store.get_data(@s.docname(:md),Array).sort.should == @data
     end
-  
+      
     it "should replace simple data to existing set" do
       new_data,new_data['3'] = {},{'name' => 'Droid','brand' => 'Google'}
       Store.put_data(@s.docname(:md),@data).should == true
@@ -71,7 +72,7 @@ describe "Store" do
       Store.get_data(@c.docname(:cd)).should == @data1
       Store.get_diff_data(@s.docname(:md),@c.docname(:cd)).should == [expected,1]
     end
-  
+      
     it "should return attributes modified and missed in doc2" do
       Store.put_data(@s.docname(:md),@data).should == true
       Store.get_data(@s.docname(:md)).should == @data
@@ -84,7 +85,7 @@ describe "Store" do
       Store.get_data(@c.docname(:cd)).should == @data1
       Store.get_diff_data(@c.docname(:cd),@s.docname(:md)).should == [expected,2]
     end  
-  
+      
     it "should ignore reserved attributes" do
       @newproduct = {
         'name' => 'iPhone',
@@ -116,19 +117,26 @@ describe "Store" do
     it "should lock document" do
       doc = "locked_data"
       m_lock = Store.get_lock(doc)
-      th = Thread.new do 
+      pid = Process.fork do
+        Store.db = Redis.new
         t_lock = Store.get_lock(doc)
         Store.put_data(doc,{'1'=>@product1},true)
         Store.release_lock(doc,t_lock) 
+        Process.exit(0)
       end
       Store.put_data(doc,{'2'=>@product2},true)
       Store.get_data(doc).should == {'2'=>@product2}
-      th.alive?.should == true
       Store.release_lock(doc,m_lock)
-      sleep(2)
+      Process.waitpid(pid)
       m_lock = Store.get_lock(doc)
       Store.get_data(doc).should == {'1'=>@product1,'2'=>@product2}
-      th.alive?.should == false
+    end
+    
+    it "should lock key for timeout" do
+      doc = "locked_data"
+      Store.db.set "#{doc}:lock", Time.now.to_i+3
+      Store.should_receive(:sleep).at_least(:once).with(1).and_return { sleep 1 }
+      m_lock = Store.get_lock(doc,2)
     end
     
     it "should lock document in block" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -07:00
+date: 2010-08-04 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,12 +106,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
-        - 1
+        - 2
         - 0
         - 0
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -122,12 +122,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 61
         segments: 
         - 1
-        - 8
-        - 3
-        version: 1.8.3
+        - 9
+        - 7
+        version: 1.9.7
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -448,6 +448,7 @@ files:
 - spec/api/push_deletes_spec.rb
 - spec/api/push_objects_spec.rb
 - spec/api/reset_spec.rb
+- spec/api/rhosync_api_spec.rb
 - spec/api/set_db_doc_spec.rb
 - spec/api/set_refresh_time_spec.rb
 - spec/api/update_user_spec.rb
@@ -560,6 +561,7 @@ test_files:
 - spec/api/push_deletes_spec.rb
 - spec/api/push_objects_spec.rb
 - spec/api/reset_spec.rb
+- spec/api/rhosync_api_spec.rb
 - spec/api/set_db_doc_spec.rb
 - spec/api/set_refresh_time_spec.rb
 - spec/api/update_user_spec.rb