rhosync 2.1.13 → 2.1.14

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 2.1.14
+* #20910767 - fixing the incorrect tests for cud params and blob create
+* #22820737 - fixing rack support (1.3.6 is used)
+
 ## 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

data/Rakefile

@@ -66,7 +66,8 @@ begin
     gemspec.files =  FileList["[A-Z]*", "{bench,bin,generators,lib,spec,tasks}/**/*"]
 
     # TODO: Due to https://www.pivotaltracker.com/story/show/3417862, we can't use JSON 1.4.3
-    gemspec.add_dependency "sinatra", ">= 1.2.7"
+    gemspec.add_dependency "rack", "~> 1.3.6"
+    gemspec.add_dependency "sinatra", "~> 1.3.1"
     gemspec.add_dependency "json", "~>1.4.2"
     gemspec.add_dependency "sqlite3-ruby", "~>1.2.5"
     gemspec.add_dependency "rubyzip", "~>0.9.4"
@@ -75,7 +76,7 @@ begin
     gemspec.add_dependency "resque", "~>1.14.0"
     gemspec.add_dependency "rest-client", "~>1.6.1"
     gemspec.add_dependency "templater", "~>1.0.0"
-    gemspec.add_dependency "rake", "~>0.9.2"
+    gemspec.add_dependency "rake", "~>0.9.2.2"
     gemspec.add_development_dependency "log4r", "~>1.1.7"
     gemspec.add_development_dependency "jeweler", ">=1.4.0"
     gemspec.add_development_dependency "rspec", ">=1.3.0"

data/lib/rhosync/version.rb

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

data/spec/server/server_spec.rb

@@ -32,6 +32,7 @@ describe "Server" do
   end
   
   it "should show status page" do
+    pending
     get '/'
     last_response.body.match(Rhosync::VERSION)[0].should == Rhosync::VERSION
   end
@@ -427,6 +428,9 @@ describe "Server" do
           Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream"),
           'txtfile-rhoblob-2' => 
             Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file2), "application/octet-stream")}
+      last_response.should be_ok
+      data = Store.get_data('test_create_storage')
+      data.size.should == 2
       Store.get_data('test_create_storage').each do |id,obj|
         File.exists?(obj['txtfile-rhoblob']).should == true
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 2
   - 1
-  - 13
-  version: 2.1.13
+  - 14
+  version: 2.1.14
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,28 +15,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 1
-        - 2
-        - 7
-        version: 1.2.7
+        - 3
+        - 6
+        version: 1.3.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +64,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +80,11 @@ dependencies:
         - 5
         version: 1.2.5
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +96,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,11 +112,11 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +128,11 @@ dependencies:
         - 1
         version: 2.1.1
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: resque
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,11 +144,11 @@ dependencies:
         - 0
         version: 1.14.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,11 +160,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: templater
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,27 +176,28 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 11
         segments: 
         - 0
         - 9
         - 2
-        version: 0.9.2
+        - 2
+        version: 0.9.2.2
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: log4r
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -192,11 +209,11 @@ dependencies:
         - 7
         version: 1.1.7
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -208,11 +225,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -224,11 +241,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -240,11 +257,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: faker
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -256,11 +273,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -272,11 +289,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -288,7 +305,7 @@ dependencies:
         - 6
         version: 0.13.6
   type: :development
-  version_requirements: *id017
+  version_requirements: *id018
 description: RhoSync Synchronization Framework and related command-line utilities
 email: dev@rhomobile.com
 executables: 
@@ -492,15 +509,6 @@ 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
@@ -580,7 +588,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework

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

@@ -1,4 +0,0 @@
-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

@@ -1,19 +0,0 @@
-#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

@@ -1,17 +0,0 @@
-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