rhoconnect 4.0.4 → 5.1.1

data/lib/rhoconnect/model/helpers/find_duplicates_on_update.rb

@@ -7,9 +7,9 @@ module Rhoconnect
 					base.extend Rhoconnect::Model::Helpers::FindDuplicatesOnUpdate::ClassMethods
 				end
 
-				def find_duplicates_on_update(options, invalid_meta, operation, operation_data, client_ids)
+        def find_duplicates_on_update(options, invalid_meta, operation, operation_data, client_ids)
 	        invalid_meta ||= {}
-	        processed_ids = {}
+	        # processed_ids = {}
 	        processed_objs = {}
 	        operation_data.each_with_index do |client_operation_data,index|
 	          client_id = client_ids[index]
@@ -27,29 +27,29 @@ module Rhoconnect
 	                processed_records = processed_source_objs[key]
 	                processed_records.each do |processed_record|
 	                  master_obj = processed_record[:value]
-	                  master_client_id = processed_record[:client_id]
+	                  # master_client_id = processed_record[:client_id]
 	                  master_queue_index = processed_record[:queue_index].to_i
 	                  master_obj_index = processed_record[:index].to_i
 
 	                  if master_obj == objvalue
 	                    obj_not_a_duplicate = false
-	                		if options[:raise_error]
+                      if options[:raise_error]
 	                		  invalid_meta[index] ||= {}
 	                		  invalid_meta[index][source_id] ||= {}
 	                		  invalid_meta[index][source_id][objindex] ||= {}
 	                		  invalid_meta[index][source_id][objindex][:error] = "Error during #{operation}: object confict detected"
-	                		else
+	                	  else
 		                    invalid_meta[index] ||= {}
 		                    invalid_meta[index][source_id] ||= {}
 		                    invalid_meta[index][source_id][objindex] ||= {}
 		                    invalid_meta[index][source_id][objindex][:duplicate_of] = true
-		                
+
 		                    invalid_meta[master_queue_index] ||= {}
 		                    invalid_meta[master_queue_index][source_id] ||= {}
 		                    invalid_meta[master_queue_index][source_id][master_obj_index] ||= {}
 		                    invalid_meta[master_queue_index][source_id][master_obj_index][:duplicates] ||= []
-		                    invalid_meta[master_queue_index][source_id][master_obj_index][:duplicates] <<  {:client_id => client_id, :key => key, :value => objvalue} 
-		                  end 
+		                    invalid_meta[master_queue_index][source_id][master_obj_index][:duplicates] <<  {:client_id => client_id, :key => key, :value => objvalue}
+                      end
 	                    break
 	                  end
 	                end
@@ -62,15 +62,15 @@ module Rhoconnect
 	            end
 	          end
 	        end
-	        if options[:handler] and invalid_meta.size > 0
+          if options[:handler] and invalid_meta.size > 0
 	        	proc = bind_handler :find_duplicates_on_update, options[:handler]
             invalid_meta = proc.call options, invalid_meta, operation, operation_data, client_ids
           end
-	        invalid_meta  
-	      end
+	        invalid_meta
+        end
 
 	     	# methods that needs to be 'extended', not 'included'
-		  	module ClassMethods
+        module ClassMethods
 		    	def install_find_duplicates_on_update(options)
 		    		options ||= {}
 		    		options[:update] = true
@@ -78,7 +78,7 @@ module Rhoconnect
 		      	@validators[:find_duplicates_on_update] = options
 		      	options
 		    	end
-				end
+        end
 			end
 		end
 	end

data/lib/rhoconnect/ping/apple.rb

@@ -9,10 +9,10 @@ module Rhoconnect
     	passphrase = settings[:iphonepassphrase]
     	host = settings[:iphoneserver]
     	port = settings[:iphoneport]
-    	if(cert and host and port)
+      if(cert and host and port)
         begin
           ssl_ctx = OpenSSL::SSL::SSLContext.new
-      		ssl_ctx.key = OpenSSL::PKey::RSA.new(cert, passphrase)
+      		ssl_ctx.key = OpenSSL::PKey::RSA.new(cert, passphrase.to_s)
       		ssl_ctx.cert = OpenSSL::X509::Certificate.new(cert)
 
       		socket = TCPSocket.new(host, port)
@@ -23,10 +23,10 @@ module Rhoconnect
       		res = ssl_socket.write(apn_message(params))
       		ssl_socket.close
       		socket.close
-    		rescue SocketError => error
+    	  rescue SocketError => error
     		  log "Error while sending ping: #{error}"
     		  raise error
-    		end
+        end
 		  else
         log "Invalid APNS settings: ping is ignored."
         log "cert_file: #{cert_file}, host: #{host}, port: #{port}"

data/lib/rhoconnect/server.rb

@@ -151,7 +151,7 @@ module Rhoconnect
       return false if @dispatch_framework_initialized
 
       @dispatch_framework_initialized ||=true
-      if RUBY_VERSION =~ /1.9/ and not defined?(JRUBY_VERSION)
+      if (RUBY_VERSION =~ /^1\.9\.\d/ || RUBY_VERSION =~ /^2\.\d+\.\d+/) and not defined?(JRUBY_VERSION)
         begin
           require 'rhoconnect/async'
           register Rhoconnect::Synchrony
@@ -231,7 +231,7 @@ _INSTALL_ASYNC_GEMS
       if rc_handler
         rc_handler_method = "execute_#{rc_handler}_handler"
         invoke_hook(:handler_installed, self, rc_handler, verb, route_url, options)
-      end 
+      end
       unless deprecated_route.nil?
         deprecated_urls = deprecated_route[:url].is_a?(String) ? [deprecated_route[:url]] : deprecated_route[:url]
         deprecated_urls.each do |deprecated_url|

data/lib/rhoconnect/source.rb

@@ -365,11 +365,11 @@ module Rhoconnect
       return self.user_id if self.user_id == '*'
       # default is user_id
       pname = self.user_id
-      begin 
+      begin
         model_klass = Rhoconnect::Model::Base.load_source_model(self)
         pname = model_klass ? model_klass.partition_name(self.user_id) : self.user_id
       # eat the exception here
-      rescue Exception => e
+      rescue Exception #=> e
       end
       pname
     end

data/lib/rhoconnect/store.rb

@@ -361,7 +361,7 @@ module Rhoconnect
 
       collected_adds = {}
       collected_rems = {}
-      my_bucket = nil
+      # my_bucket = nil
       @db.pipelined do
         data.each do |key,obj|
           is_create = objs[key].nil?
@@ -688,7 +688,7 @@ module Rhoconnect
           # ensure lock wasn't released between the setnx and get calls
           if current_lock
            	current_lock_timeout = current_lock.to_i
-           	if raise_on_expire or Rhoconnect.raise_on_expired_lock
+            if raise_on_expire or Rhoconnect.raise_on_expired_lock
            	  if current_lock_timeout <= current_time
            	    # lock expired before operation which set it up completed
            	    # this process cannot continue without corrupting locked data
@@ -700,11 +700,11 @@ module Rhoconnect
            	    # previous lock expired and we replaced it with our own
            	    break
            	  end
-         	  end
+            end
        	  # lock was released between setnx and get - try to acquire it again
      	    elsif @db.setnx(lock_key,ts)
        	    break
-   	      end
+          end
           sleep(1)
           current_time = Time.now.to_i
         else
@@ -885,8 +885,14 @@ module Rhoconnect
         ConnectionPool::Wrapper.new(:size => Rhoconnect.connection_pool_size,
                                     :timeout => Rhoconnect.connection_pool_timeout) do
           host = '127.0.0.1' if host == 'localhost'
-          Redis.connect(:thread_safe => true, :host => host,
-            :port => port, :db => db, :password => password, :timeout => Rhoconnect.redis_timeout)
+          Redis.connect(
+            :thread_safe => true,
+            :host => host,
+            :port => port,
+            :db => db,
+            :password => password,
+            :timeout => Rhoconnect.redis_timeout
+          )
         end
       elsif server and (server.is_a?(Redis) or server.is_a?(ConnectionPool::Wrapper))
         server

data/lib/rhoconnect/utilities.rb

@@ -73,8 +73,8 @@ module Utilities
     ENV['REDIS_HOME'] || File.join($redis_dest,$redis_ver)
   end
 
-  def ruby19?
-    RUBY_VERSION =~ /1.9/
+  def supported_mri_ruby?
+    RUBY_VERSION =~ /^1\.9\.\d/ || RUBY_VERSION =~ /^2\.\d+\.\d+/
   end
 
   def jruby?

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '4.0.4'
+  VERSION = '5.1.1'
 end

data/lib/rhoconnect.rb

@@ -3,7 +3,7 @@ require 'cgi'
 require 'json'
 require 'base64'
 require 'securerandom'
-require 'zip/zip'
+require 'zip'
 require 'yaml'
 require 'rhoconnect/license'
 require 'rhoconnect/version'
@@ -56,7 +56,8 @@ module Rhoconnect
       :log_disabled, :license, :bulk_sync_poll_interval, :stats, :appserver, :api_token,
       :raise_on_expired_lock, :lock_duration, :cookie_expire, :predefined_sources,
       :connection_pool_size, :connection_pool_timeout, :redis_timeout, :store_key_ttl,
-      :disable_resque_console, :disable_rc_console, :use_node, :restart_node_on_error, :redis_url
+      :disable_resque_console, :disable_rc_console, :use_node, :restart_node_on_error, :redis_url,
+      :node_channel_timeout
   end
 
   # this mixin adds the controller into the Application's URL Map
@@ -123,6 +124,7 @@ module Rhoconnect
     Rhoconnect.disable_resque_console ||= false
     Rhoconnect.use_node = Rhoconnect.use_node.nil? ? true : Rhoconnect.use_node
     Rhoconnect.restart_node_on_error ||= true if Rhoconnect.use_node
+    Rhoconnect.node_channel_timeout = get_setting(config, environment, :node_channel_timeout, 30)
     if File.directory?(File.join(Rhoconnect.app_directory,'sources'))
       check_and_add(File.join(Rhoconnect.app_directory,'sources'))
       # post deprecation warning !!!
@@ -193,7 +195,7 @@ _MIGRATE_TO_NEW_RHOCONNECT
 
   def start_nodejs_channels(opts = {})
     Node.shell_node(opts)
-    NodeChannel.bootstrap if Node.started
+    NodeChannel.bootstrap(Rhoconnect.node_channel_timeout) if Node.started
   end
 
   # Generate admin user on first load
@@ -332,7 +334,7 @@ _MIGRATE_TO_NEW_RHOCONNECT
       File.open(uploaded_file, 'wb') do |file|
         file.write(params[:tempfile].read)
       end
-      Zip::ZipFile.open(uploaded_file) do |zip_file|
+      Zip::File.open(uploaded_file) do |zip_file|
         zip_file.each do |f|
           f_path = File.join(file_dir,f.name)
           FileUtils.mkdir_p(File.dirname(f_path))

data/rhoconnect.gemspec

@@ -41,14 +41,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency('bundler', '~> 1.0')
   s.add_dependency('rack', '~> 1.5.2')
-  s.add_dependency('sinatra', '~> 1.3')
-  s.add_dependency('rake', '~> 10.0.0')
-  s.add_dependency('json', '~> 1.7.7')
-  s.add_dependency('rubyzip', '~> 0.9.4')
-  s.add_dependency('connection_pool', '~> 1.0.0')
+  s.add_dependency('sinatra', '~> 1.4')
+  s.add_dependency('rake', '~> 10.4.0')
+  s.add_dependency('json', '~> 1.8')
+  s.add_dependency('rubyzip', '~> 1.1')
+  s.add_dependency('connection_pool', '~> 1.2.0')
   s.add_dependency('redis', '>= 3.0.1')
   s.add_dependency('resque', '>= 1.22.0')
   s.add_dependency('rest-client', '~> 1.6.1')
-  s.add_dependency('templater', '~> 1.0.0')
   s.add_dependency('thor', '~> 0.18.0')
 end

data/spec/api/api_helper.rb

@@ -9,7 +9,7 @@ def compress(path)
   path.sub!(%r[/$],'')
   archive = File.join(path,File.basename(path))+'.zip'
   FileUtils.rm archive, :force=>true
-  Zip::ZipFile.open(archive, 'w') do |zipfile|
+  Zip::File.open(archive, 'w') do |zipfile|
     Dir["#{path}/**/**"].reject{|f|f==archive}.each do |file|
       zipfile.add(file.sub(path+'/',''),file)
     end

data/spec/api/app/fast_delete_spec.rb

@@ -1,27 +1,27 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiFastDelete" do
-  it_should_behave_like "ApiHelper" do
-    it "should delete an object from rhoconnect's :md" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete", 
-        {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      data.delete('3')
-      verify_doc_result(@s, {:md => data, :md_size =>'2'})
-    end
+  include_examples "ApiHelper"
 
-    it "should not properly delete the object if fast_delete is called without all the attributes (because fast_delete doesn't ensure any data integrity)" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      delete_data = {'3' => {'price' => '1.99'}}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete", 
-        {:user_id => @u.id, :data => delete_data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@s, {:md => data, :md_size=>'2'})
-    end
-  end  
+  it "should delete an object from rhoconnect's :md" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete",
+      {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    data.delete('3')
+    verify_doc_result(@s, {:md => data, :md_size =>'2'})
+  end
+
+  it "should not properly delete the object if fast_delete is called without all the attributes (because fast_delete doesn't ensure any data integrity)" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    delete_data = {'3' => {'price' => '1.99'}}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_delete",
+      {:user_id => @u.id, :data => delete_data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@s, {:md => data, :md_size=>'2'})
+  end
 end

data/spec/api/app/fast_insert_spec.rb

@@ -1,28 +1,28 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiFastInsert" do
-  it_should_behave_like "ApiHelper" do
-    it "should append new objects to rhoconnect's :md" do
-      data = {'1' => @product1, '2' => @product2}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '2'})
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
-        {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      data.merge!({'3' => @product3})
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
+  include_examples "ApiHelper"
 
-    it "should incorrectly append data to existing object (because fast_insert doesn't ensure any data integrity)" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      incorrect_insert = {'3' => {'price' => '1.99', 'new_field' => 'value'}}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
-        {:user_id => @u.id, :data => incorrect_insert}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      data['3'].merge!(incorrect_insert['3'])
-      verify_doc_result(@s, :md_size=>'4')
-    end
-  end  
+  it "should append new objects to rhoconnect's :md" do
+    data = {'1' => @product1, '2' => @product2}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '2'})
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
+      {:user_id => @u.id, :data => {'3' => @product3}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    data.merge!({'3' => @product3})
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
+
+  it "should incorrectly append data to existing object (because fast_insert doesn't ensure any data integrity)" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    incorrect_insert = {'3' => {'price' => '1.99', 'new_field' => 'value'}}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_insert",
+      {:user_id => @u.id, :data => incorrect_insert}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    data['3'].merge!(incorrect_insert['3'])
+    verify_doc_result(@s, :md_size=>'4')
+  end
 end

data/spec/api/app/fast_update_spec.rb

@@ -1,67 +1,67 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiFastUpdate" do
-  it_should_behave_like "ApiHelper" do
-    it "should update an attribute and add new one for an object in rhoconnect's :md" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      
-      orig_obj_attrs = {'3' => {'price' => @product3['price']}}
-      new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
-      
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
-        {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      data['3'].merge!(new_obj_attrs['3'])
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
-    
-    it "should update an attribute and add new one for an object in rhoconnect's :md using old route with deprecation warning" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      
-      orig_obj_attrs = {'3' => {'price' => @product3['price']}}
-      new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
-      
-      post "/api/source/fast_update", 
-        {:user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      data['3'].merge!(new_obj_attrs['3'])
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
-    
-    it "should update one attr, add one attr, and remove one attr for an object in rhoconnect's :md" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      
-      orig_obj_attrs = {'3' => {'name' => @product3['name'], 'price' => @product3['price']}}
-      new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
-      
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
-        {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      data['3'].delete('name')
-      data['3'].merge!(new_obj_attrs['3'])
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
-    
-    it "should remove all attributes , and properly adjust md_size" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      
-      orig_obj_attrs = {'3' => @product3}
-      new_obj_attrs = {}
-      
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
-        {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      data.delete('3')
-      verify_doc_result(@s, {:md => data, :md_size=>'2'})
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should update an attribute and add new one for an object in rhoconnect's :md" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+
+    orig_obj_attrs = {'3' => {'price' => @product3['price']}}
+    new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
+
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
+      {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    data['3'].merge!(new_obj_attrs['3'])
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
+
+  it "should update an attribute and add new one for an object in rhoconnect's :md using old route with deprecation warning" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+
+    orig_obj_attrs = {'3' => {'price' => @product3['price']}}
+    new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
+
+    post "/api/source/fast_update",
+      {:user_id => @u.id, :source_id => @s_fields[:name], :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    data['3'].merge!(new_obj_attrs['3'])
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
+
+  it "should update one attr, add one attr, and remove one attr for an object in rhoconnect's :md" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+
+    orig_obj_attrs = {'3' => {'name' => @product3['name'], 'price' => @product3['price']}}
+    new_obj_attrs = {'3' => {'price' => '0.99', 'new_attr' => 'new_value'}}
+
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
+      {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    data['3'].delete('name')
+    data['3'].merge!(new_obj_attrs['3'])
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
+
+  it "should remove all attributes , and properly adjust md_size" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+
+    orig_obj_attrs = {'3' => @product3}
+    new_obj_attrs = {}
+
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/fast_update",
+      {:user_id => @u.id, :delete_data => orig_obj_attrs, :data => new_obj_attrs}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    data.delete('3')
+    verify_doc_result(@s, {:md => data, :md_size=>'2'})
+  end
 end

data/spec/api/app/push_deletes_spec.rb

@@ -1,18 +1,16 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiPushDeletes" do
-  it_should_behave_like "ApiHelper" do
-  
-    it "should delete object from :md" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      data.delete('2')
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_deletes",
-        {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@s, {:md => data, :md_size=>'2'})
-    end
-  
+  include_examples "ApiHelper"
+
+  it "should delete object from :md" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+    data.delete('2')
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_deletes",
+      {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@s, {:md => data, :md_size=>'2'})
   end
 end