rhoconnect 3.4.5 → 4.0.0.beta.10

data/spec/apps/rhotestapp/controllers/ruby/sample_adapter_controller.rb

@@ -0,0 +1,8 @@
+class SampleAdapterController < Rhoconnect::Controller::Base
+  register Rhoconnect::EndPoint
+
+  # register SYNC routes
+  register Rhoconnect::Handler::Sync
+
+  # add your custom routes here
+end

data/spec/apps/rhotestapp/models/js/js_sample.js

@@ -0,0 +1,55 @@
+var rcHelpers = require('rhoconnect_helpers');
+
+var JsSample = function() {
+
+  this.query = function(resp){
+    var result = {'1': {'name': 'iPhone'}};
+    resp.send(result);
+  };
+
+  this.create = function(resp){
+    resp.send('2');
+  };
+
+  this.update = function(resp){
+    resp.send('');
+  };
+
+  this.del = function(resp){
+    resp.send('');
+  };
+
+  this.login = function(resp){
+    var result = "success";
+    resp.send(result);
+  };
+
+  this.logoff = function(resp){
+    resp.send(true);
+  };
+
+  this.getUser = function(resp){
+    rcHelpers.current_user(resp,function(resp){
+      var current_user = resp['result']["login"];
+      resp.send(current_user);
+    });
+  };
+
+  this.getSource = function(resp){
+    rcHelpers.source(resp,function(resp){
+      var source = resp['result']['id'];
+      resp.send(source);
+    });
+  };
+
+// var get_stash_result = function(resp){
+//  resp.params = {"1":{"name":"John"}};
+//  rc_helpers.stash_result(resp,function(resp){
+//    var result = {};
+//    resp.send(result);
+//  })
+// }
+
+};
+
+module.exports = new JsSample();

data/spec/apps/rhotestapp/models/js/sample2.js

@@ -0,0 +1,25 @@
+var ruby_functions = require('rhoconnect_helpers');
+
+var query = function(resp){
+	var result = "success";
+	resp.send(result);
+}
+
+var sync = function(resp){
+	
+}
+
+var login = function(resp){
+	var result = "success";
+	resp.send(result);
+}
+
+var logoff = function(resp){
+	var result = "logout";
+	resp.send(result);
+}
+
+exports.query = query;
+exports.sync = sync;
+exports.login = login;
+exports.logoff = logoff;

data/spec/apps/rhotestapp/{sources → models/ruby}/simple_adapter.rb

@@ -1,7 +1,7 @@
 class SimpleAdapter < SourceAdapter
   # initialize method created by source generator (Rhoconnect version < 2.2.0)
-  def initialize(source,credential)
-    super(source,credential)
+  def initialize(source)
+    super(source)
   end
  
   def login

data/spec/apps/rhotestapp/settings/settings.yml

@@ -15,7 +15,6 @@
     partition_type: 'app'
     :force_default: true
     :poll_interval: 300
-
 :development:
   :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600

data/spec/bulk_data/bulk_data_spec.rb

@@ -32,7 +32,9 @@ describe "BulkData" do
     end
 
     it "should expire_bulk_data from a source adapter" do
-      adapter = SourceSync.new(@s).adapter
+
+      @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,
@@ -40,7 +42,7 @@ describe "BulkData" do
         :user_id => @u.id,
         :sources => [@s_fields[:name]],
         :refresh_time => time)
-      adapter.expire_bulk_data
+      @model.expire_bulk_data
       data = BulkData.load(bulk_data_docname(@a.id,@u.id))
       data.refresh_time.should <= Time.now.to_i
     end
@@ -107,10 +109,23 @@ describe "BulkData" do
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
       data.process_sources
-      verify_result(@s.docname(:md_copy) => @data)
+      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
-      verify_result(@s.docname(:md_copy) => {},
-        @s.docname(:md) => @data)
     end
   end
 

data/spec/cli/cli_spec.rb

@@ -0,0 +1,83 @@
+require 'rspec'
+require 'thor'
+require 'tmpdir' 
+
+describe "RhoconnectCommandLineInterface" do
+  RHOCONNECT_PORT  = 9292
+  REDIS_SERVER_URL = "localhost:6379"
+  PUSH_SERVER_URL  = "http://someappname@localhost:8675/"
+  API_TOKEN        = "my-rhoconnect-token"
+  
+  class Execute < Thor
+    no_tasks do
+      def self.define_task(&block)
+        Execute.class_eval(&block)
+      end
+      # Disable dtach usage
+      def dtach_installed?
+        false
+      end    
+    end
+    
+    require_relative '../../lib/rhoconnect'  
+    require_relative "../../lib/rhoconnect/utilities"
+    
+    require_relative "../../commands/utilities/utilities"
+    require_relative "../../commands/utilities/redis_runner"
+    require_relative "../../commands/rhoconnect/config"
+    require_relative "../../commands/rhoconnect/start"
+    require_relative "../../commands/rhoconnect/stop"
+    require_relative "../../commands/rhoconnect/version"
+    include Utilities
+    
+  end
+
+  before(:all) do
+    @cur_dir = Dir.pwd
+    @tmpdir = Dir.mktmpdir
+    Dir.chdir @tmpdir
+  end
+
+  after(:each) do
+    pid = `cat /tmp/rhoconnect.pid` if File.exist?("/tmp/rhoconnect.pid")      
+    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
+  end
+
+  it "'rhoconnect version' cmd should display gem version" do
+    begin
+      out = StringIO.new
+      $stdout = out
+      Execute.start ["version"] # 'rhoconnect version'
+    ensure
+      $stdout = STDOUT
+    end 
+    out.string.strip.should == Rhoconnect::VERSION
+  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")
+    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

data/spec/client_spec.rb

@@ -49,40 +49,43 @@ describe "Client" do
     end
 
     it "should delete client and all associated documents" do
+      @c.put_data(:cd, @data)
       docname = @c.docname(:cd)
-      set_state(docname => @data)    
+      store_index = @c.store_index(:cd) 
       @c.delete
-      verify_result(docname => {})
+      Store.get_store(store_index).exists?(docname).should == false
     end
 
     it "should switch client user and remove existing documents" do
-      docname = @c.docname(:cd)
-      set_state(docname => @data)
-      verify_result(@c.docname(:cd) => @data)
+      prevdocname = @c.docname(:cd)
+      prev_store_index = @c.store_index(:cd)
+      @c.put_data(:cd, @data)
+      verify_doc_result(@c, :cd => @data)
       User.create({:login => 'user2'})
       @c.switch_user('user2')    
-      verify_result(@c.docname(:cd) => {},docname => {})
+      verify_doc_result(@c, :cd => {})
+      Store.get_store(prev_store_index).get_data(prevdocname).should == {}
       @u.clients.members.should == []
       @c.user_id.should == 'user2'
       User.load('user2').clients.members.should == [@c.id]
     end
 
     it "should create cd as masterdoc clone" do
-      set_state(@s.docname(:md_copy) => @data,
-        @c.docname(:cd) => {'foo' => {'bar' => 'abc'}})
+      @s.put_data(:md_copy, @data)
+      @c.put_data(:cd, {'foo' => {'bar' => 'abc'}})
       @c.update_clientdoc([@s_fields[:name]])
-      verify_result(@c.docname(:cd) => @data,
-        @s.docname(:md_copy) => @data)
+      verify_doc_result(@c, :cd => @data)
+      verify_doc_result(@s, :md_copy => @data)
     end
 
     it "should update client schema_sha1" do
-      set_state(@s.docname(:md_copy) => @data, 
-        @s.docname(:schema_sha1) => 'foobar',
-        @c.docname(:cd) => {'foo' => {'bar' => 'abc'}})
+      @s.put_data(:md_copy, @data)
+      @s.put_value(:schema_sha1, 'foobar')
+      @c.put_data(:cd, {'foo' => {'bar' => 'abc'}})
       @c.update_clientdoc([@s_fields[:name]])
-      verify_result(@c.docname(:cd) => @data,
-        @s.docname(:md_copy) => @data,
-        @c.docname(:schema_sha1) => 'foobar')  
+      verify_doc_result(@c, :cd => @data)
+      verify_doc_result(@s, :md_copy => @data)
+      verify_doc_result(@c, :schema_sha1 => 'foobar')  
     end
 
     describe "Client Stats" do
@@ -96,7 +99,7 @@ describe "Client" do
       end
 
       after(:all) do
-        Store.flash_data('stat:clients*')
+        Store.flush_data('stat:clients*')
       end
 
       it "should increment clients stats on create" do