liquidum 1.0.22 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9404d7d54b121faac879b08487dec002714680bc3ce0c06ef965436de160397e
-  data.tar.gz: f129a504cd29ada36902b96dd7e3e97094f7c593413d1593a0762c4d1c810f67
+  metadata.gz: d1a19fc1988722ecc75d48fdc1e25101679f91af1cc0de696118198d5a35d08b
+  data.tar.gz: fc6a6a5d26c79dc15fb0be0e9b0ec404b97387395d80221b3b38d2d0b86cbcbe
 SHA512:
-  metadata.gz: dd318aba803d49412b67be25cb29fb905d3a562e92796a027f844873f5ea47626f75c0f31098f39f58e12728f41b6f001b8ec122f36b35b850a583ef6c3514bb
-  data.tar.gz: 1bde9499325821bfe9b7a68944fd19ba2c91870277d382748e8e97b1481305bcfe26d880a18d20d244b14f7d89cfed63d3d6322dc9a3dc9a9a1d123ba8d3e48d
+  metadata.gz: 384e81ad24db742d2995fa4af3bf3891f4a6d10ded6f47c43a05a9d708409e1297f07749264ec5c845711b7fc8b63d2b2f1d3c6ce464835d4450b6716428699b
+  data.tar.gz: 6dd9b4c3eb08256f02a5c92cb1ada34937606bd5154497c7618a8355c06b2ca4072e3e206e7a2d048726541de3f77be30bc0fe963af78a7c23cf0fdd27f7469a

data/.rubocop.yml

@@ -1,37 +1,14 @@
-inherit_from: .rubocop_todo.yml
-AllCops:
-  TargetRubyVersion: 2.7
-  Exclude:
-    - 'bin/**/*'
-    - 'db/**/*'
-    - 'vagrant/**/*'
-    - 'vendor/**/*'
-    - 'spec/**/*'
-    - 'lib/generators/**/*'
-    - 'node_modules/**/*'
-    - 'test/dummy/**/*'
-    - 'test/dummy/config/**/*'
-
-Metrics:
-  Enabled: false
+# https://www.fastruby.io/blog/ruby/code-quality/how-we-use-rubocop-and-standardrb.html
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '[]'
-    '%i': '[]'
-    '%q': '[]'
-    '%Q': '[]'
-    '%r': '[]'
-    '%s': '[]'
-    '%w': '[]'
-    '%W': '[]'
-    '%x': '[]'
+require:
+  - standard
 
-Style/Documentation:
-  Enabled: false
+inherit_gem:
+  standard: config/base.yml
 
-Style/GuardClause:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
+AllCops:
+  NewCops: enable
+  Exclude:
+    - node_modules/**/*
+    - public/**/*
+    - vendor/**/*

data/Gemfile

@@ -1,18 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-git_source(:entdec) { |repo_name| "git@github.com:entdec/#{repo_name}.git" }
 
 # Declare your gem's dependencies in liquidum.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-gem 'pry'
-gem 'solargraph'

data/Rakefile

@@ -1,37 +1,33 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Liquidum'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "Liquidum"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
-load 'rails/tasks/engine.rake'
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
   t.warning = false
 end
 
 task default: :test
-
-# Adds the Auxilium semver task
-spec = Gem::Specification.find_by_name 'auxilium'
-load "#{spec.gem_dir}/lib/tasks/semver.rake"

data/lib/liquidum/configuration.rb

@@ -1,23 +1,74 @@
 module Liquidum
+  module Options
+    module ClassMethods
+      def option(name, default: nil, proc: false)
+        attr_writer(name)
+        schema[name] = {default: default, proc: proc}
+
+        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
+        @schema ||= {}
+      end
+    end
+
+    def set_defaults!
+      self.class.schema.each do |name, options|
+        instance_variable_set(:"@#{name}", options[:default])
+      end
+    end
+
+    def self.included(cls)
+      cls.extend(ClassMethods)
+    end
+  end
+
   class Configuration
