rhoconnect 5.5.2 → 5.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f819ccfcf70cacf49151ffc6ed04485860e0d34a
-  data.tar.gz: 4c014947eef4bc42b1758117f737c5d9f43a106f
+  metadata.gz: 0d484d1d18fc5144f01d9937aab6ac89c86be634
+  data.tar.gz: 1ed1e8dd2989c38dc0d5d375f867852881f0bbf8
 SHA512:
-  metadata.gz: ca2fdc537bfbf91e5f8d40631b99920ee6d8eb2569789e05c5ba6538051a38f825820c6997bc879f3e94d38df683d771ade8df38b0991a590f2931112493b394
-  data.tar.gz: 67f0bbc6f2963750329419aec0cdcd82c9f26a7ee4f64e2c53f449d9f35d17beedee4097e61e3ebcf9b2c61db6311d4e4ed94c23693d6a988143c23d82a880fd
+  metadata.gz: ba4e48ade45d65a1369b922f4479d457ea334a886bb8b103f0d85f7e03287bff47abec9064d8127b95f74c01dbbc2513c3a3bac1ebea575184f65320ed153fa9
+  data.tar.gz: 89a00cc6df102e2ab6cb88a24f000b2ee2428bb8f5fe915605e20676c2a17143f4d2423393186036e2130397f59d1397a19dbcdc53c444cf730e01b526cb0839

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (5.5.2)
+    rhoconnect (5.5.15)
       bundler (~> 1.0)
       connection_pool (~> 1.2.0)
       json (~> 1.8)
@@ -29,22 +29,22 @@ GEM
       mime-types
       xml-simple
     backports (3.6.8)
-    builder (3.2.2)
+    builder (3.2.3)
     cabin (0.9.0)
-    childprocess (0.5.9)
+    childprocess (0.6.2)
       ffi (~> 1.0, >= 1.0.11)
     clamp (1.0.1)
     connection_pool (1.2.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     daemons (1.2.4)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    dotenv (2.1.1)
+    dotenv (2.2.0)
     eventmachine (1.0.9.1)
     excon (0.22.1)
     ffaker (1.14.0)
-    ffi (1.9.14)
+    ffi (1.9.18)
     fog (1.11.1)
       builder
       excon (~> 0.20)
@@ -56,8 +56,8 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.5)
-    fpm (1.7.0)
-      archive-tar-minitar
+    fpm (1.8.1)
+      archive-tar-minitar (= 0.5.2)
       arr-pm (~> 0.0.10)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
@@ -69,23 +69,23 @@ GEM
       ruby-xz
     insist (1.0.0)
     io-like (0.3.0)
-    json (1.8.3)
+    json (1.8.6)
     mime-types (1.25.1)
     mono_logger (1.1.0)
     multi_json (1.12.1)
     mustache (0.99.8)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (4.1.0)
     nokogiri (1.5.11)
-    pleaserun (0.0.27)
+    pleaserun (0.0.28)
       cabin (> 0)
       clamp
       dotenv
       insist
       mustache (= 0.99.8)
       stud
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (1.5.5)
     rack-fiber_pool (0.9.3)
     rack-protection (1.5.3)
@@ -93,10 +93,10 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.4.2)
-    redis (3.3.2)
-    redis-namespace (1.5.2)
+    redis (3.3.3)
+    redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
-    resque (1.26.0)
+    resque (1.27.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
@@ -116,27 +116,27 @@ GEM
     ruby-xz (0.2.3)
       ffi (~> 1.9)
       io-like (~> 0.3)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     safe_yaml (1.0.4)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     stud (0.0.22)
     thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.18.1)
-    tilt (2.0.5)
+    tilt (2.0.6)
     vegas (0.1.11)
       rack (>= 1.0.0)
     webmock (1.9.3)
@@ -173,4 +173,4 @@ DEPENDENCIES
   win32-process
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

data/generators/templates/application/settings/settings.yml

@@ -1,6 +1,28 @@
 :sources:
 
 :development:
+  :iphoneserver: gateway.sandbox.push.apple.com
+  :iphoneport: 2195
+  ## Note: example how define Apple push certificate
+  #:iphonecertfile: settings/aps_development_myapp.pem
+  #:iphonepassphrase: store01
+  ## Note: example how define set of Apple certificates when differnet applications use the same RhoConnect server
+  ## In this case each application should be define "rho_app_id" in build.yml
+  ## This is example how define two Apple's certificates for two applications with
+  ## first application rho_app_id = com.tautechnologies.store01
+  ## second application rho_app_id = com.tautechnologies.store02
+  ## you should define rho_app_id without ":" -> "com.tautechnologies.store01" not ":com.tautechnologies.store01"
+  ## if application do not has rho_app_id or you do not defined :iphonecertificates then
+  ##   :iphonecertfile and :iphonepassphrase from root of settings will be used
+  ## for prepare *.pem firstly prepare *.p12 in "Keychain Access" application then use this command for convert to *.pem :
+  ## openssl pkcs12 -in mycert.p12 -out mycert.pem -nodes -clcerts 
+  #:iphonecertificates:
+  #  com.tautechnologies.store01:
+  #      :iphonecertfile: settings/aps_development_store01.pem
+  #      :iphonepassphrase: store01
+  #  com.tautechnologies.store02:
+  #      :iphonecertfile: settings/aps_development_store02.pem
+  #      :iphonepassphrase: store02
   :redis: localhost:6379
   :syncserver: http://localhost:9292
   :push_server: http://someappname@localhost:8675/

data/lib/rhoconnect/client.rb

@@ -6,6 +6,8 @@ module Rhoconnect
     field :device_push_type,  :string
     field :device_pin,        :string
     field :device_port,       :string
+    field :device_app_id,       :string
+    field :device_app_version,       :string
     field :phone_id,          :string
     field :user_id,           :string
     field :last_sync,         :datetime
@@ -130,7 +132,7 @@ module Rhoconnect
     end
     
     def update_fields(params)
-      [:device_type, :device_push_type,:device_pin,:device_port,:phone_id].each do |setting|
+      [:device_type, :device_push_type,:device_pin,:device_port,:phone_id, :device_app_id, :device_app_version].each do |setting|
         self.send "#{setting}=".to_sym, params[setting].to_s if params[setting]
       end 
     end
@@ -141,4 +143,4 @@ module Rhoconnect
       raise ArgumentError.new('Missing required attribute source_name') unless params[:source_name]
     end
   end
-end
+end

data/lib/rhoconnect/handler/changes/runner.rb

@@ -45,13 +45,17 @@ module Rhoconnect
         end
         
         def _process_blobs(params)
+          #puts "$$$ runner:_process_blobs params = [#{params}]"
           unless params[:blob_fields].nil?
             [:create,:update].each do |utype|
               objects = params[utype] || {}
               objects.each do |id,obj|
                 params[:blob_fields].each do |field|
                   blob = params["#{field}-#{id}"]
-                  obj[field] = @model.store_blob(obj,field,blob)
+                  if blob != nil
+                    # skip unchanged fields (some items can not have changed blob property - only non-blob or another blob etc.)
+                    obj[field] = @model.store_blob(obj,field,blob)
+                  end
                 end
               end
             end
@@ -60,4 +64,4 @@ module Rhoconnect
       end
     end
   end
-end
+end

data/lib/rhoconnect/handler/query/runner.rb

@@ -60,6 +60,15 @@ module Rhoconnect
               @client.flush_data(:delete_page)
               _delete_errors_page
               return true
+            else
+                if token == nil
+                    # client lost state - may be previous connection was failed etc.
+                    # we ned reinit connection
+                    puts "$$$ ERROR: receive NIL token => reset saved session connection. client["+@client.to_s+"] stored token["+stored_token.to_s+"]"
+                    @client.put_value(:page_token,nil)
+                    _delete_errors_page
+                    return true
+                end
             end
           else
             return true    

data/lib/rhoconnect/jobs/ping_job.rb

@@ -32,18 +32,29 @@ module Rhoconnect
       user = User.load(user_id)
       clients = user.clients if user
       if clients
+        client_objects = []
         clients.members.each do |client_id|
-          client = Client.load(client_id,{:source_name => '*'})
+            client_obj = Client.load(client_id,{:source_name => '*'})
+            client_objects << client_obj
+        end
+        sorted_clients = client_objects.sort! { |a,b|  a.last_sync <=> b.last_sync }
+        sorted_clients.reverse_each do |client|
           params.merge!(
-            'device_port' => client.device_port, 
-            'device_pin' => client.device_pin, 
-            'phone_id' => client.phone_id
+            'device_port' => client.device_port,
+            'device_pin' => client.device_pin,
+            'phone_id' => client.phone_id,
+            'device_app_id' => client.device_app_id,
+            'device_app_version' => client.device_app_version
           )
           send_push = false
           if client.device_type and client.device_type.size > 0
             if client.phone_id and client.phone_id.size > 0
-              unless phone_ids.include? client.phone_id   
-                phone_ids << client.phone_id
+              combined_phone_id = client.phone_id
+              if client.device_app_id and client.device_app_id.size > 0
+                  combined_phone_id = combined_phone_id + client.device_app_id
+              end
+              unless phone_ids.include? combined_phone_id
+                phone_ids << combined_phone_id
                 send_push = true
               end
             elsif client.device_pin and client.device_pin.size > 0
@@ -52,7 +63,7 @@ module Rhoconnect
                 send_push = true
               end
             else
-              log "Skipping ping for non-registered client_id '#{client_id}'..."
+              log "Skipping ping for non-registered client_id '#{client.rho__id.to_s}'..."
               next
             end
             if send_push
@@ -72,10 +83,10 @@ module Rhoconnect
                 end
               end
             else
-              log "Dropping ping request for client_id '#{client_id}' because it's already in user's device pin or phone_id list."
+              log "Dropping ping request for client_id '#{client.rho__id.to_s}' because it's already in user's device pin or phone_id list."
             end
           else
-            log "Skipping ping for non-registered client_id '#{client_id}'..."
+            log "Skipping ping for non-registered client_id '#{client.rho__id.to_s}'..."
           end
         end
       else

data/lib/rhoconnect/ping/apple.rb

@@ -3,10 +3,32 @@ require 'openssl'
 module Rhoconnect
   class Apple
     def self.ping(params)
+      #log '$$$ ping params = '+params.to_s
       settings = get_config(Rhoconnect.base_directory)[Rhoconnect.environment]
-      cert_file = File.join(Rhoconnect.base_directory,settings[:iphonecertfile])
+      #puts '$$$ settings = '+settings.to_s
+      cert_file = nil # File.join(Rhoconnect.base_directory,settings[:iphonecertfile])
+      passphrase = nil
+      device_app_id = params[:device_app_id]
+      if device_app_id != nil
+         if  settings[:iphonecertificates] != nil
+            if  settings[:iphonecertificates][device_app_id] != nil
+                cert_file = settings[:iphonecertificates][device_app_id][:iphonecertfile]
+                passphrase = settings[:iphonecertificates][device_app_id][:iphonepassphrase]
+            end
+         end
+      end
+      if cert_file == nil
+          cert_file = settings[:iphonecertfile]
+      end
+      if passphrase == nil
+          passphrase = settings[:iphonepassphrase]
+      end
+
+      #puts '$$$ cert_file = '+cert_file.to_s
+      cert_file = File.join(Rhoconnect.base_directory,cert_file)
+
       cert = File.read(cert_file) if File.exists?(cert_file)
-    	passphrase = settings[:iphonepassphrase]
+
     	host = settings[:iphoneserver]
     	port = settings[:iphoneport]
       if(cert and host and port)
@@ -54,4 +76,4 @@ module Rhoconnect
       super(params)
     end
   end
-end
+end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '5.5.2'
+  VERSION = '5.5.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 5.5.2
+  version: 5.5.15
 platform: ruby
 authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler