rhoconnect 3.3.3 → 3.3.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.4 (2012-08-28)
+* flush_zdata was not properly cleaning the related Redis storage (which led to incorrect CUD queue states) 
+
 ## 3.3.3 (2012-08-21)
 * allow selective bulk_sync source parameter to be sent as a comma-separated string
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (3.3.3)
+    rhoconnect (3.3.4)
       bundler (~> 1.0)
       json (~> 1.6.0)
       rake (~> 0.9.2.2)
@@ -65,7 +65,7 @@ GEM
       cabin (~> 0.4.3)
       clamp (= 0.3.1)
       json (= 1.6.6)
-    highline (1.6.13)
+    highline (1.6.14)
     hike (1.2.1)
     jasmine (1.2.1)
       jasmine-core (>= 1.2.0)

data/README.md

@@ -2,13 +2,56 @@ RhoConnect App Integration Server
 -------------------------------------------------------------
 RhoConnect is an app integration server which keeps enterprise data current and available on users’ devices.
 
-Prerequisites
+Development Prerequisites
 -------------------------------------------------------------
-You will need to install the Qt libraray <http://qt.nokia.com/downloads> in order to run the specs.
+You will need to install the following in order to run the RhoConnect specs.
 
-More Info
+* QT: <http://qt.nokia.com/downloads>
+* RVM: <https://rvm.io/> or RB-env: <https://github.com/sstephenson/rbenv> with Ruby 1.9.3p194+ installed
+* Bundler: <http://gembundler.com/>
+* Redis: <http://redis.io>
+* Java JDK 1.6+: <http://www.oracle.com/technetwork/java/javase/downloads/index.html>
+* hsqldata.jar: <https://github.com/rhomobile/hsqldata/downloads> - put this in a directory called vendor/
+
+Running Tests
+-------------------------------------------------------------
+
+* Install dependencies
+
+```
+$ bundle install
+```
+
+* Start redis (assumes it is installed in /usr/local/bin)
+
+```
+$ rake redis:start
+```
+
+* Run RhoConnect specs
+
+```
+$ rake spec
+```
+
+You will see a lot of output including backtraces as negative tests produce exceptions that print to stdout.  This is normal.  At the end you should see something like the following:
+
+<pre>
+Finished in 47.47 seconds
+543 examples, 0 failures
+...
+Running Jasmine specs...
+.........................................
+PASS: 41 tests, 0 failures, 0.05 secs.
+</pre>
+
+If you have 0 failures, everything is good!
+
+Test Layout
+-------------------------------------------------------------
+RhoConnect uses the [RSpec](https://www.relishapp.com/rspec/) framework to implement tests.  All tests are located in the `spec/` directory.  Tests use the following file naming convention: `classname_spec.rb` where `classname` is the class under test (i.e. `server_spec.rb` tests the `Server` class).
+
+Resources
 -------------------------------------------------------------
-  * Intro to Rhodes & RhoConnect: 	<http://docs.rhomobile.com>
-  * RhoConnect:               	   	<http://docs.rhomobile.com/rhoconnect/introduction>
-  * Tutorial:                  		<http://docs.rhomobile.com/rhoconnect/tutorial> 
-  * RDoc (still rough):        		<http://rdoc.info/projects/rhomobile/rhoconnect>
+  * RhoConnect:	<http://docs.rhomobile.com/rhoconnect/introduction>
+  * Tutorial:   <http://docs.rhomobile.com/rhoconnect/tutorial> 

data/lib/rhoconnect/store.rb

@@ -364,12 +364,10 @@ module Rhoconnect
         current_score_data = Store.db.zrevrange(dockey,0,0,:with_scores => true)
         current_score = current_score_data[-1].to_i if current_score_data
         current_score += 1
-        Store.db.pipelined do
-          data.each do |key,hash_value|
-            unique_record_key = setelement(current_score,assoc_key, key)
-            Store.db.zadd(dockey, current_score, unique_record_key)
-            Store.put_data(unique_record_key,{key => hash_value})
-          end
+        data.each do |key,hash_value|
+          unique_record_key = setelement(current_score,assoc_key, key)
+          Store.db.zadd(dockey, current_score, unique_record_key)
+          Store.put_data("#{dockey}:#{unique_record_key}",{key => hash_value})
         end
         true
       end
@@ -382,7 +380,7 @@ module Rhoconnect
         unless data.nil?
           scores = []
           data.each do |zsetkey|
-            obj_hash = Store.get_data zsetkey
+            obj_hash = Store.get_data "#{dockey}:#{zsetkey}"
             score,key,objkey = getelement(zsetkey)
             if scores[-1] != score
               ret << obj_hash
@@ -399,10 +397,8 @@ module Rhoconnect
       # Deletes all keys and their hashes from the Redis DB
       def flush_zdata(dockey)
         data = Store.db.zrange(dockey, 0, -1)
-        Store.db.pipelined do
-          data.each do |hash_key|
-            Store.db.del(hash_key)
-          end
+        data.each do |hash_key|
+          _delete_doc("#{dockey}:#{hash_key}")
         end
         Store.db.zremrangebyrank(dockey, 0, -1)
       end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.3'
+  VERSION = '3.3.4'
 end

data/spec/store_spec.rb

@@ -237,6 +237,8 @@ describe "Store" do
         zdata,keys = Store.get_zdata('doc1')
         zdata.should == []
         keys.should == []
+        zdocs = Store.get_data('doc1:1:my_assoc_key:1')
+        zdocs.should == {}
       end
 
       if defined?(JRUBY_VERSION)