rhoconnect 4.0.4 → 5.1.1

data/spec/api/user/user_set_db_doc_spec.rb

@@ -1,41 +1,41 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiUserSetDbDoc" do
-  it_should_behave_like "ApiHelper" do
-    it "should set user's db document by doc key and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      dockey = 'myuserdoc'
-      sdocname = @s2.docname(dockey)
-      
-      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result(sdocname => data)
-    end
-    
-    it "should append data to the user's db document by doc name and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      data2 = {'2' => {'foo1' => 'bar1'}}
-      data3 = data.merge(data2)
-      dockey = 'abc:abc'
-      sdocname = @s2.docname(dockey)
-      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result(sdocname => data)
-      
-      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result(sdocname => data3)
-    end
-    
-    it "should error out in ateempt to set a db doc for a non-existent user" do
-      data = {'1' => {'foo' => 'bar'}}
-      data2 = {'2' => {'foo1' => 'bar1'}}
-      data3 = data.merge(data2)
-      dockey = 'abc:abc'
-      sdocname = @s2.docname(dockey)
-      post "/rc/#{Rhoconnect::API_VERSION}/users/invalid_user/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.status.should == 500
-      last_response.should_not be_ok
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should set user's db document by doc key and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    dockey = 'myuserdoc'
+    sdocname = @s2.docname(dockey)
+
+    post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result(sdocname => data)
+  end
+
+  it "should append data to the user's db document by doc name and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    data2 = {'2' => {'foo1' => 'bar1'}}
+    data3 = data.merge(data2)
+    dockey = 'abc:abc'
+    sdocname = @s2.docname(dockey)
+    post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result(sdocname => data)
+
+    post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result(sdocname => data3)
+  end
+
+  it "should error out in ateempt to set a db doc for a non-existent user" do
+    data = {'1' => {'foo' => 'bar'}}
+    data2 = {'2' => {'foo1' => 'bar1'}}
+    data3 = data.merge(data2)
+    dockey = 'abc:abc'
+    sdocname = @s2.docname(dockey)
+    post "/rc/#{Rhoconnect::API_VERSION}/users/invalid_user/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.status.should == 500
+    last_response.should_not be_ok
+  end
 end

data/spec/api_token_spec.rb

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe "ApiToken" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
-    it "should generate api token with user" do
-      token = ApiToken.create(:user_id => @u.id)
-      token.value.length.should == 32
-      token.user_id.should == @u.id
-      token.user.login.should == @u.login
-      token.delete
-    end
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => true
+
+  it "should generate api token with user" do
+    token = ApiToken.create(:user_id => @u.id)
+    token.value.length.should == 32
+    token.user_id.should == @u.id
+    token.user.login.should == @u.login
+    token.delete
   end
 end

data/spec/app_spec.rb

@@ -1,24 +1,25 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe "App" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => false do
-    it "should create app with fields" do
-      @a.id.should == @a_fields[:name]
-      @a1 = App.load(@a_fields[:name])
-      @a1.id.should == @a.id
-      @a1.name.should == @a_fields[:name]
-    end
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
 
-    it "should add source adapters" do
-      @a1 = App.load(@a_fields[:name])
-      @a1.sources.sort.should == ["FixedSchemaAdapter", "JsSample", "OtherAdapter", "SampleAdapter", "SimpleAdapter"]
-    end
+  it "should create app with fields" do
+    @a.id.should == @a_fields[:name]
+    @a1 = App.load(@a_fields[:name])
+    @a1.id.should == @a.id
+    @a1.name.should == @a_fields[:name]
+  end
+
+  it "should add source adapters" do
+    @a1 = App.load(@a_fields[:name])
+    @a1.sources.sort.should == ["FixedSchemaAdapter", "JsSample", "OtherAdapter", "SampleAdapter", "SimpleAdapter"]
+  end
 
-    it "should force environment default and override setting" do
-      poll_interval_default = Rhoconnect.source_config('OtherAdapter')[:poll_interval]
-      poll_interval_default.should == 201
-      poll_interval_override = Rhoconnect.source_config('SimpleAdapter')[:poll_interval]
-      poll_interval_override.should == 600
-    end
+  it "should force environment default and override setting" do
+    poll_interval_default = Rhoconnect.source_config('OtherAdapter')[:poll_interval]
+    poll_interval_default.should == 201
+    poll_interval_override = Rhoconnect.source_config('SimpleAdapter')[:poll_interval]
+    poll_interval_override.should == 600
   end
+
 end

data/spec/apps/jstestapp/settings/settings.yml

@@ -7,6 +7,8 @@
   :licensefile: settings/license.key
   :redis: localhost:6379
   :syncserver: http://localhost:9292/
+  # set :node_channel_timeout to 60 secs.
+  :node_channel_timeout: 60
 :production:
   :licensefile: settings/license.key
   :redis: localhost:6379

data/spec/async_spec.rb

@@ -3,17 +3,15 @@ require File.join(File.dirname(__FILE__),'api','api_helper')
 # these specs are executed only with Async support
 if not defined?(JRUBY_VERSION)
   describe "BasicEventMachineTest with Threads" do
-    it_should_behave_like "ApiHelper" do 
-      it "should run EventMachine gracefully and schedule callback execution in thread" do
-        f = Fiber.current
-        operation = proc { res = 1 }
-        operation_res = 0
-        callback = proc { |proc_res| operation_res = proc_res; f.resume }
-        EventMachine.defer operation, callback
-        Fiber.yield
-        # this code should be executed only after the thread's return
-        operation_res.should == 1
-      end
+    it "should run EventMachine gracefully and schedule callback execution in thread" do
+      f = Fiber.current
+      operation = proc { res = 1 }
+      operation_res = 0
+      callback = proc { |proc_res| operation_res = proc_res; f.resume }
+      EventMachine.defer operation, callback
+      Fiber.yield
+      # this code should be executed only after the thread's return
+      operation_res.should == 1
     end
   end
 end

data/spec/bulk_data/bulk_data_spec.rb

@@ -1,132 +1,132 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
 describe "BulkData" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
-    before(:each) do
-      @s = Source.load(@s_fields[:name],@s_params)
-      @s1 = Source.load(@s1_fields[:name], @s_params)
-    end
-
-    after(:each) do
-      delete_data_directory
-    end
-
-    it "should return true if bulk data is completed" do
-      dbfile = create_datafile(File.join(@a.name,@u.id.to_s),@u.id.to_s)
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
-        :state => :completed,
-        :app_id => @a.id,
-        :user_id => @u.id,
-        :sources => [@s_fields[:name]])
-      data.dbfile = dbfile
-      data.completed?.should == true
-    end
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => true
 
-    it "should return false if bulk data isn't completed" do
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
-        :state => :inprogress,
-        :app_id => @a.id,
-        :user_id => @u.id,
-        :sources => [@s_fields[:name]])
-      data.completed?.should == false
-    end
+  before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
+    @s1 = Source.load(@s1_fields[:name], @s_params)
+  end
 
-    it "should expire_bulk_data from a source adapter" do
+  after(:each) do
+    delete_data_directory
+  end
 
-      @model = Rhoconnect::Model::Base.create(@s)
-      @engine = Rhoconnect::Handler::Query::Engine.new(@model, lambda { @model.query }, {})
-      time = Time.now.to_i + 10000
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
-        :state => :inprogress,
-        :app_id => @a.id,
-        :user_id => @u.id,
-        :sources => [@s_fields[:name]],
-        :refresh_time => time)
-      @model.expire_bulk_data
-      data = BulkData.load(bulk_data_docname(@a.id,@u.id))
-      data.refresh_time.should <= Time.now.to_i
-    end
-
-    it "should enqueue sqlite db type" do
-      BulkData.enqueue
-      Resque.peek(:bulk_data).should == {"args"=>[{}],
-        "class"=>"Rhoconnect::BulkDataJob"}
-    end
-
-    it "should generate correct bulk data name for user partition" do
-      BulkData.get_name(:user,@c.user_id).should == File.join(@a_fields[:name],@u_fields[:login],@u_fields[:login])
-    end
-
-    it "should generate correct bulk data name for app partition" do
-      BulkData.get_name(:app,@c.user_id).should ==
-        File.join(@a_fields[:name],@a_fields[:name])
-    end
-
-    it "should have ordered sources list by priority" do
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
-        :state => :inprogress,
-        :app_id => @a.id,
-        :user_id => @u.id,
-        :sources => @a.partition_sources(:user, @u.id))
-
-      data.sources[0, -1].should == ["SampleAdapter", "JsSample", "FixedSchemaAdapter"]
-      p1 = Source.load("SampleAdapter", {:app_id => data.app_id, :user_id => data.user_id}).priority
-      p2 = Source.load("JsSample", {:app_id => data.app_id, :user_id => data.user_id}).priority
-      p1.should < p2
-    end
-
-    it "should process_sources for bulk data" do
-      current = Time.now.to_i
-      @s.read_state.refresh_time = current
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
-        :state => :inprogress,
-        :app_id => @a.id,
-        :user_id => @u.id,
-        :sources => [@s_fields[:name], @s1_fields[:name]])
-      data.process_sources
-      @s.read_state.refresh_time.should > current + @s_fields[:poll_interval].to_i
-      @s1.read_state.refresh_time.should > current + @s1_fields[:poll_interval].to_i
-    end
-
-    it "should process specific sources for bulk data" do
-      current = Time.now.to_i
-      @s.read_state.refresh_time = current
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
-        :state => :inprogress,
-        :app_id => @a.id,
-        :user_id => @u.id,
-        :sources => [@s1_fields[:name]])
-      data.process_sources
-      @s.read_state.refresh_time.should <= current
-      @s1.read_state.refresh_time.should > current + @s1_fields[:poll_interval].to_i
-    end
-
-    it "should delete source masterdoc copy on delete" do
-      set_state('test_db_storage' => @data)
-      data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+  it "should return true if bulk data is completed" do
+    dbfile = create_datafile(File.join(@a.name,@u.id.to_s),@u.id.to_s)
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :completed,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => [@s_fields[:name]])
+    data.dbfile = dbfile
+    data.completed?.should == true
+  end
+
+  it "should return false if bulk data isn't completed" do
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => [@s_fields[:name]])
+    data.completed?.should == false
+  end
+
+  it "should expire_bulk_data from a source adapter" do
+
+    @model = Rhoconnect::Model::Base.create(@s)
+    @engine = Rhoconnect::Handler::Query::Engine.new(@model, lambda { @model.query }, {})
+    time = Time.now.to_i + 10000
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => [@s_fields[:name]],
+      :refresh_time => time)
+    @model.expire_bulk_data
+    data = BulkData.load(bulk_data_docname(@a.id,@u.id))
+    data.refresh_time.should <= Time.now.to_i
+  end
+
+  it "should enqueue sqlite db type" do
+    BulkData.enqueue
+    Resque.peek(:bulk_data).should == {"args"=>[{}],
+      "class"=>"Rhoconnect::BulkDataJob"}
+  end
+
+  it "should generate correct bulk data name for user partition" do
+    BulkData.get_name(:user,@c.user_id).should == File.join(@a_fields[:name],@u_fields[:login],@u_fields[:login])
+  end
+
+  it "should generate correct bulk data name for app partition" do
+    BulkData.get_name(:app,@c.user_id).should ==
+      File.join(@a_fields[:name],@a_fields[:name])
+  end
+
+  it "should have ordered sources list by priority" do
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => @a.partition_sources(:user, @u.id))
+
+    data.sources[0, -1].should == ["SampleAdapter", "JsSample", "FixedSchemaAdapter"]
+    p1 = Source.load("SampleAdapter", {:app_id => data.app_id, :user_id => data.user_id}).priority
+    p2 = Source.load("JsSample", {:app_id => data.app_id, :user_id => data.user_id}).priority
+    p1.should < p2
+  end
+
+  it "should process_sources for bulk data" do
+    current = Time.now.to_i
+    @s.read_state.refresh_time = current
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => [@s_fields[:name], @s1_fields[:name]])
+    data.process_sources
+    @s.read_state.refresh_time.should > current + @s_fields[:poll_interval].to_i
+    @s1.read_state.refresh_time.should > current + @s1_fields[:poll_interval].to_i
+  end
+
+  it "should process specific sources for bulk data" do
+    current = Time.now.to_i
+    @s.read_state.refresh_time = current
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => [@s1_fields[:name]])
+    data.process_sources
+    @s.read_state.refresh_time.should <= current
+    @s1.read_state.refresh_time.should > current + @s1_fields[:poll_interval].to_i
+  end
+
+  it "should delete source masterdoc copy on delete" do
+    set_state('test_db_storage' => @data)
+    data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
+      :state => :inprogress,
+      :app_id => @a.id,
+      :user_id => @u.id,
+      :sources => [@s_fields[:name]])
+    data.process_sources
+    verify_doc_result(@s, :md_copy => @data)
+    data.delete
+    verify_doc_result(@s, {:md_copy => {},
+                           :md => @data})
+  end
+
+  it "should escape bulk data url" do
+    name = 'a b'
+    data = BulkData.create(:name => bulk_data_docname(@a.id,name),
         :state => :inprogress,
         :app_id => @a.id,
-        :user_id => @u.id,
+        :user_id => name,
         :sources => [@s_fields[:name]])
-      data.process_sources
-      verify_doc_result(@s, :md_copy => @data)
-      data.delete
-      verify_doc_result(@s, {:md_copy => {},
-                             :md => @data})
-    end
-
-    it "should escape bulk data url" do
-      name = 'a b'
-      data = BulkData.create(:name => bulk_data_docname(@a.id,name),
-          :state => :inprogress,
-          :app_id => @a.id,
-          :user_id => name,
-          :sources => [@s_fields[:name]])
-      do_bulk_data_job("data_name" => bulk_data_docname(@a.id,name))
-      data = BulkData.load(bulk_data_docname(@a.id,name))
-      data.url.should match /a%20b/
-      data.delete
-    end
+    do_bulk_data_job("data_name" => bulk_data_docname(@a.id,name))
+    data = BulkData.load(bulk_data_docname(@a.id,name))
+    data.url.should match /a%20b/
+    data.delete
   end
 
   def create_datafile(dir,name)

data/spec/cli/cli_spec.rb

@@ -41,10 +41,29 @@ describe "RhoconnectCommandLineInterface" do
     end
   end
 
-  before(:all) do
-    @cur_dir = Dir.pwd
-    @tmpdir = Dir.mktmpdir
-    Dir.chdir @tmpdir
+  # Captures $stdout and $stderr into strings
+  def capture_io
+    require 'stringio'
+
+    orig_stdout, orig_stderr         = $stdout, $stderr
+    captured_stdout, captured_stderr = StringIO.new, StringIO.new
+    $stdout, $stderr                 = captured_stdout, captured_stderr
+
+    yield
+
+    return captured_stdout.string, captured_stderr.string
+  ensure
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+  end
+
+  def run_in_sandbox
+    Dir.mktmpdir do |tmp_dir|
+      Dir.chdir(tmp_dir) do
+        # Run example in a sandbox on the file system
+        yield
+      end
+    end
   end
 
   after(:each) do
@@ -52,70 +71,48 @@ describe "RhoconnectCommandLineInterface" do
     puts "\nExecuting 'rhoconnect stop' command ..." if pid
     Execute.start ["stop"] # 'rhoconnect stop'
     File.exist?("/tmp/rhoconnect.pid").should == false
-    `ps -p #{pid} -o pid=`.should be_empty if pid
-  end
-
-  after(:all) do
-    Dir.chdir @cur_dir
-    FileUtils.remove_entry @tmpdir
+    # `ps -p #{pid} -o pid=`.should be_empty if pid
   end
 
   it "'rhoconnect help' cmd should display list of available commands" do
-    begin
-      out = StringIO.new
-      $stdout = out
-      Execute.start ["help"] # 'rhoconnect help'
-    ensure
-      $stdout = STDOUT
+    run_in_sandbox do
+      out = capture_io{ Execute.start ["help"] }.join ''
+      out.strip.should start_with "Commands:"
     end
-    out.string.strip.should start_with "Commands:"
   end
 
   it "'rhoconnect version' cmd should display gem version" do
-    begin
-      out = StringIO.new
-      $stdout = out
-      Execute.start ["version"] # 'rhoconnect version'
-    ensure
-      $stdout = STDOUT
+    run_in_sandbox do
+      out = capture_io{ Execute.start ["version"] }.join ''
+      out.strip.should == Rhoconnect::VERSION
     end
-    out.string.strip.should == Rhoconnect::VERSION
   end
 
   it "'rhoconnect routes' cmd should display list of available routes" do
-    begin
-      @prev_dir = Dir.pwd
-      @appdir = File.join(File.dirname(__FILE__),  "..", "apps", "rhotestapp")
-      puts " we have here #{@appdir}"
-      Dir.chdir @appdir
-      out = StringIO.new
-      $stdout = out
-      Execute.start ["routes"] # 'rhoconnect routes'
-    ensure
-      $stdout = STDOUT
-      Dir.chdir @prev_dir
+    Dir.chdir(File.join(File.dirname(__FILE__),  "..", "apps", "rhotestapp")) do
+      out = capture_io{ Execute.start ['routes'] }.join ''
+      out.strip.should include("SampleAdapterController: /app/v1/SampleAdapter")
+      out.strip.should include("FixedSchemaAdapterController: /app/v1/FixedSchemaAdapter")
+      out.strip.should_not include("FooAdapterController: /app/v1/FooAdapter")
     end
-    out.string.strip.should include("SampleAdapterController: /app/v1/SampleAdapter")
-    out.string.strip.should include("FixedSchemaAdapterController: /app/v1/FixedSchemaAdapter")
-    out.string.strip.should_not include("FooAdapterController: /app/v1/FooAdapter")
   end
 
   it "'rhoconnect start' cmd should start blank app from any directory" do
-    thread = Thread.new do
-      puts "Executing 'rhoconnect start' command ..."
-      # Array of params expected
-      Execute.start ["start"] # 'rhoconnect start'
-    end
-    30.times do
-      sleep 1
-      raise "'rhoconnect start' failed to start with exception" if thread.status.nil?
-      break if File.exist?("/tmp/rhoconnect.pid")
+    run_in_sandbox do
+      thread = Thread.new do
+        puts "Executing 'rhoconnect start' command ..."
+        # Array of params expected
+        Execute.start ["start"] # 'rhoconnect start'
+      end
+      30.times do
+        sleep 1
+        raise "'rhoconnect start' failed to start with exception" if thread.status.nil?
+        break if File.exist?("/tmp/rhoconnect.pid")
+      end
+      File.exist?("/tmp/rhoconnect.pid").should == true
+      pid = `cat /tmp/rhoconnect.pid`
+      puts "Rhoconnect app is running with pid=#{pid}"
+      `ps -p #{pid} -o pid=`.should_not be_empty
     end
-
-    File.exist?("/tmp/rhoconnect.pid").should == true
-    pid = `cat /tmp/rhoconnect.pid`
-    puts "Rhoconnect app is running with pid=#{pid}"
-    `ps -p #{pid} -o pid=`.should_not be_empty
   end
-
 end