rhosync 2.1.12 → 2.1.13

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 2.1.13
+* #20910767 - fix for cud params modification in before filter (support requests #1802, #1804)
+* #20917129 - add Cache-Control:no-cache and Pragma:no-cache headers into response
+
 ## 2.1.12
 * #19304885 - fixing race condition in get_lock (lock is released between setnx and get calls)
 * #18508155 - on failed syncs allow the user to retry it up to pre-defined number of times (another approach)

data/lib/rhosync/server.rb

@@ -170,19 +170,9 @@ module Rhosync
     Rhosync.log "Rhosync Server v#{Rhosync::VERSION} started..."
 
     before do
-      begin
-        if params["cud"]
-          cud = JSON.parse(params["cud"])
-          params.delete("cud")
-          params.merge!(cud)
-        end      
-      rescue JSON::ParserError => jpe
-        log jpe.message + jpe.backtrace.join("\n")
-        throw :halt, [500, "Server error while processing client data"]
-      rescue Exception => e
-        log e.message + e.backtrace.join("\n")
-        throw :halt, [500, "Internal server error"]
-      end
+      cache_control :no_cache
+      headers({'pragma'=>'no-cache'})
+      
       if params[:version] and params[:version].to_i < 3
         throw :halt, [404, "Server supports version 3 or higher of the protocol."]
       end
@@ -247,6 +237,19 @@ module Rhosync
     end
 
     post '/application' do
+      begin
+        if params["cud"]
+          cud = JSON.parse(params["cud"])
+          params.delete("cud")
+          params.merge!(cud)
+        end      
+      rescue JSON::ParserError => jpe
+        log jpe.message + jpe.backtrace.join("\n")
+        throw :halt, [500, "Server error while processing client data"]
+      rescue Exception => e
+        log e.message + e.backtrace.join("\n")
+        throw :halt, [500, "Internal server error"]
+      end
       catch_all do
         current_client_sync.receive_cud(params)
         status 200

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.12'
+  VERSION = '2.1.13'
 end

data/spec/api/get_api_token_spec.rb

@@ -9,6 +9,12 @@ describe "RhosyncApiGetApiToken" do
     last_response.body.should == @api_token
   end
   
+  it "response should have cache-control and pragma headers set to no-cache" do
+    post "/login", :login => 'rhoadmin',:password => ''
+    last_response.headers['Cache-Control'].should == 'no-cache'
+    last_response.headers['Pragma'].should == 'no-cache'
+  end
+  
   it "should fail to get token if user is not rhoadmin" do
     post "/login", :login => @u_fields[:login],:password => 'testpass'
     post "/api/get_api_token"

data/spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.backup

@@ -0,0 +1,4 @@
+x
�T;��@�#���!�X�(�SU�"B:(���.q���Rb�Mw�ҧ���s%%�J�
�7�Y?"
+F��cg盙]��t��XB#�D�����&"����~9���VVB/O6
+�;�d�WE��!8!�8�F��>����8�}e'f)D<��:�S�PZ����rR�lު	�N��e���dr>���
>���A]�Xy嚚��UOݷ��ۑ��"n�*sW�z"��Z8��1��4Ou��U4bU]���B���ۼ	��}���{���c���Ͼ�*V�D�)΁���=�o������+����J��:� �t�A�}�u=�� ��$�_l]��=tp���8��o8���X�R���Bxv�ݨ�j�R�d�&�Ni��á��*
+�.&�LCD�Y�8���s4�t����2>����*�2p�W�
���'

data/spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.properties

@@ -0,0 +1,19 @@
+#HSQL Database Engine 1.8.0.10
+#Fri Nov 11 14:20:30 PST 2011
+hsqldb.script_format=0
+runtime.gc_interval=0
+hsqldb.incremental_backup=false
+sql.enforce_strict_size=false
+hsqldb.cache_size_scale=8
+readonly=false
+hsqldb.nio_data_file=false
+hsqldb.cache_scale=14
+version=1.8.1
+hsqldb.default_table_type=cached
+hsqldb.cache_file_scale=1
+hsqldb.lock_file=true
+hsqldb.log_size=200
+modified=no
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.8.1
+hsqldb.compatible_version=1.8.0

data/spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.script

@@ -0,0 +1,17 @@
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+CREATE CACHED TABLE CLIENT_INFO("client_id" VARCHAR(255) DEFAULT NULL,"session" VARCHAR(255) DEFAULT NULL,"token" VARCHAR(255) DEFAULT NULL,"token_sent" BIGINT DEFAULT 0,"reset" BIGINT DEFAULT 0,"port" VARCHAR(10) DEFAULT NULL,"last_sync_success" VARCHAR(100) DEFAULT NULL)
+CREATE CACHED TABLE OBJECT_VALUES("source_id" BIGINT DEFAULT NULL,"attrib" VARCHAR(255) DEFAULT NULL,"object" VARCHAR(255) DEFAULT NULL,"value" VARCHAR DEFAULT NULL)
+CREATE INDEX BY_SRC_ID ON OBJECT_VALUES("source_id")
+CREATE INDEX BY_SRC_VALUE ON OBJECT_VALUES("attrib","source_id","value")
+CREATE UNIQUE INDEX BY_SRC_OBJECT ON OBJECT_VALUES("object","attrib","source_id")
+CREATE CACHED TABLE CHANGED_VALUES("source_id" BIGINT DEFAULT NULL,"attrib" VARCHAR(255) DEFAULT NULL,"object" VARCHAR(255) DEFAULT NULL,"value" VARCHAR DEFAULT NULL,"attrib_type" VARCHAR(255) DEFAULT NULL,"update_type" VARCHAR(255) DEFAULT NULL,"sent" BIGINT DEFAULT 0)
+CREATE CACHED TABLE SOURCES("source_id" BIGINT NOT NULL PRIMARY KEY,"name" VARCHAR(255) DEFAULT NULL,"token" BIGINT DEFAULT NULL,"sync_priority" BIGINT,"partition" VARCHAR(255),"sync_type" VARCHAR(255),"metadata" VARCHAR DEFAULT NULL,"last_updated" BIGINT DEFAULT 0,"last_inserted_size" BIGINT DEFAULT 0,"last_deleted_size" BIGINT DEFAULT 0,"last_sync_duration" BIGINT DEFAULT 0,"last_sync_success" BIGINT DEFAULT 0,"backend_refresh_time" BIGINT DEFAULT 0,"source_attribs" VARCHAR DEFAULT NULL,"schema" VARCHAR DEFAULT NULL,"schema_version" VARCHAR DEFAULT NULL,"associations" VARCHAR DEFAULT NULL,"blob_attribs" VARCHAR DEFAULT NULL)
+CREATE CACHED TABLE FIXEDSCHEMAADAPTER("object" VARCHAR(255) NOT NULL PRIMARY KEY,"name" VARCHAR DEFAULT NULL,"brand" VARCHAR DEFAULT NULL,"price" VARCHAR DEFAULT NULL,"image_url_cropped" VARCHAR DEFAULT NULL,"image_url" VARCHAR DEFAULT NULL)
+CREATE INDEX BY_NAME_BRAND ON FIXEDSCHEMAADAPTER("name","brand")
+CREATE UNIQUE INDEX BY_PRICE ON FIXEDSCHEMAADAPTER("price")
+SET TABLE OBJECT_VALUES INDEX'344 344 32 448 0'
+SET TABLE SOURCES INDEX'976 0'
+SET TABLE FIXEDSCHEMAADAPTER INDEX'1672 1672 1768 0'
+CREATE USER SA PASSWORD ""
+GRANT DBA TO SA
+SET WRITE_DELAY 10

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 2
   - 1
-  - 12
-  version: 2.1.12
+  - 13
+  version: 2.1.13
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -492,6 +492,15 @@ files:
 - spec/apps/rhotestapp/Rakefile
 - spec/apps/rhotestapp/application.rb
 - spec/apps/rhotestapp/config.ru
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.gzip
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.backup
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.data
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.data.gzip
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.properties
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.hsqldb.script
+- spec/apps/rhotestapp/data/application/testuser/testuser_1321050029.data.rzip
+- spec/apps/rhotestapp/data/application/testuser/tmp/testuser_1321050029.data
 - spec/apps/rhotestapp/settings/apple_fake_cert.pem
 - spec/apps/rhotestapp/settings/license.key
 - spec/apps/rhotestapp/settings/settings.yml