mobility 1.0.0.beta2 → 1.0.0.rc1

data/lib/mobility/plugins/arel/nodes.rb

@@ -0,0 +1,15 @@
+# frozen-string-literal: true
+module Mobility
+  module Plugins
+    module Arel
+      module Nodes
+        class Binary < ::Arel::Nodes::Binary; end
+        class Grouping < ::Arel::Nodes::Grouping; end
+
+        ::Arel::Visitors::ToSql.class_eval do
+          alias :visit_Mobility_Plugins_Arel_Nodes_Grouping :visit_Arel_Nodes_Grouping
+        end
+      end
+    end
+  end
+end

data/lib/mobility/plugins/arel/nodes/pg_ops.rb

@@ -0,0 +1,134 @@
+# frozen-string-literal: true
+require "mobility/plugins/arel"
+
+module Mobility
+  module Plugins
+    module Arel
+      module Nodes
+        %w[
+          JsonDashArrow
+          JsonDashDoubleArrow
+          JsonbDashArrow
+          JsonbDashDoubleArrow
+          JsonbQuestion
+          HstoreDashArrow
+          HstoreQuestion
+        ].each do |name|
+          const_set name, (Class.new(Binary) do
+            include ::Arel::Predications
+            include ::Arel::OrderPredications
+            include ::Arel::AliasPredication
+            include MobilityExpressions
+
+            def lower
+              super self
+            end
+          end)
+        end
+
+        # Needed for AR 4.2, can be removed when support is deprecated
+        if ::ActiveRecord::VERSION::STRING < '5.0'
+          [JsonbDashDoubleArrow, HstoreDashArrow].each do |klass|
+            klass.class_eval do
+              def quoted_node other
+                other && super
+              end
+            end
+          end
+        end
+
+        class Jsonb  < JsonbDashDoubleArrow
+          def to_dash_arrow
+            JsonbDashArrow.new left, right
+          end
+
+          def to_question
+            JsonbQuestion.new left, right
+          end
+
+          def eq other
+            case other
+            when NilClass
+              to_question.not
+            when Integer, Array, ::Hash
+              to_dash_arrow.eq other.to_json
+            when Jsonb
+              to_dash_arrow.eq other.to_dash_arrow
+            when JsonbDashArrow
+              to_dash_arrow.eq other
+            else
+              super
+            end
+          end
+        end
+
+        class Hstore < HstoreDashArrow
+          def to_question
+            HstoreQuestion.new left, right
+          end
+
+          def eq other
+            other.nil? ? to_question.not : super
+          end
+        end
+
+        class Json < JsonDashDoubleArrow; end
+
+        class JsonContainer < Json
+          def initialize column, locale, attr
+            super(Nodes::JsonDashArrow.new(column, locale), attr)
+          end
+        end
+
+        class JsonbContainer < Jsonb
+          def initialize column, locale, attr
+            @column, @locale = column, locale
+            super(JsonbDashArrow.new(column, locale), attr)
+          end
+
+          def eq other
+            other.nil? ? super.or(JsonbQuestion.new(@column, @locale).not) : super
+          end
+        end
+      end
+
+      module Visitors
+        def visit_Mobility_Plugins_Arel_Nodes_JsonDashArrow o, a
+          json_infix o, a, '->'
+        end
+
+        def visit_Mobility_Plugins_Arel_Nodes_JsonDashDoubleArrow o, a
+          json_infix o, a, '->>'
+        end
+
+        def visit_Mobility_Plugins_Arel_Nodes_JsonbDashArrow o, a
+          json_infix o, a, '->'
+        end
+
+        def visit_Mobility_Plugins_Arel_Nodes_JsonbDashDoubleArrow o, a
+          json_infix o, a, '->>'
+        end
+
+        def visit_Mobility_Plugins_Arel_Nodes_JsonbQuestion o, a
+          json_infix o, a, '?'
+        end
+
+        def visit_Mobility_Plugins_Arel_Nodes_HstoreDashArrow o, a
+          json_infix o, a, '->'
+        end
+
+        def visit_Mobility_Plugins_Arel_Nodes_HstoreQuestion o, a
+          json_infix o, a, '?'
+        end
+
+        private
+
+        def json_infix o, a, opr
+          visit(Nodes::Grouping.new(::Arel::Nodes::InfixOperation.new(opr, o.left, o.right)), a)
+        end
+      end
+
+      ::Arel::Visitors::PostgreSQL.include Visitors
+    end
+  end
+end

data/lib/mobility/plugins/sequel/dirty.rb

@@ -51,7 +51,7 @@ Automatically includes dirty plugin in model class when enabled.
           # @!group Backend Accessors
           # @!macro backend_writer
           # @param [Hash] options
-          def write(locale, value, options = {})
+          def write(locale, value, **options)
             locale_accessor = Mobility.normalize_locale_accessor(attribute, locale).to_sym
             if model.column_changes.has_key?(locale_accessor) && model.initial_values[locale_accessor] == value
               super

data/lib/mobility/version.rb

@@ -9,7 +9,7 @@ module Mobility
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    PRE = "beta2"
+    PRE = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Chris Salzberg
@@ -34,7 +34,7 @@ cert_chain:
   gSQml7TqcC6dZRsZRwYqzD9kUwdAJoCqno2CBUKs2l0yQAjFT36lRrVJznb7uWwa
   xpPFnsrtyaZW6Dty8TSG3qzmeGpmpIotA8x1VA==
   -----END CERTIFICATE-----
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -156,14 +156,6 @@ files:
 - README.md
 - Rakefile
 - lib/mobility.rb
-- lib/mobility/active_record/model_translation.rb
-- lib/mobility/active_record/string_translation.rb
-- lib/mobility/active_record/text_translation.rb
-- lib/mobility/active_record/translation.rb
-- lib/mobility/arel.rb
-- lib/mobility/arel/nodes.rb
-- lib/mobility/arel/nodes/pg_ops.rb
-- lib/mobility/arel/visitor.rb
 - lib/mobility/backend.rb
 - lib/mobility/backends.rb
 - lib/mobility/backends/active_record.rb
@@ -209,6 +201,9 @@ files:
 - lib/mobility/plugins/active_record/dirty.rb
 - lib/mobility/plugins/active_record/query.rb
 - lib/mobility/plugins/active_record/uniqueness_validation.rb
+- lib/mobility/plugins/arel.rb
+- lib/mobility/plugins/arel/nodes.rb
+- lib/mobility/plugins/arel/nodes/pg_ops.rb
 - lib/mobility/plugins/attribute_methods.rb
 - lib/mobility/plugins/attributes.rb
 - lib/mobility/plugins/backend.rb
@@ -228,13 +223,6 @@ files:
 - lib/mobility/plugins/sequel/dirty.rb
 - lib/mobility/plugins/sequel/query.rb
 - lib/mobility/plugins/writer.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
 - lib/mobility/translations.rb
 - lib/mobility/util.rb
 - lib/mobility/version.rb

data/lib/mobility/active_record/model_translation.rb

@@ -1,14 +0,0 @@
-module Mobility
-  module ActiveRecord
-=begin
-
-Subclassed dynamically to generate translation class in
-{Backends::ActiveRecord::Table} backend.
-
-=end
-    class ModelTranslation < ::ActiveRecord::Base
-      self.abstract_class = true
-      validates :locale, presence: true
-    end
-  end
-end

data/lib/mobility/active_record/string_translation.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-require "mobility/active_record/translation"
-
-module Mobility
-  module ActiveRecord
-    class StringTranslation < Translation
-      self.table_name = "mobility_string_translations"
-    end
-  end
-end

data/lib/mobility/active_record/text_translation.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-require "mobility/active_record/translation"
-
-module Mobility
-  module ActiveRecord
-    class TextTranslation < Translation
-      self.table_name = "mobility_text_translations"
-    end
-  end
-end

data/lib/mobility/active_record/translation.rb

@@ -1,14 +0,0 @@
-module Mobility
-  module ActiveRecord
-    # @abstract Subclass and set +table_name+ to implement for a particular column type.
-    class Translation < ::ActiveRecord::Base
-      self.abstract_class = true
-
-      belongs_to :translatable, polymorphic: true, touch: true
-
-      validates :key, presence: true, uniqueness: { scope: [:translatable_id, :translatable_type, :locale], case_sensitive: true }
-      validates :translatable, presence: true
-      validates :locale, presence: true
-    end
-  end
-end

data/lib/mobility/arel.rb

@@ -1,49 +0,0 @@
-# frozen-string-literal: true
-require "mobility/arel/nodes"
-require "mobility/arel/visitor"
-
-module Mobility
-  module Arel
-    module MobilityExpressions
-      include ::Arel::Expressions
-
-      # @note This is necessary in order to ensure that when a translated
-      #   attribute is selected with an alias using +AS+, the resulting
-      #   expression can still be counted without blowing up.
-      #
-      #   Extending +::Arel::Expressions+ is necessary to convince ActiveRecord
-      #   that this node should not be stringified, which otherwise would
-      #   result in garbage SQL.
-      #
-      # @see https://github.com/rails/rails/blob/847342c25c61acaea988430dc3ab66a82e3ed486/activerecord/lib/active_record/relation/calculations.rb#L261
-      def as(*)
-        super
-          .extend(::Arel::Expressions)
-          .extend(Countable)
-      end
-
-      module Countable
-        # @note This allows expressions with selected translated attributes to
-        #   be counted.
-        def count(*args)
-          left.count(*args)
-        end
-      end
-    end
-
-    class Attribute < ::Arel::Attributes::Attribute
-      include MobilityExpressions
-
-      attr_reader :backend_class
-      attr_reader :locale
-      attr_reader :attribute_name
-
-      def initialize(relation, column_name, locale, backend_class, attribute_name = nil)
-        @backend_class = backend_class
-        @locale = locale
-        @attribute_name = attribute_name || column_name
-        super(relation, column_name)
-      end
-    end
-  end
-end

data/lib/mobility/arel/nodes.rb

@@ -1,13 +0,0 @@
-# frozen-string-literal: true
-module Mobility
-  module Arel
-    module Nodes
-      class Binary < ::Arel::Nodes::Binary; end
-      class Grouping < ::Arel::Nodes::Grouping; end
-
-      ::Arel::Visitors::ToSql.class_eval do
-        alias :visit_Mobility_Arel_Nodes_Grouping :visit_Arel_Nodes_Grouping
-      end
-    end
-  end
-end

data/lib/mobility/arel/nodes/pg_ops.rb

@@ -1,132 +0,0 @@
-# frozen-string-literal: true
-require "mobility/arel"
-
-module Mobility
-  module Arel
-    module Nodes
-      %w[
-        JsonDashArrow
-        JsonDashDoubleArrow
-        JsonbDashArrow
-        JsonbDashDoubleArrow
-        JsonbQuestion
-        HstoreDashArrow
-        HstoreQuestion
-      ].each do |name|
-        const_set name, (Class.new(Binary) do
-          include ::Arel::Predications
-          include ::Arel::OrderPredications
-          include ::Arel::AliasPredication
-          include ::Mobility::Arel::MobilityExpressions
-
-          def lower
-            super self
-          end
-        end)
-      end
-
-      # Needed for AR 4.2, can be removed when support is deprecated
-      if ::ActiveRecord::VERSION::STRING < '5.0'
-        [JsonbDashDoubleArrow, HstoreDashArrow].each do |klass|
-          klass.class_eval do
-            def quoted_node other
-              other && super
-            end
-          end
-        end
-      end
-
-      class Jsonb  < JsonbDashDoubleArrow
-        def to_dash_arrow
-          JsonbDashArrow.new left, right
-        end
-
-        def to_question
-          JsonbQuestion.new left, right
-        end
-
-        def eq other
-          case other
-          when NilClass
-            to_question.not
-          when Integer, Array, ::Hash
-            to_dash_arrow.eq other.to_json
-          when Jsonb
-            to_dash_arrow.eq other.to_dash_arrow
-          when JsonbDashArrow
-            to_dash_arrow.eq other
-          else
-            super
-          end
-        end
-      end
-
-      class Hstore < HstoreDashArrow
-        def to_question
-          HstoreQuestion.new left, right
-        end
-
-        def eq other
-          other.nil? ? to_question.not : super
-        end
-      end
-
-      class Json < JsonDashDoubleArrow; end
-
-      class JsonContainer < Json
-        def initialize column, locale, attr
-          super(Arel::Nodes::JsonDashArrow.new(column, locale), attr)
-        end
-      end
-
-      class JsonbContainer < Jsonb
-        def initialize column, locale, attr
-          @column, @locale = column, locale
-          super(JsonbDashArrow.new(column, locale), attr)
-        end
-
-        def eq other
-          other.nil? ? super.or(JsonbQuestion.new(@column, @locale).not) : super
-        end
-      end
-    end
-
-    module Visitors
-      def visit_Mobility_Arel_Nodes_JsonDashArrow o, a
-        json_infix o, a, '->'
-      end
-
-      def visit_Mobility_Arel_Nodes_JsonDashDoubleArrow o, a
-        json_infix o, a, '->>'
-      end
-
-      def visit_Mobility_Arel_Nodes_JsonbDashArrow o, a
-        json_infix o, a, '->'
-      end
-
-      def visit_Mobility_Arel_Nodes_JsonbDashDoubleArrow o, a
-        json_infix o, a, '->>'
-      end
-
-      def visit_Mobility_Arel_Nodes_JsonbQuestion o, a
-        json_infix o, a, '?'
-      end
-
-      def visit_Mobility_Arel_Nodes_HstoreDashArrow o, a
-        json_infix o, a, '->'
-      end
-
-      def visit_Mobility_Arel_Nodes_HstoreQuestion o, a
-        json_infix o, a, '?'
-      end
-
-      private
-
-      def json_infix o, a, opr
-        visit(Nodes::Grouping.new(::Arel::Nodes::InfixOperation.new(opr, o.left, o.right)), a)
-      end
-    end
-
-    ::Arel::Visitors::PostgreSQL.include Visitors
-  end
-end