express_admin 1.2.1 → 1.3.0

data/vendor/gems/express_templates/express_templates.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", "~> 4.2" # strictly speaking we only depend on active support
   s.add_dependency "parslet", "~> 1.6"
+  s.add_dependency "arbre"
   s.add_development_dependency "rails", "~> 4.2"
   s.add_development_dependency "pry", "~> 0"
   s.add_development_dependency "erubis", "~> 2.7"

data/vendor/gems/express_templates/lib/arbre/patches.rb

@@ -0,0 +1,50 @@
+module Arbre
+  class Context
+    def resource
+      helpers.resource
+    end
+  end
+
+  class Element
+
+    module BuilderMethods
+
+      # we do not want to check the arity of the
+      # block in express templates because components
+      # are expected to be able to contain other components or template code
+      # without use of a builder style syntax
+      def build_tag(klass, *args, &block)
+        tag = klass.new(arbre_context)
+        tag.parent = current_arbre_element
+
+        with_current_arbre_element tag do
+          tag.build(*args, &block)
+        end
+
+        tag
+      end
+    end
+
+    # Implements the method lookup chain. When you call a method that
+    # doesn't exist, we:
+    #
+    #  1. Try to call the method on the current DOM context
+    #  2. Return an assigned variable of the same name
+    #  3. Call the method on the helper object
+    #  4. Call super
+    #
+    def method_missing(name, *args, &block)
+      if current_arbre_element.respond_to?(name)
+        current_arbre_element.send name, *args, &block
+      elsif assigns && assigns.has_key?(name)
+        assigns[name]
+      elsif helpers.respond_to?(name)
+        current_arbre_element.add_child helpers.send(name, *args, &block)
+      else
+        super
+      end
+    end
+
+  end
+
+end

data/vendor/gems/express_templates/lib/core_extensions/proc.rb

@@ -24,6 +24,7 @@ class Proc
   def source
     @source ||= begin
       file, line_no = source_location
+      raise "no file provided by source_location: #{self}" if file.nil?
       raise "no line number provided for source_location: #{self}" if line_no.nil?
       tokens =  Ripper.lex File.read(file)
       tokens_on_line = tokens.select {|pos, lbl, str| pos[0].eql?(line_no) }

data/vendor/gems/express_templates/lib/express_templates.rb

@@ -1,13 +1,12 @@
 module ExpressTemplates
+  require 'arbre'
+  require 'arbre/patches'
   require 'core_extensions/proc'
   require 'core_extensions/string'
   require 'express_templates/indenter'
-  require 'express_templates/macro'
-  require 'express_templates/markup'
   require 'express_templates/components'
   require 'express_templates/template/handler'
   require 'express_templates/renderer'
-  require 'express_templates/expander'
   require 'express_templates/compiler'
   require 'express_templates/interpolator'
   extend Renderer

data/vendor/gems/express_templates/lib/express_templates/compiler.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 module ExpressTemplates
   module Compiler
     def compile(template_or_src=nil, &block)
@@ -12,13 +13,7 @@ module ExpressTemplates
 
       template, src = _normalize(template_or_src)
 
-      expander = Expander.new(template)
-
-      compiled = expander.expand(src, &block).map(&:compile)
-
-      return Interpolator.transform(compiled.join("+").gsub('"+"', '')).tap do |s|
-        puts("\n"+template.inspect+"\nSource:\n#{template.try(:source)}\nInterpolated:\n#{s}\n") if ENV['DEBUG'].eql?('true')
-      end
+      %Q[Arbre::Context.new(assigns.merge(template_virtual_path: @virtual_path), self) { #{src || block.source_body} }.to_s]
     end
 
     private

data/vendor/gems/express_templates/lib/express_templates/components.rb

@@ -3,16 +3,8 @@ module ExpressTemplates
   end
 end
 
-require 'express_templates/expander'
 require 'express_templates/components/base'
-require 'express_templates/components/container'
-require 'express_templates/components/null_wrap'
-require 'express_templates/components/for_each'
-require 'express_templates/components/unless_block'
-require 'express_templates/components/row'
-require 'express_templates/components/column'
+require 'express_templates/components/configurable'
 require 'express_templates/components/form_rails_support'
-require 'express_templates/components/content_for'
-require 'express_templates/components/table_for'
 require 'express_templates/components/tree_for'
 require 'express_templates/components/forms'

data/vendor/gems/express_templates/lib/express_templates/components/base.rb

@@ -5,50 +5,46 @@ module ExpressTemplates
   # Components provide self-contained reusable view code meant to be shared
   # within a project or across many projects through a library of components
   #
-  # Components gain their functionality through inclusion of Capabilities.
-  #
-  # Most Components are descendents of Components::Base.
-  #
   module Components
 
     # Components::Base is the base class for ExpressTemplates view components.
     #
-    # View components are available as macros in ExpressTemplates and may be
-    # used to encapsulate common view patterns, behavior and functionality in
-    # reusable classes that can be shared within and across projects.
-    #
-    # Components intended to provide a base framework for a library of reusable
-    # components to cut development time across a multitude of projects.
-    #
-    # Components gain their functionality through including Capabilities.
-    #
-    # Example capabilities include:
-    #
-    # * Managing related ExpressTemplate fragments
-    # * Compiling template fragments for evaluation in a View Context
-    # * Specifying rendering logic to be executed in the View Context
-    # * Potentially referencing external assets that may be required
-    #   for the component to work.
     #
-    # Components::Base includes the following capabilities:
-    #
-    # * Capabilities::Templating
-    # * Capabilities::Rendering
-    # * Capabilities::Wrapping
-    # * Capabilities::Iterating
-    #
-    class Base < Expander
-      include ExpressTemplates::Macro
-      include Capabilities::Templating
-      include Capabilities::Rendering
-      include Capabilities::Wrapping
-      include Capabilities::Iterating
-
-      def self.inherited(klass)
-        ExpressTemplates::Expander.register_macros_for klass
+    class Base < Arbre::Component
+
+      def self.builder_method_and_class(method_name, klass)
+        Arbre::Element::BuilderMethods.class_eval <<-EOF, __FILE__, __LINE__
+          def #{method_name}(*args, &block)
+            insert_tag ::#{klass.name}, *args, &block
+          end
+        EOF
+        # puts "added #{method_name} -> #{klass.name}"
       end
 
-    end
+      def self.emits(proc = nil, &block)
+        define_method(:build, &(proc || block))
+      end
 
+      def build(*args, block)
+        raise "#build method must be overridden"
+      end
+
+      def resource
+        helpers.resource
+      end
+
+      def self.inherited(subclass)
+        builder_method_and_class subclass.to_s.demodulize.underscore, subclass
+      end
+
+      def indent_level
+        parent_indent_level = parent.try(:indent_level) || 0
+      end
+
+      def to_s
+        children.to_s
+      end
+
+    end
   end
 end

data/vendor/gems/express_templates/lib/express_templates/components/capabilities/resourceful.rb

@@ -4,15 +4,15 @@ module ExpressTemplates
 
       module Resourceful
         def namespace
-          @config[:namespace] || infer_namespace
+          config[:namespace] || infer_namespace
         end
 
         def path_prefix
-          @config[:path_prefix] || infer_path_prefix
+          config[:path_prefix] || infer_path_prefix
         end
 
         def resource_class
-          resource_class = @config[:resource_class] || _namespaced_resource_class
+          resource_class = config[:resource_class] || _namespaced_resource_class
           resource_class.constantize
         end
 
@@ -26,10 +26,17 @@ module ExpressTemplates
           end
         end
 
+        def template_virtual_path
+          begin
+            super
+          rescue
+            nil
+          end
+        end
+
         def infer_namespace
-          expander = @args.last
-          if expander.try(:template)
-            path_parts = expander.template.virtual_path.split('/')
+          if template_virtual_path
+            path_parts = template_virtual_path.split('/')
 
             case
             when path_parts.size == 4
@@ -50,9 +57,8 @@ module ExpressTemplates
         end
 
         def infer_path_prefix
-          expander = @args.last
-          if expander.try(:template)
-            path_parts = expander.template.virtual_path.split('/')
+          if template_virtual_path
+            path_parts = template_virtual_path.split('/')
 
             case
             when path_parts.size == 4
@@ -75,7 +81,7 @@ module ExpressTemplates
         # TODO: this can now be inferred from the template.virtual_path
         # if not supplied...
         def resource_name
-          @config[:id].to_s.singularize
+          config[:id].to_s.singularize
         end
 
         def collection_member_name
@@ -91,14 +97,15 @@ module ExpressTemplates
         end
 
         def collection
-          @config[:collection] || collection_var
+          config[:collection] || helpers.collection
         end
 
         def collection_path
-          if @config[:collection_path]
-            @config[:collection_path]
+          if config[:collection_path]
+            config[:collection_path]
           else
-            "#{collection_name_with_prefix}_path"
+            #super
+            helpers.instance_eval "#{collection_name_with_prefix}_path"
           end
         end
 
@@ -110,11 +117,16 @@ module ExpressTemplates
           end
         end
 
+        def resource_path_helper
+          "#{resource_name_with_path_prefix}_path"
+        end
+
         def resource_path(ivar=false)
-          if @config[:resource_path]
-            @config[:resource_path]
+          if config[:resource_path]
+            config[:resource_path]
           else
-            "#{resource_name_with_path_prefix}_path(#{ivar ? '@' : ''}#{resource_name})"
+            # super
+            helpers.instance_eval("#{resource_path_helper}(#{ivar ? '@' : ''}#{resource_name})")
           end
         end
 
@@ -126,7 +138,7 @@ module ExpressTemplates
           end
         end
 
-        def attributes
+        def resource_attributes
           resource_class.columns
         end
       end

data/vendor/gems/express_templates/lib/express_templates/components/configurable.rb

@@ -0,0 +1,41 @@
+module ExpressTemplates
+  module Components
+    class Configurable < Base
+
+      def self.emits(proc = nil, &block)
+        define_method(:markup, &(proc || block))
+      end
+
+      def build(*args, &block)
+        _process_args!(args)
+        if method(:markup).arity > 0
+          markup(block)
+        else
+          markup(&block)
+        end
+      end
+
+      def config
+        @config ||= {}
+      end
+
+      alias :my :config
+
+
+      protected
+
+        def _process_args!(args)
+          if args.first.kind_of?(Symbol)
+            config.merge!(id: args.shift)
+            attributes[:id] = config[:id]
+          end
+          args.each do |arg|
+            if arg.kind_of?(Hash)
+              config.merge!(arg)
+            end
+          end
+        end
+
+    end
+  end
+end

data/vendor/gems/express_templates/lib/express_templates/components/form_rails_support.rb

@@ -5,16 +5,15 @@ module ExpressTemplates
     # would be provided by Rails' form helpers.
     #
     # An optional method may be speficied.  Defaults to 'post'.
-    class FormRailsSupport < Base
-      include Capabilities::Configurable
-      emits -> {
+    class FormRailsSupport < Configurable
+      emits -> (ctx) {
         div(style: 'display:none') {
-          utf8_enforcer_tag
+          add_child helpers.utf8_enforcer_tag
           # NOTE: This should be moved into the forms module and made a FormComponent
           #       to have access to the resource_name as this code assumes existence of
           #       a resource method which may not exist
-          method_tag(@config[:id] || "{{((resource.persisted? ? :put : :post) rescue :post)}}")
-          token_tag
+          add_child helpers.send(:method_tag, (config[:id] || ((resource.persisted? ? :put : :post) rescue :post)))
+          helpers.send(:token_tag)
         }
       }
     end

data/vendor/gems/express_templates/lib/express_templates/components/forms.rb

@@ -5,7 +5,6 @@ module ExpressTemplates
   end
 end
 
-require 'express_templates/components/forms/form_support'
 require 'express_templates/components/forms/express_form'
 require 'express_templates/components/forms/form_component'
 require 'express_templates/components/forms/option_support'

data/vendor/gems/express_templates/lib/express_templates/components/forms/basic_fields.rb

@@ -12,7 +12,7 @@ module ExpressTemplates
               emits -> {
                 div(class: field_wrapper_class) {
                   label_tag(label_name, label_text)
-                  #{type}_field resource_var, field_name.to_sym
+                  #{type}_field resource_var, field_name.to_sym, html_options
                 }
               }
             end
@@ -35,19 +35,16 @@ RUBY
         emits -> {
           div(class: field_wrapper_class) {
             label_tag(label_name, label_text)
-            text_area resource_var, field_name.to_sym
+            text_area resource_var, field_name.to_sym, html_options
           }
         }
       end
 
       class Hidden < FormComponent
         emits -> {
-          hidden_field resource_var, field_name.to_sym
+          hidden_field resource_var, field_name.to_sym, html_options
         }
       end
-
-
     end
   end
 end
-

data/vendor/gems/express_templates/lib/express_templates/components/forms/checkbox.rb

@@ -16,7 +16,7 @@ module ExpressTemplates
         end
 
         def label_after?
-          !!@config[:label_after]
+          !!config[:label_after]
         end
 
         def field_options

data/vendor/gems/express_templates/lib/express_templates/components/forms/express_form.rb

@@ -1,55 +1,45 @@
 module ExpressTemplates
   module Components
     module Forms
-      class ExpressForm < Base
-        include Capabilities::Configurable
-        include Capabilities::Parenting
-        include Capabilities::Resourceful
-        include Forms::FormSupport
-
-        emits -> {
-          form( form_args ) {
+      class ExpressForm < Configurable
+        include ExpressTemplates::Components::Capabilities::Resourceful
+
+        emits -> (block) {
+          form(form_tag_options ) {
             form_rails_support form_method
-            _yield
+            block.call(self) if block
           }
         }
 
         def form_id
-          "#{resource_name}_{{@#{resource_name}.id}}"
+          "#{resource_name}_#{resource.id}"
         end
 
         def form_method
-          @config[:method]
+          config[:method].to_s.upcase || 'POST'
         end
 
+        def form_action
+          config[:action] || (resource.try(:persisted?) ? resource_path(ivar: true) : collection_path)
+        end
 
-        def form_args
-          # there are no put/patch emthods in HTML5, so we have to enforce post
-          # need to find a better way to do this: id/action can be overridden but method
-          # should always be :post IN THE FORM TAG
-          args = {id: form_id, action: form_action}.merge!(@config).merge!(method: :post)
+        def form_tag_options
+          args = {id: form_id, action: form_action}.merge!(config).merge!(method: 'POST')
 
           if html_options = args.delete(:html_options)
             args.merge!(html_options)
           end
-          args[:method] = args[:method].to_s.upcase
           args
         end
 
         def resource_name_for_path
-          @config[:id].to_s
+          config[:id].to_s
         end
 
         def resource_name
-          (@config[:resource_name] || @config[:id]).to_s
+          (config[:resource_name] || config[:id]).to_s
         end
 
-        private
-
-          def _modifying_resource?
-            [:put, :patch].include? form_method
-          end
-
       end
     end
   end