mobility 0.7.6 → 0.8.0

data/lib/mobility/sequel.rb

@@ -5,19 +5,5 @@ Module loading Sequel-specific classes for Mobility models.
 
 =end
   module Sequel
-    def self.included(model_class)
-      model_class.extend DatasetMethod.new(Mobility.query_method)
-    end
-
-    class DatasetMethod < Module
-      def initialize(query_method)
-        module_eval <<-EOM, __FILE__, __LINE__ + 1
-          def #{query_method}
-            dataset
-          end
-        EOM
-      end
-    end
-    private_constant :DatasetMethod
   end
 end

data/lib/mobility/sequel/sql.rb

@@ -0,0 +1,16 @@
+module Mobility
+  module Sequel
+    module SQL
+      class QualifiedIdentifier < ::Sequel::SQL::QualifiedIdentifier
+        attr_reader :backend_class, :locale, :attribute_name
+
+        def initialize(table, column, locale, backend_class, attribute_name: nil)
+          @backend_class = backend_class
+          @locale = locale
+          @attribute_name = attribute_name || column
+          super(table, column)
+        end
+      end
+    end
+  end
+end

data/lib/mobility/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mobility
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

data/lib/rails/generators/mobility/templates/column_translations.rb

@@ -1,7 +1,7 @@
 class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
 <% attributes.each do |attribute| -%>
-<% I18n.available_locales.each do |locale| -%>
+<% Mobility.available_locales.each do |locale| -%>
 <% column_name = Mobility.normalize_locale_accessor(attribute.name, locale) -%>
 <% if connection.column_exists?(table_name, column_name) -%>
 <% warn "#{column_name} already exists, skipping." -%>

data/lib/rails/generators/mobility/templates/initializer.rb

@@ -62,8 +62,9 @@ Mobility.configure do |config|
   # config.default_options[:default] = ...
 
   # Uncomment to enable locale_accessors by default on models. A true value
-  # will use the locales defined in I18n.available_locales. If you want
-  # something else, pass an array of locales instead.
+  # will use the locales defined either in
+  # Rails.application.config.i18n.available_locales or I18n.available_locales.
+  # If you want something else, pass an array of locales instead.
   #
   # config.default_options[:locale_accessors] = true
 

data/lib/rails/generators/mobility/translations_generator.rb

@@ -23,7 +23,7 @@ For the +table+ backend, the generator will either create a translation table
 exists.
 
 For the +column+ backend, the generator will add columns for all locales in
-+I18n.available_locales+. If some columns already exist, they will simply be
++Mobility.available_locales+. If some columns already exist, they will simply be
 skipped.
 
 Other backends are not supported, for obvious reasons:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Salzberg
@@ -10,27 +10,32 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ4wDAYDVQQDDAVjaHJp
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQ4wDAYDVQQDDAVjaHJp
   czEYMBYGCgmSJomT8ixkARkWCGRlamltYXRhMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE3MDgxMTE0NDU0N1oXDTE4MDgxMTE0NDU0N1owPzEOMAwGA1UEAwwFY2hy
+  MB4XDTE4MDkxMTA3MTIxOVoXDTE5MDkxMTA3MTIxOVowPzEOMAwGA1UEAwwFY2hy
   aXMxGDAWBgoJkiaJk/IsZAEZFghkZWppbWF0YTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4/1rb97IE2+aDbwqO0
-  BdbiS9QONr9mZRyTCSVkKh4XY+Ex3XzoJSK/qj0E6eRb2K8Lsc8JNZra+1h6do8H
-  dkl+GfFcHnWVuDkt17YcZuK/uAaxFOlWGVbFIdGxYz94rBddWGh3bOxqQGr3YtdD
-  Ajj1foUnsPmxQ0j8p8vAJhHM0h0MTyphFxMT5xTDJkprVQOiktfWQBL+76jx/UQ4
-  UXczbSgaObaUzvNM7ggi7+PPNG4S39SafjQ0MM/QvBZ31B6tN1KuzluKFhAMC+sH
-  NofRUmYbrjZiCId6WCepJz48/fel6BtQ8CQGcQShx+eYOKEWRBiDkhpIil5JVaxi
-  NucCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFAzG
-  77899+wndUmwUTLUD8z+YnnwMB0GA1UdEQQWMBSBEmNocmlzQGRlamltYXRhLmNv
-  bTAdBgNVHRIEFjAUgRJjaHJpc0BkZWppbWF0YS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAGP58/sXe/VX8dZ74Ih5VscaWOHZqfT5VzsremZS2899Mf+MaSDhMmdYx8b7
-  e8Muzpi0V7EIbP0+QeocepYHugyodeoKerqaLEPQ0yCbUbfNAZd9HwkpFbd8hA/J
-  Nt2Az+BsBS0COBZKnruEqXA2AbrDua/ifSAjQMPBKCJ8nPQqRQf5A1hcP71yO3du
-  8t13MBd1vS8/4nYUoCQnOCTA8A1Lj6RSbQWyS1zZHq7hDm9hmgvvcIMGOkBCcFhy
-  eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
-  SZBPXjzrHdyOFLBYXB+PG7s3F/4=
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANhITJvJIMVXZJm7M4ci
+  SEY+ou/ugebCkfEZ7kJ+hKoprQixv/ox9WfFo8Mfdtw5XUHkmDate3yQ//yJ319Q
+  VxhM9/DDGffMJIQ0R5MRHF0wplKwlJfuoLqDRashBWqMaTzQZIGmUaYLFlLsbGhG
+  pYui/LixfEoGM6BJPJQa22gCTayLoOedj0UZRY60o50a7HquAl175DbC/pcvL/2u
+  sWfVUbY4ml+E/Y8ImSzzQ9281sf/qKAccbM4tOTRXCzf45aBpkfpgoNez7QUcO75
+  u84QlyBfrSjF3If7/i0N8XQoTm59XJqeoyoRUrs/9onzEK8FWcwRpjc2jnwwrS3G
+  FOS69dScNMJRhF/WCD0CiFr/x9TbcddANAv1dTo09ZIa9F4qYIXmrTbRVxedYp4J
+  53yhhrmYKgPIIFgRwpZ4PLopBzcoqDQEDN2S7bF0uQKZEOFWmxFW0gSkais/kUQs
+  +KBOLR+hZE+XY9e9AF5sPFPI1cCVlzWycYYyj+q3esZNMQIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUnl91HnXC+LP5WR3+xHTBPFpe
+  7BwwHQYDVR0RBBYwFIESY2hyaXNAZGVqaW1hdGEuY29tMB0GA1UdEgQWMBSBEmNo
+  cmlzQGRlamltYXRhLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAbRUo4qXHMGMniB7t
+  2TGnmV+pOhih+gMPUN15/fQNLITc2GCgNYeZNWLdhXvKI15EWD+kyZYuRy9TI7IJ
+  8MJuh7C0llSB0MB8Q83T/V1cyG714fvrove6Ki8RgjQ+JMjN23zleaVIenhJu5mS
+  7Yg4RkKmt3DaYiLP7GCzAaFMUFVhNyEmXVFcuVXgE2FO5SPUABegJS4S8hY/f/Wr
+  nLKv9tCpXO8np++HNp2ryj7Z54/eQ1KaqzodRL31HBuFkpzmm5Y34Hf9faaITeOJ
+  wLSx9yXQpNtMvtxj66ztwWR75HPP2ZsujTtLMxhRO74gADdIujX9FTQHmn3YaJ24
+  8abCZ79sPvLP9FaOM2lLbzA+C/QWSTDAzNtyxS3+hOZsCyjRew8rpmhbGSoiCkJy
+  m46ezJjnr4uXgSNuTs+RdM6DtrKaFG2HuziSP+dzmWqZiUgj1eTACYsPwfF/Z1Z6
+  2DiDkec/SK4qJBMlNYPo/PTZuh5m1jROtf/hyS0VXJmm+uWc
   -----END CERTIFICATE-----
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -66,20 +71,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +183,6 @@ files:
 - lib/mobility/backends/active_record/jsonb.rb
 - lib/mobility/backends/active_record/key_value.rb
 - lib/mobility/backends/active_record/pg_hash.rb
-- lib/mobility/backends/active_record/query_methods.rb
 - lib/mobility/backends/active_record/serialized.rb
 - lib/mobility/backends/active_record/table.rb
 - lib/mobility/backends/column.rb
@@ -205,25 +195,14 @@ files:
 - lib/mobility/backends/null.rb
 - lib/mobility/backends/sequel.rb
 - lib/mobility/backends/sequel/column.rb
-- lib/mobility/backends/sequel/column/query_methods.rb
 - lib/mobility/backends/sequel/container.rb
-- lib/mobility/backends/sequel/container/json_query_methods.rb
-- lib/mobility/backends/sequel/container/jsonb_query_methods.rb
 - lib/mobility/backends/sequel/hstore.rb
-- lib/mobility/backends/sequel/hstore/query_methods.rb
 - lib/mobility/backends/sequel/json.rb
-- lib/mobility/backends/sequel/json/query_methods.rb
 - lib/mobility/backends/sequel/jsonb.rb
-- lib/mobility/backends/sequel/jsonb/query_methods.rb
 - lib/mobility/backends/sequel/key_value.rb
-- lib/mobility/backends/sequel/key_value/query_methods.rb
 - lib/mobility/backends/sequel/pg_hash.rb
-- lib/mobility/backends/sequel/pg_query_methods.rb
-- lib/mobility/backends/sequel/query_methods.rb
 - lib/mobility/backends/sequel/serialized.rb
-- lib/mobility/backends/sequel/serialized/query_methods.rb
 - lib/mobility/backends/sequel/table.rb
-- lib/mobility/backends/sequel/table/query_methods.rb
 - lib/mobility/backends/serialized.rb
 - lib/mobility/backends/table.rb
 - lib/mobility/configuration.rb
@@ -249,11 +228,13 @@ files:
 - lib/mobility/plugins/query.rb
 - lib/mobility/plugins/sequel.rb
 - lib/mobility/plugins/sequel/dirty.rb
+- lib/mobility/plugins/sequel/query.rb
 - lib/mobility/sequel.rb
 - lib/mobility/sequel/backend_resetter.rb
 - lib/mobility/sequel/column_changes.rb
 - lib/mobility/sequel/hash_initializer.rb
 - lib/mobility/sequel/model_translation.rb
+- lib/mobility/sequel/sql.rb
 - lib/mobility/sequel/string_translation.rb
 - lib/mobility/sequel/text_translation.rb
 - lib/mobility/sequel/translation.rb
@@ -286,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.9
+      version: 2.3.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

metadata.gz.sig

@@ -1 +1 @@
-d��/഍i_�!��9LE]�,�
+�m�y����}P$��@���g����;����e�w��>/�iz��5D�K9+�PT��l^�'ړ��pN��lj�l���w�1rx�yUyV\82|�h9\��-�I�K�‹ޙf������<�[��X#�Y�3��վ*�ƒ�YR
���_8���|�^��f�5��Ove�\��*�����h�L�;+gV�ԍ+��!���t��t��)����qߛmn<�J:p���j3H�(
/3��1�R,i~�y���)�n�\y*����T

data/lib/mobility/backends/active_record/query_methods.rb

@@ -1,50 +0,0 @@
-module Mobility
-  module Backends
-    module ActiveRecord
-=begin
-
-Defines query method overrides to handle translated attributes for ActiveRecord
-models. For details see backend-specific subclasses.
-
-=end
-      class QueryMethods < Module
-        # @param [Array<String>] attributes Translated attributes
-        def initialize(attributes, _)
-          @attributes = attributes
-
-          attributes.each do |attribute|
-            define_method :"find_by_#{attribute}" do |value|
-              find_by(attribute.to_sym => value)
-            end
-          end
-        end
-
-        # @param [ActiveRecord::Relation] relation Relation being extended
-        # @note Only want to define this once, even if multiple QueryMethods
-        #   modules are included, so include it here into the singleton class.
-        def extended(relation)
-          relation.singleton_class.include WhereChainable
-        end
-
-        def extract_attributes(opts)
-          opts.is_a?(Hash) && (opts.keys.map(&:to_s) & @attributes).presence
-        end
-
-        def collapse(value)
-          value.is_a?(Array) ? value.uniq : value
-        end
-      end
-
-      module WhereChainable
-        def where(opts = :chain, *rest)
-          opts == :chain ? mobility_where_chain.new(spawn) : super
-        end
-
-        def mobility_where_chain
-          @mobility_where_chain ||= Class.new(::ActiveRecord::QueryMethods::WhereChain)
-        end
-      end
-      private_constant :QueryMethods, :WhereChainable
-    end
-  end
-end

data/lib/mobility/backends/sequel/column/query_methods.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-require "mobility/backends/sequel/query_methods"
-
-module Mobility
-  module Backends
-    module Sequel
-      class Column::QueryMethods < QueryMethods
-        def initialize(attributes, _)
-          super
-          q = self
-
-          %w[exclude or where].each do |method_name|
-            define_method method_name do |*conds, &block|
-              if i18n_keys = q.extract_attributes(conds.first)
-                cond = conds.first.dup
-                i18n_keys.each do |attr|
-                  cond[Backends::Column.column_name_for(attr)] = q.collapse cond.delete(attr)
-                end
-                super(cond, &block)
-              else
-                super(*conds, &block)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/mobility/backends/sequel/container/json_query_methods.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-require "mobility/backends/sequel/pg_query_methods"
-require "mobility/backends/sequel/query_methods"
-
-Sequel.extension :pg_json, :pg_json_ops
-
-module Mobility
-  module Backends
-    module Sequel
-      class Container::JsonQueryMethods < QueryMethods
-        include PgQueryMethods
-        attr_reader :column_name
-
-        def initialize(attributes, options)
-          super
-          @column_name = options[:column_name]
-          define_query_methods
-        end
-
-        def matches(key, locale)
-          build_op(column_name)[locale].get_text(key.to_s)
-        end
-
-        def exists(key, locale)
-          matches(key, locale) !~ nil
-        end
-
-        def quote(value)
-          value && value.to_s
-        end
-
-        private
-
-        def build_op(key)
-          ::Sequel.pg_json_op(key)
-        end
-      end
-      Container.private_constant :JsonQueryMethods
-    end
-  end
-end

data/lib/mobility/backends/sequel/container/jsonb_query_methods.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-require "mobility/backends/sequel/pg_query_methods"
-require "mobility/backends/sequel/query_methods"
-
-Sequel.extension :pg_json, :pg_json_ops
-
-module Mobility
-  module Backends
-    module Sequel
-      class Container::JsonbQueryMethods < QueryMethods
-        include PgQueryMethods
-        attr_reader :column_name
-
-        def initialize(attributes, options)
-          super
-          @column_name = options[:column_name]
-          define_query_methods
-        end
-
-        def matches(key, locale)
-          build_op(column_name)[locale][key.to_s]
-        end
-
-        def exists(key, locale)
-          build_op(column_name).has_key?(locale) & build_op(column_name)[locale].has_key?(key.to_s)
-        end
-
-        def quote(value)
-          value && value.to_json
-        end
-
-        private
-
-        def build_op(key)
-          ::Sequel.pg_jsonb_op(key)
-        end
-      end
-      Container.private_constant :JsonbQueryMethods
-    end
-  end
-end

data/lib/mobility/backends/sequel/hstore/query_methods.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require 'mobility/backends/sequel/pg_query_methods'
-require "mobility/backends/sequel/query_methods"
-
-Sequel.extension :pg_hstore, :pg_hstore_ops
-
-module Mobility
-  module Backends
-    module Sequel
-      class Hstore::QueryMethods < QueryMethods
-        include PgQueryMethods
-
-        def matches(key, locale)
-          build_op(key)[locale]
-        end
-
-        def exists(key, locale)
-          build_op(key).has_key?(locale)
-        end
-
-        def quote(value)
-          value && value.to_s
-        end
-
-        private
-
-        def build_op(key)
-          ::Sequel.hstore_op(column_name(key))
-        end
-      end
-      Hstore.private_constant :QueryMethods
-    end
-  end
-end

data/lib/mobility/backends/sequel/json/query_methods.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require "mobility/backends/sequel/pg_query_methods"
-require "mobility/backends/sequel/query_methods"
-
-Sequel.extension :pg_json, :pg_json_ops
-
-module Mobility
-  module Backends
-    module Sequel
-      class Json::QueryMethods < QueryMethods
-        include PgQueryMethods
-
-        def matches(key, locale)
-          build_op(key).get_text(locale)
-        end
-
-        def exists(key, locale)
-          matches(key, locale) !~ nil
-        end
-
-        def quote(value)
-          value && value.to_s
-        end
-
-        private
-
-        def build_op(key)
-          ::Sequel.pg_json_op(column_name(key))
-        end
-      end
-      Json.private_constant :QueryMethods
-    end
-  end
-end