mobility 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 733ca7a4894cdebcc0cefe533129793b6648d19c5c9f57f837b3660f8ac704f6
-  data.tar.gz: 7fc756a3e7b7278702b43c9ecbdf12d904000a960037cee8bbba0bc0b4b3ee3a
+  metadata.gz: 9a4242439552faaeb722300168bed5974112ff0f9a66452073b9f30e4a898f08
+  data.tar.gz: 14d4bf01f2bed2faa7d795f809707453a44183f50516465dfeb0155bb7ce2061
 SHA512:
-  metadata.gz: 30bbaa926ac3aef1fa1f438120f20c47077f97412ae24140b4a827cc1862f1ebf9cf0d24caf1caae2362f12af1e46ca6251848f012dfbd606aa603e682c0af91
-  data.tar.gz: c30e9bfbd12036581a03cca35488a068832f33928a91c337f27fd2ccf25908cc8363c3d20b95fa60c8ed0792ed6ce3fc0d8d49c55e8874f7a4a41cbc8693fee5
+  metadata.gz: 2b36d734faa10f98f87283f1b4a6577c6ba10762d175383ef0ca30c3fedb7b645595b2db02d63800a1545d9ddbcc537dea0ab00b7e31b36473bf625079654bf7
+  data.tar.gz: 47e035ddd560973c01a64525f6206268eadfce2a38728b6195fae59cecc3822f61ccf72a824bcd14d29028fd943cf89a16d9c61c202a9e2a083cc7bc59125c71

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.8
 
+### 0.8.5 (November 1, 2018)
+* Load column_type when building node
+  ([#301](https://github.com/shioyama/mobility/pull/301))
+
 ### 0.8.4 (October 19, 2018)
 * Use references to define polymorphic associations in generator migrations
   ([#292](https://github.com/shioyama/mobility/pull/292))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.8.2)
+    mobility (1.0.alpha.1)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
@@ -61,7 +61,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -76,7 +76,7 @@ GEM
     minitest (5.11.3)
     mysql2 (0.4.10)
     nenv (0.3.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -114,7 +114,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)

data/README.md

@@ -51,7 +51,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.8.4'
+gem 'mobility', '~> 0.8.5'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't

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

@@ -17,10 +17,6 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
       #   @return [Symbol] (:translations) Name of translations column
       option_reader :column_name
 
-      # @!method column_type
-      #   @return [Symbol] Either :json or :jsonb
-      option_reader :column_type
-
       # @!group Backend Accessors
       #
       # @note Translation may be a string, integer, boolean, hash or array
@@ -44,30 +40,42 @@ Implements the {Mobility::Backends::Container} backend for ActiveRecord models.
       end
       # @!endgroup
 
-      # @!group Backend Configuration
-      # @option options [Symbol] column_name (:translations) Name of column on which to store translations
-      # @raise [InvalidColumnType] if the type of the container column is not json or jsonb
-      def self.configure(options)
-        options[:column_name] ||= :translations
-        options[:column_name] = options[:column_name].to_sym
-        options[:column_type] = options[:model_class].type_for_attribute(options[:column_name].to_s).try(:type)
-        unless %i[json jsonb].include?(options[:column_type])
-          raise InvalidColumnType, "#{options[:column_name]} must be a column of type json or jsonb"
+      class << self
+        # @!group Backend Configuration
+        # @option options [Symbol] column_name (:translations) Name of column on which to store translations
+        # @raise [InvalidColumnType] if the type of the container column is not json or jsonb
+        def configure(options)
+          options[:column_name] ||= :translations
+          options[:column_name] = options[:column_name].to_sym
+        end
+        # @!endgroup
+
+        # @param [String] attr Attribute name
+        # @param [Symbol] locale Locale
+        # @return [Mobility::Arel::Nodes::Json,Mobility::Arel::Nodes::Jsonb] Arel
+        #   node for attribute on json or jsonb column
+        def build_node(attr, locale)
+          column = model_class.arel_table[column_name]
+          case column_type
+          when :json
+            Arel::Nodes::JsonContainer.new(column, build_quoted(locale), build_quoted(attr))
+          when :jsonb
+            Arel::Nodes::JsonbContainer.new(column, build_quoted(locale), build_quoted(attr))
+          end
         end
-      end
-      # @!endgroup
 
-      # @param [String] attr Attribute name
-      # @param [Symbol] locale Locale
-      # @return [Mobility::Arel::Nodes::Json,Mobility::Arel::Nodes::Jsonb] Arel
-      #   node for attribute on json or jsonb column
-      def self.build_node(attr, locale)
-        column = model_class.arel_table[column_name]
-        case column_type
-        when :json
-          Arel::Nodes::JsonContainer.new(column, build_quoted(locale), build_quoted(attr))
-        when :jsonb
-          Arel::Nodes::JsonbContainer.new(column, build_quoted(locale), build_quoted(attr))
+        def column_type
+          @column_type ||= get_column_type
+        end
+
+        private
+
+        def get_column_type
+          options[:model_class].type_for_attribute(options[:column_name].to_s).try(:type).tap do |type|
+            unless %i[json jsonb].include? type
+              raise InvalidColumnType, "#{options[:column_name]} must be a column of type json or jsonb"
+            end
+          end
         end
       end
 

data/lib/mobility/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Chris Salzberg
@@ -35,7 +35,7 @@ cert_chain:
   m46ezJjnr4uXgSNuTs+RdM6DtrKaFG2HuziSP+dzmWqZiUgj1eTACYsPwfF/Z1Z6
   2DiDkec/SK4qJBMlNYPo/PTZuh5m1jROtf/hyS0VXJmm+uWc
   -----END CERTIFICATE-----
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store