rhosync 2.0.0.beta2 → 2.0.0.beta3

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

@@ -58,9 +58,14 @@ class SampleAdapter < SourceAdapter
   
   def _read(operation,params)
     @result = Store.get_data('test_db_storage')
-    raise SourceAdapterServerErrorException.new(@result[ERROR]['an_attribute']) if @result[ERROR] and 
-      @result[ERROR]['name'] == "#{operation} error"
-    @result.reject! {|key,value| value['name'] != params['name']} if params
+    if params and params['stash_result']
+      stash_result
+      # @result is nil at this point; if @result is empty then md will be cleared
+    else   
+      raise SourceAdapterServerErrorException.new(@result[ERROR]['an_attribute']) if @result[ERROR] and 
+        @result[ERROR]['name'] == "#{operation} error"
+      @result.reject! {|key,value| value['name'] != params['name']} if params
+    end  
     @result
   end
 end

data/spec/client_sync_spec.rb

@@ -351,7 +351,7 @@ describe "ClientSync" do
           "class"=>"Rhosync::BulkDataJob"}
     end
     
-    it "should create bulk data job app partition if none exists and no parition sources" do
+    it "should create bulk data job app partition if none exists and no partition sources" do
       ClientSync.bulk_data(:app,@c).should == {:result => :nop}
       Resque.peek(:bulk_data).should == nil
     end
@@ -369,7 +369,7 @@ describe "ClientSync" do
       ClientSync.bulk_data(:user,@c)
       BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
       ClientSync.bulk_data(:user,@c).should == {:result => :url,
-        :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).dbfile}
+        :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).url}
       verify_result(
         "client:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@c.id}:#{@s_fields[:name]}:cd" => @data,
         "source:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}:md" => @data,
@@ -382,7 +382,7 @@ describe "ClientSync" do
       ClientSync.bulk_data(:app,@c)
       BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,"*"))
       ClientSync.bulk_data(:app,@c).should == {:result => :url,
-        :url => BulkData.load(bulk_data_docname(@a.id,"*")).dbfile}
+        :url => BulkData.load(bulk_data_docname(@a.id,"*")).url}
       verify_result(
         "client:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@c.id}:#{@s_fields[:name]}:cd" => @data,
         "source:#{@a_fields[:name]}:__shared__:#{@s_fields[:name]}:md" => @data,
@@ -395,11 +395,23 @@ describe "ClientSync" do
       ClientSync.bulk_data(:user,@c)
       BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
       ClientSync.bulk_data(:user,@c).should == {:result => :url,
-        :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).dbfile}
+        :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).url}
       verify_result(
         "client:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@c.id}:#{@s_fields[:name]}:cd" => {},
         "source:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}:md" => @data,
         "source:#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}:md_copy" => {})
     end
+    
+    it "should create bulk data job if no file exists" do
+      set_state('test_db_storage' => @data)
+      ClientSync.bulk_data(:user,@c)
+      BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
+      data = BulkData.load(bulk_data_docname(@a.id,@u.id))
+      ClientSync.bulk_data(:user,@c).should == {:result => :url, :url => data.url}
+      File.delete(data.dbfile)
+      ClientSync.bulk_data(:user,@c).should == {:result => :wait}
+      Resque.peek(:bulk_data).should == {"args"=>
+        [{"data_name"=>bulk_data_docname(@a.id,@u.id)}], "class"=>"Rhosync::BulkDataJob"}
+    end
   end
 end

data/spec/generator/generator_spec.rb

@@ -5,8 +5,8 @@ describe "Generator" do
   source = 'mysource'
   path = File.expand_path(File.join(File.dirname(__FILE__)))
   
-  after(:each) do
-    #FileUtils.rm_rf path
+  before(:each) do
+    FileUtils.mkdir_p '/tmp'
   end
   
   describe "AppGenerator" do
@@ -26,7 +26,8 @@ describe "Generator" do
         "application.rb",
         'settings/settings.yml',
         'settings/license.key',
-        'Rakefile'
+        'Rakefile',
+        'spec/spec_helper.rb'
       ].each do |template|
         @generator.should create("/tmp/#{appname}/#{template}")
       end
@@ -41,12 +42,15 @@ describe "Generator" do
     end
     
     before(:each) do
-      @generator = Rhosync::SourceGenerator.new('/tmp',{},source)
+      FileUtils.rm_rf "/tmp/#{appname}"
+      @app_generator = Rhosync::AppGenerator.new('/tmp',{},appname)
+      @app_generator.invoke!
+      @generator = Rhosync::SourceGenerator.new("/tmp/#{appname}",{},source)
     end
     
-    it "should create new source adapter" do
-      pending
-      @generator.should create("/tmp/sources/#{source}.rb")
+    it "should create new source adapter and spec" do
+      @generator.should create("/tmp/#{appname}/sources/#{source}.rb")
+      @generator.should create("/tmp/#{appname}/spec/sources/#{source}_spec.rb")
     end
   end
   

data/spec/jobs/bulk_data_job_spec.rb

@@ -26,9 +26,14 @@ describe "BulkDataJob" do
     data.completed?.should == true
     verify_result(@s.docname(:md) => @data,@s.docname(:md_copy) => @data)
     validate_db(data,@data).should == true
+    File.exists?(data.dbfile+'.rzip').should == true
     File.exists?(data.dbfile+'.hsqldb.data').should == true
     File.exists?(data.dbfile+'.hsqldb.script').should == true
     File.exists?(data.dbfile+'.hsqldb.properties').should == true
+    path = File.join(File.dirname(data.dbfile),'tmp')
+    FileUtils.mkdir_p path
+    unzip_file("#{data.dbfile}.rzip",path)
+    validate_db_by_name(File.join(path,File.basename(data.dbfile)),@data)
   end
   
   it "should not create hsql db files if blackberry_bulk_sync is disabled" do
@@ -49,6 +54,25 @@ describe "BulkDataJob" do
     File.exists?(data.dbfile+'.hsqldb.properties').should == false
   end
   
+  it "should create sqlite data with source metadata" do
+    set_state('test_db_storage' => @data)
+    mock_metadata_method([SampleAdapter]) do
+      docname = bulk_data_docname(@a.id,@u.id)
+      data = BulkData.create(:name => docname,
+        :state => :inprogress,
+        :app_id => @a.id,
+        :user_id => @u.id,
+        :sources => [@s_fields[:name]])
+      BulkDataJob.perform("data_name" => data.name)
+      data = BulkData.load(docname)
+      data.completed?.should == true
+      verify_result(@s.docname(:md) => @data,
+        @s.docname(:metadata) => {'foo'=>'bar'}.to_json,
+        @s.docname(:md_copy) => @data)
+      validate_db(data,@data).should == true
+    end
+  end
+  
   it "should raise exception if hsqldata fails" do
     data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
       :state => :inprogress,

data/spec/rhosync_spec.rb

@@ -14,6 +14,7 @@ describe "Rhosync" do
     File.expand_path(Rhosync.data_directory).should == File.join(path,'data')
     Rhosync.vendor_directory.should == 'foo'
     Rhosync.blackberry_bulk_sync.should == false
+    Rhosync.bulk_sync_poll_interval.should == 3600
     Rhosync.environment.should == :development  
     App.is_exist?(@test_app_name).should be_true
   end

data/spec/server/server_spec.rb

@@ -43,6 +43,11 @@ describe "Server" do
     last_response.should be_ok
   end
   
+  it "should login as admin user" do
+    post "/login", "login" => 'admin', "password" => ''
+    last_response.should be_ok
+  end
+  
   it "should respond with 401 to /:app_name" do
     get "/application"
     last_response.status.should == 401
@@ -83,9 +88,22 @@ describe "Server" do
       last_response.should be_ok
     end
     
-    it "should respond 401 for incorrect username or password" do
+    it "should return 401 and LoginException messsage from authenticate" do
       do_post "/application/clientlogin", "login" => @u.login, "password" => 'wrongpass'
       last_response.status.should == 401
+      last_response.body.should == 'login exception'
+    end
+    
+    it "should return 500 and Exception messsage from authenticate" do
+      do_post "/application/clientlogin", "login" => @u.login, "password" => 'server error'
+      last_response.status.should == 500
+      last_response.body.should == 'server error'
+    end
+    
+    it "should return 401 and no messsage from authenticate if no exception raised" do
+      do_post "/application/clientlogin", "login" => @u.login, "password" => 'wrongpassnomsg'
+      last_response.status.should == 401
+      last_response.body.should == ''
     end
     
     it "should create unknown user through delegated authentication" do
@@ -286,9 +304,10 @@ describe "Server" do
       BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
       get "/application/bulk_data", :partition => :user, :client_id => @c.id
       last_response.should be_ok
+      data = BulkData.load(bulk_data_docname(@a.id,@u.id))
       last_response.body.should == {:result => :url, 
-        :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).dbfile}.to_json
-      validate_db_by_name(JSON.parse(last_response.body)["url"],@data)
+        :url => data.url}.to_json
+      validate_db_by_name(data.dbfile,@data)
     end
     
     it "should download bulk data file" do
@@ -296,7 +315,7 @@ describe "Server" do
       get "/application/bulk_data", :partition => :user, :client_id => @c.id
       BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
       get "/application/bulk_data", :partition => :user, :client_id => @c.id
-      get "/data/application/#{@u.id}/#{JSON.parse(last_response.body)["url"].split('/').last}"
+      get JSON.parse(last_response.body)["url"]
       last_response.should be_ok
       File.open('test.data','wb') {|f| f.puts last_response.body}
       validate_db_by_name('test.data',@data)

data/spec/source_adapter_spec.rb

@@ -4,6 +4,11 @@ class Rhosync::SourceAdapter
   def inject_result(result) 
     @result = result
   end
+  
+  def inject_tmpdoc(docname)
+    @tmp_docname = docname
+    @stash_size = 0
+  end
 end
 
 describe "SourceAdapter" do
@@ -50,12 +55,6 @@ describe "SourceAdapter" do
       @sa.query.should == expected
     end
     
-    it "should execute SourceAdapter query method" do
-      expected = {'1'=>@product1,'2'=>@product2}
-      @sa.inject_result expected
-      @sa.query.should == expected
-    end
-    
     it "should execute SourceAdapter search method and modify params" do
       params = {:hello => 'world'}
       expected = {'1'=>@product1,'2'=>@product2}
@@ -72,8 +71,7 @@ describe "SourceAdapter" do
     it "should execute SourceAdapter sync method" do
       expected = {'1'=>@product1,'2'=>@product2}
       @sa.inject_result expected
-      @sa.query.should == expected
-      @sa.sync
+      @sa.do_query
       Store.get_data(@s.docname(:md)).should == expected
       Store.get_value(@s.docname(:md_size)).to_i.should == 2
     end
@@ -85,10 +83,10 @@ describe "SourceAdapter" do
         
     it "should reset count if @result is empty" do
       @sa.inject_result({'1'=>@product1,'2'=>@product2})
-      @sa.query; @sa.sync
+      @sa.do_query
       Store.get_value(@s.docname(:md_size)).to_i.should == 2
       @sa.inject_result({})
-      @sa.query; @sa.sync
+      @sa.do_query
       Store.get_value(@s.docname(:md_size)).to_i.should == 0
     end
     
@@ -96,10 +94,12 @@ describe "SourceAdapter" do
       @sa.create(@product4).should == 'obj4'
     end
     
-    it "should log warning if @result is missing" do
-      @sa.should_receive(:log).with(SourceAdapter::MSG_NIL_RESULT_ATTRIB)
-      @sa.inject_result nil
-      @sa.sync
+    it "should stash @result in store and set it to nil" do
+      expected = {'1'=>@product1,'2'=>@product2}
+      @sa.inject_result(expected)
+      @sa.inject_tmpdoc('tmpdoc')
+      @sa.stash_result
+      Store.get_data('tmpdoc').should == expected
     end
     
     describe "SourceAdapter metadata method" do

data/spec/source_sync_spec.rb

@@ -72,6 +72,15 @@ describe "SourceSync" do
       end
     end
     
+    it "should process source adapter with stash" do
+      expected = {'1'=>@product1,'2'=>@product2}
+      set_state('test_db_storage' => expected)
+      #@ss.adapter.should_receive(:stash_result).once
+      @ss.process_query('stash_result' => true)
+      verify_result(@s.docname(:md) => expected,
+        @s.docname(:md_size) => expected.size.to_s)
+    end
+    
     it "should call methods in source adapter" do
       mock_metadata_method([SampleAdapter, SimpleAdapter]) do
         expected = {'1'=>@product1,'2'=>@product2}

data/spec/spec_helper.rb

@@ -2,94 +2,12 @@ require 'rubygems'
 require 'rhosync'
 include Rhosync
 
-describe "RhosyncHelper", :shared => true do
-  before(:each) do
-    Store.create
-    Store.db.flushdb
-  end
-end
+ERROR = '0_broken_object_id' unless defined? ERROR
 
-describe "TestappHelper", :shared => true do
-  before(:all) do
-    @test_app_name = 'application'
-  end
+module TestHelpers
   def get_testapp_path
     File.expand_path(File.join(File.dirname(__FILE__),'apps','rhotestapp'))
   end
-end
-
-describe "RhosyncDataHelper", :shared => true do
-  it_should_behave_like "RhosyncHelper"
-  it_should_behave_like "TestappHelper"
-  
-  before(:each) do
-    @source = 'Product'
-    @user_id = 5
-    @client_id = 1
-    
-    @product1 = {
-      'name' => 'iPhone',
-      'brand' => 'Apple',
-      'price' => '199.99'
-    }
-    
-    @product2 = {
-      'name' => 'G2',
-      'brand' => 'Android',
-      'price' => '99.99'
-    }
-
-    @product3 = {
-      'name' => 'Fuze',
-      'brand' => 'HTC',
-      'price' => '299.99'
-    }
-    
-    @product4 = {
-      'name' => 'Droid',
-      'brand' => 'Android',
-      'price' => '249.99'
-    }
-    
-    @data = {'1'=>@product1,'2'=>@product2,'3'=>@product3}
-  end
-end  
-
-describe "DBObjectsHelper", :shared => true do
-  
-  ERROR = '0_broken_object_id' unless defined? ERROR
-  
-  before(:each) do
-    @a_fields = { :name => @test_app_name }
-    # @a = App.create(@a_fields)
-    @a = (App.load(@test_app_name) || App.create(@a_fields))
-    @u_fields = {:login => 'testuser'}
-    @u = User.create(@u_fields) 
-    @u.password = 'testpass'
-    @c_fields = {
-      :device_type => 'iPhone',
-      :device_pin => 'abcd',
-      :device_port => '3333',
-      :user_id => @u.id,
-      :app_id => @a.id 
-    }
-    @s_fields = {
-      :name => 'SampleAdapter',
-      :url => 'http://example.com',
-      :login => 'testuser',
-      :password => 'testpass',
-    }
-    @s_params = {
-      :user_id => @u.id,
-      :app_id => @a.id
-    }
-    @c = Client.create(@c_fields,{:source_name => @s_fields[:name]})
-    @s = Source.load(@s_fields[:name],@s_params)
-    @s = Source.create(@s_fields,@s_params) if @s.nil?
-    @r = @s.read_state
-    @a.sources << @s.id
-    @a.users << @u.id
-  end
   
   def do_post(url,params)
     post url, params.to_json, {'CONTENT_TYPE'=>'application/json'}
@@ -184,8 +102,14 @@ describe "DBObjectsHelper", :shared => true do
   
   def validate_db_by_name(name,data)
     db = SQLite3::Database.new(name)
-    db.execute("select * from sources").each do |row|
-      return false if row.last != get_attrib_counter(data)
+    db.execute("select source_id,name,sync_priority,partition,sync_type,source_attribs,metadata from sources").each do |row|
+      return false if row[0] != @s.source_id.to_s
+      return false if row[1] != @s.name
+      return false if row[2] != @s.priority.to_s
+      return false if row[3] != @s.partition_type.to_s
+      return false if row[4] != @s.sync_type.to_s
+      return false if row[5] != get_attrib_counter(data)
+      return false if row[6] != @s.get_value(:metadata)
     end
     db.execute("select * from object_values").each do |row|
       object = data[row[2]]
@@ -215,6 +139,103 @@ describe "DBObjectsHelper", :shared => true do
       klass.class_eval "def metadata; end"
     end
   end
+  
+  def unzip_file(file,file_dir)
+    Zip::ZipFile.open(file) do |zip_file|
+      zip_file.each do |f|
+        f_path = File.join(file_dir,f.name)
+        FileUtils.mkdir_p(File.dirname(f_path))
+        zip_file.extract(f, f_path) { true }
+      end
+    end
+  end
+end #TestHelpers
+
+describe "RhosyncHelper", :shared => true do
+  before(:each) do
+    Store.create
+    Store.db.flushdb
+  end
+end
+
+describe "TestappHelper", :shared => true do
+  include TestHelpers
+  before(:all) do
+    @test_app_name = 'application'
+  end
+end
+
+describe "RhosyncDataHelper", :shared => true do  
+  it_should_behave_like "RhosyncHelper"
+  it_should_behave_like "TestappHelper"
+  
+  before(:each) do
+    @source = 'Product'
+    @user_id = 5
+    @client_id = 1
+    
+    @product1 = {
+      'name' => 'iPhone',
+      'brand' => 'Apple',
+      'price' => '199.99'
+    }
+    
+    @product2 = {
+      'name' => 'G2',
+      'brand' => 'Android',
+      'price' => '99.99'
+    }
+
+    @product3 = {
+      'name' => 'Fuze',
+      'brand' => 'HTC',
+      'price' => '299.99'
+    }
+    
+    @product4 = {
+      'name' => 'Droid',
+      'brand' => 'Android',
+      'price' => '249.99'
+    }
+    
+    @data = {'1'=>@product1,'2'=>@product2,'3'=>@product3}
+  end
+end  
+
+describe "DBObjectsHelper", :shared => true do
+  include TestHelpers
+  
+  before(:each) do
+    @a_fields = { :name => @test_app_name }
+    # @a = App.create(@a_fields)
+    @a = (App.load(@test_app_name) || App.create(@a_fields))
+    @u_fields = {:login => 'testuser'}
+    @u = User.create(@u_fields) 
+    @u.password = 'testpass'
+    @c_fields = {
+      :device_type => 'iPhone',
+      :device_pin => 'abcd',
+      :device_port => '3333',
+      :user_id => @u.id,
+      :app_id => @a.id 
+    }
+    @s_fields = {
+      :name => 'SampleAdapter',
+      :url => 'http://example.com',
+      :login => 'testuser',
+      :password => 'testpass',
+    }
+    @s_params = {
+      :user_id => @u.id,
+      :app_id => @a.id
+    }
+    @c = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+    @s = Source.load(@s_fields[:name],@s_params)
+    @s = Source.create(@s_fields,@s_params) if @s.nil?
+    @r = @s.read_state
+    @a.sources << @s.id
+    @a.users << @u.id
+  end
 end
 
 describe "SourceAdapterHelper", :shared => true do

data/spec/store_spec.rb

@@ -18,6 +18,17 @@ describe "Store" do
       end
     end
     
+    it "should create default redis connection" do
+      Store.db = nil
+      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 = ''
+    end
+    
     it "should add simple data to new set" do
       Store.put_data(@s.docname(:md),@data).should == true
       Store.get_data(@s.docname(:md)).should == @data

data/spec/test_methods_spec.rb

@@ -0,0 +1,89 @@
+require 'rhosync/test_methods'
+require File.join(File.dirname(__FILE__),'spec_helper')
+
+describe "TestMethods" do
+  include TestHelpers
+  
+  it_should_behave_like "RhosyncHelper"
+  it_should_behave_like "RhosyncDataHelper"
+    
+  # The module we're testing
+  include Rhosync::TestMethods
+  
+  before(:each) do
+    Rhosync.bootstrap(get_testapp_path)
+    setup_test_for(SampleAdapter,'user1')
+  end
+  
+  it "should setup_test_for an adapter and user" do
+    @u.is_a?(User).should == true
+    @s.is_a?(Source).should == true
+    @ss.is_a?(SourceSync).should == true
+    @ss.adapter.is_a?(SampleAdapter).should == true
+    @u.login.should == 'user1'
+    @s.name.should == 'SampleAdapter'
+    @c.id.size.should == 32
+    @c.device_pin.should == 'abcd'
+    @c.device_port.should == '3333'
+    @c.device_type.should == 'iPhone'
+    @c.user_id.should == 'user1'
+    @c.app_id.should == 'application'
+  end
+  
+  it "should include test_query helper" do
+    expected = {'1'=>@product1,'2'=>@product2}
+    set_state('test_db_storage' => expected)
+    test_query.should == expected
+  end
+  
+  it "should include query_errors helper" do
+    expected =  {"query-error"=>{'message'=>'failed'}}
+    set_state(@s.docname(:errors) => expected)
+    query_errors.should == expected
+  end
+  
+  it "should include test_create helper" do
+    @product4['link'] = 'test link'
+    test_create(@product4).should == 'backend_id'
+  end
+  
+  it "should include create_errors helper" do
+    expected =  {"create-error"=>{'message'=>'failed'}}
+    set_state(@c.docname(:create_errors) => expected)
+    create_errors.should == expected
+  end
+  
+  it "should include test_update helper" do
+    record = {'4'=> { 'price' => '199.99' }}
+    test_update(record)
+    verify_result(@c.docname(:update) => {})
+  end
+  
+  it "should include update_errors helper" do
+    expected =  {"update-error"=>{'message'=>'failed'}}
+    set_state(@c.docname(:update_errors) => expected)
+    update_errors.should == expected
+  end
+  
+  it "should include test_delete helper" do
+    record = {'4'=> { 'price' => '199.99' }}
+    test_delete(record)
+    verify_result(@c.docname(:delete) => {})
+  end
+  
+  it "should include delete_errors helper" do
+    expected =  {"delete-error"=>{'message'=>'failed'}}
+    set_state(@c.docname(:delete_errors) => expected)
+    delete_errors.should == expected
+  end
+  
+  it "should include md helper" do
+    set_state(@s.docname(:md) => @data)
+    md.should == @data
+  end
+  
+  it "should include cd helper" do
+    set_state(@c.docname(:cd) => @data)
+    cd.should == @data
+  end
+end