mobility 0.5.1 → 0.6.0

data/lib/mobility/adapter.rb

@@ -16,4 +16,5 @@ Provides interface to access attributes across all backends of an instance.
       @model.send(Backend.method_name(attribute))
     end
   end
+  private_constant :Adapter
 end

data/lib/mobility/attributes.rb

@@ -153,7 +153,7 @@ with other backends.
         plugin.apply(self, options[name])
       end
 
-      names.each do |name|
+      each do |name|
         define_backend(name)
         define_reader(name) if %i[accessor reader].include?(method)
         define_writer(name) if %i[accessor writer].include?(method)
@@ -169,18 +169,8 @@ with other backends.
       names.each(&block)
     end
 
-    # Process options passed into accessor method before calling backend, and
-    # return locale
-    # @deprecated This method was mainly used internally but is no longer
-    #   needed. It will be removed in the next major release.
-    # @param [Hash] options Options hash passed to accessor method
-    # @return [Symbol] locale
-    # TODO: Remove in v1.0
-    def self.process_options!(options)
-      (options[:locale] || Mobility.locale).tap { |locale|
-        Mobility.enforce_available_locales!(locale)
-        options[:locale] &&= !!locale
-      }.to_sym
+    def inspect
+      "#<Attributes (#{backend_name}) @names=#{names.join(", ")}>"
     end
 
     private

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

@@ -19,6 +19,7 @@ or locales.)
 
 @example
   class Post < ActiveRecord::Base
+    extend Mobility
     translates :title, backend: :column
   end
 

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

@@ -3,35 +3,40 @@ require "mobility/backends/active_record/query_methods"
 
 module Mobility
   module Backends
-    class ActiveRecord::Column::QueryMethods < ActiveRecord::QueryMethods
-      def initialize(attributes, _)
-        super
-        q = self
+    module ActiveRecord
+      class Column::QueryMethods < QueryMethods
+        def initialize(attributes, _)
+          super
+          q = self
 
-        define_method :where! do |opts, *rest|
-          super(q.convert_opts(opts), *rest)
+          define_method :where! do |opts, *rest|
+            super(q.convert_opts(opts), *rest)
+          end
         end
-      end
 
-      def extended(relation)
-        super
-        q = self
+        def extended(relation)
+          super
+          q = self
 
-        mod = Module.new do
-          define_method :not do |opts, *rest|
-            super(q.convert_opts(opts), *rest)
+          mod = Module.new do
+            define_method :not do |opts, *rest|
+              super(q.convert_opts(opts), *rest)
+            end
           end
+          relation.mobility_where_chain.include(mod)
         end
-        relation.mobility_where_chain.include(mod)
-      end
 
-      def convert_opts(opts)
-        if i18n_keys = extract_attributes(opts)
-          opts = opts.with_indifferent_access
-          i18n_keys.each { |attr| opts[Column.column_name_for(attr)] = opts.delete(attr) }
+        def convert_opts(opts)
+          if i18n_keys = extract_attributes(opts)
+            opts = opts.with_indifferent_access
+            i18n_keys.each do |attr|
+              opts[Backends::Column.column_name_for(attr)] = collapse opts.delete(attr)
+            end
+          end
+          opts
         end
-        opts
       end
+      Column.private_constant :QueryMethods
     end
   end
 end

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

@@ -4,27 +4,33 @@ require "mobility/backends/active_record/query_methods"
 
 module Mobility
   module Backends
-    class ActiveRecord::Container::JsonQueryMethods < ActiveRecord::QueryMethods
-      include ActiveRecord::PgQueryMethods
-      attr_reader :column_name, :column
+    module ActiveRecord
+      class Container::JsonQueryMethods < QueryMethods
+        include PgQueryMethods
+        attr_reader :column_name, :column
 
-      def initialize(_attributes, options)
-        super
-        @column_name = options[:column_name]
-        @column      = arel_table[@column_name]
-      end
+        def initialize(_attributes, options)
+          super
+          @column = arel_table[options[:column_name]]
+        end
 
-      private
+        def matches(key, locale)
+          build_infix(:'->>', build_infix(:'->', column, build_quoted(locale)), build_quoted(key))
+        end
 
-      def matches(key, value, locale)
-        build_infix(:'->>',
-                    build_infix(:'->', column, quote(locale)),
-                    quote(key)).eq(value && value.to_s)
-      end
+        def exists(key, locale)
+          matches(key, locale).eq(nil).not
+        end
+
+        def absent(key, locale)
+          matches(key, locale).eq(nil)
+        end
 
-      def has_locale(key, locale)
-        matches(key, nil, locale).not
+        def quote(value)
+          value.to_s
+        end
       end
+      Container.private_constant :JsonQueryMethods
     end
   end
 end

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

@@ -4,30 +4,30 @@ require "mobility/backends/active_record/query_methods"
 
 module Mobility
   module Backends
-    class ActiveRecord::Container::JsonbQueryMethods < ActiveRecord::QueryMethods
-      include ActiveRecord::PgQueryMethods
-      attr_reader :column_name, :column
+    module ActiveRecord
+      class Container::JsonbQueryMethods < QueryMethods
+        include PgQueryMethods
+        attr_reader :column
 
-      def initialize(_attributes, options)
-        super
-        @column_name = options[:column_name]
-        @column      = arel_table[@column_name]
-      end
+        def initialize(_attributes, options)
+          super
+          @column = arel_table[options[:column_name]]
+        end
 
-      private
+        def matches(key, locale)
+          build_infix(:'->', build_infix(:'->', column, build_quoted(locale)), build_quoted(key))
+        end
 
-      def matches(key, value, locale)
-        build_infix(:'->',
-                    build_infix(:'->', column, quote(locale)),
-                    quote(key)).eq(quote(value.to_json))
-      end
+        def exists(key, locale)
+          build_infix(:'?', column, build_quoted(locale)).and(
+            build_infix(:'?', build_infix(:'->', column, build_quoted(locale)), build_quoted(key)))
+        end
 
-      def has_locale(key, locale)
-        build_infix(:'?', column, quote(locale)).and(
-          build_infix(:'?',
-                      build_infix(:'->', column, quote(locale)),
-                      quote(key)))
+        def quote(value)
+          build_quoted(value.to_json)
+        end
       end
+      Container.private_constant :JsonbQueryMethods
     end
   end
 end

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

@@ -9,21 +9,23 @@ Implements the {Mobility::Backends::Hstore} backend for ActiveRecord models.
 @see Mobility::Backends::ActiveRecord::HashValued
 
 =end
-    class ActiveRecord::Hstore < ActiveRecord::PgHash
-      require 'mobility/backends/active_record/hstore/query_methods'
+    module ActiveRecord
+      class Hstore < PgHash
+        require 'mobility/backends/active_record/hstore/query_methods'
 
-      # @!group Backend Accessors
-      # @!macro backend_reader
-      # @!method read(locale, **options)
+        # @!group Backend Accessors
+        # @!macro backend_reader
+        # @!method read(locale, **options)
 
-      # @!group Backend Accessors
-      # @!macro backend_writer
-      def write(locale, value, options = {})
-        super(locale, value && value.to_s, options)
-      end
-      # @!endgroup
+        # @!group Backend Accessors
+        # @!macro backend_writer
+        def write(locale, value, options = {})
+          super(locale, value && value.to_s, options)
+        end
+        # @!endgroup
 
-      setup_query_methods(QueryMethods)
+        setup_query_methods(QueryMethods)
+      end
     end
   end
 end

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

@@ -3,14 +3,23 @@ require 'mobility/backends/active_record/query_methods'
 
 module Mobility
   module Backends
-    class ActiveRecord::Hstore::QueryMethods < ActiveRecord::QueryMethods
-      include ActiveRecord::PgQueryMethods
+    module ActiveRecord
+      class Hstore::QueryMethods < QueryMethods
+        include PgQueryMethods
 
-      private
+        def matches(key, locale)
+          build_infix(:'->', arel_table[column_name(key)], build_quoted(locale))
+        end
 
-      def matches(key, value, locale)
-        build_infix(:'->', arel_table[key], quote(locale)).eq(quote(value.to_s))
+        def exists(key, locale)
+          build_infix(:'?', arel_table[column_name(key)], build_quoted(locale))
+        end
+
+        def quote(value)
+          build_quoted(value)
+        end
       end
+      Hstore.private_constant :QueryMethods
     end
   end
 end

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

@@ -9,28 +9,30 @@ Implements the {Mobility::Backends::Json} backend for ActiveRecord models.
 @see Mobility::Backends::ActiveRecord::HashValued
 
 =end
-    class ActiveRecord::Json < ActiveRecord::PgHash
-      require 'mobility/backends/active_record/json/query_methods'
+    module ActiveRecord
+      class Json < PgHash
+        require 'mobility/backends/active_record/json/query_methods'
 
-      # @!group Backend Accessors
-      #
-      # @note Translation may be string, integer or boolean-valued since
-      #   value is stored on a JSON hash.
-      # @param [Symbol] locale Locale to read
-      # @param [Hash] options
-      # @return [String,Integer,Boolean] Value of translation
-      # @!method read(locale, **options)
+        # @!group Backend Accessors
+        #
+        # @note Translation may be string, integer or boolean-valued since
+        #   value is stored on a JSON hash.
+        # @param [Symbol] locale Locale to read
+        # @param [Hash] options
+        # @return [String,Integer,Boolean] Value of translation
+        # @!method read(locale, **options)
 
