maestrano-connector-rails 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281bc1ff015d7a52fea1344faf8043cb24d0dff7
-  data.tar.gz: a0cea7d9c59defc98176b45b64909afe523a7aa1
+  metadata.gz: 49ad895ae9f7ccb8c717de5c94315cb461014e4a
+  data.tar.gz: e44a61f6ed398c3bf11c5e0101c448b113f346a1
 SHA512:
-  metadata.gz: 0cee71417cd68c6cc2b620a5ece25bc5dee1877a8327d47d1e7433e364e2fff1fa8c5eae1dc07b910f109df394fcad53801f4c2c1e3dcb129acfeb2e3227d874
-  data.tar.gz: 4501102c4571eab87459e7f84fdcb5e538bf7522b5dba7704e1693f12ec029a2ca103f52dff4613f6641efd142a4e829dffb48ef6c26f3228de71623e213d8f3
+  metadata.gz: 2ec144e8478ce9a39030a7d92cae478d2a3c8881ea73ab480aaa565c767c3fe4612757bbdc0911c438744dd98109b817702fd201b63140ddc311b45c6477d09d
+  data.tar.gz: b57077d44bc54a32e6893177cd44097dab5d88aa6c082e56f376cafb5bfbd7dae0e443825eec3b5d7431606a8e97aec408676995cd79abb4ac331de16b389e5a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v2.3.6](https://github.com/maestrano/maestrano-connector-rails/tree/v2.3.6)
+[Full Changelog](https://github.com/maestrano/maestrano-connector-rails/compare/v2.3.5...v2.3.6)
+
+**Fixed bugs:**
+
+- Lock concurrent-ruby to 1.0.5 [\#182](https://github.com/maestrano/maestrano-connector-rails/pull/182) ([ouranos](https://github.com/ouranos))
+- \[APPINT-1146\] Fix database encoding configuration [\#181](https://github.com/maestrano/maestrano-connector-rails/pull/181) ([ouranos](https://github.com/ouranos))
+
 ## [v2.3.5](https://github.com/maestrano/maestrano-connector-rails/tree/v2.3.5) (2018-11-02)
 [Full Changelog](https://github.com/maestrano/maestrano-connector-rails/compare/v2.3.4...v2.3.5)
 

data/config/initializers/db_encoding.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Only applicable for MySQL
+if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
+  # Get the configured encoding
+  configured_encoding = ActiveRecord::Base.connection_config[:encoding]
+
+  # Get the actual character set from the DB
+  database_charset = ActiveRecord::Base.connection.exec_query('SELECT @@character_set_database as charset').first['charset']
+
+  msg = <<~LOG
+    WARNING: The configured db encoding `#{configured_encoding}` is different from the actual one `#{database_charset}`!
+             This is likely to cause issues with special characters.
+             Please see https://maestrano.atlassian.net/wiki/x/rQ0nBg or run:
+               $ rails g connector:charset_migration
+  LOG
+
+  if configured_encoding != database_charset
+    Rails.logger.warn msg
+    warn msg
+  end
+end

data/lib/generators/connector/charset_migration/charset_migration_generator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails/generators/named_base'
+require 'rails/generators/active_record/migration'
+
+module Connector
+  module Generators
+    class CharsetMigrationGenerator < ::Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+
+      source_root File.expand_path('templates', __dir__)
+
+      def copy_migration
+        migration_template 'migration.rb', 'db/migrate/convert_tables_to_utf8.rb'
+      end
+    end
+  end
+end

data/lib/generators/connector/charset_migration/templates/migration.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class ConvertTablesToUtf8 < ActiveRecord::Migration
+  def change_encoding(encoding, collation)
+    # Allow for different adapter in different environment
+    unless ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
+      say "Skipping conversion as non MySQL database (#{ActiveRecord::Base.connection_config[:adapter]})"
+      return
+    end
+    tables = connection.tables
+    dbname = ActiveRecord::Base.connection_config[:database]
+    say_with_time "Converting database to #{encoding}" do
+      execute <<-SQL
+        ALTER DATABASE `#{dbname}` CHARACTER SET #{encoding} COLLATE #{collation};
+      SQL
+    end
+    tables.each do |tablename|
+      say_with_time "Converting table `#{tablename}` to #{encoding}" do
+        execute <<-SQL
+        ALTER TABLE `#{dbname}`.`#{tablename}` CONVERT TO CHARACTER SET #{encoding} COLLATE #{collation};
+        SQL
+      end
+    end
+  end
+
+  def change
+    reversible do |dir|
+      dir.up do
+        change_encoding('utf8', 'utf8_general_ci')
+      end
+      dir.down do
+        change_encoding('latin1', 'latin1_swedish_ci')
+      end
+    end
+  end
+end

data/lib/maestrano/connector/rails/version.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.3.5'.freeze
+      VERSION = '2.3.6'.freeze
     end
   end
 end

data/maestrano-connector-rails.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('autoprefixer-rails')
   s.add_runtime_dependency('bootstrap-sass')
   s.add_runtime_dependency('config')
+  # v1.1 breaks the build. See: https://github.com/ruby-concurrency/concurrent-ruby/issues/768
+  s.add_runtime_dependency('concurrent-ruby', '~> 1.0.5')
   s.add_runtime_dependency('figaro')
   s.add_runtime_dependency('jquery-rails', '>= 4.0.4')
   s.add_runtime_dependency('jsonapi-resources')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: figaro
   requirement: !ruby/object:Gem::Requirement
@@ -500,6 +514,7 @@ files:
 - app/resources/maestrano/api/organization_resource.rb
 - app/resources/maestrano/api/synchronization_resource.rb
 - app/resources/maestrano/api/user_resource.rb
+- config/initializers/db_encoding.rb
 - config/initializers/json_api.rb
 - config/initializers/retriable.rb
 - config/routes.rb
@@ -518,6 +533,8 @@ files:
 - db/migrate/20170202033323_update_organization_metadata.rb
 - db/migrate/20170315032224_add_metadata_to_id_map.rb
 - lib/generators/connector/USAGE
+- lib/generators/connector/charset_migration/charset_migration_generator.rb
+- lib/generators/connector/charset_migration/templates/migration.rb
 - lib/generators/connector/complex_entity_generator.rb
 - lib/generators/connector/install_generator.rb
 - lib/generators/connector/templates/account_controller.rb