external_services 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bb6cfd9b9015c02de0f4a4cbde0c8e998370079bbcea2c76dbaeb006c3c19d6
-  data.tar.gz: c6a2719336d34b5a5731bcba73529e40547c725a1aaa236dde2b226aa14d4938
+  metadata.gz: 78fd3591dc6aabbbbcc337d7ddbe280656c172cc5f12845cffe71cf966edead6
+  data.tar.gz: d2bef2cdb63bcd5fffa2c5855a75b5feb1f97dc4b72724b9ecacca0b80d13e57
 SHA512:
-  metadata.gz: 0efa87a106b4bba92f953a4ce5e8416885892cc7e16f035bb688e4e736470548fdb71ffa567a51034e5ea885cac387fac70af6a35396537d8c151940ae70a4bf
-  data.tar.gz: d118e1daf478352dde4a919f98c3fe3869ac70223ef888451946a330729ec3066a40928f9d3bdbc3ca935466b9ad0968ed9d71a8f8f8c2f84464e5edd0369934
+  metadata.gz: f4ef134ce088983588b94d21417723ea8b3edafc2c317adf99944325259bbe6e85ca106d16cab0f51701d41ff8d8fd585cf845e1bee07d5e10b9fa3fe99fcf96
+  data.tar.gz: dac4c7f82850a64347613c849fff44c459df1ba0823c9cea33c28862ddbdc4ae0716b76812b42e5b7753f7802fce145f8ad4a65dce093198b49de239c6bcf855

data/Gemfile

@@ -13,5 +13,5 @@ gem 'rubocop', '~> 0.48', require: false
 
 gem 'pry-rails'
 
-gem 'factory_girl_rails'
+gem 'factory_bot_rails'
 gem 'rspec-rails'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    external_services (0.2.4)
+    external_services (0.3.0)
       faraday (>= 0.9)
       faraday_middleware (>= 0.10)
       rails (>= 4.2.5, < 6.0)
@@ -9,169 +9,175 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activesupport (5.1.5)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (8.0.0)
+    arel (9.0.0)
     ast (2.4.0)
-    backports (3.6.8)
+    backports (3.11.3)
     builder (3.2.3)
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    diff-lcs (1.2.5)
-    erubi (1.7.0)
-    ethon (0.9.0)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.7.1)
+    ethon (0.11.0)
       ffi (>= 1.3.0)
-    factory_girl (4.7.0)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
       railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.18)
-    gh (0.14.0)
-      addressable
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.23)
+    gh (0.15.1)
+      addressable (~> 2.4.0)
       backports
       faraday (~> 0.8)
       multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
+      net-http-persistent (~> 2.9)
       net-http-pipeline
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    highline (1.7.8)
-    i18n (0.9.5)
+    highline (1.7.10)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     iniparse (1.4.4)
-    json (2.0.2)
+    json (2.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    method_source (0.8.2)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    nio4r (2.2.0)
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    overcommit (0.41.0)
+    overcommit (0.45.0)
       childprocess (~> 0.6, >= 0.6.3)
       iniparse (~> 1.4)
     parallel (1.12.1)
-    parser (2.5.0.2)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-rails (0.3.4)
-      pry (>= 0.9.10)
+      method_source (~> 0.9.0)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.4)
-    rack-test (0.8.2)
+    rack (2.0.5)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
-    rails (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
       bundler (>= 1.3.0)
-      railties (= 5.1.5)
+      railties (= 5.2.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (10.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.52.1)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.55.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -179,10 +185,10 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.13)
     thor (0.20.0)
     thread_safe (0.3.6)
-    travis (1.8.2)
+    travis (1.8.8)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -195,9 +201,9 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    websocket (1.2.3)
-    websocket-driver (0.6.5)
+    unicode-display_width (1.3.2)
+    websocket (1.2.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
 
@@ -207,7 +213,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.12)
   external_services!
-  factory_girl_rails
+  factory_bot_rails
   overcommit
   pry-rails
   rake (~> 10.0)
@@ -217,4 +223,4 @@ DEPENDENCIES
   travis (~> 1.8, >= 1.8.2)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/app/models/external_services/service.rb

@@ -5,7 +5,10 @@ module ExternalServices
     belongs_to :subject, polymorphic: true
     serialize :extra_data, JSON
 
-    after_update :on_first_sync, if: -> { external_id_was.nil? && external_id_changed? }
+    after_update :on_first_sync, if: proc { # Rails 5.1+ support
+      (respond_to?(:saved_change_to_external_id?) ? saved_change_to_external_id? : external_id_changed? ) &&
+      (respond_to?(:external_id_before_last_save) ? external_id_before_last_save.nil? : external_id_was)
+    }
 
     def self.to_sym
       to_s.demodulize.underscore.to_sym

data/lib/external_services/active_record.rb

@@ -12,7 +12,7 @@ module ExternalServices
           unless options[:only_api_actions] == true
             service_class = get_service_class(name, options)
             service_assoc = :"#{name}_service"
-            has_one service_assoc, class_name: service_class, as: :subject, dependent: :destroy, autosave: true
+            has_one service_assoc, class_name: service_class.to_s, as: :subject, dependent: :destroy, autosave: true
 
             define_external_service_getset         name, options
             define_external_service_sync_methods   name, options
@@ -106,10 +106,12 @@ module ExternalServices
                 before_destroy :halt_on_external_services_syncing
               end
 
-              after_save    :"#{name}_on_create", if: :id_changed?
+              after_save    :"#{name}_on_create", if: proc { # Rails 5.1+ support
+                respond_to?(:saved_change_to_id?) ? saved_change_to_id? : id_changed?
+              }
 
-              after_save    :"#{name}_on_update", if: proc {
-                !id_changed?
+              after_save    :"#{name}_on_update", if: proc {# Rails 5.1+ support
+                !(respond_to?(:saved_change_to_id?) ? saved_change_to_id? : id_changed?)
               }
 
               after_destroy :"#{name}_on_destroy"

data/lib/external_services/engine.rb

@@ -5,7 +5,7 @@ module ExternalServices
 
     config.generators do |g|
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
     end
   end
 end

data/lib/external_services/version.rb

@@ -1,3 +1,3 @@
 module ExternalServices
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: external_services
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday