draisine 0.7.10 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d532674344caaa230a569619645f1741bc250576
-  data.tar.gz: dfa98a38eaace1c4358310a3580c87020d8ee016
+  metadata.gz: e02084ec5e958abc727a572424931988333da60c
+  data.tar.gz: 263bfc31d6f0f5728cefaae6533f929b1a23b4e7
 SHA512:
-  metadata.gz: 7c94c9310d3dea3f8d4a64f2c07bd162dc8409ad18fa715f575c80e271656d43e37e8335e2d146c27447ba6d6cfea50375313cf1503d76daa533508b2f37a1e9
-  data.tar.gz: df7c45a1aace9a9775ac5ea2bf0e3b1f8cecf260e72d3593c02778b602c647a08e65ed828930d02353ad4477d9172c6028e1ce8a0be90859e96bfb5aa497a8ca
+  metadata.gz: 667c1187aa466afe49c43335ca603786db538985481a288d4c14f781226ee05ff009ace0c970c603e61d027f146f7426b8b53ffd3e3727ab6a017742e2ef7ce1
+  data.tar.gz: babbfc5d421361b6ff4d6cc7cfd6e70ffd1c615df1611dc675b0b7c6c9a4a6bad1b3e5efc967444cf94bd32f5c51f554911ccb00adafd07124d3933ff28d2347

data/app/controllers/draisine/soap_controller.rb

@@ -5,7 +5,7 @@ module Draisine
     before_filter :validate_ip
 
     def update
-      message = request.body.read
+      message = incoming_xml
       if Draisine.sync_soap_operations?
         Draisine::SoapUpdateJob.perform_now(message)
       else
@@ -16,7 +16,7 @@ module Draisine
     end
 
     def delete
-      message = request.body.read
+      message = incoming_xml
       if Draisine.sync_soap_operations?
         Draisine::SoapDeleteJob.perform_now(message)
       else
@@ -45,5 +45,9 @@ module Draisine
 </soapenv:Envelope>
 EOF
     end
+
+    def incoming_xml
+      Draisine::Encoding.convert_to_utf_and_sanitize(request.body.read)
+    end
   end
 end

data/lib/draisine/jobs/job_base.rb

@@ -33,6 +33,7 @@ module Draisine
     end
 
     def deserialize(job_data)
+      super
       @retry_attempt = job_data.fetch('_retry_attempt', 0)
     end
   end

data/lib/draisine/soap_handler.rb

@@ -44,7 +44,7 @@ module Draisine
       when String
         Hash.from_xml(message_xml)
       else
-        raise ArgumentError
+        fail ArgumentError, "unknown message type: #{message_xml.inspect}"
       end
     end
 
@@ -57,13 +57,13 @@ module Draisine
     def assert_valid_organization_id!(message)
       unless diggable_to?(message, ['Envelope', 'Body', 'notifications', 'OrganizationId']) &&
              message['Envelope']['Body']['notifications']['OrganizationId'] == Draisine.organization_id
-        fail InvalidOrganizationError, "a message from invalid organization id received"
+        fail InvalidOrganizationError, "a message from invalid organization id received, source xml: #{message.inspect}"
       end
     end
 
     def assert_valid_message!(message)
       unless diggable_to?(message, ['Envelope', 'Body', 'notifications', 'Notification'])
-        fail ArgumentError, "malformed xml inbound message from salesforce"
+        fail ArgumentError, "malformed xml inbound message from salesforce, source xml: #{message.inspect}"
       end
       assert_valid_organization_id!(message)
     end

data/lib/draisine/util/encoding.rb

@@ -0,0 +1,7 @@
+module Draisine
+  module Encoding
+    def self.convert_to_utf_and_sanitize(string)
+      string.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?")
+    end
+  end
+end

data/lib/draisine/util/salesforce_comparisons.rb

@@ -24,7 +24,7 @@ module Draisine
     def salesforce_cleanup(value)
       case value
       when String
-        value.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?")
+        Draisine::Encoding.convert_to_utf_and_sanitize(value)
       else
         value
       end

data/lib/draisine/version.rb

@@ -1,3 +1,3 @@
 module Draisine
-  VERSION = "0.7.10"
+  VERSION = "0.7.12"
 end

data/lib/draisine.rb

@@ -2,6 +2,7 @@ require "active_support"
 require "active_support/core_ext"
 require "active_support/concern"
 require "active_job/base"
+require "ext/active_job"
 
 require "databasedotcom"
 require "ext/databasedotcom"
@@ -25,6 +26,7 @@ require "draisine/util/hash_diff"
 require "draisine/util/parse_time"
 require "draisine/util/salesforce_comparisons"
 require "draisine/util/caching_client"
+require "draisine/util/encoding"
 
 require "draisine/query_mechanisms"
 require "draisine/partitioner"

data/lib/ext/active_job.rb

@@ -0,0 +1,31 @@
+# Borrowed from:
+# https://github.com/isaacseymour/activejob-retry/blob/master/lib/active_job/retry/deserialize_monkey_patch.rb
+# Unneccessary after rails 5+
+
+# In Rails 4.2, ActiveJob externally applies deserialized job ID, queue name, arguments to
+# the instantiated job in `ActiveJob::Base.deserialize`, which cannot be overridden in
+# subclasses. https://github.com/rails/rails/pull/18260 changes this to delegate as much
+# of the deserialization as possible to the instance, i.e. `ActiveJob::Base#deserialize`,
+# which can be overridden. This allows us to store extra information in the queue (i.e.
+# retry_attempt), which is essential for ActiveJob::Retry.
+#
+# This monkey patch is automatically applied if necessary when ActiveJob::Retry is
+# required.
+
+unless ActiveJob::Base.method_defined?(:deserialize)
+  module ActiveJob
+    class Base
+      def self.deserialize(job_data)
+        job = job_data['job_class'].constantize.new
+        job.deserialize(job_data)
+        job
+      end
+
+      def deserialize(job_data)
+        self.job_id               = job_data['job_id']
+        self.queue_name           = job_data['queue_name']
+        self.serialized_arguments = job_data['arguments']
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draisine
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.12
 platform: ruby
 authors:
 - Mark Abramov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,10 +203,12 @@ files:
 - lib/draisine/syncer.rb
 - lib/draisine/type_mapper.rb
 - lib/draisine/util/caching_client.rb
+- lib/draisine/util/encoding.rb
 - lib/draisine/util/hash_diff.rb
 - lib/draisine/util/parse_time.rb
 - lib/draisine/util/salesforce_comparisons.rb
 - lib/draisine/version.rb
+- lib/ext/active_job.rb
 - lib/ext/databasedotcom.rb
 - lib/generators/draisine/delta_migration_generator.rb
 - lib/generators/draisine/integration_generator.rb