rhoconnect 5.5.18 → 7.4.1

data/lib/rhoconnect/ping.rb

@@ -1,3 +1,3 @@
 require 'rhoconnect/ping/apple'
 require 'rhoconnect/ping/rhoconnect_push'
-require 'rhoconnect/ping/gcm'
+require 'rhoconnect/ping/fcm'

data/lib/rhoconnect/store.rb

@@ -879,7 +879,7 @@ module Rhoconnect
         Rhoconnect.redis_url = url
         ConnectionPool::Wrapper.new(:size => Rhoconnect.connection_pool_size,
                                     :timeout => Rhoconnect.connection_pool_timeout) do
-          Redis.connect(:url => url, :timeout => Rhoconnect.redis_timeout, :thread_safe => true)
+          Redis.new(:url => url, :timeout => Rhoconnect.redis_timeout, :thread_safe => true)
         end
       elsif server and server.is_a?(String)
         Rhoconnect.redis_url = "redis://#{server}"
@@ -887,7 +887,7 @@ module Rhoconnect
         ConnectionPool::Wrapper.new(:size => Rhoconnect.connection_pool_size,
                                     :timeout => Rhoconnect.connection_pool_timeout) do
           host = '127.0.0.1' if host == 'localhost'
-          Redis.connect(
+          Redis.new(
             :thread_safe => true,
             :host => host,
             :port => port,
@@ -901,7 +901,7 @@ module Rhoconnect
       else
         Rhoconnect.redis_url = "redis://localhost:6379"
         ConnectionPool::Wrapper.new(:size => 5, :timeout => 30) do
-          Redis.connect(:timeout => 30, :thread_safe => true)
+          Redis.new(:timeout => 30, :thread_safe => true)
         end
       end
     end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '5.5.18'
+  VERSION = '7.4.1'
 end

data/rhoconnect.gemspec

@@ -39,15 +39,19 @@ Gem::Specification.new do |s|
     'README.md'
   ]
 
-  s.add_dependency('bundler', '~> 1.0')
-  s.add_dependency('rack', '~> 1.5.2')
-  s.add_dependency('sinatra', '~> 1.4')
-  s.add_dependency('rake', '~> 10.4.0')
-  s.add_dependency('json', '~> 1.8')
-  s.add_dependency('rubyzip', '~> 1.1')
-  s.add_dependency('connection_pool', '~> 1.2.0')
-  s.add_dependency('redis', '>= 3.0.1')
-  s.add_dependency('resque', '>= 1.22.0')
-  s.add_dependency('rest-client', '~> 1.6.1')
-  s.add_dependency('thor', '~> 0.18.0')
+  s.add_dependency('bundler', '~> 1.17.3')
+  s.add_dependency('rack', '~> 2.0.6')
+  s.add_dependency('sinatra', '~> 2.0.5')
+  s.add_dependency('rake', '~> 12.3.2')
+  s.add_dependency('json', '>= 1.8', '< 2.0')
+  s.add_dependency('rubyzip', '>= 1.2.2', '< 2.1.0')
+  s.add_dependency('connection_pool', '~> 2.2.2')
+  s.add_dependency('redis-namespace', '~> 1.6.0')
+  s.add_dependency('redis', '~> 4.1.0')
+  s.add_dependency('resque', '>= 2.0.0')
+  s.add_dependency('rest-client', '~> 2.0.2')
+  s.add_dependency('thor', '~> 0.20.3')
+  s.add_dependency('signet', '~> 0.11.0')
+  s.add_dependency('google-api-client', '~> 0.31.0')
+  s.add_dependency('google-api-fcm', '~> 0.1.7')
 end

data/spec/api/client/get_client_params_spec.rb

@@ -12,6 +12,8 @@ describe "RhoconnectApiGetClientParams" do
       {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"},
       {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
       {"name"=>"device_push_type", "type"=>"string", "value"=>nil},
+      {"name"=>"device_app_id", "type"=>"string", "value"=>nil},
+      {"name"=>"device_app_version", "type"=>"string", "value"=>nil},
       {"name"=>"user_id", "value"=>"testuser", "type"=>"string"},
       {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
       {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
@@ -26,6 +28,8 @@ describe "RhoconnectApiGetClientParams" do
       {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"},
       {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
       {"name"=>"device_push_type", "type"=>"string", "value"=>nil},
+      {"name"=>"device_app_id", "type"=>"string", "value"=>nil},
+      {"name"=>"device_app_version", "type"=>"string", "value"=>nil},
       {"name"=>"user_id", "value"=>"testuser", "type"=>"string"},
       {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
       {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}

data/spec/apps/rhotestapp/models/ruby/sample_adapter.rb

@@ -40,7 +40,7 @@ class SampleAdapter < SourceAdapter
             invalid_meta[index] ||= {}
             invalid_meta[index][source_id] ||= {}
             invalid_meta[index][source_id][objindex] ||= {}
-            invalid_meta[index][source_id][objindex][:error] = "Error during #{operation}: object confict detected"
+            invalid_meta[index][source_id][objindex][:error] = "Error during #{operation}: object conflict detected"
           end
           if objvalue['duplicate_of_cid']
             invalid_meta[index] ||= {}

data/spec/client_sync_spec.rb

@@ -12,7 +12,7 @@ describe "ClientSync" do
     @model = Rhoconnect::Model::Base.create(@s2)
     @cs1 = Rhoconnect::Handler::Changes::Runner.new(['create'],@model,@c,lv,params)
     stub_request(:post, "http://test.com/rhoconnect/authenticate")
-    stub_request(:post, "http://test.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
+    stub_request(:post, "http://test.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5}.to_json)
     @cs1.run
     verify_source_queue_data(@s2, {:create => [],
                         :update => [],
@@ -484,7 +484,7 @@ describe "ClientSync" do
       @sync_handler.client.get_data(:cd).should == @data
     end
 
-    it "should resend page if page exists and no token provided" do
+    xit "should resend page if page exists and no token provided" do
       expected = {'1'=>@product1}
       set_test_data('test_db_storage',{'1'=>@product1,'2'=>@product2,'4'=>@product4})
       params = {'name' => 'iPhone'}
@@ -492,10 +492,10 @@ describe "ClientSync" do
       @sync_handler.run
       token = @c.get_value(:page_token)
       @sync_handler.run.should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>token},
-        {"count"=>1}, {"progress_count"=>0},{"total_count"=>1},{'insert' => expected}]
+                                   {"count"=>1}, {"progress_count"=>0},{"total_count"=>1},{'insert' => expected}]
       @sync_handler.params[:token] = token
       @sync_handler.run.should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>""},
-        {"count"=>0}, {"progress_count"=>0}, {"total_count"=>1}, {}]
+                                   {"count"=>0}, {"progress_count"=>0}, {"total_count"=>1}, {}]
       @sync_handler.client.get_data(:page).should == {}
       @c.get_value(:page_token).should be_nil
     end
@@ -514,7 +514,7 @@ describe "ClientSync" do
       end
     end
 
-    it "should send metadata with resend page" do
+    xit "should send metadata with resend page" do
       expected = {'1'=>@product1}
       set_state('test_db_storage' => expected)
       mock_metadata_method([SampleAdapter]) do
@@ -563,7 +563,7 @@ describe "ClientSync" do
       end
     end
 
-    it "should re-send schema-changed if no token sent" do
+    xit "should re-send schema-changed if no token sent" do
       mock_schema_method([SampleAdapter]) do
         @c.put_value(:schema_sha1,'foo')
         result = @sync_handler.run
@@ -629,4 +629,4 @@ describe "ClientSync" do
         {"#{operation}-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>op_data[operation][ERROR]}}]
     end
   end
-end
+end

data/spec/dynamic_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'spec_helper')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "Rhoconnect::Model::DynamicAdapterModel" do
   include_examples "SharedRhoconnectHelper", :rhoconnect_data => true
@@ -6,33 +6,33 @@ describe "Rhoconnect::Model::DynamicAdapterModel" do
   it "should return login when backend service defined" do
     stub_request(:post, "http://test.com/rhoconnect/authenticate").to_return(:body => "lucas")
     Rhoconnect.appserver = 'http://test.com'
-    Rhoconnect::Model::DynamicAdapterModel.authenticate('lucas','').should == 'lucas'
+    Rhoconnect::Model::DynamicAdapterModel.authenticate('lucas', '').should == 'lucas'
   end
 
   it "should query dynamic adapter service" do
-    data = {'1'=>@product1}
+    data = {'1' => @product1}
     stub_request(:post, "http://test.com/rhoconnect/query").with(:headers => {'Content-Type' => 'application/json'}).to_return(:status => 200, :body => data.to_json)
-    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2,nil,'http://test.com')
+    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2, nil, 'http://test.com')
     da.query.should == data
   end
 
   it "should create new object using dynamic adapter" do
-    stub_request(:post, "http://test.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
-    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2,nil,'http://test.com')
-    da.create(@product1).should == {:id => 5}
+    stub_request(:post, "http://test.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5}.to_json)
+    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2, nil, 'http://test.com')
+    da.create(@product1).should == {:id => 5}.to_json
   end
 
   it "should update object using dynamic adapter" do
     data = {'id' => 2}
-    stub_request(:post, "http://test.com/rhoconnect/update").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
-    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2,nil,'http://test.com')
-    da.update(data).should == {:id => 5}
+    stub_request(:post, "http://test.com/rhoconnect/update").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5}.to_json)
+    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2, nil, 'http://test.com')
+    da.update(data).should == {:id => 5}.to_json
   end
 
   it "should delete object using dynamic adapter" do
     data = {'id' => 2}
-    stub_request(:post, "http://test.com/rhoconnect/delete").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
-    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2,nil,'http://test.com')
-    da.delete(data).should == {:id => 5}
+    stub_request(:post, "http://test.com/rhoconnect/delete").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5}.to_json)
+    da = Rhoconnect::Model::DynamicAdapterModel.new(@s2, nil, 'http://test.com')
+    da.delete(data).should == {:id => 5}.to_json
   end
 end

data/spec/generator/generator_spec.rb

@@ -37,7 +37,7 @@ describe "Generator" do
               'settings/settings.yml',
               'spec/spec_helper.rb'
             ].each do |template|
-              File.exist?("/tmp/#{appname}/#{template}").should be_true
+              File.exist?("/tmp/#{appname}/#{template}").should be true
             end
           end
         end
@@ -61,7 +61,7 @@ describe "Generator" do
               'public',
               'settings/settings.yml'
             ].each do |template|
-              File.exist?("/tmp/#{appname}/#{template}").should be_true
+              File.exist?("/tmp/#{appname}/#{template}").should be true
             end
           end
         end
@@ -85,14 +85,14 @@ describe "Generator" do
           Dir.chdir appname do
             Rhoconnect::SourceGenerator.start([source])
 
-            File.exist?("/tmp/#{appname}/models/ruby/#{source}.rb").should be_true
-            File.exist?("/tmp/#{appname}/controllers/ruby/#{source}_controller.rb").should be_true
-            File.exist?("/tmp/#{appname}/spec/models/ruby/#{source}_spec.rb").should be_true
-            File.exist?("/tmp/#{appname}/spec/controllers/ruby/#{source}_controller_spec.rb").should be_true
+            File.exist?("/tmp/#{appname}/models/ruby/#{source}.rb").should be true
+            File.exist?("/tmp/#{appname}/controllers/ruby/#{source}_controller.rb").should be true
+            File.exist?("/tmp/#{appname}/spec/models/ruby/#{source}_spec.rb").should be true
+            File.exist?("/tmp/#{appname}/spec/controllers/ruby/#{source}_controller_spec.rb").should be true
           end
         end
       end
     end
   end
 
-end
+end