translateable 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9671e00730e7002e2b1efa1046531933be8008160c7e2828cf0ab7bdb0f17d39
-  data.tar.gz: 9cf5dc7806bcdab742a5d07adc3729104ebb50d7e7ecf698854b07accafe616c
+  metadata.gz: defd8be91545d9bcb09d295a8ae09c77c6d8ac54ee98750d0eb147aa7ac5fcca
+  data.tar.gz: 96cbd961acd362feed04bc5f64405c2972fe3449b68967fc8eb4f0a2db4ee70a
 SHA512:
-  metadata.gz: 1b2f821a94e70a8cb9e40cb17cb050720cd8a9d3bbc404824837925f556b5bb52368b06c2f2883ce645feef0072c16415e0da2ff36fd92898da2c16c7777ad26
-  data.tar.gz: e6d5c9c9575d624e2a4860b059cbb8327f42c07747ad382b382cbd8176d5e429d40fc074233b41db237d23cfb709be91d2a8c7402aa8deabf647469e9c3df6c0
+  metadata.gz: 7322b573da75338d645a8d5f0b6d772eb9220207ea2bfccf05ef6f8ff918fe23f8dc96fa0bf6985c935d31dd4b43d6ab7b1a384e7a1cef3eb9c66449387dd2cb
+  data.tar.gz: 616042ff3c72df3d6626bc96b5e075d315f7745ac8824aa9852746184df10099946378c90397235ca399c2b6348d04a131715ad81b016d6fa7100452fb280c8d

data/.github/workflows/tests.yml

@@ -0,0 +1,48 @@
+name: CI Ruby
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.2', '3.3', '3.4']
+        gemfile: ['7.0', '7.1', '7.2', '8.0']
+        exclude:
+        - ruby-version: '3.4'
+          gemfile: '7.0'
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - run: bundle install
+        env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+          BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      - run: bundle exec rspec
+        env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+          BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+          # The hostname used to communicate with the PostgreSQL service container
+          POSTGRES_HOST: localhost
+          # The default PostgreSQL port
+          POSTGRES_PORT: 5432
+          POSTGRES_PASSWORD: postgres

data/README.md

@@ -1,6 +1,6 @@
 # Translateable
 
-[![Build Status](https://travis-ci.org/olegantonyan/translateable.svg)](https://travis-ci.org/olegantonyan/translateable)
+[![CI Ruby](https://github.com/olegantonyan/translateable/actions/workflows/tests.yml/badge.svg)](https://github.com/olegantonyan/translateable/actions/workflows/tests.yml)
 [![Gem Version](https://badge.fury.io/rb/translateable.svg)](https://badge.fury.io/rb/translateable)
 
 Allows you to store text data in multiple languages with your ActiveRecord models. Similar to [globalize](https://github.com/globalize/globalize), but with a few differences:

data/gemfiles/7.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.0'
+gem 'activesupport', '~> 7.0.0'
+gem 'concurrent-ruby', '1.3.4' # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
+
+gemspec path: '../'

data/gemfiles/7.1.gemfile

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

data/gemfiles/7.2.gemfile

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

data/gemfiles/8.0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 8.0.0'
+gem 'activesupport', '~> 8.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/version.rb

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

data/lib/translateable.rb

@@ -9,6 +9,8 @@ module Translateable
     "#{attr}_translateable"
   end
 
+  AttributeValue = Struct.new(:locale, :data)
+
   module ClassMethods
     def translateable(*attrs)
       attrs.each do |attr|
@@ -23,7 +25,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 +39,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]
@@ -48,7 +48,7 @@ module Translateable
 
       define_method(Translateable.translateable_attribute_by_name(attr)) do
         value = send("#{attr}_fetch_translateable")
-        value.map { |k, v| OpenStruct.new(locale: k, data: v) }
+        value.map { |k, v| AttributeValue.new(locale: k, data: v) }
       end
 
       define_method("#{attr}_translateable_attributes=") do |arg|
@@ -69,6 +69,5 @@ module Translateable
         self[attr] = value
       end
     end
-    # rubocop: enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
 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 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
 
-  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,59 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: translateable
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Oleg Antonyan
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2025-03-29 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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,28 +57,28 @@ dependencies:
     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
@@ -130,10 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -141,9 +125,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/4.2.gemfile
-- gemfiles/5.0.gemfile
-- gemfiles/5.2.gemfile
+- gemfiles/7.0.gemfile
+- gemfiles/7.1.gemfile
+- gemfiles/7.2.gemfile
+- gemfiles/8.0.gemfile
 - lib/generators/translateable/migration_generator.rb
 - lib/generators/translateable/templates/migration.rb.erb
 - lib/translateable.rb
@@ -153,7 +138,6 @@ homepage: https://github.com/olegantonyan/translateable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -168,9 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Allows to store text data in different languages.
 test_files: []

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/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.2
-  - 2.5.0
-
-gemfile:
-  - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.2.gemfile
-
-script:
-  - bundle exec rspec
-  - bundle exec rubocop
-
-before_install: gem install bundler
-
-services:
-  - postgresql
-
-addons:
-  postgresql: "9.4"

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: '../'

data/gemfiles/5.0.gemfile

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

data/gemfiles/5.2.gemfile

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