-    attr_writer :logger
-    attr_accessor :liquidum_file_system
+    include Options
+
+    option :logger, default: -> { Logger.new($stdout).tap { |l| l.level = Logger::INFO } }, proc: true
+    option :liquidum_file_system, default: "Liquidum::LiquidumFileSystem"
     attr_writer :i18n_store
 
     def initialize
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-      @liquidum_file_system = 'Liquidum::LiquidumFileSystem'
-      @i18n_store = ->(context, block) { nil }
+      @i18n_store = ->(context, block) {}
+      set_defaults!
     end
 
-    # logger [Object].
-    def logger
-      @logger.is_a?(Proc) ? instance_exec(&@logger) : @logger
+    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
 
-    def i18n_store(context, &block)
-      @i18n_store.is_a?(Proc) ? instance_exec(context, block, &@i18n_store) : @i18n_store
+  module Configurable
+    attr_writer :config
+
+    def config
+      @config ||= Configuration.new
+    end
+
+    def configure
+      yield(config)
+    end
+
+    alias_method :setup, :configure
+
+    def reset_config!
+      @config = Configuration.new
     end
   end
 end

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.0.22"
+  VERSION = "1.1.1"
 end

data/lib/liquidum.rb

@@ -3,7 +3,7 @@
 require 'liquid'
 require 'tilt'
 require 'sassc'
-require "addressable/uri"
+require 'addressable/uri'
 
 require 'liquidum/version'
 require 'liquidum/engine'
@@ -17,11 +17,14 @@ require 'liquidum/liquid/liquidum_tag'
 require 'liquidum/liquid/parser'
 
 module Liquidum
+  extend Configurable
+
   class Error < StandardError; end
   class UnknownStepTypeError < Error; end
 
   class LiquidumFileSystem
     attr_reader :registers
+
     def initialize(registers)
       @registers = registers
     end
@@ -37,19 +40,14 @@ module Liquidum
   end
 
   class << self
-    attr_reader :config
-
-    def setup
-      @config = Configuration.new
-      yield config
-    end
-
     def render(content, options = {})
       template = Liquid::Template.parse(content)
       options[:assigns] ||= {}
       options[:registers] ||= {}
-      options[:registers]['file_system'] = Liquidum.config.liquidum_file_system.constantize.new(options[:registers])
-      result = template.render(options[:context] || options[:assigns].stringify_keys, registers: options[:registers])
+      options[:registers]['file_system'] =
+        Liquidum.config.liquidum_file_system.constantize.new(options[:registers])
+      result = template.render(options[:context] || options[:assigns].stringify_keys,
+                               registers: options[:registers])
 
       if template.errors.present?
         Liquidum.config.logger.error '--- Template rendering errors: ' + '-' * 49
@@ -66,9 +64,14 @@ module Liquidum
       assigns = assigns.merge(template.assigns.stringify_keys) if template.assigns
       options[:registers].deep_merge!(template.registers.stringify_keys) if template.registers
 
-      result = Tilt[options[:filter]].new(options[:filter_options]) { result }.render if options[:filter].present? && Tilt[options[:filter]]
+      if options[:filter].present? && Tilt[options[:filter]]
+        result = Tilt[options[:filter]].new(options[:filter_options]) do
+          result
+        end.render
+      end
       if options[:layout].present?
-        result = render(options[:layout], assigns: assigns.merge('content' => result), registers: options[:registers])
+        result = render(options[:layout], assigns: assigns.merge('content' => result),
+                                          registers: options[:registers])
       end
 
       result

data/liquidum.gemspec

@@ -1,47 +1,44 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('lib', __dir__)
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
-require 'liquidum/version'
+require "liquidum/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'liquidum'
+  spec.name = "liquidum"
   spec.version = Liquidum::VERSION
 
