sho 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6824fa2e826773658bce36e4f33d23715d62651b
-  data.tar.gz: fbe63cdf11cc334f60d87558c0996e6e55614113
+SHA256:
+  metadata.gz: 427749263f79f34fd5a984ba28c2a1aabce93e3fd46058d1cbbc35464f31a297
+  data.tar.gz: 579438830d604921733e4f8706a3e5f5c9276c10a2265154766d7c58409e7611
 SHA512:
-  metadata.gz: ac5a8af9cf6047cbcfdbada0732738fa4802b1c3defd84a25fb352bfa2f49ed269a459f80571bbb54cb3811eb6f08ea2865e9051322069ac9d6e25b1979f7c9c
-  data.tar.gz: 2049bebaa82fcef22b3ac50c82aeafe86b1cb72b201c9b8a6a5c3f4f38dc2101738e20932bc0e2b89e4c149070def8d89734f1af0f62205532cd856efd3fae2b
+  metadata.gz: 899d2e64aab70e4ff24fff5568a1c60f2f633c91a5a96e1f71d2e074fb984d7f1e70021f94b5b626589f621e82c58ed9563379186b81e5c8c6006dca22260338
+  data.tar.gz: 4846a578d8a630a7c091e450ffe686344df3dc757e3ab7e8ff1f26c244916bf12783a897a3dc07abdc585786ccf0ecb94a584112deaa7ae6673b62882c6192dd

data/Changelog.md

@@ -1,5 +1,10 @@
 # Sho versions
 
+## 0.0.3 - 2023-09-10
+
+* Ruby 3+ compatiblity - [@uanka](https://github.com/uanka)
+
+
 ## 0.0.2 - 2018-06-27
 
 * `yield` in inline templates work (for small inline layouts) -- [@adam12](https://github.com/adam12).

data/README.md

@@ -135,7 +135,7 @@ end
 
 **Template caching**
 
-Sho creates Tilt templates at a moment of the method definition. This seems to lead to most natural behavior: the templates are found and cached at a moment of code loading/reloading (whatever reloader you use).
+Sho creates Tilt templates at a moment of the method definition. This seems to lead to most natural behavior: the templates are found and cached at a moment of code loading/reloading (whatever reloader you use). Though, you can use `sho.cache = false` to "hard-reload" templates on each method call.
 
 ## Library status
 

data/lib/sho/argument_validator.rb

@@ -11,8 +11,8 @@ module Sho
     end
 
     def call(**params)
-      guard_missing!(params)
-      guard_unknown!(params)
+      guard_missing!(**params)
+      guard_unknown!(**params)
       params.merge(@optional.reject { |key,| params.key?(key) })
     end
 

data/lib/sho/configurator.rb

@@ -27,9 +27,13 @@ module Sho
     #   meaning application's current folder (`Dir.pwd`).
     attr_accessor :base_folder
 
+    # @return [true, false] cache templates upon initialization. `true` by default.
+    attr_accessor :cache
+
     # @private
     def initialize(host)
       @host = host
+      @cache = true
     end
 
     # Generates instance method named `name` in a host module, which renders template from
@@ -53,7 +57,8 @@ module Sho
     # @param mandatory [Array<Symbol>] list of mandatory params;
     # @param optional [Hash{Symbol => Object}] list of optional params and their default values
     def template(name, template, *mandatory, _layout: nil, **optional)
-      tpl = Tilt.new(File.expand_path(template, base_folder || Dir.pwd))
+      tpl = proc { Tilt.new(File.expand_path(template, base_folder || Dir.pwd)) }
+
       define_template_method(name, tpl, mandatory, optional, _layout)
     end
 
@@ -76,7 +81,7 @@ module Sho
     # @param optional [Hash{Symbol => Object}] list of optional params and their default values
     def template_relative(name, template, *mandatory, _layout: nil, **optional)
       base = File.dirname(caller(1..1).first.split(':').first)
-      tpl = Tilt.new(File.expand_path(template, base))
+      tpl = proc { Tilt.new(File.expand_path(template, base)) }
 
       define_template_method(name, tpl, mandatory, optional, _layout)
     end
@@ -111,14 +116,18 @@ module Sho
 
     private
 
-    def define_template_method(name, tilt, mandatory, optional, layout)
+    def define_template_method(name, tilt, mandatory, optional, layout) # rubocop:disable Metrics/MethodLength
       arguments = ArgumentValidator.new(*mandatory, **optional)
+      tilt = tilt.call if cache && tilt.respond_to?(:call)
+
       @host.__send__(:define_method, name) do |**locals, &block|
         locals = arguments.call(**locals)
+        tpl = tilt.respond_to?(:call) ? tilt.call : tilt
+
         if layout
-          __send__(layout) { tilt.render(self, **locals) }
+          __send__(layout) { tpl.render(self, **locals) }
         else
-          tilt.render(self, **locals, &block)
+          tpl.render(self, **locals, &block)
         end
       end
     end

data/lib/sho/version.rb

@@ -3,7 +3,7 @@
 module Sho
   MAJOR = 0
   MINOR = 0
-  PATCH = 2
+  PATCH = 3
   PRE = nil
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 end

data/lib/sho.rb

@@ -22,7 +22,7 @@ module Sho
   # included into.
   def self.included(mod)
     mod.define_singleton_method(:sho) {
-      @__sho_configurator__ ||= Configurator.new(mod)
+      @__sho_configurator__ ||= Configurator.new(mod) # rubocop:disable Naming/MemoizedInstanceVariableName
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sho
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 1.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 1.56.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 2.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -232,15 +232,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Experimental post-framework view library