rhosync 2.1.0.beta.2 → 2.1.0

data/CHANGELOG

@@ -14,6 +14,8 @@
 * #7034095 - don't ping device if device_pin is empty or nil
 * #7089047 - fixed application.rb template store_blob method
 * #7055889 - fixed schema tables should have 'object' primary key
+* #7217581 - use REDIS_HOME env var if it exists for rake redis:* tasks
+* #6645553 - detect and run thin if available, fallback to mongrel and die on webrick
 
 ## 2.0.9
 * #5154725 - stats framework

data/Rakefile

@@ -60,7 +60,7 @@ begin
     gemspec.homepage = %q{http://rhomobile.com/products/rhosync}
     gemspec.authors = ["Rhomobile"]
     gemspec.email = %q{dev@rhomobile.com}
-    gemspec.version = '2.1.0.beta.2'
+    gemspec.version = Rhosync::VERSION
     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

data/lib/rhosync/client_sync.rb

@@ -12,30 +12,22 @@ module Rhosync
     end
     
     def receive_cud(cud_params={},query_params=nil)
-      if @source.is_pass_through
-        @source_sync.pass_through_cud(cud_params,query_params) if value
-      else  
-        _process_blobs(cud_params)
-        processed = 0
-        ['create','update','delete'].each do |op|
-          key,value = op,cud_params[op]
-          processed += _receive_cud(key,value) if value
-        end
-        @source_sync.process_cud(@client.id) if processed > 0
+      _process_blobs(cud_params)
+      processed = 0
+      ['create','update','delete'].each do |op|
+        key,value = op,cud_params[op]
+        processed += _receive_cud(key,value) if value
       end
+      @source_sync.process_cud(@client.id) if processed > 0
     end
     
     def send_cud(token=nil,query_params=nil)
       res = []
-      if not _ack_token(token) and not @source.is_pass_through?
+      if not _ack_token(token)
         res = resend_page(token)
       else
-        query_result = @source_sync.process_query(query_params)
-        if @source.is_pass_through?
-          res = send_pass_through_data(query_result)
-        else
-          res = send_new_page
-        end
+        @source_sync.process_query(query_params)
+        res = send_new_page
       end
       _format_result(res[0],res[1],res[2],res[3])
     end
@@ -85,25 +77,6 @@ module Rhosync
       [token,progress_count,total_count,res]
     end
     
-    def send_pass_through_data(data)
-      data ||= {}
-      data.each_key do |object_id| 
-        data[object_id].each { |attrib,value| data[object_id][attrib] = '' if value.nil? }
-      end
-      token = ''
-      compute_errors_page
-      res = build_page do |r|
-        r['insert'] = data
-        r['metadata'] = compute_metadata
-      end
-      if res['insert']
-        token = compute_token(@client.docname(:page_token))
-      else
-        _delete_errors_page 
-      end    
-      [token,0,data.size,res]
-    end
-    
     # Resend token for a client, also sends exceptions
     def resend_page(token=nil)
       token,progress_count,total_count,res = '',0,0,{}
@@ -298,8 +271,8 @@ module Rhosync
     def _do_search(params={})
       # call source adapter search unless client is sending token for ack
       search_params = params[:search] if params
-      res = @source_sync.search(@client.id,search_params) if params.nil? or !params[:token]
-      res,diffsize =  @source.is_pass_through? ? [res,res.size] : compute_search 
+      @source_sync.search(@client.id,search_params) if params.nil? or !params[:token]
+      res,diffsize = compute_search
       formatted_res = _format_search_result(res,diffsize)      
       @client.flash_data('search*') if diffsize == 0
       formatted_res

data/lib/rhosync/source.rb

@@ -15,7 +15,6 @@ module Rhosync
     field :queue,:string
     field :query_queue,:string
     field :cud_queue,:string
-    field :pass_through,:string
     attr_accessor :app_id, :user_id
     validates_presence_of :name #, :source_id
     
@@ -146,10 +145,6 @@ module Rhosync
       yield client_id,params if need_refresh
     end
         
-    def is_pass_through?
-      self.pass_through and self.pass_through == 'true'
-    end
-          
     private
     def self.validate_attributes(params)
       raise ArgumentError.new('Missing required attribute user_id') unless params[:user_id]

data/lib/rhosync/source_adapter.rb

@@ -62,12 +62,7 @@ module Rhosync
       @tmp_docname = @source.docname(:md) + get_random_uuid
       @stash_size = 0
       params ? self.query(params) : self.query
-      if @source.is_pass_through?
-        @result
-      else
-        self.sync
-        true
-      end
+      self.sync
     end
     
     def stash_result

data/lib/rhosync/source_sync.rb

@@ -22,33 +22,6 @@ module Rhosync
       _measure_and_process_cud('delete',client_id)
     end
     
-    # Pass through CUD to adapter, no data stored
-    def pass_through_cud(cud_params,query_params)
-      res,processed_objects = {},[]
-      begin
-        ['create','update','delete'].each do |op|
-          key,objects = op,cud_params[op]
-          objects.each do |key,value|
-            case op
-            when 'create'
-              @adapter.send(op.to_sym,value)
-            when 'update'
-              value['id'] = key
-              @adapter.send(op.to_sym,value)
-            when 'delete'
-              @adapter.send(op.to_sym,key)
-            end
-            process_objects << key
-          end if objects
-        end
-      rescue Exception => e
-        log "Error in #{op} pass through method: #{e.message}"
-        res['error'] = { 'operation' => op, 'message' => e.message } 
-      end
-      res['processed'] = process_objects
-      res.to_json
-    end
-    
     # Read Operation; params are query arguments
     def read(client_id=nil,params=nil)
       _read('query',client_id,params)
@@ -86,15 +59,13 @@ module Rhosync
     end
     
     def do_query(params=nil)
-      result = nil
       @source.if_need_refresh do
         Stats::Record.update("source:query:#{@source.name}") do
           return if _auth_op('login') == false
-          result = self.read(nil,params)
+          self.read(nil,params)
           _auth_op('logoff')
         end  
       end
-      result
     end
     
     # Enqueue a job for the source based on job type
@@ -252,20 +223,19 @@ module Rhosync
     # Read Operation; params are query arguments
     def _read(operation,client_id,params=nil)
       errordoc = nil
-      result = nil
       begin
         if operation == 'search'
           client = Client.load(client_id,{:source_name => @source.name})
           errordoc = client.docname(:search_errors)
           compute_token(client.docname(:search_token))
-          result = @adapter.search(params)
+          @adapter.search(params)
           @adapter.save(client.docname(:search))
         else
           errordoc = @source.docname(:errors)
           [:metadata,:schema].each do |method|
             _get_data(method)
           end  
-          result = @adapter.do_query(params)
+          @adapter.do_query(params)
         end
         # operation,sync succeeded, remove errors
         Store.lock(errordoc) do
@@ -278,7 +248,7 @@ module Rhosync
           Store.put_data(errordoc,{"#{operation}-error"=>{'message'=>e.message}},true)
         end
       end
-      result
+      true
     end
   end
 end

data/lib/rhosync/tasks.rb

@@ -50,6 +50,35 @@ module Rhosync
     def windows?
       RUBY_PLATFORM =~ /(win|w)32$/
     end
+    
+    def thin?
+      begin
+        require 'thin'
+        'rackup -s thin'
+      rescue LoadError
+        nil
+      end
+    end
+    
+    def mongrel?
+      begin
+        require 'mongrel'
+        'rackup -s mongrel'
+      rescue LoadError
+        nil
+      end
+    end
+    
+    def report_missing_server
+      msg =<<-EOF
+Could not find 'thin' or 'mongrel' on your system.  Please install one:
+  gem install thin
+or
+  gem install mongrel
+EOF
+      puts msg
+      exit 1
+    end
   end
 end
 
@@ -206,13 +235,14 @@ namespace :rhosync do
   
   desc "Start rhosync server"
   task :start => :dtach_installed do
+    cmd = thin? || mongrel? || report_missing_server
     if windows?
       puts 'Starting server in new window...'
-      system('start cmd.exe /c rackup config.ru')
+      system("start cmd.exe /c #{cmd} config.ru")
     else
       puts 'Detach with Ctrl+\  Re-attach with rake rhosync:attach'
       sleep 2
-      sh "dtach -A #{rhosync_socket} rackup config.ru -P #{rhosync_pid}"
+      sh "dtach -A #{rhosync_socket} #{cmd} config.ru -P #{rhosync_pid}"
     end
   end
   

data/spec/api/get_source_params_spec.rb

@@ -21,8 +21,7 @@ describe "RhosyncApiGetSourceParams" do
       {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
       {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
       {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
-      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"},
-      {"name"=>"pass_through", "value"=>nil, "type"=>"string"}]
+      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}]
   end
   
 end

data/spec/api/rhosync_api_spec.rb

@@ -168,8 +168,7 @@ describe "RhosyncApi" do
       {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
       {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
       {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
-      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"},
-      {"name"=>"pass_through", "value"=>nil, "type"=>"string"}]
+      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}]
   end
  
   it "should list source attributes using rest call" do

data/spec/client_sync_spec.rb

@@ -35,19 +35,6 @@ describe "ClientSync" do
         @cs.client.docname(:cd) => data)
     end
     
-    it "should handle send cud if pass_through is set" do
-      data = {'1'=>@product1,'2'=>@product2}
-      expected = {'insert'=>data}
-      set_test_data('test_db_storage',data)
-      @s.pass_through = 'true'
-      @cs.send_cud.should == [{'version'=>ClientSync::VERSION},
-        {'token'=>@c.get_value(:page_token)},
-        {'count'=>data.size},{'progress_count'=>data.size},
-        {'total_count'=>data.size},expected]
-      verify_result(@cs.client.docname(:page) => {},
-        @cs.client.docname(:cd) => {})
-    end
-    
     it "should return read errors in send cud" do
       msg = "Error during query"
       data = {'1'=>@product1,'2'=>@product2}

data/spec/source_sync_spec.rb

@@ -105,16 +105,6 @@ describe "SourceSync" do
       end
     end
     
-    it "should process source adapter with pass_through set" do
-      expected = {'1'=>@product1,'2'=>@product2}
-      set_state('test_db_storage' => expected)
-      @s.pass_through = 'true'
-      @ss.process_query.should == expected
-      verify_result(@s.docname(:md) => {},
-        @s.docname(:md_size) => nil)
-      @s.pass_through = nil
-    end
-    
     describe "create" do
       it "should do create where adapter.create returns nil" do
         set_state(@c.docname(:create) => {'2'=>@product2})
@@ -240,7 +230,7 @@ describe "SourceSync" do
         verify_result(@s.docname(:md) => expected, 
           @s.docname(:errors) => {})
       else
-        @ss.search(@c.id).should == expected
+        @ss.search(@c.id).should == true  
         verify_result(@c.docname(:search) => expected,
           @c.docname(:search_errors) => {})
       end
@@ -251,11 +241,11 @@ describe "SourceSync" do
       @ss.should_receive(:log).with("SourceAdapter raised #{operation} exception: #{msg}")
       set_test_data('test_db_storage',{},msg,"#{operation} error")
       if operation == 'query'
-        @ss.read.should be_nil
+        @ss.read.should == true
         verify_result(@s.docname(:md) => {},
           @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
       else
-        @ss.search(@c.id).should be_nil
+        @ss.search(@c.id).should == true
         verify_result(@c.docname(:search) => {}, 
           @c.docname(:search_errors) => {'search-error'=>{'message'=>msg}})
       end

data/tasks/redis.rake

@@ -11,6 +11,19 @@ if windows?
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
+
+def redis_home
+  ENV['REDIS_HOME'] || File.join($redis_dest,$redis_ver)
+end
+
+def mk_bin_dir(bin_dir)
+  begin
+    mkdir_p bin_dir unless File.exists?(bin_dir)
+  rescue
+    puts "Can't create #{bin_dir}, maybe you need to run command as root?"
+    exit 1
+  end
+end
 	
 class RedisRunner
   
@@ -43,7 +56,7 @@ class RedisRunner
   def self.start
   	if windows?
   		puts "Starting redis in a new window..."
-  		sh "start #{File.join($redis_dest,$redis_ver,'redis-server')}" rescue
+  		sh "start #{File.join(redis_home,'redis-server')}" rescue
   			"redis-server not installed on your path, please run 'rake redis:install' first."
 		else
       puts 'Detach with Ctrl+\  Re-attach with rake redis:attach'
@@ -95,6 +108,9 @@ namespace :redis do
   task :install => [:about, :download, :make] do
   	unless windows?
 	    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
+	    
+	    mk_bin_dir(bin_dir)
+	    
 	    %w(redis-benchmark redis-cli redis-server).each do |bin|
 	      sh "cp /tmp/redis/#{bin} #{bin_dir}"
 	    end
@@ -123,7 +139,7 @@ namespace :redis do
 	  	require 'net/http'
 	  	require 'zip/zip'
 	  	
-	  	puts "Installing redis to #{$redis_dest}/#{$redis_ver}."
+	  	puts "Installing redis to #{redis_home}."
 	
 	    Net::HTTP.start("servicestack.googlecode.com") do |http|
 	      resp = http.get("/files/#{$redis_ver}.zip")
@@ -144,7 +160,7 @@ namespace :redis do
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout v2.0.2-stable"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout v2.0.4-stable"
     end
   end
 
@@ -173,6 +189,9 @@ namespace :dtach do
       end
 
       ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
+      
+      mk_bin_dir(bin_dir)
+	    
       Dir.chdir('/tmp/dtach-0.8/')
       sh 'cd /tmp/dtach-0.8/ && ./configure && make'
       sh "cp /tmp/dtach-0.8/dtach #{bin_dir}"

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 62196471
-  prerelease: true
+  hash: 11
+  prerelease: false
   segments: 
   - 2
   - 1
   - 0
-  - beta
-  - 2
-  version: 2.1.0.beta.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2010-12-14 00:00:00 -08:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -567,14 +565,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: