json_translate 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf107bdbc1965bfe33a5dbe315fb17f4f0dea348
-  data.tar.gz: b100d78c6d6ed8cf4519470810c095bed8c0b47d
+  metadata.gz: 18109ecd716fe83a685fba1c452278e24c292d88
+  data.tar.gz: 23188ebe9a7a00efc712a3ee7945911eae0137bb
 SHA512:
-  metadata.gz: 0797a274b96cf268c5f5a86eab8dd97f6cca3c4590ee34765986e2d663030bffa12d94b9c51c28acb3c1e883ebcb5a0e372af9d4ebb49c0589d7ba68f7101e19
-  data.tar.gz: 7c30af32a81d2c8dc8a160c57687e037a5725f1c3afb8f517e0ace39137d316a9a8ce4f217d216015fadf1bd0480d967e85f98558dc2a99617019bb7975f24ec
+  metadata.gz: b38e84f20f8c74bd68cd8cf18149fdc54c55b5b514d491056b177c1cacc9372289235d11f4bc954395e25dbf7aa1d6eb533fe23d26fd01fa616c2e0724147c07
+  data.tar.gz: bb93cce1c20f30bcc460e59c53f80fda46e6f5232ef4f7c43c7344dafc618a26b424bb60ac7320d9be1d5849e7bf1a13f007d23d869181408d35145f7d8d72ee

data/README.md

@@ -1,18 +1,20 @@
+[![Gem Version](https://badge.fury.io/rb/json_translate.svg)](https://badge.fury.io/rb/json_translate)
+[![Build Status](https://api.travis-ci.org/cfabianski/json_translate.png)](https://travis-ci.org/cfabianski/json_translate)
+[![License](http://img.shields.io/badge/license-mit-brightgreen.svg)](COPYRIGHT)
+[![Code Climate](https://codeclimate.com/github/cfabianski/json_translate.png)](https://codeclimate.com/github/cfabianski/json_translate)
+
 # JSON Translate
 
 Rails I18n library for ActiveRecord model/data translation using PostgreSQL's
-JSONB datatype. It provides an interface inspired by
+JSONB datatype or MySQL's JSON datatype. It provides an interface inspired by
 [Globalize3](https://github.com/svenfuchs/globalize3) but removes the need to
 maintain separate translation tables.
 
-[![Build Status](https://api.travis-ci.org/cfabianski/json_translate.png)](https://travis-ci.org/cfabianski/json_translate)
-[![License](http://img.shields.io/badge/license-mit-brightgreen.svg)](COPYRIGHT)
-[![Code Climate](https://codeclimate.com/github/cfabianski/json_translate.png)](https://codeclimate.com/github/cfabianski/json_translate)
-
 ## Requirements
 
 * ActiveRecord >= 4.2.0
 * I18n
+* MySQL support requires ActiveRecord >= 5 and MySQL >= 5.7.8.
 
 ## Installation
 
@@ -24,8 +26,15 @@ When using bundler, put it in your Gemfile:
 source 'https://rubygems.org'
 
 gem 'activerecord'
+
+# PostgreSQL
 gem 'pg', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+
+# or MySQL
+gem 'mysql2', :platform => :ruby
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+
 gem 'json_translate'
 ```
 
@@ -57,21 +66,21 @@ post.title # => This database rocks!
 post.title_he # => אתר זה טוב
 ```
 
-To find records using translations without constructing JSONB queries by hand:
+To find records using translations without constructing JSON queries by hand:
 
 ```ruby
 Post.with_title_translation("This database rocks!") # => #<ActiveRecord::Relation ...>
 Post.with_title_translation("אתר זה טוב", :he) # => #<ActiveRecord::Relation ...>
 ```
 
-In order to make this work, you'll need to define an JSONB column for each of
+In order to make this work, you'll need to define an JSON or JSONB column for each of
 your translated attributes, using the suffix "_translations":
 
 ```ruby
 class CreatePosts < ActiveRecord::Migration
   def up
     create_table :posts do |t|
-      t.column :title_translations, 'jsonb'
+      t.column :title_translations, 'jsonb' # or 'json' for MySQL
       t.column :body_translations,  'jsonb'
       t.timestamps
     end

data/lib/json_translate.rb

@@ -1,6 +1,5 @@
 require "active_record"
 require "json_translate/translates"
 require "json_translate/translates/instance_methods"
-require "json_translate/translates/active_record_with_json_translates"
 
 ActiveRecord::Base.extend(JSONTranslate::Translates)

data/lib/json_translate/translates.rb

@@ -1,7 +1,7 @@
 module JSONTranslate
   module Translates
     SUFFIX = "_translations".freeze
-
+    MYSQL_ADAPTERS = %w[MySQL Mysql2 Mysql2Spatial]
 
     def translates(*attrs)
       include InstanceMethods
@@ -18,22 +18,37 @@ module JSONTranslate
       ].flatten.compact
 
       attrs.each do |attr_name|
-        define_method attr_name do
-          read_json_translation(attr_name)
+        define_method attr_name do |**params|
+          read_json_translation(attr_name, params)
         end
 
         define_method "#{attr_name}=" do |value|
           write_json_translation(attr_name, value)
         end
 
+        I18n.available_locales.each do |locale|
+          normalized_locale = locale.to_s.downcase.gsub(/[^a-z]/, '')
+
+          define_method :"#{attr_name}_#{normalized_locale}" do |**params|
+            read_json_translation(attr_name, locale, false, params)
+          end
+
+          define_method "#{attr_name}_#{normalized_locale}=" do |value|
+            write_json_translation(attr_name, value, locale)
+          end
+        end
+
         define_singleton_method "with_#{attr_name}_translation" do |value, locale = I18n.locale|
           quoted_translation_store = connection.quote_column_name("#{attr_name}#{SUFFIX}")
           translation_hash = { "#{locale}" => value }
-          where("#{quoted_translation_store} @> :translation::jsonb", translation: translation_hash.to_json)
+
+          if MYSQL_ADAPTERS.include?(connection.adapter_name)
+            where("JSON_CONTAINS(#{quoted_translation_store}, :translation, '$')", translation: translation_hash.to_json)
+          else
+            where("#{quoted_translation_store} @> :translation::jsonb", translation: translation_hash.to_json)
+          end
         end
       end
-
-      send(:prepend, ActiveRecordWithJSONTranslate)
     end
 
     def translates?

data/lib/json_translate/translates/instance_methods.rb

@@ -3,10 +3,12 @@ module JSONTranslate
     module InstanceMethods
       def disable_fallback
         toggle_fallback(false)
+        yield if block_given?
       end
 
       def enable_fallback
         toggle_fallback(true)
+        yield if block_given?
       end
 
       protected
@@ -14,70 +16,47 @@ module JSONTranslate
       attr_reader :enabled_fallback
 
       def json_translate_fallback_locales(locale)
-        return locale if enabled_fallback == false || !I18n.respond_to?(:fallbacks)
-        I18n.fallbacks[locale]
+        if enabled_fallback != false && I18n.respond_to?(:fallbacks)
+          Array(I18n.fallbacks[locale])
+        else
+          Array(locale)
+        end
       end
 
-      def read_json_translation(attr_name, locale = I18n.locale)
+      def read_json_translation(attr_name, locale = I18n.locale, fallback = true, **params)
         translations = public_send("#{attr_name}#{SUFFIX}") || {}
 
-        available = Array(json_translate_fallback_locales(locale)).detect do |available_locale|
-          translations[available_locale.to_s].present?
+        selected_locale = locale
+        if fallback
+          selected_locale = json_translate_fallback_locales(locale).detect do |available_locale|
+            translations[available_locale.to_s].present?
+          end
+        end
+
+        translation = translations[selected_locale.to_s]
+
+        if translation && params.present?
+          begin
+            translation = I18n.interpolate(translation, params)
+          rescue I18n::MissingInterpolationArgument
+          end
         end
 
-        translations[available.to_s]
+        translation
       end
 
       def write_json_translation(attr_name, value, locale = I18n.locale)
+        value = value.presence
         translation_store = "#{attr_name}#{SUFFIX}"
         translations = public_send(translation_store) || {}
         public_send("#{translation_store}_will_change!") unless translations[locale.to_s] == value
-        translations[locale.to_s] = value
-        public_send("#{translation_store}=", translations)
-        value
-      end
-
-      def respond_to_with_translates?(symbol, include_all = false)
-        return true if parse_translated_attribute_accessor(symbol)
-        respond_to_without_translates?(symbol, include_all)
-      end
-
-      def method_missing_with_translates(method_name, *args)
-        translated_attr_name, locale, assigning = parse_translated_attribute_accessor(method_name)
-
-        return method_missing_without_translates(method_name, *args) unless translated_attr_name
-
-        if assigning
-          write_json_translation(translated_attr_name, args.first, locale)
+        if value
+          translations[locale.to_s] = value
         else
-          read_json_translation(translated_attr_name, locale)
+          translations.delete(locale.to_s)
         end
-      end
-
-      # Internal: Parse a translated convenience accessor name.
-      #
-      # method_name - The accessor name.
-      #
-      # Examples
-      #
-      #   parse_translated_attribute_accessor("title_en=")
-      #   # => [:title, :en, true]
-      #
-      #   parse_translated_attribute_accessor("title_fr")
-      #   # => [:title, :fr, false]
-      #
-      # Returns the attribute name Symbol, locale Symbol, and a Boolean
-      # indicating whether or not the caller is attempting to assign a value.
-      def parse_translated_attribute_accessor(method_name)
-        return unless /\A(?<attribute>[a-z_]+)_(?<locale>[a-z]{2})(?<assignment>=?)\z/ =~ method_name
-
-        translated_attr_name = attribute.to_sym
-        return unless translated_attribute_names.include?(translated_attr_name)
-
-        locale    = locale.to_sym
-        assigning = assignment.present?
-
-        [translated_attr_name, locale, assigning]
+        public_send("#{translation_store}=", translations)
+        value
       end
 
       def toggle_fallback(enabled)

data/lib/json_translate/version.rb

@@ -1,3 +1,3 @@
 module JSONTranslate
-  VERSION = "3.0.1"
+  VERSION = "4.0.0"
 end

data/test/database.yml

@@ -1,6 +1,13 @@
-test:
+postgres:
   adapter:  postgresql
   host:     localhost
   database: json_translate_test
   username: postgres
+  schema_search_path: public
   min_messages: warning
+
+mysql:
+  adapter:  mysql2
+  host:     localhost
+  database: json_translate_test
+  username: root

data/test/gemfiles/Gemfile.rails-4.2.x

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec :path => './../..'
 
-gem 'pg'
+gem 'pg', '< 1.0.0'
+gem 'mysql2'
 gem 'activerecord', '~> 4.2.0'

data/test/gemfiles/Gemfile.rails-5.0.x

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec :path => './../..'
 
-gem 'pg'
+gem 'pg', '< 1.0.0'
+gem 'mysql2'
 gem 'activerecord', '~> 5.0.0'

data/test/test_helper.rb

@@ -7,7 +7,7 @@ DatabaseCleaner.strategy = :transaction
 I18n.available_locales = [:en, :fr]
 
 class Post < ActiveRecord::Base
-  translates :title
+  translates :title, :body_1
 end
 
 class PostDetailed < Post
@@ -23,10 +23,14 @@ class JSONTranslate::Test < Minitest::Test
 
     private
 
+    def adapter
+      @adapter ||= ENV['DB'] || 'postgres'
+    end
+
     def db_config
       @db_config ||= begin
         filepath = File.join('test', 'database.yml')
-        YAML.load_file(filepath)['test']
+        YAML.load_file(filepath)[adapter]
       end
     end
 
@@ -36,16 +40,18 @@ class JSONTranslate::Test < Minitest::Test
     end
 
     def create_database
-      system_config = db_config.merge('database' => 'postgres', 'schema_search_path' => 'public')
+      system_config = db_config
       connection = establish_connection(system_config)
       connection.create_database(db_config['database']) rescue nil
     end
 
     def create_table
+      column_type = adapter == 'mysql' ? 'json' : 'jsonb'
       connection = establish_connection(db_config)
       connection.create_table(:posts, :force => true) do |t|
-        t.column :title_translations, 'jsonb'
-        t.column :comment_translations, 'jsonb'
+        t.column :title_translations, column_type
+        t.column :body_1_translations, column_type
+        t.column :comment_translations, column_type
       end
     end
   end

data/test/translates_test.rb

@@ -4,15 +4,20 @@ require 'test_helper'
 class TranslatesTest < JSONTranslate::Test
   def test_assigns_in_current_locale
     I18n.with_locale(:en) do
-      p = Post.new(:title => "English Title")
+      p = Post.new(:title => "English Title", :body_1 => "English Body")
       assert_equal("English Title", p.title_translations['en'])
+      assert_equal("English Body", p.body_1_translations['en'])
     end
   end
 
   def test_retrieves_in_current_locale
-    p = Post.new(:title_translations => { "en" => "English Title", "fr" => "Titre français" })
+    p = Post.new(
+      :title_translations => { "en" => "English Title", "fr" => "Titre français" },
+      :body_1_translations => { "en" => "English Body", "fr" => "Corps anglais" }
+    )
     I18n.with_locale(:fr) do
       assert_equal("Titre français", p.title)
+      assert_equal("Corps anglais", p.body_1)
     end
   end
 
@@ -20,33 +25,41 @@ class TranslatesTest < JSONTranslate::Test
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => {"en" => "English Title"})
+    p = Post.new(:title_translations => {"en" => "English Title"}, :body_1_translations => { "en" => "English Body" })
     I18n.with_locale(:fr) do
       assert_equal("English Title", p.title)
+      assert_equal("English Body", p.body_1)
     end
   end
 
   def test_assigns_in_specified_locale
     I18n.with_locale(:en) do
-      p = Post.new(:title_translations => { "en" => "English Title" })
+      p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
       p.title_fr = "Titre français"
+      p.body_1_fr = "Corps anglais"
       assert_equal("Titre français", p.title_translations["fr"])
+      assert_equal("Corps anglais", p.body_1_translations["fr"])
     end
   end
 
   def test_persists_changes_in_specified_locale
     I18n.with_locale(:en) do
-      p = Post.create!(:title_translations => { "en" => "Original Text" })
+      p = Post.create!(:title_translations => { "en" => "Original Text" }, :body_1_translations => { "en" => "Original Body" })
       p.title_en = "Updated Text"
+      p.body_1_en = "Updated Body"
       p.save!
       assert_equal("Updated Text", Post.last.title_en)
+      assert_equal("Updated Body", Post.last.body_1_en)
     end
   end
 
   def test_retrieves_in_specified_locale
     I18n.with_locale(:en) do
-      p = Post.new(:title_translations => { "en" => "English Title", "fr" => "Titre français" })
+      p = Post.new(:title_translations => { "en" => "English Title", "fr" => "Titre français" }, :body_1_translations => { "en" => "English Body", "fr" => "Corps anglais" })
       assert_equal("Titre français", p.title_fr)
+      assert_equal("Corps anglais", p.body_1_fr)
+      assert_equal("English Title", p.title_en)
+      assert_equal("English Body", p.body_1_en)
     end
   end
 
@@ -54,9 +67,14 @@ class TranslatesTest < JSONTranslate::Test
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => { "en" => "English Title" })
+    p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     I18n.with_locale(:fr) do
-      assert_equal("English Title", p.title_fr)
+      assert_equal("English Title", p.title)
+      assert_equal("English Body", p.body_1)
+      assert_nil(p.title_fr)
+      assert_nil(p.body_1_fr)
+      assert_equal("English Title", p.title_en)
+      assert_equal("English Body", p.body_1_en)
     end
   end
 
@@ -64,9 +82,14 @@ class TranslatesTest < JSONTranslate::Test
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => { "en" => "English Title", "fr" => "" })
+    p = Post.new(:title_translations => { "en" => "English Title", "fr" => "" }, :body_1_translations => { "en" => "English Body", "fr" => "" })
     I18n.with_locale(:fr) do
-      assert_equal("English Title", p.title_fr)
+      assert_equal("English Title", p.title)
+      assert_equal("English Body", p.body_1)
+      assert_equal("", p.title_fr)
+      assert_equal("", p.body_1_fr)
+      assert_equal("English Title", p.title_en)
+      assert_equal("English Body", p.body_1_en)
     end
   end
 
@@ -74,10 +97,11 @@ class TranslatesTest < JSONTranslate::Test
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => { "en" => "English Title" })
+    p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.disable_fallback
     I18n.with_locale(:fr) do
-      assert_equal(nil, p.title_fr)
+      assert_nil(p.title)
+      assert_nil(p.body_1)
     end
   end
 
@@ -85,22 +109,43 @@ class TranslatesTest < JSONTranslate::Test
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => { "en" => "English Title" })
+    p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.enable_fallback
 
-    assert_equal("English Title", p.title_fr)
-    p.disable_fallback { assert_nil p.title_fr }
+    I18n.with_locale(:fr) do
+      assert_equal("English Title", p.title)
+      assert_equal("English Body", p.body_1)
+      assert_nil(p.title_fr)
+      assert_nil(p.body_1_fr)
+      assert_equal("English Title", p.title_en)
+      assert_equal("English Body", p.body_1_en)
+      yielded = p.disable_fallback do
+        assert_nil(p.title)
+        assert_nil(p.body_1)
+        assert_nil(p.title_fr)
+        assert_nil(p.body_1_fr)
+        assert_equal("English Title", p.title_en)
+        assert_equal("English Body", p.body_1_en)
+        :block_return_value
+      end
+      assert_equal(:block_return_value, yielded)
+    end
   end
 
   def test_retrieves_in_specified_locale_with_fallback_reenabled
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => { "en" => "English Title" })
+    p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.disable_fallback
     p.enable_fallback
     I18n.with_locale(:fr) do
-      assert_equal("English Title", p.title_fr)
+      assert_equal("English Title", p.title)
+      assert_equal("English Body", p.body_1)
+      assert_nil(p.title_fr)
+      assert_nil(p.body_1_fr)
+      assert_equal("English Title", p.title_en)
+      assert_equal("English Body", p.body_1_en)
     end
   end
 
@@ -108,11 +153,27 @@ class TranslatesTest < JSONTranslate::Test
     I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
     I18n.default_locale = :"en-US"
 
-    p = Post.new(:title_translations => { "en" => "English Title" })
+    p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.disable_fallback
 
-    assert_nil(p.title_fr)
-    p.enable_fallback { assert_equal("English Title", p.title_fr) }
+    I18n.with_locale(:fr) do
+      assert_nil(p.title)
+      assert_nil(p.body_1)
+      assert_nil(p.title_fr)
+      assert_nil(p.body_1_fr)
+      assert_equal("English Title", p.title_en)
+      assert_equal("English Body", p.body_1_en)
+      yielded = p.enable_fallback do
+        assert_equal("English Title", p.title)
+        assert_equal("English Body", p.body_1)
+        assert_nil(p.title_fr)
+        assert_nil(p.body_1_fr)
+        assert_equal("English Title", p.title_en)
+        assert_equal("English Body", p.body_1_en)
+        :block_return_value
+      end
+      assert_equal(:block_return_value, yielded)
+    end
   end
 
   def test_method_missing_delegates
@@ -124,22 +185,38 @@ class TranslatesTest < JSONTranslate::Test
   end
 
   def test_persists_translations_assigned_as_hash
-    p = Post.create!(:title_translations => { "en" => "English Title", "fr" => "Titre français" })
+    p = Post.create!(:title_translations => { "en" => "English Title", "fr" => "Titre français" }, :body_1_translations => { "en" => "English Body", "fr" => "Corps anglais" })
     p.reload
     assert_equal({"en" => "English Title", "fr" => "Titre français"}, p.title_translations)
+    assert_equal({"en" => "English Body", "fr" => "Corps anglais"}, p.body_1_translations)
   end
 
   def test_persists_translations_assigned_to_localized_accessors
-    p = Post.create!(:title_en => "English Title", :title_fr => "Titre français")
+    p = Post.create!(:title_en => "English Title", :title_fr => "Titre français", :body_1_en => "English Body", :body_1_fr => "Corps anglais")
     p.reload
     assert_equal({"en" => "English Title", "fr" => "Titre français"}, p.title_translations)
+    assert_equal({"en" => "English Body", "fr" => "Corps anglais"}, p.body_1_translations)
   end
 
   def test_with_translation_relation
-    p = Post.create!(:title_translations => { "en" => "Alice in Wonderland", "fr" => "Alice au pays des merveilles" })
+    p = Post.create!(:title_translations => { "en" => "Alice in Wonderland", "fr" => "Alice au pays des merveilles" }, :body_1_translations => { "en" => "English Body", "fr" => "Corps anglais" })
     I18n.with_locale(:en) do
       assert_equal p.title_en, Post.with_title_translation("Alice in Wonderland").first.try(:title)
+      assert_equal p.body_1_en, Post.with_body_1_translation("English Body").first.try(:body_1)
+    end
+  end
+
+  def test_with_interpolation_arguments
+    p = Post.create!(:title_translations => { "en" => "Alice in %{where}" })
+    I18n.with_locale(:en) do
+      assert_equal p.title(where: "Wonderland"), "Alice in Wonderland"
     end
+    assert_equal p.title_en(where: "Wonderland"), "Alice in Wonderland"
+  end
+
+  def test_for_missing_interpolation_arguments
+    p = Post.create!(:title_translations => { "en" => "Alice in %{where}" })
+    assert_equal p.title_en, "Alice in %{where}"
   end
 
   def test_class_method_translates?
@@ -153,6 +230,10 @@ class TranslatesTest < JSONTranslate::Test
         "en" => "Alice in Wonderland",
         "fr" => "Alice au pays des merveilles"
       },
+      :body_1_translations => {
+        "en" => "English Body",
+        "fr" => "Corps anglais"
+      },
       :comment_translations => {
         "en" => "Awesome book",
         "fr" => "Un livre unique"
@@ -161,11 +242,13 @@ class TranslatesTest < JSONTranslate::Test
 
     I18n.with_locale(:en) { assert_equal "Awesome book", p.comment }
     I18n.with_locale(:en) { assert_equal "Alice in Wonderland", p.title }
+    I18n.with_locale(:en) { assert_equal "English Body", p.body_1 }
     I18n.with_locale(:fr) { assert_equal "Un livre unique", p.comment }
     I18n.with_locale(:fr) { assert_equal "Alice au pays des merveilles", p.title }
+    I18n.with_locale(:fr) { assert_equal "Corps anglais", p.body_1 }
   end
 
   def test_permitted_translated_attributes
-    assert_equal [:title_en, :title_fr, :comment_en, :comment_fr], PostDetailed.permitted_translated_attributes
+    assert_equal [:title_en, :title_fr, :body_1_en, :body_1_fr, :comment_en, :comment_fr], PostDetailed.permitted_translated_attributes
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_translate
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Rob Worley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -79,7 +79,6 @@ files:
 - README.md
 - lib/json_translate.rb
 - lib/json_translate/translates.rb
-- lib/json_translate/translates/active_record_with_json_translates.rb
 - lib/json_translate/translates/instance_methods.rb
 - lib/json_translate/version.rb
 - test/database.yml
@@ -87,7 +86,7 @@ files:
 - test/gemfiles/Gemfile.rails-5.0.x
 - test/test_helper.rb
 - test/translates_test.rb
-homepage: https://github.com/cfabiaski/json_translate
+homepage: https://github.com/cfabianski/json_translate
 licenses:
 - MIT
 metadata: {}
@@ -107,14 +106,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rails I18n library for ActiveRecord model/data translation using PostgreSQL's
   JSONB datatype.
 test_files:
-- test/database.yml
-- test/gemfiles/Gemfile.rails-4.2.x
 - test/gemfiles/Gemfile.rails-5.0.x
-- test/test_helper.rb
+- test/gemfiles/Gemfile.rails-4.2.x
+- test/database.yml
 - test/translates_test.rb
+- test/test_helper.rb

data/lib/json_translate/translates/active_record_with_json_translates.rb

@@ -1,22 +0,0 @@
-module JSONTranslate
-  module Translates
-    module ActiveRecordWithJSONTranslate
-      def respond_to?(symbol, include_all = false)
-        return true if parse_translated_attribute_accessor(symbol)
-        super(symbol, include_all)
-      end
-
-      def method_missing(method_name, *args)
-        translated_attr_name, locale, assigning = parse_translated_attribute_accessor(method_name)
-
-        return super(method_name, *args) unless translated_attr_name
-
-        if assigning
-          write_json_translation(translated_attr_name, args.first, locale)
-        else
-          read_json_translation(translated_attr_name, locale)
-        end
-      end
-    end
-  end
-end