translateable 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9671e00730e7002e2b1efa1046531933be8008160c7e2828cf0ab7bdb0f17d39
-  data.tar.gz: 9cf5dc7806bcdab742a5d07adc3729104ebb50d7e7ecf698854b07accafe616c
+  metadata.gz: 6f1c8fd60b4fc6af2bc16471c0655015bebfb2b9e6d80ac24ee4a23fb5fbfa7d
+  data.tar.gz: fbf64c55adb25358e0340857780eed1df75e1f63852cf30b203c2752d85e4a8c
 SHA512:
-  metadata.gz: 1b2f821a94e70a8cb9e40cb17cb050720cd8a9d3bbc404824837925f556b5bb52368b06c2f2883ce645feef0072c16415e0da2ff36fd92898da2c16c7777ad26
-  data.tar.gz: e6d5c9c9575d624e2a4860b059cbb8327f42c07747ad382b382cbd8176d5e429d40fc074233b41db237d23cfb709be91d2a8c7402aa8deabf647469e9c3df6c0
+  metadata.gz: bd28660d2d526157247283ecb8ef127dea68a3b46eef1d5349d578967da848ed04ef711093afcb2e6021770d7b4b25763262fd6ee71b4eb4eafd969596851fba
+  data.tar.gz: c08ec3530d7997f823d8aa4f278b35ea52d8bc17ebf305e4e3ab8350cfed784d30da018588b8043cae086fd7db111c881203c8eb1bb0985b78a80e143c66d804

data/.travis.yml

@@ -1,16 +1,15 @@
 language: ruby
 rvm:
-  - 2.2.2
   - 2.5.0
+  - 2.6.1
 
 gemfile:
-  - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 
 script:
   - bundle exec rspec
-  - bundle exec rubocop
 
 before_install: gem install bundler
 

data/gemfiles/6.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+gem 'activesupport', '~> 6.0.0'
+
+gemspec path: '../'

data/lib/generators/translateable/migration_generator.rb

@@ -10,30 +10,15 @@ if defined?(Rails)
       argument :field_name, type: :string
       argument :locale, type: :string, default: I18n.default_locale
 
-      # rubocop: disable Metrics/AbcSize
       def create_migration_file
         raise ArgumentError, "given locale #{locale} is not available, check I18n.available_locales" unless I18n.available_locales.include?(locale.to_sym)
-        migration_template('migration.rb.erb', "db/migrate/migrate_translateable_#{name}_#{field_name}.rb",
-                           migration_version: migration_version,
-                           table_name: name,
-                           field_name: field_name,
-                           field_type: name.classify.constantize.columns_hash[field_name].type,
-                           locale: locale)
+        migration_template('migration.rb.erb', "db/migrate/migrate_translateable_#{table_name}_#{field_name}.rb", migration_version: migration_version)
       end
-      # rubocop: enable Metrics/AbcSize
 
       private
 
-      def rails5?
-        Rails.version.start_with?('5')
-      end
-
       def migration_version
-        if rails5?
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        else
-          ''
-        end
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
     end
   end

data/lib/generators/translateable/templates/migration.rb.erb

@@ -1,4 +1,4 @@
-class MigrateTranslateable<%= table_name.camelize + field_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
+class MigrateTranslateable<%= table_name.capitalize + field_name.capitalize %> < ActiveRecord::Migration<%= migration_version %>
   def change
     reversible do |dir|
       dir.up do
@@ -13,13 +13,13 @@ class MigrateTranslateable<%= table_name.camelize + field_name.camelize %> < Act
         SQL
         remove_column :<%= table_name %>, :<%= field_name %>
         rename_column :<%= table_name %>, :<%= field_name + '_t' %>, :<%= field_name %>
-        <% if index_exists?(table_name, field_name) %>
+        <% if ActiveRecord::Base.connection.index_exists?(table_name, field_name) %>
         add_index :<%= table_name %>, :<%= field_name %>, using: :gin
         <% end %>
       end
 
       dir.down do
-        add_column :<%= table_name %>, :<%= field_name + '_t' %>, <%= field_type || ':string' %>, null: false, default: ''
+        add_column :<%= table_name %>, :<%= field_name + '_t' %>, :string, null: false, default: ''
         execute <<-SQL
         UPDATE <%= table_name %> AS m1
         SET <%= field_name + '_t' %> = (
@@ -28,7 +28,7 @@ class MigrateTranslateable<%= table_name.camelize + field_name.camelize %> < Act
         SQL
         remove_column :<%= table_name %>, :<%= field_name %>
         rename_column :<%= table_name %>, :<%= field_name + '_t' %>, :<%= field_name %>
-        <% if index_exists?(table_name, field_name) %>
+        <% if ActiveRecord::Base.connection.index_exists?(table_name, field_name) %>
         add_index :<%= table_name %>, :<%= field_name %>
         <% end %>
       end

data/lib/translateable.rb

@@ -23,7 +23,6 @@ module Translateable
       return unless database_connection_exists?
       attr = attr.to_s
       raise ArgumentError, "no such column '#{attr}' in '#{name}' model" unless column_names.include?(attr)
-      raise ArgumentError, "'#{attr}' column must be of JSONB type" unless columns_hash[attr].type.to_s.casecmp('jsonb').zero?
     end
 
     def define_translateable_strong_params(*attrs)
@@ -38,7 +37,6 @@ module Translateable
       false
     end
 
-    # rubocop: disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def define_translateable_methods(attr)
       define_method("#{attr}_fetch_translateable") do
         value = self[attr]
@@ -69,6 +67,5 @@ module Translateable
         self[attr] = value
       end
     end
-    # rubocop: enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
 end

data/lib/translateable/version.rb

@@ -1,3 +1,3 @@
 module Translateable
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/translateable.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w(lib)
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'activerecord', '>= 4.2'
-  spec.add_dependency 'activesupport', '>= 4.2'
+  spec.add_dependency 'activerecord', '>= 5.0'
+  spec.add_dependency 'activesupport', '>= 5.0'
   spec.add_dependency 'i18n'
   spec.add_dependency 'pg'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: translateable
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Oleg Antonyan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +118,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -141,9 +126,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
 - lib/generators/translateable/migration_generator.rb
 - lib/generators/translateable/templates/migration.rb.erb
 - lib/translateable.rb
@@ -168,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Allows to store text data in different languages.

data/.rubocop.yml

@@ -1,18 +0,0 @@
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 162
-
-Style/Lambda:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*'

data/gemfiles/4.2.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.2.0'
-gem 'activesupport', '~> 4.2.0'
-gem 'pg', '~> 0.21'
-
-gemspec path: '../'