-      # @!group Backend Accessors
-      # @note Translation may be string, integer or boolean-valued since
-      #   value is stored on a JSON hash.
-      # @param [Symbol] locale Locale to write
-      # @param [String,Integer,Boolean] value Value to write
-      # @param [Hash] options
-      # @return [String,Integer,Boolean] Updated value
-      # @!method write(locale, value, **options)
+        # @!group Backend Accessors
+        # @note Translation may be string, integer or boolean-valued since
+        #   value is stored on a JSON hash.
+        # @param [Symbol] locale Locale to write
+        # @param [String,Integer,Boolean] value Value to write
+        # @param [Hash] options
+        # @return [String,Integer,Boolean] Updated value
+        # @!method write(locale, value, **options)
 
-      setup_query_methods(QueryMethods)
+        setup_query_methods(QueryMethods)
+      end
     end
   end
 end

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

@@ -4,22 +4,27 @@ require "mobility/backends/active_record/query_methods"
 
 module Mobility
   module Backends
-    class ActiveRecord::Json::QueryMethods < ActiveRecord::QueryMethods
-      include ActiveRecord::PgQueryMethods
+    module ActiveRecord
+      class Json::QueryMethods < QueryMethods
+        include PgQueryMethods
 
-      private
+        def matches(key, locale)
+          build_infix(:'->>', arel_table[column_name(key)], build_quoted(locale))
+        end
 
-      def matches(key, value, locale)
-        build_locale_infix(key, locale).eq(value.to_s)
-      end
+        def exists(key, locale)
+          absent(key, locale).not
+        end
 
-      def has_locale(key, locale)
-        build_locale_infix(key, locale).eq(nil).not
-      end
+        def absent(key, locale)
+          matches(key, locale).eq(nil)
+        end
 
-      def build_locale_infix(key, locale)
-        build_infix(:'->>', arel_table[key], quote(locale))
+        def quote(value)
+          value.to_s
+        end
       end
+      Json.private_constant :QueryMethods
     end
   end
 end

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

@@ -9,28 +9,30 @@ Implements the {Mobility::Backends::Jsonb} backend for ActiveRecord models.
 @see Mobility::Backends::ActiveRecord::HashValued
 
 =end
-    class ActiveRecord::Jsonb < ActiveRecord::PgHash
-      require 'mobility/backends/active_record/jsonb/query_methods'
+    module ActiveRecord
+      class Jsonb < PgHash
+        require 'mobility/backends/active_record/jsonb/query_methods'
 
-      # @!group Backend Accessors
-      #
-      # @note Translation may be any json type, but querying will only work on
-      #   string-typed values.
-      # @param [Symbol] locale Locale to read
-      # @param [Hash] options
-      # @return [String,Integer,Boolean] Value of translation
-      # @!method read(locale, **options)
+        # @!group Backend Accessors
+        #
+        # @note Translation may be any json type, but querying will only work on
+        #   string-typed values.
+        # @param [Symbol] locale Locale to read
+        # @param [Hash] options
+        # @return [String,Integer,Boolean] Value of translation
+        # @!method read(locale, **options)
 
-      # @!group Backend Accessors
-      # @note Translation may be any json type, but querying will only work on
-      #   string-typed values.
-      # @param [Symbol] locale Locale to write
-      # @param [String,Integer,Boolean] value Value to write
-      # @param [Hash] options
-      # @return [String,Integer,Boolean] Updated value
-      # @!method write(locale, value, **options)
+        # @!group Backend Accessors
+        # @note Translation may be any json type, but querying will only work on
+        #   string-typed values.
+        # @param [Symbol] locale Locale to write
+        # @param [String,Integer,Boolean] value Value to write
+        # @param [Hash] options
+        # @return [String,Integer,Boolean] Updated value
+        # @!method write(locale, value, **options)
 
-      setup_query_methods(QueryMethods)
+        setup_query_methods(QueryMethods)
+      end
     end
   end
 end

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

@@ -4,14 +4,23 @@ require "mobility/backends/active_record/query_methods"
 
 module Mobility
   module Backends
-    class ActiveRecord::Jsonb::QueryMethods < ActiveRecord::QueryMethods
-      include ActiveRecord::PgQueryMethods
+    module ActiveRecord
+      class Jsonb::QueryMethods < QueryMethods
+        include PgQueryMethods
 
-      private
+        def matches(key, locale)
+          build_infix(:'->', arel_table[column_name(key)], build_quoted(locale))
+        end
 
-      def matches(key, value, locale)
-        build_infix(:'->', arel_table[key], quote(locale)).eq(quote(value.to_json))
+        def exists(key, locale)
+          build_infix(:'?', arel_table[column_name(key)], build_quoted(locale))
+        end
+
+        def quote(value)
+          build_quoted(value.to_json)
+        end
       end
+      Jsonb.private_constant :QueryMethods
     end
   end
 end