rhoconnect 4.0.4 → 5.1.1

data/bench/spec/mock_adapter_spec.rb

@@ -3,59 +3,58 @@ require 'bench_spec_helper'
 require 'benchapp/models/ruby/mock_adapter'
 
 describe "MockAdapter" do
-  # it_should_behave_like "BenchSpecHelper" 
-  it_behaves_like "BenchSpecHelper" do
-    before(:each) do
-      @s_fields = {
-        :source_id => 1,
-        :name => 'SampleAdapter',
-        :url => 'http://example.com',
-        :login => 'testuser',
-        :password => 'testpass',
-      }
-      @s_params = {
-        :user_id => 'mock_user_id',
-        :app_id => 'mock_app_id'
-      }
-      @s = Source.create(@s_fields,@s_params)
-      @ma = MockAdapter.new(@s)
-    end
-
-    it "should return db name" do
-      @ma.db_name.should == "test_db_storage:mock_app_id:mock_user_id"
-    end
-
-    it "should return db lock name" do
-      @ma.lock_name.should == "lock:test_db_storage:mock_app_id:mock_user_id"
-    end
-
-    it "should login" do
-      @ma.login.should == true
-    end
-
-    it "should query data from db" do 
-      set_state(@ma.db_name => @data)
-      @ma.query.should == @data
-    end
-
-    it "should create object in the db" do
-      @product1.merge!('mock_id'=>'1')
-      @ma.create(@product1).should == '1'
-      verify_result(@ma.db_name => {'1' => @product1})
-    end     
-
-    it "should update object in db" do
-      set_state(@ma.db_name => @data)
-      @ma.update('id' => '3','price' => '99.99')
-      @product3['price'] = '99.99'
-      verify_result(@ma.db_name => @data)
-    end
-
-    it "should delete object in db" do
-      set_state(@ma.db_name => @data)
-      del_object = {}.merge!(@product2).merge!('id'=>'2')
-      @ma.delete(del_object)
-      verify_result(@ma.db_name => {'1' => @product1, '3' => @product3})
-    end
-  end  
+  include_examples "BenchSpecHelper"
+
+  before(:each) do
+    @s_fields = {
+      :source_id => 1,
+      :name => 'SampleAdapter',
+      :url => 'http://example.com',
+      :login => 'testuser',
+      :password => 'testpass',
+    }
+    @s_params = {
+      :user_id => 'mock_user_id',
+      :app_id => 'mock_app_id'
+    }
+    @s = Source.create(@s_fields,@s_params)
+    @ma = MockAdapter.new(@s)
+  end
+
+  it "should return db name" do
+    @ma.db_name.should == "test_db_storage:mock_app_id:mock_user_id"
+  end
+
+  it "should return db lock name" do
+    @ma.lock_name.should == "lock:test_db_storage:mock_app_id:mock_user_id"
+  end
+
+  it "should login" do
+    @ma.login.should == true
+  end
+
+  it "should query data from db" do
+    set_state(@ma.db_name => @data)
+    @ma.query.should == @data
+  end
+
+  it "should create object in the db" do
+    @product1.merge!('mock_id'=>'1')
+    @ma.create(@product1).should == '1'
+    verify_result(@ma.db_name => {'1' => @product1})
+  end
+
+  it "should update object in db" do
+    set_state(@ma.db_name => @data)
+    @ma.update('id' => '3','price' => '99.99')
+    @product3['price'] = '99.99'
+    verify_result(@ma.db_name => @data)
+  end
+
+  it "should delete object in db" do
+    set_state(@ma.db_name => @data)
+    del_object = {}.merge!(@product2).merge!('id'=>'2')
+    @ma.delete(del_object)
+    verify_result(@ma.db_name => {'1' => @product1, '3' => @product3})
+  end
 end

data/bench/spec/mock_client_spec.rb

@@ -2,64 +2,63 @@ $:.unshift File.join(File.dirname(__FILE__))
 require 'bench_spec_helper'
 
 describe "MockClient" do
-  # it_should_behave_like "BenchSpecHelper" 
-  it_behaves_like "BenchSpecHelper" do
-    before(:each) do
-      @mc = MockClient.new(1,2,123)
-    end
+  include_examples "BenchSpecHelper"
 
-    it "should return document type" do
-      @mc.doc_type.should == "123:mock:cd"
-    end
+  before(:each) do
+    @mc = MockClient.new(1,2,123)
+  end
 
-    it "should insert objects into the client document" do
-      @mc.insert(@data)
-      verify_result(@mc.doc_type => @data)
-    end
+  it "should return document type" do
+    @mc.doc_type.should == "123:mock:cd"
+  end
 
-    it "should delete objects from the client document" do
-      set_state(@mc.doc_type => @data)
-      @mc.delete('1' => @product1,'3' => @product3)
-      verify_result(@mc.doc_type => {'2' => @product2})
-    end
+  it "should insert objects into the client document" do
+    @mc.insert(@data)
+    verify_result(@mc.doc_type => @data)
+  end
 
-    it "should verify state of the client document" do
-      set_state(@mc.doc_type => @data)
-      @mc.verify(@data).should == true
-      @mc.verify('1' => @product1,'3' => @product3).should == false    
-    end
+  it "should delete objects from the client document" do
+    set_state(@mc.doc_type => @data)
+    @mc.delete('1' => @product1,'3' => @product3)
+    verify_result(@mc.doc_type => {'2' => @product2})
+  end
 
-    it "should parse server message and insert objects into the client document" do
-      message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>3},{:insert=>@data}].to_json  
-      @mc.parse message
-      verify_result(@mc.doc_type => @data)
-    end
+  it "should verify state of the client document" do
+    set_state(@mc.doc_type => @data)
+    @mc.verify(@data).should == true
+    @mc.verify('1' => @product1,'3' => @product3).should == false
+  end
 
-    it "should parse server message and delete objects for the client document" do
-      set_state(@mc.doc_type => @data)
-      message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>3},{:delete=>{'2'=>@product2}}].to_json  
-      @mc.parse message
-      verify_result(@mc.doc_type => {'1' => @product1,'3' => @product3})
-    end
+  it "should parse server message and insert objects into the client document" do
+    message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>3},{:insert=>@data}].to_json
+    @mc.parse message
+    verify_result(@mc.doc_type => @data)
+  end
 
-    it "should parse server message and insert/delete objects to/from client document" do
-      set_state(@mc.doc_type => {'1' => @product1,'2' => @product2})
-      message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>3},
-        {:insert=>{'3'=>@product3}},{:delete=>{'2'=>@product2}}].to_json  
-      @mc.parse message
-      verify_result(@mc.doc_type => {'1' => @product1,'3' => @product3})
-    end
+  it "should parse server message and delete objects for the client document" do
+    set_state(@mc.doc_type => @data)
+    message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>3},{:delete=>{'2'=>@product2}}].to_json
+    @mc.parse message
+    verify_result(@mc.doc_type => {'1' => @product1,'3' => @product3})
+  end
 
-    it "should raise exception on wrong message format" do
-      message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0}].to_json
-      lambda { @mc.parse message }.should raise_error(Exception,
-        '[T:001|I:002] Wrong message format. Message: "[{\"version\":3},{\"token\":\"123\"},{\"count\":3},{\"progress_count\":0}]"')
-    end
+  it "should parse server message and insert/delete objects to/from client document" do
+    set_state(@mc.doc_type => {'1' => @product1,'2' => @product2})
+    message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>3},
+      {:insert=>{'3'=>@product3}},{:delete=>{'2'=>@product2}}].to_json
+    @mc.parse message
+    verify_result(@mc.doc_type => {'1' => @product1,'3' => @product3})
+  end
 
-    it "should raise exception on wrong protocol version" do 
+  it "should raise exception on wrong message format" do
+    message = [{:version => 3},{:token=>'123'},{:count=>3},{:progress_count=>0}].to_json
+    lambda { @mc.parse message }.should raise_error(Exception,
+      '[T:001|I:002] Wrong message format. Message: "[{\"version\":3},{\"token\":\"123\"},{\"count\":3},{\"progress_count\":0}]"')
+  end
+
+  it "should raise exception on wrong protocol version" do
     message = [{:version => 1},{:token=>'123'},{:count=>3},{:progress_count=>0},{:total_count=>0},{}].to_json
     lambda { @mc.parse message }.should raise_error(Exception,
       '[T:001|I:002] Wrong protocol version. Message: "[{\"version\":1},{\"token\":\"123\"},{\"count\":3},{\"progress_count\":0},{\"total_count\":0},{}]"')
-    end
-  end  
+  end
 end

data/bench/spec/result_spec.rb

@@ -3,59 +3,56 @@ require 'bench_spec_helper'
 require 'rest_client'
 
 describe "ResultSpec" do
-  # it_should_behave_like "BenchSpecHelper"
-
   include Utils
-  it_behaves_like "BenchSpecHelper" do
-    before(:each) do
-      @s1 = [{"foo" => {"bar" => "cake"}}]
-      @s2 = [{"foo" => {"bar" => "cake1"}},{"hello" => "world"}]
-      @result = Result.new("marker",:get,"some/url",0,1)
-      client = mock("RestClient")
-      client.stub!(:headers).and_return({'header1'=>'headervalue1'})
-      client.stub!(:cookies).and_return({'session1'=>'sessval1'})
-      client.stub!(:code).and_return(200)
-      client.stub!(:to_s).and_return(@s1.to_json)
-      @result.last_response = client
-    end
-
-    describe "test @last_response wrapper" do
-
-      it "should return 'code'" do
-        @result.code.should == 200
-      end
+  include_examples "BenchSpecHelper"
+
+  before(:each) do
+    @s1 = [{"foo" => {"bar" => "cake"}}]
+    @s2 = [{"foo" => {"bar" => "cake1"}},{"hello" => "world"}]
+    @result = Result.new("marker",:get,"some/url",0,1)
+    client = double("RestClient")
+    client.stub(:headers).and_return({'header1'=>'headervalue1'})
+    client.stub(:cookies).and_return({'session1'=>'sessval1'})
+    client.stub(:code).and_return(200)
+    client.stub(:to_s).and_return(@s1.to_json)
+    @result.last_response = client
+  end
 
-      it "should return 'body'" do
-        JSON.parse(@result.body).should == @s1
-      end
+  describe "test @last_response wrapper" do
 
-      it "should return 'cookies'" do
-        @result.cookies.should == {'session1'=>'sessval1'}
-      end
+    it "should return 'code'" do
+      @result.code.should == 200
+    end
 
-      it "shhould return 'headers'" do
-        @result.headers.should == {'header1'=>'headervalue1'}
-      end
+    it "should return 'body'" do
+      JSON.parse(@result.body).should == @s1
+    end
 
+    it "should return 'cookies'" do
+      @result.cookies.should == {'session1'=>'sessval1'}
     end
 
-    it "should compare two array/hash structures" do
-      compare(:expected,@s1,:actual,@s2).should == [{:expected=>"cake", 
-        :path=>[0, "foo", "bar"], :actual=>"cake1"}, 
-        {:expected=>nil, :path=>[1], :actual=>{"hello"=>"world"}}]
+    it "shhould return 'headers'" do
+      @result.headers.should == {'header1'=>'headervalue1'}
     end
 
-    it "should verify body" do
-      @result.should_receive(:bench_log).exactly(8).times
-      @result.verify_body(@s2.to_json)
-      @result.verification_error.should == 1
-    end  
+  end
 
-    it "should verify code" do
-      @result.should_receive(:bench_log).exactly(4).times
-      @result.verify_code(500)
-      @result.verification_error.should == 1
-    end
+  it "should compare two array/hash structures" do
+    compare(:expected,@s1,:actual,@s2).should == [{:expected=>"cake",
+      :path=>[0, "foo", "bar"], :actual=>"cake1"},
+      {:expected=>nil, :path=>[1], :actual=>{"hello"=>"world"}}]
+  end
+
+  it "should verify body" do
+    @result.should_receive(:bench_log).exactly(8).times
+    @result.verify_body(@s2.to_json)
+    @result.verification_error.should == 1
+  end
+
+  it "should verify code" do
+    @result.should_receive(:bench_log).exactly(4).times
+    @result.verify_code(500)
+    @result.verification_error.should == 1
   end
-  
 end

data/bench/spec/utils_spec.rb

@@ -2,35 +2,34 @@ $:.unshift File.join(File.dirname(__FILE__))
 require 'bench_spec_helper'
 
 describe "UtilsSpec" do
-  # it_should_behave_like "BenchSpecHelper"
   include Utils
   include Logging
 
-  it_behaves_like "BenchSpecHelper" do
-    it "should compare two identical hashes" do
-      h1 = {'key1' => {'key2' => 'value2'}}
-      h2 = {'key1' => {'key2' => 'value2'}}
-      compare(:expected,h1,:actual,h2).should == []
-    end
+  include_examples "BenchSpecHelper"
 
-    it "should compare two different hashes" do
-      h1 = {'key1' => {'key2' => 'value2'}}
-      h2 = {'key1' => {'key2' => 'value3'}}
-      compare(:expected,h1,:actual,h2).should == 
-        [{:actual=>"value3", :path=>["key1", "key2"], :expected=>"value2"}]
-    end
+  it "should compare two identical hashes" do
+    h1 = {'key1' => {'key2' => 'value2'}}
+    h2 = {'key1' => {'key2' => 'value2'}}
+    compare(:expected,h1,:actual,h2).should == []
+  end
 
-    it "should compare_and_log two identical hashes" do
-      h1 = {'key1' => {'key2' => 'value2'}}
-      h2 = {'key1' => {'key2' => 'value2'}}
-      Bench::Utils.should_not_receive(:bench_log)
-      compare_and_log(h1,h2,'the caller').should == 0
-    end
+  it "should compare two different hashes" do
+    h1 = {'key1' => {'key2' => 'value2'}}
+    h2 = {'key1' => {'key2' => 'value3'}}
+    compare(:expected,h1,:actual,h2).should ==
+      [{:actual=>"value3", :path=>["key1", "key2"], :expected=>"value2"}]
+  end
 
-    it "should compare_and_log two different hashes" do
-      h1 = {'key1' => {'key2' => 'value2'}}
-      h2 = {'key1' => {'key2' => 'value3'}}
-      compare_and_log(h1,h2,'the caller').should == 1
-    end
-  end  
+  it "should compare_and_log two identical hashes" do
+    h1 = {'key1' => {'key2' => 'value2'}}
+    h2 = {'key1' => {'key2' => 'value2'}}
+    Bench::Utils.should_not_receive(:bench_log)
+    compare_and_log(h1,h2,'the caller').should == 0
+  end
+
+  it "should compare_and_log two different hashes" do
+    h1 = {'key1' => {'key2' => 'value2'}}
+    h2 = {'key1' => {'key2' => 'value3'}}
+    compare_and_log(h1,h2,'the caller').should == 1
+  end
 end

data/commands/generators/app.rb

@@ -1,6 +1,8 @@
 Execute.define_task do
-  desc "app NAME [options]", "Generate a new rhoconnect application"
-  def app(name,platform=nil)
-    Rhoconnect.run_cli(Dir.pwd, 'rhoconnect', Rhoconnect::VERSION, ARGV)
-  end #app
-end #do
+  desc "app NAME [--js]", "Generate a new rhoconnect application"
+  def app(name, platform=nil)
+    # ARGV = [command, argument, ... option, ...]
+    ARGV.shift
+    invoke :app_generator
+  end
+end

data/commands/generators/controller.rb

@@ -1,6 +1,8 @@
 Execute.define_task do
-  desc "source NAME", "Generate a new source adapter controller", :hide => true
-  def controller(name,platform='ruby')
-    Rhoconnect.run_cli(Dir.pwd, 'thorhoconnect', Rhoconnect::VERSION, ARGV)
-  end #source
-end #do
+  desc "controller NAME [--js]", "Generate a new source adapter controller", :hide => true
+  def controller(name, platform='ruby')
+    # ARGV = [command, argument, ... option, ...]
+    ARGV.shift
+    invoke :controller_generator
+  end
+end

data/commands/generators/model.rb

@@ -1,6 +1,8 @@
 Execute.define_task do
-  desc "source NAME", "Generate a new source adapter model", :hide => true
-  def model(name,platform='ruby')
-    Rhoconnect.run_cli(Dir.pwd, 'thorhoconnect', Rhoconnect::VERSION, ARGV)
-  end #model
-end #do
+  desc "model NAME [--js]", "Generate a new source adapter model", :hide => true
+  def model(name, platform='ruby')
+    # ARGV = [command, argument, ... option, ...]
+    ARGV.shift
+    invoke :model_generator
+  end
+end

data/commands/generators/source.rb

@@ -1,6 +1,8 @@
 Execute.define_task do
-  desc "source NAME [options]", "Generate a new source adapter"
-  def source(name,platform=nil)
-    Rhoconnect.run_cli(Dir.pwd, 'rhoconnect', Rhoconnect::VERSION, ARGV)
-  end #source
-end #do
+  desc "source NAME [--js]", "Generate a new source adapter"
+  def source(name, platform=nil)
+    # ARGV = [command, argument, ... option, ...]
+    ARGV.shift
+    invoke :source_generator
+  end
+end

data/commands/parser.rb

@@ -134,7 +134,7 @@ end
 
 # rhoconnect get-token|set-admin-password
 module AdminCommands
-  def self.match?(input); input == 'get-token' || input == 'set_admin_password'; end
+  def self.match?(input); input =~ /get[-_]token/ || input =~ /set[-_]admin[-_]password/; end
   def self.execute(input)
     require_relative '../commands/rhoconnect/config'
     require_relative '../commands/rhoconnect/get_token'

data/commands/redis/redis_download.rb

@@ -1,4 +1,4 @@
-REDIS_RELEASE = "2.6.16"
+REDIS_RELEASE = "2.8.17"
 Execute.define_task do
   desc "redis-download", "Download redis release #{REDIS_RELEASE}"
   def redis_download

data/doc/async-jobs.txt

@@ -12,21 +12,21 @@ RhoConnect supports three job types: BulkDataJob, PingJob, SourceJob
 ### PingJob
 Ping jobs are used to execute a [device ping](/rhoconnect/push).  A PingJob can be queued from anywhere in your RhoConnect application (i.e. at the end of another job or adapter query method).
 
-Example: 
-	
+Example:
+
 	:::ruby
 	Resque.enqueue(
 	  PingJob,
 	  {
 	    "user_id" => current_user.login,
-	    "message" => "New products available!", 
-	    "badge" => 1, 
+	    "message" => "New products available!",
+	    "badge" => 1,
 	    "sources" => ['Product']
 	  }
 	)
 
 ### SourceJob
-Source jobs are used to execute source adapter queues asynchronously. 
+Source jobs are used to execute source adapter queues asynchronously.
 
 To make your source adapters always run asynchronously, define a queue in `settings/settings.yml`:
 
@@ -37,14 +37,14 @@ To make your source adapters always run asynchronously, define a queue in `setti
 Then run a resque worker so the job will execute.
 
 Example that queues a new source adapter job manually:
-	
+
 	:::ruby
 	Resque.enqueue(
 	 SourceJob,
 	 :query,
 	 APP_NAME,
 	 'Joe',
-	 'some-client-id
+	 'some-client-id'
 	)
 
 ## Running Async Jobs
@@ -55,11 +55,11 @@ Running RhoConnect jobs requires one or more [resque](http://github.com/defunkt/
 	$ QUEUE=* rake resque:work
 
 To start multiple workers(in this case 5):
-	
+
 	:::term
 	$ cd <your rhoconnect app>
 	$ QUEUE=* COUNT=5 rake resque:workers
-	
+
 For more information on the options available when running resque workers, please refer to the [resque readme](https://github.com/defunkt/resque#readme).
 
 If you want to run resque workers in daemon mode, we recommend using [nohup](http://en.wikipedia.org/wiki/Nohup), [god](http://github.com/defunkt/resque/tree/master/examples/god/), or [monit](http://github.com/defunkt/resque/tree/master/examples/monit):

data/doc/supported-platforms.txt

@@ -67,5 +67,3 @@ The components you should have for this environment are:
 
 * Usually JDK is shipped with only weak encryption, and that simply will not allow the proper key sizes being created by openssl. RhoConnect uses strong encryption for license keys and to function properly in JRuby environment installation of Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction policy files might be required.
 * Path to user’s gems, warbler data should not include white spaces (i.e. in user's account name).
-
-