-  spec.required_rubygems_version = Gem::Requirement.new('>= 0') if spec.respond_to? :required_rubygems_version=
-  spec.require_paths = ['lib']
-  spec.authors = ['Tom de Grunt']
-  spec.date = '2021-11-18'
-  spec.description = 'Ready made set of tags, parsings and awesomeness'
-  spec.email = ['tom@degrunt.nl']
+  spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
+  spec.require_paths = ["lib"]
+  spec.authors = ["Tom de Grunt"]
+  spec.description = "Ready made set of tags, parsings and awesomeness"
+  spec.email = ["tom@degrunt.nl"]
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.homepage = 'https://github.com/entdec/liquidum'
-  spec.licenses = ['MIT']
-  spec.rubygems_version = '3.1.6'
-  spec.summary = 'Liquid templating - on steroids'
+  spec.homepage = "https://github.com/entdec/liquidum"
+  spec.licenses = ["MIT"]
+  spec.summary = "Liquid templating - on steroids"
 
-  spec.installed_by_version = '3.1.6' if spec.respond_to? :installed_by_version
+  spec.installed_by_version = "3.1.6" if spec.respond_to? :installed_by_version
 
-  spec.specification_version = 4 if spec.respond_to? :specification_version
-
-  spec.add_runtime_dependency('addressable', ['~> 2'])
-  spec.add_runtime_dependency('babel-transpiler', ['~> 0.7'])
-  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('parslet', ['>= 0'])
-  spec.add_runtime_dependency('pg', ['>= 0'])
-  spec.add_runtime_dependency('rails', ['>= 5.2'])
-  spec.add_runtime_dependency('sassc', ['~> 2.2'])
+  spec.add_runtime_dependency("addressable", ["~> 2"])
+  spec.add_runtime_dependency("babel-transpiler", ["~> 0.7"])
+  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"])
+  spec.add_runtime_dependency("parslet", [">= 0"])
+  spec.add_runtime_dependency("pg", [">= 0"])
+  spec.add_runtime_dependency("rails", [">= 5.2"])
+  spec.add_runtime_dependency("sassc", ["~> 2.2"])
   spec.add_runtime_dependency "slim-rails", "~> 3.6"
-  spec.add_development_dependency('auxilium', ['~>3'])
-  spec.add_development_dependency('minitest', ['~> 5.11'])
-  spec.add_development_dependency('minitest-reporters', ['~> 1.1'])
-  spec.add_development_dependency('pry', ['> 0'])
-  spec.add_development_dependency('pry-rails', ['~> 0.3'])
-  spec.add_development_dependency('rubocop', ['~> 1'])
+  spec.add_development_dependency("minitest", ["~> 5.11"])
+  spec.add_development_dependency("minitest-reporters", ["~> 1.1"])
+  spec.add_development_dependency("pry", ["> 0"])
+  spec.add_development_dependency("pry-rails", ["~> 0.3"])
+  spec.add_development_dependency "rubocop", "~> 1"
+
+  spec.add_development_dependency "standard", "~> 1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidum
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.1.1
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -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
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: auxilium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Ready made set of tags, parsings and awesomeness
 email:
 - tom@degrunt.nl
@@ -258,7 +258,6 @@ files:
 - ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md

data/.rubocop_todo.yml

@@ -1,39 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-01-25 20:13:51 +0100 using RuboCop version 0.63.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Exclude:
-    - "test/liquidum_test.rb"
-
-# Offense count: 6
-Style/Documentation:
-  Exclude:
-    - "spec/**/*"
-    - "test/**/*"
-    - "app/controllers/liquidum/application_controller.rb"
-    - "app/helpers/liquidum/application_helper.rb"
-    - "app/mailers/liquidum/application_mailer.rb"
-    - "app/models/liquidum/application_record.rb"
-    - "lib/liquidum.rb"
-    - "lib/liquidum/engine.rb"
-
-# Offense count: 2
-Style/MixinUsage:
-  Exclude:
-    - "test/dummy/bin/setup"
-    - "test/dummy/bin/update"
-
-# Offense count: 27
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 112