workarea-core 3.4.41 → 3.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6a06d43a5afb8d5f0b1cf56c81a9f98c7d354d491d5f34bc343c2eff550f94
-  data.tar.gz: 24b2c3a28a8566a643157312dcca780a094802e8e26acd4a464ad89d8489200c
+  metadata.gz: fb1a7c0e5cf9108b58d636eca7349f0ec61c1c24b91e3356d6978a70048fb745
+  data.tar.gz: 46609e92ace1945db58648ce33306fb2000532d9b1867bbf1a8530484e2a2ba0
 SHA512:
-  metadata.gz: a595de98f25b125a2518db893178ca1b950396f97f9de175e1592520ed18bbe9dda49a9cc8bc38dc7f25b8207489adea3cb2861a10d91adb6d3b5c7f6ed653b8
-  data.tar.gz: 414a2d37a8b2f29f0a5d463d8fb497ac01b6efe9231f3e254b4f3d3b6f1a05f3c9e9adc8552d9d6f22485f159eb3dc15ff818d7045381f5745171516c4712ac7
+  metadata.gz: 4320bf6ca0537e6aa5e5ca6c3c5afd68cd269579fc38f8acff6d669064c8d8aaf37b2afadc160edf8c55fb4857834cb9d9a38a1a6e9fdb9e2f36bae62781d286
+  data.tar.gz: 353ee66c41b45fe5695a19c444fb8f21e4c35140cdfa804f03b8da50bb6cd2e6e70d05e1ee06b61cc4577c666d68dca09f4e58915a04b1974f7b916eacc531b0

data/app/controllers/workarea/current_referrer.rb

@@ -9,6 +9,7 @@ module Workarea
       @current_referrer ||= TrafficReferrer.new(
         RefererParser::Parser.new.parse(referrer).slice(:source, :medium, :uri)
       )
+    rescue RefererParser::InvalidUriError
     end
   end
 end

data/lib/workarea/core.rb

@@ -140,6 +140,7 @@ require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
 require 'workarea/ext/jbuilder/jbuilder_cache'
+require 'workarea/ext/referer_parser/parser.decorator'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'

data/lib/workarea/ext/referer_parser/parser.decorator

@@ -0,0 +1,43 @@
+module RefererParser
+  # This code is actually in `master` branch of
+  # https://github.com/snowplow-referer-parser/ruby-referer-parser but
+  # has not yet been released. It's used to allow through android-app://
+  # URLs.
+  decorate Parser do
+    # Given a string or URI, return a hash of data
+    def parse(obj)
+      url = obj.is_a?(URI) ? obj : URI.parse(obj.to_s)
+
+      unless ['android-app', 'http', 'https'].include?(url.scheme)
+        raise InvalidUriError, "Only Android-App, HTTP, and HTTPS schemes are supported -- #{url.scheme}"
+      end
+
+      data = { known: false, uri: url.to_s }
+
+      domain, name_key = domain_and_name_key_for(url)
+      if domain && name_key
+        referer_data = @name_hash[name_key]
+        data[:known] = true
+        data[:source] = referer_data[:source]
+        data[:medium] = referer_data[:medium]
+        data[:domain] = domain
+
+        # Parse parameters if the referer uses them
+        if url.query && referer_data[:parameters]
+          query_params = CGI.parse(url.query)
+          referer_data[:parameters].each do |param|
+            # If there is a matching parameter, get the first non-blank value
+            unless (values = query_params[param]).empty?
+              data[:term] = values.reject { |v| v.strip == '' }.first
+              break if data[:term]
+            end
+          end
+        end
+      end
+
+      data
+    rescue URI::InvalidURIError
+      raise InvalidUriError.new("Unable to parse URI, not a URI? -- #{obj.inspect}", $ERROR_INFO)
+    end
+  end
+end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 41
+    PATCH = 42
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/lib/workarea/ext/referer_parser/parser_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+module RefererParser
+  class ParserTest < Workarea::TestCase
+    def test_parse_android_app_referrers
+      referrers = [
+        'android-app://com.linkedin.android',
+        'android-app://org.telegram.plus',
+        'android-app://com.twitter.android'
+      ]
+
+      referrers.each do |uri|
+        referrer = Parser.new.parse(uri)
+
+        refute(referrer[:known])
+        assert_equal(uri, referrer[:uri])
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.41
+  version: 3.4.42
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1873,6 +1873,7 @@ files:
 - lib/workarea/ext/mongoid/list_field.rb
 - lib/workarea/ext/mongoid/moped_bson.rb
 - lib/workarea/ext/mongoid/timestamps_timeless.rb
+- lib/workarea/ext/referer_parser/parser.decorator
 - lib/workarea/ext/sprockets/ruby_processor.rb
 - lib/workarea/ext/sprockets/task.rb
 - lib/workarea/geolocation.rb
@@ -2017,6 +2018,7 @@ files:
 - test/lib/workarea/ext/mongoid/except_test.rb
 - test/lib/workarea/ext/mongoid/find_ordered_test.rb
 - test/lib/workarea/ext/mongoid/list_field_test.rb
+- test/lib/workarea/ext/referer_parser/parser_test.rb
 - test/lib/workarea/geolocation_test.rb
 - test/lib/workarea/lint/inconsistent_details_test.rb
 - test/lib/workarea/lint/products_missing_images_test.rb