mobility 0.5.1 → 0.6.0

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

@@ -3,19 +3,23 @@ require "mobility/backends/sequel/query_methods"
 
 module Mobility
   module Backends
-    class Sequel::Column::QueryMethods < Sequel::QueryMethods
-      def initialize(attributes, _)
-        super
-        q = self
+    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 keys = q.extract_attributes(conds.first)
-              cond = conds.first.dup
-              keys.each { |attr| cond[Column.column_name_for(attr)] = cond.delete(attr) }
-              super(cond, &block)
-            else
-              super(*conds, &block)
+          %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

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

@@ -6,29 +6,36 @@ Sequel.extension :pg_json, :pg_json_ops
 
 module Mobility
   module Backends
-    class Sequel::Container::JsonQueryMethods < Sequel::QueryMethods
-      include Sequel::PgQueryMethods
-      attr_reader :column_name
-
-      def initialize(attributes, options)
-        super
-        @column_name = options[:column_name]
-        define_query_methods
-      end
+    module Sequel
+      class Container::JsonQueryMethods < QueryMethods
+        include PgQueryMethods
+        attr_reader :column_name
 
-      private
+        def initialize(attributes, options)
+          super
+          @column_name = options[:column_name]
+          define_query_methods
+        end
 
-      def matches(key, value, locale)
-        build_op(column_name)[locale].get_text(key.to_s) =~ value.to_s
-      end
+        def matches(key, locale)
+          build_op(column_name)[locale].get_text(key.to_s)
+        end
 
-      def has_locale(key, locale)
-        build_op(column_name)[locale].get_text(key.to_s) !~ nil
-      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)
+        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

@@ -6,29 +6,36 @@ Sequel.extension :pg_json, :pg_json_ops
 
 module Mobility
   module Backends
-    class Sequel::Container::JsonbQueryMethods < Sequel::QueryMethods
-      include Sequel::PgQueryMethods
-      attr_reader :column_name
-
-      def initialize(attributes, options)
-        super
-        @column_name = options[:column_name]
-        define_query_methods
-      end
+    module Sequel
+      class Container::JsonbQueryMethods < QueryMethods
+        include PgQueryMethods
+        attr_reader :column_name
 
-      private
+        def initialize(attributes, options)
+          super
+          @column_name = options[:column_name]
+          define_query_methods
+        end
 
-      def matches(key, value, locale)
-        build_op(column_name)[locale][key.to_s] =~ value.to_json
-      end
+        def matches(key, locale)
+          build_op(column_name)[locale][key.to_s]
+        end
 
-      def has_locale(key, locale)
-        build_op(column_name).has_key?(locale) & build_op(column_name)[locale].has_key?(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)
+        def build_op(key)
+          ::Sequel.pg_jsonb_op(key)
+        end
       end
+      Container.private_constant :JsonbQueryMethods
     end
   end
 end

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

@@ -9,21 +9,23 @@ Implements the {Mobility::Backends::Hstore} backend for Sequel models.
 @see Mobility::Backends::Sequel::HashValued
 
 =end
-    class Sequel::Hstore < Sequel::PgHash
-      require 'mobility/backends/sequel/hstore/query_methods'
+    module Sequel
+      class Hstore < PgHash
+        require 'mobility/backends/sequel/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/sequel/hstore/query_methods.rb

@@ -6,22 +6,29 @@ Sequel.extension :pg_hstore, :pg_hstore_ops
 
 module Mobility
   module Backends
-    class Sequel::Hstore::QueryMethods < Sequel::QueryMethods
-      include Sequel::PgQueryMethods
+    module Sequel
+      class Hstore::QueryMethods < QueryMethods
+        include PgQueryMethods
 
-      private
+        def matches(key, locale)
+          build_op(key)[locale]
+        end
 
-      def matches(key, value, locale)
-        build_op(key)[locale] =~ value.to_s
-      end
+        def exists(key, locale)
+          build_op(key).has_key?(locale)
+        end
 
