rhoconnect 3.3.6 → 3.4.2

data/lib/rhoconnect/ping.rb

@@ -2,3 +2,4 @@ require 'rhoconnect/ping/android'
 require 'rhoconnect/ping/apple'
 require 'rhoconnect/ping/blackberry'
 require 'rhoconnect/ping/rhoconnect_push'
+require 'rhoconnect/ping/gcm'

data/lib/rhoconnect/ping/gcm.rb

@@ -0,0 +1,58 @@
+require 'rest_client'
+
+module Rhoconnect
+  class Gcm
+    class InvalidApiKey < Exception; end
+    class GCMPingError < Exception; end
+
+    def self.ping(params)
+      begin
+        gcm_api_key = Rhoconnect.settings[:gcm_api_key]
+        raise InvalidApiKey.new("Missing `:gcm_api_key:` option in settings/settings.yml") unless gcm_api_key
+
+        send_ping_to_device(gcm_api_key, params)
+      rescue InvalidApiKey => error
+        log error
+        log error.backtrace.join("\n")
+        raise error
+      rescue Exception => error
+        log error
+        log error.backtrace.join("\n")
+        raise error
+      end
+    end
+
+    def self.send_ping_to_device(api_key,params)
+      RestClient.post(
+        'https://android.googleapis.com/gcm/send', gcm_message(params).to_json,
+        :authorization => "key=#{api_key}",
+        :content_type => :json
+      ) do |response, request, result, &block|
+        # return exceptions based on response code & body
+        case response.code
+        when 200
+          if response.body =~ /^Error=(.*)$/
+            raise GCMPingError.new("GCM ping error: #{$1 || ''}")
+          end
+          response.return!(request, result, &block)
+        when 401, 403
+          raise InvalidApiKey.new("Invalid GCM api key. Obtain new api key from GCM service.")
+        end
+      end
+    end
+
+    def self.gcm_message(params)
+      params.reject! {|k,v| v.nil? || v.length == 0}
+      data = {}
+      data['registration_ids'] = [params['device_pin'].to_s]
+      data['collapse_key'] = (rand * 100000000).to_i.to_s
+      data['data'] = {}
+      data['data']['do_sync'] = params['sources'] ? params['sources'].join(',') : ''
+      data['data']['alert'] = params['message'] if params['message']
+      data['data']['vibrate'] = params['vibrate'] if params['vibrate']
+      data['data']['sound'] = params['sound'] if params['sound']
+      data['data']['phone_id'] = params['phone_id'] if params['phone_id']
+      data
+    end
+  end
+end

data/lib/rhoconnect/predefined_adapters/bench_adapter.rb

@@ -57,7 +57,13 @@ module Rhoconnect
     end
 
     def db_name
-      "test_db_storage:#{@source.app_id}:#{@source.user_id}"
+      res = ''
+      if @source.user_id[0..1] == 'nq'
+        res = "test_db_storage:#{@source.app_id}:nquser"
+      else
+        res = "test_db_storage:#{@source.app_id}:benchuser"
+      end
+      res
     end
 
     def lock_name

data/lib/rhoconnect/source.rb

@@ -4,10 +4,10 @@ module Rhoconnect
     @@string_fields = []
     @@integer_fields = []
     attr_accessor :id
-    
+
     class << self
       attr_accessor :validates_presence
-      
+
       def create(fields,params)
         if self.validates_presence
           self.validates_presence.each do |field|
@@ -15,12 +15,12 @@ module Rhoconnect
           end
         end
       end
-    
+
       def define_fields(string_fields = [], integer_fields = [])
         @@string_fields,@@integer_fields = string_fields,integer_fields
         integer_fields.each do |attrib|
           define_method("#{attrib}=") do |value|
-            value = (value.nil?) ? nil : value.to_i 
+            value = (value.nil?) ? nil : value.to_i
             @@model_data[self.name.to_sym][attrib.to_sym] = value
           end
           define_method("#{attrib}") do
@@ -34,7 +34,7 @@ module Rhoconnect
             if attrib == :name
               instance_variable_set(:@name, value)
               name = value
-            else  
+            else
               name = self.name
             end
             @@model_data[name.to_sym] ||= {} # TODO: shouldn't be nil here
@@ -47,14 +47,14 @@ module Rhoconnect
           @@integer_fields << :poll_interval unless @@integer_fields.include?(:poll_interval)
         end
       end
-        
+
       def validates_presence_of(*names)
         self.validates_presence ||= []
         names.each do |name|
           self.validates_presence << name
         end
       end
-      
+
       def is_exist?(id)
         !@@model_data[id.to_sym].nil?
       end
@@ -67,14 +67,14 @@ module Rhoconnect
           downcase
       end
     end
-    
+
     def update_fields(fields)
       fields.each do |name,value|
-        arg = "#{name}=".to_sym 
+        arg = "#{name}=".to_sym
         self.send(arg, value)
       end
     end
-    
+
     def to_array
       res = []
       @@string_fields.each do |field|
@@ -86,24 +86,24 @@ module Rhoconnect
       res
     end
   end
-  
+
   class Source < MemoryModel
     attr_accessor :app_id, :user_id
-            
+
     validates_presence_of :name
-    
+
     include Document
     include LockOps
-    
+
     # source fields
-    define_fields([:id, :rho__id, :name, :url, :login, :password, :callback_url, :partition_type, :sync_type, 
-      :queue, :query_queue, :cud_queue, :belongs_to, :has_many, :pass_through], [:source_id, :priority, :retry_limit, :simulate_time])
-    
+    define_fields([:id, :rho__id, :name, :url, :login, :password, :callback_url, :partition_type, :sync_type,
+      :queue, :query_queue, :cud_queue, :belongs_to, :has_many, :pass_through, :push_notify], [:source_id, :priority, :retry_limit, :simulate_time])
+
     def initialize(fields)
       self.name = fields['name'] || fields[:name]
       update_fields(fields)
     end
-  
+
     def self.set_defaults(fields)
       fields[:url] ||= ''
       fields[:login] ||= ''
@@ -118,8 +118,9 @@ module Rhoconnect
       fields[:schema] = fields[:schema].to_json if fields[:schema]
       fields[:retry_limit] = fields[:retry_limit] ? fields[:retry_limit] : 0
       fields[:simulate_time] = fields[:simulate_time] ? fields[:simulate_time] : 0
+      fields[:push_notify] = fields[:push_notify] ? fields[:push_notify] : 'false'
     end
-        
+
     def self.create(fields,params)
       fields = fields.with_indifferent_access # so we can access hash keys as symbols
       super(fields,params)
@@ -129,23 +130,23 @@ module Rhoconnect
       obj.assign_args(params)
       obj
     end
-          
+
     def self.load(obj_id,params)
       validate_attributes(params)
-      
-      # if source is pre-defined 
+
+      # if source is pre-defined
       # create it dynamically here
       Rhoconnect.create_predefined_source(obj_id,params)
-      
+
       model_hash = @@model_data[obj_id.to_sym]
       obj = new(model_hash) if model_hash
       if obj
         obj = obj.dup
-        obj.assign_args(params) 
+        obj.assign_args(params)
       end
       obj
     end
-      
+
     def self.update_associations(sources)
       params = {:app_id => APP_NAME,:user_id => '*'}
       sources.each { |source| Source.load(source, params).has_many = nil }
@@ -168,7 +169,7 @@ module Rhoconnect
         end
       end
     end
-    
+
     def self.delete_all
       params = {:app_id => APP_NAME,:user_id => '*'}
       @@model_data.each { |k,v| Source.load(k,params).flash_store_data }
@@ -177,9 +178,9 @@ module Rhoconnect
 
     def assign_args(params)
       self.user_id = params[:user_id]
-      self.app_id = params[:app_id]   
+      self.app_id = params[:app_id]
     end
-      
+
     def blob_attribs
       return '' unless self.schema
       schema = JSON.parse(self.schema)
@@ -189,62 +190,62 @@ module Rhoconnect
         if values.include?('blob')
           attrib = key.dup
           attrib << "," + (values.include?('overwrite') ? '1' : '0')
-          blob_attribs << attrib 
+          blob_attribs << attrib
         end
       end
       blob_attribs.sort.join(',')
     end
-    
+
     def update(fields)
       fields = fields.with_indifferent_access # so we can access hash keys as symbols
       self.class.set_defaults(fields)
     end
-    
+
     def clone(src_doctype,dst_doctype)
       Store.clone(docname(src_doctype),docname(dst_doctype))
     end
-    
+
     def poll_interval
       value = Store.get_value(poll_interval_key)
       value ? value.to_i : nil
     end
-    
+
     def poll_interval=(interval)
       Store.put_value(poll_interval_key, interval)
     end
-    
+
     # Return the user associated with a source
     def user
       User.load(self.user_id)
     end
-    
+
     # Return the app the source belongs to
     def app
       App.load(self.app_id)
     end
-    
+
     def schema
       self.get_value(:schema)
     end
-     
+
     def read_state
       id = {:app_id => self.app_id,:user_id => user_by_partition,
         :source_name => self.name}
       load_read_state || ReadState.create(id)
     end
-    
+
     def load_read_state
       id = {:app_id => self.app_id,:user_id => user_by_partition,
         :source_name => self.name}
       ReadState.load(id)
     end
-    
+
     def delete_user_read_state
       id = {:app_id => self.app_id,:user_id => user_by_partition,
         :source_name => self.name}
       ReadState.delete_user(id)
     end
-        
+
     def doc_suffix(doctype)
       "#{user_by_partition}:#{self.name}:#{doctype.to_s}"
     end
@@ -259,24 +260,24 @@ module Rhoconnect
       flash_store_data
       @@model_data.delete(rho__id.to_sym) if rho__id
     end
-    
+
     def partition
       self.partition_type.to_sym
     end
-    
+
     def partition=(value)
       self.partition_type = value
     end
-    
+
     def user_by_partition
       self.partition.to_sym == :user ? self.user_id : '__shared__'
     end
-  
+
     def check_refresh_time
-      self.poll_interval == 0 or 
+      self.poll_interval == 0 or
       (self.poll_interval != -1 and self.read_state.refresh_time <= Time.now.to_i)
     end
-    
+
     def if_need_refresh(client_id=nil,params=nil)
       need_refresh = lock(:md) do |s|
         check = check_refresh_time
@@ -286,23 +287,23 @@ module Rhoconnect
       end
       yield client_id,params if need_refresh
     end
-    
+
     def rewind_refresh_time(query_failure)
       return if self.poll_interval == 0
       lock(:md) do |s|
         rewind_time = false
-        # reset number of retries 
+        # reset number of retries
         # and prev_refresh_time on succesfull query
         # or if last refresh was more than 'poll_interval' time ago
         if not query_failure or ((Time.now.to_i - self.read_state.prev_refresh_time) >= self.poll_interval)
           # we need to reset the prev_refresh_time here
           # otherwise in case of expired poll interval
-          # and repeating failures - it will reset the counter 
+          # and repeating failures - it will reset the counter
           # on every error
           self.read_state.prev_refresh_time = Time.now.to_i
           self.read_state.retry_counter = 0
         end
-      
+
         # rewind the refresh time on failure
         # if retry limit is not reached
         if query_failure
@@ -315,22 +316,35 @@ module Rhoconnect
             self.read_state.retry_counter = 0
           end
         end
-        
+
         if rewind_time
           self.read_state.refresh_time = self.read_state.prev_refresh_time
         end
-      end 
+      end
     end
-        
+
     def is_pass_through?
-      self.pass_through and self.pass_through == 'true'
+      self.pass_through and self.pass_through.to_s == 'true'
+    end
+
+    def push_notify?
+      self.push_notify and self.push_notify.to_s == 'true'
+    end
+
+    def announce_changes
+      return unless push_notify?
+      # TODO: currently we're not allowing 'Broadcast' push to all users for :app partitioned sources
+      return if self.partition.to_sym == :app
+
+      users = [self.user_id]
+      User.ping({'user_id' => users, 'sources' => [self.name]})
     end
-          
+
     private
     def poll_interval_key
       "source:#{self.name}:poll_interval"
     end
-    
+
     def self.validate_attributes(params)
       raise ArgumentError.new('Missing required attribute user_id') unless params[:user_id]
       raise ArgumentError.new('Missing required attribute app_id') unless params[:app_id]

data/lib/rhoconnect/source_sync.rb

@@ -117,13 +117,38 @@ module Rhoconnect
         @source.put_data(:md, new_objs, true)
         @source.update_count(:md_size,diff_count)
       end
+      @source.announce_changes
     end
     
-    def fast_update(orig_hash, new_hash, timeout=10,raise_on_expire=false)
+    def fast_update(remove_hash, new_hash, timeout=10,raise_on_expire=false)
+      return unless ((remove_hash and remove_hash.size > 0) or (new_hash and new_hash.size > 0))
       @source.lock(:md,timeout,raise_on_expire) do |s|
-        @source.delete_data(:md, orig_hash)
-        @source.put_data(:md, new_hash, true)
+        # get the objects from DB, remove prev attr data, add new attr data
+        update_keys = Set.new
+        update_keys += Set.new(remove_hash.keys) if remove_hash
+        update_keys += Set.new(new_hash.keys) if new_hash
+        objs_to_update = @source.get_objects(:md, update_keys.to_a) || {}
+        diff_count = -objs_to_update.size
+        # remove old values from DB
+        @source.delete_data(:md, objs_to_update)
+        # update data
+        remove_hash.each do |key, obj|
+          next unless objs_to_update[key]
+          obj.each do |attrib, value|
+            objs_to_update[key].delete(attrib)
+            objs_to_update.delete(key) if objs_to_update[key].empty?
+          end
+        end if remove_hash
+        new_hash.each do |key, obj|
+          objs_to_update[key] ||= {}
+          objs_to_update[key].merge!(obj)
+        end if new_hash
+        # store new data into DB
+        @source.put_data(:md, objs_to_update, true)
+        diff_count += objs_to_update.size
+        @source.update_count(:md_size,diff_count)
       end
+      @source.announce_changes
     end 
     
     def fast_delete(delete_objs, timeout=10,raise_on_expire=false)
@@ -132,6 +157,7 @@ module Rhoconnect
         @source.delete_data(:md, delete_objs)
         @source.update_count(:md_size,diff_count)
       end
+      @source.announce_changes
     end
     
     def push_objects(objects,timeout=10,raise_on_expire=false,rebuild_md=true)
@@ -158,7 +184,8 @@ module Rhoconnect
         end
         
         @source.update_count(:md_size,diff_count)
-      end      
+      end
+      @source.announce_changes      
     end    
 
     def push_deletes(objects,timeout=10,raise_on_expire=false,rebuild_md=true)
@@ -184,7 +211,8 @@ module Rhoconnect
         end
         
         @source.update_count(:md_size,diff_count)
-      end    
+      end
+      @source.announce_changes    
     end
     
     private