activity_consumer 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101d9a1885649969932426a13aff95bcc8347df5
-  data.tar.gz: f5129f408165c606d5dec16ce396989413575c50
+  metadata.gz: 464fb2b08a6a96e190e4b55e0dc6d5561a0e8ed0
+  data.tar.gz: 844f3059de10413a6e1c8ed81f1d950150d4500e
 SHA512:
-  metadata.gz: d34c2766ffe545f26632485601efeed53c2a2a22cf9225387cf47f1795bd816aaeec4388f93a16fc7ece90ee6436e9c10d5582d591ea65d1ae7544ccdeb83c4f
-  data.tar.gz: ee861a941de37ce0314e7de690359fe7b8571aedf8561994f0d3e317611e2273b00f706dbf89702561e2e57a46cc23e3c4d6868e7a6dd0fcac3f2ec954bf4f6a
+  metadata.gz: 808d17c633cac10d8b19e19179fb26cc84008dd2d74b5fd0758b2e2700d1478fdf239c336475c89aeb5f0712b7b59d82500ce2fe92b978a4741856adcb7a79e0
+  data.tar.gz: 8b016fe91b3df519095b4605b4144e4a06ead7c52f7a70791b63d99ac3b13981f59d301009f9287421f338de1136ebe8f5f94a11652a102996e1b4a734993091

data/app/services/activity_consumer/remote_activity_rest_client.rb

@@ -5,24 +5,23 @@ module ActivityConsumer
   class RemoteActivityRestClient
     include HTTParty
     attr_reader :latest_etag
+    logger Rails.logger, :info, :curl
 
     def initialize(mode = :delta)
       @mode = mode
     end
 
     def fetch
-      Rails.logger.info "GET #{request_url}"
-      response = self.class.get(request_url, basic_auth: auth)
-      Rails.logger.info "Response: #{response}"
+      response = self.class.get(request_url, basic_auth: auth, query: query_params)
       if response.success?
         @latest_etag = response.headers['ETag']
         activities = []
         response['activities'].each do |activity|
           activity = activity.deep_symbolize_keys
 
-          Rails.logger.info "trying to import #{activity}"
-          if !ActivityConsumer.configuration.import_types.include?(activity[:activity_type])
-            Rails.logger.info "type not in: #{ActivityConsumer.configuration.import_types} ... skipping!"
+          Rails.logger.info "[ActivityConsumer] Trying to import #{activity}"
+          unless ActivityConsumer.configuration.import_types.include?(activity[:activity_type])
+            Rails.logger.info "[ActivityConsumer] type not in: #{ActivityConsumer.configuration.import_types} ... skipping!"
             next
           end
 
@@ -39,11 +38,9 @@ module ActivityConsumer
     def is_fresh?
       url = ActivityConsumer.configuration.activity_uri
       etag = RemoteActivity.last ? RemoteActivity.last.etag : ''
-      Rails.logger.info "HEAD #{url} with ETag #{etag}"
       response = self.class.head(url, basic_auth: auth, headers: {"If-None-Match" => etag})
-      Rails.logger.info "Response code: #{response.code}"
 
-      return response.code == 304
+      response.code == 304
     end
 
   private
@@ -53,17 +50,16 @@ module ActivityConsumer
     end
 
     def request_url
-      case @mode
-      when :delta
-        ActivityConsumer.configuration.activity_uri + request_params
-      when :initial
+      if @mode == :initial
         ActivityConsumer.configuration.activity_fullexport_uri
+      else
+        ActivityConsumer.configuration.activity_uri
       end
     end
 
-    def request_params
+    def query_params
       latest = RemoteActivity.latest_timestamp
-      latest ? "?since=#{latest}" : ""
+      latest ? {since: latest} : {}
     end
 
     def auth

data/lib/activity_consumer/version.rb

@@ -1,3 +1,3 @@
 module ActivityConsumer
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end