-      def has_locale(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(key)
+        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.rb

@@ -9,28 +9,30 @@ Implements the {Mobility::Backends::Json} backend for Sequel models.
 @see Mobility::Backends::Sequel::HashValued
 
 =end
-    class Sequel::Json < Sequel::PgHash
-      require 'mobility/backends/sequel/json/query_methods'
+    module Sequel
+      class Json < PgHash
+        require 'mobility/backends/sequel/json/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/sequel/json/query_methods.rb

@@ -6,22 +6,29 @@ Sequel.extension :pg_json, :pg_json_ops
 
 module Mobility
   module Backends
-    class Sequel::Json::QueryMethods < Sequel::QueryMethods
-      include Sequel::PgQueryMethods
+    module Sequel
+      class Json::QueryMethods < QueryMethods
+        include PgQueryMethods
 
-      private
+        def matches(key, locale)
+          build_op(key).get_text(locale)
+        end
 
-      def matches(key, value, locale)
-        build_op(key).get_text(locale) =~ value.to_s
-      end
+        def exists(key, locale)
+          matches(key, locale) !~ nil
+        end
 
-      def has_locale(key, locale)
-        build_op(key).get_text(locale) !~ nil
-      end
+        def quote(value)
+          value && value.to_s
+        end
+
+        private
 
-      def build_op(key)
-        ::Sequel.pg_json_op(key)
+        def build_op(key)
+          ::Sequel.pg_json_op(column_name(key))
+        end
       end
+      Json.private_constant :QueryMethods
     end
   end
 end

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

@@ -9,28 +9,30 @@ Implements the {Mobility::Backends::Jsonb} backend for Sequel models.
 @see Mobility::Backends::Sequel::HashValued
 
 =end
-    class Sequel::Jsonb < Sequel::PgHash
-      require 'mobility/backends/sequel/jsonb/query_methods'
+    module Sequel
+      class Jsonb < PgHash
+        require 'mobility/backends/sequel/jsonb/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/sequel/jsonb/query_methods.rb

@@ -6,22 +6,29 @@ Sequel.extension :pg_json, :pg_json_ops
 
 module Mobility
   module Backends
-    class Sequel::Jsonb::QueryMethods < Sequel::QueryMethods
-      include Sequel::PgQueryMethods
+    module Sequel
+      class Jsonb::QueryMethods < QueryMethods
+        include PgQueryMethods
 
-      private
+        def matches(key, locale)
+          build_op(key)[locale]
+        end
 
-      def matches(key, value, locale)
-        build_op(key)[locale] =~ value.to_json
-      end
+        def exists(key, locale)
+          build_op(key).has_key?(locale)
+        end
 
-      def has_locale(key, locale)
-        build_op(key).has_key?(locale)
-      end
+        def quote(value)
+          value && value.to_json
+        end
+
+        private
 
-      def build_op(key)
-        ::Sequel.pg_jsonb_op(key)
+        def build_op(key)
+          ::Sequel.pg_jsonb_op(column_name(key))
+        end
       end
+      Jsonb.private_constant :QueryMethods
     end
   end
 end

data/lib/mobility/backends/sequel/key_value.rb

@@ -37,19 +37,18 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
       end
 
       # @!group Backend Configuration
-      # @option options [Symbol,String] type (:text) Column type to use
-      # @option options [Symbol] associaiton_name (:text_translations) Name of association method
-      # @option options [Symbol] class_name ({Mobility::Sequel::TextTranslation}) Translation class
+      # @option (see Mobility::Backends::KeyValue::ClassMethods#configure)
+      # @raise (see Mobility::Backends::KeyValue::ClassMethods#configure)
       # @raise [CacheRequired] if cache is disabled
-      # @raise [ArgumentError] if type is not either :text or :string
       def self.configure(options)
-        super
         raise CacheRequired, "Cache required for Sequel::KeyValue backend" if options[:cache] == false
-        type = options[:type]
-        options[:class_name] ||= Mobility::Sequel.const_get("#{type.capitalize}Translation")
-        options[:class_name] = options[:class_name].constantize if options[:class_name].is_a?(String)
-        options[:association_name] ||= :"#{options[:type]}_translations"
-        %i[type association_name].each { |key| options[key] = options[key].to_sym }
+        super
+        if type = options[:type]
+          options[:association_name] ||= :"#{options[:type]}_translations"
+          options[:class_name]       ||= Mobility::Sequel.const_get("#{type.capitalize}Translation")
+        end
+      rescue NameError
+        raise ArgumentError, "You must define a Mobility::Sequel::#{type.capitalize}Translation class."
       end
       # @!endgroup
 
@@ -84,7 +83,7 @@ Implements the {Mobility::Backends::KeyValue} backend for Sequel models.
         include callback_methods
 
         include DestroyKeyValueTranslations
-        include Mobility::Sequel::ColumnChanges.new(*attributes)
+        include Mobility::Sequel::ColumnChanges.new(attributes)
       end
 
       setup_query_methods(QueryMethods)