view-cell 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a15d49ffdcd069071a8221bbc30a4085ddc6e5a99899aa4269b1c8e806557971
-  data.tar.gz: 22c6c8ddf07120ffbc4b4efb69bbc8329d769e8577da336f6d2d8081cca7afd4
+  metadata.gz: e824d4c0b1b36272bec26a314c40443dd2ff0aab2c9aa42f2d299ad9bb60932b
+  data.tar.gz: 9fdcfa09e93d5757ed33c52f9858fea668b13e1410be8a77ad36392fa482bbc9
 SHA512:
-  metadata.gz: f57e0b945f9533fd17c0cbd389c81ce860129a73299b54b6384ab3ea037d6da7510355540df5a2211ca6d473aa55388d40d8e67b771f4319a3ea3634de2c08f6
-  data.tar.gz: 9b8c586e7353abcd7a365a5634f30943ee7cdbf010d5c88bd4d66cd2ac127a2a3353afcbd5356331a10a5a3f083b8aababa9f9743c7787066a4cadbe2fc3f9c4
+  metadata.gz: f74b643dcd73c2a576c932e9644cfbbe77426a2f501dcebb15c0323d332f363ce32121cacea0e6d0da0146d3516577028a32812785c25396b2cb1195f9fa2bc6
+  data.tar.gz: 60342055ac39181ed1240d04a8865e19bf748bb7da572e792dd6375bc65520169b8292e20aae9355035caf45fddb6ad28445e957e33f9485d6ea17547c4ecfc8

data/.version

@@ -1 +1,3 @@
-0.7.0
+0.8.2
+
+

data/lib/adapters/view.rb

@@ -1,14 +1,14 @@
-klass =
-if defined? ActionView::Base
-  ActionView::Base
-elsif defined? HtmlHelper
-  HtmlHelper
-end
+if Object.const_defined?('ActionView::Base')
+  # Rails inject
+  ActionView::Base.include ViewCell::ProxyMethod
+
+elsif Object.const_defined?('Lux::Template::Helper')
+  # Lux inject
+  Lux::Template::Helper.include ViewCell::ProxyMethod
+
+elsif Object.const_defined?('Sinatra::Application')
+  # Sinatra inject
+  Sinatra::Application.include ViewCell::ProxyMethod
 
-if klass
-  klass.class_eval do
-    def cell *args
-      ViewCell.cell self, *args
-    end
-  end
 end
+

data/lib/view-cell.rb

@@ -3,3 +3,18 @@ require_relative 'view-cell/instance'
 require_relative 'view-cell/proxy'
 
 require_relative 'adapters/view'
+
+# If inflectors are not present, inject them (thx Piotr)
+for el in [:underscore, :classify, :constantize]
+  unless ''.respond_to?(el)
+    require 'dry/inflector'
+
+    eval %[
+      class String
+        def #{el}
+          Dry::Inflector.new.#{el}(self)
+        end
+      end
+    ]
+  end
+end

data/lib/view-cell/class.rb

@@ -9,22 +9,53 @@ class ViewCell
     end
 
     # delegate current scope methods to parent binding
+    # delegate :image_tag, :request, params
     def delegate *list
       list.each do |el|
         define_method(el) { |*args, &block| parent.send(el, *args, &block) }
       end
     end
 
-    # cell.user.profile
-    # cell(:user, user: @user).profile
+    # = cell @users
+    # = cell @user
+    # = cell.user.render @user
+    # = cell(:user, user: @user).render
     def cell parent, *args
       if args.first
-        ViewCell.get(parent, *args)
+        # covert to list of objects
+        unless [String, Symbol, Array].include?(args[0].class)
+          args[0] = [args.first]
+        end
+
+        out =
+        if args.first.class == Array
+          # cell @users
+          args.first.map do |object|
+            name = object.class.to_s.underscore.to_sym
+            ViewCell.get(parent, name).render object
+          end.join('')
+        else
+          # cell(:user, user: @user).profile
+          ViewCell.get parent, *args
+        end
+
+        out.respond_to?(:html_safe) ? out.html_safe : out
       else
+        # cell.user.profile
         ViewCell::Proxy.new(parent)
       end
     end
 
+    # can be called as a block or a method
+    # block do ...
+    # def block; super; ...
+    def before &block
+      define_method :before do
+        super() if self.class != ViewCell
+        instance_exec &block
+      end
+    end
+
     # set or get template root directory
     def template_root name=nil
       if name

data/lib/view-cell/instance.rb

@@ -24,11 +24,11 @@ class ViewCell
 
   # call
   def cell *args
-    ViewCell.get @_parent, *args
+    ViewCell.cell @_parent, *args
   end
 
   # render template by name
-  def render name
+  def template name
     template_root = self.class.template_root
     class_part    = self.class.to_s.underscore.sub(/_cell$/, '')
 
@@ -42,7 +42,7 @@ class ViewCell
 
     name = name % class_part if name.include?('%s')
 
-    RENDER_CACHE.delete(name) if Rails.env.development?
+    RENDER_CACHE.delete(name) if _development?
 
     RENDER_CACHE[name] ||= proc do
       # find extension if one not provided
@@ -51,14 +51,23 @@ class ViewCell
       unless name =~ /\.\w{2,4}$/
         if (file = Dir['%s*' % name].first)
           file_name = file
-        else
-          raise 'Template "%s.*" not found' % name
         end
       end
 
+      unless File.exist?(file_name)
+        raise ArgumentError, 'Template "%s.*" not found' % name
+      end
+
       Tilt.new(file_name)
     end.call
 
-    RENDER_CACHE[name].render(self).html_safe
+    out = RENDER_CACHE[name].render(self)
+    out.respond_to?(:html_safe) ? out.html_safe : out
+  end
+
+  private
+
+  def _development?
+    ENV['RAILS_ENV'] == 'development' || ENV['RACK_ENV'] == 'development'
   end
 end

data/lib/view-cell/proxy.rb

@@ -10,4 +10,11 @@ class ViewCell
       ViewCell.get(@parent, cell_name, vars)
     end
   end
+
+  # adaptrer will inject this
+  module ProxyMethod
+    def cell *args
+      ViewCell.cell self, *args
+    end
+  end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: view-cell
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Clean, simple explicit and strait-forward web view cell for use in Rails/Sinatra/Lux.
 email: reic.dino@gmail.com
 executables: []