liquidum 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16e876c05fe67578580e9b365f02e957d0931317ced4765c9eeccc46e997deac
-  data.tar.gz: 20d60c9963067edc071ec34fc37833dc98cb41d8099ba6b8d860def2a8f90584
+  metadata.gz: d1a19fc1988722ecc75d48fdc1e25101679f91af1cc0de696118198d5a35d08b
+  data.tar.gz: fc6a6a5d26c79dc15fb0be0e9b0ec404b97387395d80221b3b38d2d0b86cbcbe
 SHA512:
-  metadata.gz: f909afdc2966789818915b4fe6ad11f8a6ce9b7cba39ff3ccaec3af357a1b236242d66f6aa3ac35c2b3ce4c077674d9602b620fb2f4ef449fbab4ae690a9b206
-  data.tar.gz: ecc6f3c0bb6c259f468ba80afca0fa98de1ec096b0111c129d4ea9a7766d28aeb0be51c9281bd6ca9cd7acb0994ed8d5b094687457e66b9dc8c88c41e7c1e62c
+  metadata.gz: 384e81ad24db742d2995fa4af3bf3891f4a6d10ded6f47c43a05a9d708409e1297f07749264ec5c845711b7fc8b63d2b2f1d3c6ce464835d4450b6716428699b
+  data.tar.gz: 6dd9b4c3eb08256f02a5c92cb1ada34937606bd5154497c7618a8355c06b2ca4072e3e206e7a2d048726541de3f77be30bc0fe963af78a7c23cf0fdd27f7469a

data/lib/liquidum/configuration.rb

@@ -1,10 +1,20 @@
 module Liquidum
   module Options
     module ClassMethods
-      def option(name, default: nil)
-        attr_accessor(name)
+      def option(name, default: nil, proc: false)
+        attr_writer(name)
+        schema[name] = {default: default, proc: proc}
 
-        schema[name] = default
+        if schema[name][:proc]
+          define_method(name) do |*params|
+            value = instance_variable_get(:"@#{name}")
+            instance_exec(*params, &value)
+          end
+        else
+          define_method(name) do
+            instance_variable_get(:"@#{name}")
+          end
+        end
       end
 
       def schema
@@ -13,8 +23,8 @@ module Liquidum
     end
 
     def set_defaults!
-      self.class.schema.each do |name, default|
-        instance_variable_set(:"@#{name}", default)
+      self.class.schema.each do |name, options|
+        instance_variable_set(:"@#{name}", options[:default])
       end
     end
 
@@ -26,13 +36,22 @@ module Liquidum
   class Configuration
     include Options
 
-    option :logger, default: -> { Logger.new($stdout).tap { |l| l.level = Logger::INFO } }
+    option :logger, default: -> { Logger.new($stdout).tap { |l| l.level = Logger::INFO } }, proc: true
     option :liquidum_file_system, default: "Liquidum::LiquidumFileSystem"
-    option :i18n_store, default: ->(context, block) {}
+    attr_writer :i18n_store
 
     def initialize
+      @i18n_store = ->(context, block) {}
       set_defaults!
     end
+
+    def i18n_store(context, &block)
+      old_i18n_backend = I18n.backend
+      I18n.backend = instance_exec(context, &@i18n_store)
+      yield
+    ensure
+      I18n.backend = old_i18n_backend
+    end
   end
 
   module Configurable

data/lib/liquidum/liquid/filters/translate_filter.rb

@@ -19,27 +19,27 @@ module TranslateFilter
     result = nil
 
     Liquidum.config.i18n_store(@context) do |obj|
-      locale = options.delete('locale')
+      locale = options.delete("locale")
 
       key = input
       scope = nil
 
-      if key.start_with?('.')
+      if key.start_with?(".")
         key = input[1..-1]
-        scope = obj.translation_scope
+        scope = obj.translation_scope if obj.respond_to?(:translation_scope)
       end
 
-      result = I18n.t(key, locale: locale, scope: scope, cascade: { skip_root: false },
+      result = I18n.t(key, locale: locale, scope: scope, cascade: {skip_root: false},
                            **options.symbolize_keys)
       if result
         result = I18n::Backend::Simple.new.send(:interpolate, I18n.locale, result,
-                                                options.symbolize_keys)
+          options.symbolize_keys)
       end
     end
 
     result
   end
-  alias t translate
+  alias_method :t, :translate
 end
 
 Liquid::Template.register_filter(TranslateFilter)

data/lib/liquidum/liquid/liquid_helpers.rb

@@ -24,7 +24,7 @@ module Liquidum
 
     # Return named argument
     def arg(name)
-      raise 'No @context set' unless @context
+      raise "No @context set" unless @context
 
       attr = @args.find { |a| a[:attr] == name.to_s }
       return unless attr
@@ -39,7 +39,7 @@ module Liquidum
     # Returns the first argument - usually reserved for literal or quoted values, not for attribute value pairs
     # When the first attribute is a pair, it will return nil
     def argv1
-      raise 'No @context set' unless @context
+      raise "No @context set" unless @context
 
       argv1 = @args[0]
       return unless argv1
@@ -53,7 +53,7 @@ module Liquidum
 
     # Returns the standalone arguments
     def sargs
-      raise 'No @context set' unless @context
+      raise "No @context set" unless @context
 
       @args.slice(1..-1).select { |a| a.key?(:quoted) || a.key?(:literal) }.map do |a|
         if a.key? :quoted
@@ -66,7 +66,7 @@ module Liquidum
 
     # Returns the attribute-value-pair arguments as a hash
     def attr_args
-      raise 'No @context set' unless @context
+      raise "No @context set" unless @context
 
       result = {}
       @args.select { |a| a.key?(:value) || a.key?(:lvalue) || a.key?(:svalue) }.map do |a|
@@ -89,7 +89,7 @@ module Liquidum
     # @return [String]
     def attr_str(attr, value, default = nil)
       v = value || default
-      v.present? ? " #{attr}=\"#{v}\"" : ''
+      v.present? ? " #{attr}=\"#{v}\"" : ""
     end
 
     def attrs_str(*attrs, reject: [])
@@ -111,20 +111,18 @@ module Liquidum
 
     # For use with forms and inputs
     def input(purpose, name)
-      form_model      = lookup(@context, 'form.model')
-      form_class_name = lookup(@context, 'form.class_name')
-
-      # binding.pry if name == 'postal_code'
+      form_model = lookup(@context, "form.model")
+      form_class_name = lookup(@context, "form.class_name")
 
       # order[order_lines_attributes][xxxx][product_name]
       #
       # order[order_attributes]_[lines_attributes][][product_name]
 
-      parts = @context.scopes.select { |scope| scope.key? 'form' }.map do |scope|
-        if scope['form'].attribute
-          scope['form'].attribute.to_s.gsub(/([a-z\-\_]+)/) { "[#{Regexp.last_match(1)}_attributes]" }.gsub(/\[\]$/, "[#{SecureRandom.uuid}]")
+      parts = @context.scopes.select { |scope| scope.key? "form" }.map do |scope|
+        if scope["form"].attribute
+          scope["form"].attribute.to_s.gsub(/([a-z\-\_]+)/) { "[#{Regexp.last_match(1)}_attributes]" }.gsub(/\[\]$/, "[#{SecureRandom.uuid}]")
         else
-          scope['form'].class_name.underscore.gsub('/', '_')
+          scope["form"].class_name.underscore.gsub("/", "_")
         end
       end
       parts = parts.unshift("[#{name}]").reverse
@@ -133,7 +131,7 @@ module Liquidum
 
       case purpose
       when :id
-        parts.join('_').gsub('][', '_').tr('][', '')
+        parts.join("_").gsub("][", "_").tr("][", "")
       when :value
         # This is executed on the drop, drops provide the values for the form
         form_model.send(name.to_sym)
@@ -141,23 +139,23 @@ module Liquidum
         # The original class's name dictates the name of the fields
         parts.first + parts.slice(1..-1).join
       when :error
-        parts.slice(1..-1).join('.')
+        parts.slice(1..-1).join(".")
       when :checked
-        'checked' if (input(:value, name) ? 1 : 0) == 1
+        "checked" if (input(:value, name) ? 1 : 0) == 1
       end
     end
 
     # Returns the path for the input from the main form, say: origin.contact_name
     def path_for_input(name)
-      parts = @context.scopes.select { |scope| scope.key? 'form' }.select { |scope| scope['form'].attribute }.map do |scope|
-        scope['form'].attribute
+      parts = @context.scopes.select { |scope| scope.key? "form" }.select { |scope| scope["form"].attribute }.map do |scope|
+        scope["form"].attribute
       end
       parts = parts.unshift(name.to_s).reverse
-      parts.join('.')
+      parts.join(".")
     end
 
     def real_object_from_drop(drop)
-      drop.instance_variable_get('@object')
+      drop.instance_variable_get("@object")
     end
   end
 end

data/lib/liquidum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Liquidum
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/liquidum.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("i18n", ["~> 1.8"])
   spec.add_runtime_dependency("kramdown", ["~> 2.1"])
   spec.add_runtime_dependency("kramdown-parser-gfm", ["~> 1.0"])
-  spec.add_runtime_dependency("liquid", ["= 5.1.0"])
+  spec.add_runtime_dependency("liquid", ["~> 5.1"])
   spec.add_runtime_dependency("parslet", [">= 0"])
   spec.add_runtime_dependency("pg", [">= 0"])
   spec.add_runtime_dependency("rails", [">= 5.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidum
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tom de Grunt
@@ -84,16 +84,16 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement