rhoconnect 6.0.11 → 6.2.0

data/spec/store_spec.rb

@@ -5,22 +5,22 @@ describe "Store" do
 
   describe "store methods" do
     it "should create proper connection class" do
-      Store.get_store(0).db.class.name.should match(/Redis/)
+      expect(Store.get_store(0).db.class.name).to match(/Redis/)
     end
 
     it "should create redis connection based on ENV" do
       ENV[REDIS_URL] = 'redis://localhost:6379'
-      Redis.should_receive(:connect).with(:url => 'redis://localhost:6379', :thread_safe => true, :timeout => Rhoconnect.redis_timeout).exactly(5).times.and_return { Redis.new }
+      expect(Redis).to receive(:new).with(:url => 'redis://localhost:6379', :thread_safe => true, :timeout => Rhoconnect.redis_timeout).exactly(1).times.and_call_original
       Store.nullify
-      Store.num_stores.should == 0
+      expect(Store.num_stores).to eq(0)
       Store.create
-      Store.get_store(0).db.should_not == nil
+      expect(Store.get_store(0).db).not_to be_nil
       ENV.delete(REDIS_URL)
     end
 
     it "should create redis connection based on REDISTOGO_URL ENV" do
       ENV[REDISTOGO_URL] = 'redis://localhost:6379'
-      Redis.should_receive(:connect).with(:url => 'redis://localhost:6379', :thread_safe => true, :timeout => Rhoconnect.redis_timeout).exactly(5).times.and_return { Redis.new }
+      expect(Redis).to receive(:new).with(:url => 'redis://localhost:6379', :thread_safe => true, :timeout => Rhoconnect.redis_timeout).exactly(1).and_call_original
       Store.nullify
       Store.create
       Store.get_store(0).db.should_not == nil
@@ -75,7 +75,7 @@ describe "Store" do
       Store.update_count('mydata', -5)
       Store.get_value('mydata').to_i.should == 16
       Store.delete_value('mydata')
-      Store.exists?('mydata').should be_false
+      Store.exists?('mydata').should be false
     end
 
     it "should delete_objects with simple data and verify that srem is called only on affected fields" do
@@ -288,7 +288,7 @@ describe "Store" do
       doc = "locked_data"
       lock = Time.now.to_i+3
       Store.get_store(0).db.set "lock:#{doc}", lock
-      Store.get_store(0).should_receive(:sleep).at_least(:once).with(1).and_return { sleep 1; Store.release_lock(doc,lock); }
+      expect(Store.get_store(0)).to receive(:sleep).at_least(:once).with(1) { sleep 1; Store.release_lock(doc,lock); }
       Store.get_lock(doc,4)
     end
 
@@ -318,7 +318,7 @@ describe "Store" do
       doc = "locked_data"
       Rhoconnect.lock_duration = 2
      	Store.get_lock(doc)
-     	Store.get_store(0).should_receive(:sleep).at_least(1).times.with(1).and_return { sleep 1 }
+     	expect(Store.get_store(0)).to receive(:sleep).at_least(1).times.with(1) { sleep 1 }
       Store.get_lock(doc)
      	Rhoconnect.lock_duration = nil
     end
@@ -345,8 +345,8 @@ describe "Store" do
 
     it "should not fail to rename if key doesn't exist" do
       Store.rename('key1','key2')
-      Store.exists?('key1').should be_false
-      Store.exists?('key2').should be_false
+      Store.exists?('key1').should be false
+      Store.exists?('key2').should be false
     end
 
     it "should raise ArgumentError on put_data with invalid data" do
@@ -366,9 +366,9 @@ describe "Store" do
       Store.put_object(:md, key1, data1)
       Store.put_object(:md, key2, data2)
       Store.keys(:md).should == []
-      Store.exists?("#{:md}:#{docindex1}").should be_true
-      Store.exists?("#{:md}:#{docindex2}").should be_true
-      Store.exists?("#{:md}:indices").should be_true
+      Store.exists?("#{:md}:#{docindex1}").should be  true
+      Store.exists?("#{:md}:#{docindex2}").should be  true
+      Store.exists?("#{:md}:indices").should be  true
       Store.get_store(0).db.hkeys("#{:md}:indices").should == ["#{docindex1}", "#{docindex2}"]
       Store.get_store(0).db.hvals("#{:md}:indices").should == ["#{:md}:#{docindex1}", "#{:md}:#{docindex2}"]
     end
@@ -396,20 +396,20 @@ describe "Store" do
       Store.put_tmp_data(:md, {key1 => data1})
       Store.put_tmp_data(:md, {key2 => data2}, true)
 
-      Store.exists?("#{:md}:#{docindex1}").should be_true
-      Store.exists?("#{:md}:#{docindex2}").should be_true
-      Store.exists?("#{:md}:indices").should be_true
+      Store.exists?("#{:md}:#{docindex1}").should be  true
+      Store.exists?("#{:md}:#{docindex2}").should be  true
+      Store.exists?("#{:md}:indices").should be  true
       Store.get_store(0).db.ttl("#{:md}:#{docindex1}").should == Rhoconnect.store_key_ttl
       Store.get_store(0).db.ttl("#{:md}:#{docindex2}").should == Rhoconnect.store_key_ttl
       Store.get_store(0).db.ttl("#{:md}:indices").should == Rhoconnect.store_key_ttl
 
       Store.rename_tmp_data(:md, :md_perm)
-      Store.exists?("#{:md}:#{docindex1}").should be_false
-      Store.exists?("#{:md}:#{docindex2}").should be_false
-      Store.exists?("#{:md}:indices").should be_false
-      Store.exists?("#{:md_perm}:#{docindex1}").should be_true
-      Store.exists?("#{:md_perm}:#{docindex2}").should be_true
-      Store.exists?("#{:md_perm}:indices").should be_true
+      Store.exists?("#{:md}:#{docindex1}").should be false
+      Store.exists?("#{:md}:#{docindex2}").should be false
+      Store.exists?("#{:md}:indices").should be false
+      Store.exists?("#{:md_perm}:#{docindex1}").should be  true
+      Store.exists?("#{:md_perm}:#{docindex2}").should be  true
+      Store.exists?("#{:md_perm}:indices").should be  true
       Store.get_store(0).db.ttl("#{:md_perm}:#{docindex1}").should == -1
       Store.get_store(0).db.ttl("#{:md_perm}:#{docindex2}").should == -1
       Store.get_store(0).db.ttl("#{:md_perm}:indices").should == -1
@@ -473,4 +473,4 @@ describe "Store" do
       end
     end
   end
-end
+end

data/spec/user_spec.rb

@@ -90,8 +90,8 @@ describe "User" do
 
   describe "User Stats" do
 
-    before(:all) do
-      Store.stub(:lock).and_yield
+    before(:each) do
+      allow(Store).to receive(:lock).and_yield
     end
 
     it "should increment user stats on create" do
@@ -114,4 +114,4 @@ describe "User" do
       Rhoconnect.stats = false
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 6.0.11
+  version: 6.2.0
 platform: ruby
 authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,154 +16,160 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 12.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.3
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables: