rhosync 2.0.0.beta7 → 2.0.0.beta8

data/CHANGELOG

@@ -1,5 +1,9 @@
+== 2.0.0.beta8
+* #3685476 - CGI escape api cookies
+
 == 2.0.0.beta7
 * #3651932 - support redis:* tasks on windows and linux/mac
+* #3663335 - don't need ENV['PWD'] in tasks.rb
 
 == 2.0.0.beta6
 * no new changes, rubygems.org upload failed for 2.0.0.beta5

data/Rakefile

@@ -54,8 +54,8 @@ begin
 
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "rhosync"
-    gemspec.summary = %q{Rhosync Server}
-    gemspec.description = %q{Rhosync library and related command-line utilities for using Rhosync}
+    gemspec.summary = %q{RhoSync Synchronization Framework}
+    gemspec.description = %q{RhoSync Synchronization Framework and related command-line utilities}
     gemspec.homepage = %q{http://rhomobile.com/products/rhosync}
     gemspec.authors = ["Rhomobile"]
     gemspec.email = %q{dev@rhomobile.com}
@@ -79,6 +79,7 @@ begin
     gemspec.add_development_dependency "rcov", ">=0.9.8"
     gemspec.add_development_dependency "faker", ">=0.3.1"
     gemspec.add_development_dependency "rack-test", ">=0.5.3"
+    gemspec.add_development_dependency "thor", ">=0.13.6"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: "

data/bench/benchapp/Rakefile

@@ -1,14 +1,14 @@
 $:.unshift File.join(File.dirname(__FILE__),'..','..','lib')
 require 'rhosync/tasks'
 
+ROOT_PATH = File.expand_path(File.dirname(__FILE__))
+
 begin
   require 'resque/tasks'
-
   task "resque:setup" do
-    require 'rhosync'
     require 'application'
   end
 rescue LoadError
   puts "Resque not available. Install it with: "
   puts "gem install resque\n\n"
-end
+end

data/bench/benchapp/application.rb

@@ -4,9 +4,23 @@ class Application < Rhosync::Base
       true # do some interesting authentication here...
     end
     
+    # Add hooks for application startup here
+    # Don't forget to call super at the end!
     def initializer(path)
       super
     end
+    
+    # Calling super here returns rack tempfile path:
+    # i.e. /var/folders/J4/J4wGJ-r6H7S313GEZ-Xx5E+++TI
+    # Note: This tempfile is removed when server stops or crashes...
+    # See http://rack.rubyforge.org/doc/Multipart.html for more info
+    # 
+    # Override this by creating a copy of the file somewhere
+    # and returning the path to that file (then don't call super!):
+    # i.e. /mnt/myimages/soccer.png
+    def store_blob(blob)
+      super #=> returns blob[:tempfile]
+    end
   end
 end
 

data/bench/benchapp/config.ru

@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 
+path = File.join(File.dirname(__FILE__),'..','..','lib')
+$:.unshift path
+
 # Try to load vendor-ed rhosync, otherwise load the gem
 begin
-  require 'vendor/rhosync/lib/rhosync'
+  require 'vendor/rhosync/lib/rhosync/server'
+  require 'vendor/rhosync/lib/rhosync/console/server'
 rescue LoadError
   require 'rhosync/server'
   require 'rhosync/console/server'

data/bench/lib/bench/statistics.rb

@@ -44,7 +44,7 @@ module Bench
       @rows.each do |marker,row|
         logger.info "Request %-15s: min: %0.4f, max: %0.4f, avg: %0.4f, err: %d, verification err: %d" % [marker, row[:min], row[:max], average(row), row[:errors], row[:verification_errors]]
       end
-      logger.info "Verify Error       : #{Bench.verify_error}"
+      logger.info "State of MD        : #{Bench.verify_error == 0 ? true : false}"
       logger.info "Concurrency        : #{@concurrency}"
       logger.info "Iterations         : #{@iterations}"
       logger.info "Total Count        : #{@total_count}"

data/bench/lib/bench.rb

@@ -25,13 +25,13 @@ module Bench
     include Utils
 
     attr_accessor :concurrency, :iterations, :admin_login 
-    attr_accessor :admin_password, :user_name, :app_name
+    attr_accessor :admin_password, :user_name
     attr_accessor :password, :host, :base_url, :token
     attr_accessor :total_time, :sessions, :verify_error
     
     def config
       begin
-        @verify_error ||= false
+        @verify_error ||= 0
         yield self
       rescue Exception => e
         puts "error in config: #{e.inspect}"
@@ -50,13 +50,13 @@ module Bench
       RestClient.post("#{@host}/api/reset",{:api_token => get_token}.to_json, :content_type => :json)
     end
     
-    def create_user
-      token = get_token
-      RestClient.post("#{@host}/api/create_user",
-        {:api_token => token, :app_name => @app_name,
-         :attributes => {:login => @user_name, :password => @password}}.to_json, 
-         :content_type => :json)
-    end
+    # def create_user
+    #       token = get_token
+    #       RestClient.post("#{@host}/api/create_user",
+    #         {:api_token => token, :app_name => @app_name,
+    #          :attributes => {:login => @user_name, :password => @password}}.to_json, 
+    #          :content_type => :json)
+    #     end
     
     def set_server_state(doc,data)
       token = get_token
@@ -68,7 +68,7 @@ module Bench
       token = get_token
       RestClient.post("#{@host}/api/set_refresh_time",
         {:api_token => token, :source_name => source_name,
-          :app_name => @app_name, :user_name => @user_name, 
+          :user_name => @user_name, 
           :poll_interval => poll_interval}.to_json, 
           :content_type => :json)
     end
@@ -83,7 +83,7 @@ module Bench
     end
     
     def get_test_server
-      load_settings(File.join(File.dirname(__FILE__),'..',@app_name,'settings','settings.yml'))
+      load_settings(File.join(File.dirname(__FILE__),'..','benchapp','settings','settings.yml'))
       @base_url = $settings[:development][:syncserver].gsub(/\/$/,'')
       uri = URI.parse(@base_url)
       port = (uri.port and uri.port != 80) ? ":"+uri.port.to_s : "" 

data/bench/lib/testdata/5-data.txt

@@ -1,11 +1,9 @@
 {
-"%8fada06e7b56478e90a5348a1c6f3f85{"
-Email"jazmin_mcdermott@yahoo.com"%6144d0c7f9484eeb9c68d2304a9bfb14{@"Cronin@
-"Advertising Scientist@"Eugene@"1-980-027-5133 x549@"Jacobs-Kilback@"%6144d0c7f9484eeb9c68d2304a9bfb14@"jarvis_parker@gmail.com"%bef9e032a55949919e1ccb409ccbd187{@"
-Boehm@
-"Quality Assurance Nurse@"
-Lance@"008.738.6271 x963@"Larson LLC@"%bef9e032a55949919e1ccb409ccbd187@"cayla_marvin@hotmail.com"%ff435a73b11841f7bf0da839538db179{@"Heathcote@
-"Senior Buyer@"
-Raven@"187-409-4543 x1528@"Morar-Huels@"%ff435a73b11841f7bf0da839538db179@"keon_parisian@yahoo.com"%9828dd87b59a479a8e7488a5e44eef2e{@"Keeling@
-"Administrative Supervisor@"
-Robyn@"(159)270-6914 x9311@"Lakin and Sons@"%9828dd87b59a479a8e7488a5e44eef2e@"simone.torphy@yahoo.com
+"%0b2cad915eb44b7c8bccf098beee8c3a{"
+Swift"
+Email"kristian@yahoo.com"%67afa749e7e2465dae7e387a0650bd02{@"
+"!Environmental Superintendent@"
+Erwin@"(135)166-9749@"Schowalter-Fisher@"%67afa749e7e2465dae7e387a0650bd02@"dale@yahoo.com"%5437a251c3ad48249b9a4e5000bf8bd3{@"Shields@
+"Account Recruiter@"Dorothy@"174-253-0093 x87634@"Kutch Inc@"%5437a251c3ad48249b9a4e5000bf8bd3@"stephania@hotmail.com"%ce7c0264b8f44aaa9f0cc9b07278cdc2{@"Graham@
+"Financial Recruiter@"Hal@"834-932-4377 x87106@"Gleichner-Bailey@"%ce7c0264b8f44aaa9f0cc9b07278cdc2@"tom@hotmail.com"%0c40d2f6f1f54481af682cee463aa042{@"Jacobs@
+"Environmental Sales@"Hailey@"1-743-017-6816 x72645@"White Group@"%0c40d2f6f1f54481af682cee463aa042@"bethany_daniel@yahoo.com

data/bench/scripts/cud_script.rb

@@ -1,17 +1,15 @@
-# Simulate creating multiple objects
 include BenchHelpers
+logger.info "Simulate creating multiple objects"
 
 Bench.config do |config|
-  config.concurrency = 5
-  config.iterations  = 5
+  config.concurrency = 1
+  config.iterations  = 1
   config.user_name = "benchuser"
   config.password = "password"
-  config.app_name = "benchapp"
   config.get_test_server
   config.reset_app
-  config.create_user
   config.reset_refresh_time('MockAdapter',0)
-  config.set_server_state("test_db_storage:benchapp:#{config.user_name}",{})
+  config.set_server_state("test_db_storage:application:#{config.user_name}",{})
   @create_objects = []
   @create_count = 5
   config.concurrency.times do |i|
@@ -61,8 +59,7 @@ Bench.verify do |config,sessions|
   
   sessions.each do |session|
     actual = config.get_server_state(
-      client_docname(config.app_name,
-                     config.user_name,
+      client_docname(config.user_name,
                      session.client_id,
                      'MockAdapter',:cd))
     session.results['create-object'][0].verification_error += 
@@ -70,8 +67,7 @@ Bench.verify do |config,sessions|
   end
   
   master_doc = config.get_server_state(
-    source_docname(config.app_name,
-                   config.user_name,
+    source_docname(config.user_name,
                    'MockAdapter',:md))
   Bench.verify_error = Bench.compare_and_log(@expected_md,master_doc,current_line)
 end

data/bench/scripts/helpers.rb

@@ -2,12 +2,12 @@ module BenchHelpers
   include Bench::Logging
   include Bench::Utils
   
-  def client_docname(app_id,user_id,client_id,source_name,doctype)
-    "client:#{app_id}:#{user_id}:#{client_id}:#{source_name}:#{doctype}"
+  def client_docname(user_id,client_id,source_name,doctype)
+    "client:application:#{user_id}:#{client_id}:#{source_name}:#{doctype}"
   end
   
-  def source_docname(app_id,user_id,source_name,doctype)
-    "source:#{app_id}:#{user_id}:#{source_name}:#{doctype}"
+  def source_docname(user_id,source_name,doctype)
+    "source:application:#{user_id}:#{source_name}:#{doctype}"
   end
   
   def verify_presence_of_keys(expected,actual,session,caller)

data/bench/scripts/query_md_script.rb

@@ -1,4 +1,5 @@
-# Run sync session, forces source adapter query on every sync request
+include BenchHelpers
+logger.info "Run sync session, forces source adapter query on every sync request"
 
 @datasize = 100
 @expected = Bench.get_test_data(@datasize)
@@ -10,11 +11,9 @@ Bench.config do |config|
   config.iterations  = 5
   config.user_name = "benchuser"
   config.password = "password"
-  config.app_name = "benchapp"
   config.get_test_server
   config.reset_app
-  config.create_user
-  config.set_server_state("test_db_storage:benchapp:#{config.user_name}",@expected)
+  config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
   config.reset_refresh_time('MockAdapter',0)
 end
 

data/bench/scripts/query_script.rb

@@ -1,4 +1,5 @@
-# Runs simple login,clientcreate,sync session and validates response
+include BenchHelpers
+logger.info "Runs simple login,clientcreate,sync session and validates response"
 
 @datasize = 100
 @expected = Bench.get_test_data(@datasize)
@@ -7,14 +8,12 @@
 
 Bench.config do |config|
   config.concurrency = 5
-  config.iterations  = 5
+  config.iterations  = 2
   config.user_name = "benchuser"
   config.password = "password"
-  config.app_name = "benchapp"
   config.get_test_server
   config.reset_app
-  config.create_user
-  config.set_server_state("test_db_storage:benchapp:#{config.user_name}",@expected)
+  config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
   config.reset_refresh_time('MockAdapter')
 end