express_templates 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e11659af9b175019fa94c33686d4f4f197fcc07
-  data.tar.gz: 3bd1729777599d3ba3772c72d8b403098aa66b07
+  metadata.gz: 0ccf72f73138b37943b3f07f72fa8cff812ab095
+  data.tar.gz: 451eb47c997d6d6d7dd587a12278a3b8f1e8ef16
 SHA512:
-  metadata.gz: 34b7fedf65a87724dadb3d8c77ecdc78dbef4598d0bf2da4cecbc89bfbbba865bdbf9a9fbf3518d197f93597c0091a18153df7919a988f31bf786b3ef1b257dd
-  data.tar.gz: b55b2a3cb61868d5df45738d8c1cfbf423a0bbc60996aca66c65d7cfc72d75dad0bd4831ae352c24c372dbd08fbba6e3fc775c1a5aba08eb295a0960096d0c14
+  metadata.gz: a202286780ebf286604d50fe9708ff3a578845ad399306f203a6f9cc0fee382979a5f3d9355912f2ed5b91c6609e5df2c022c27b8a50bee5c8fec8c8db387204
+  data.tar.gz: cdcca66c5c69acd5cf172d42bb2176d8f35ec842ffb7db95f1dd2a2bddfb94cc86a5bf966f47d71d6af656c3b334346269aba4adf6f7a046afc25c8fc35b628c

data/lib/core_extensions/proc.rb

@@ -82,11 +82,7 @@ class Proc
 
   def self.from_source(prc_src)
     raise ArgumentError unless prc_src.kind_of?(String)
-    prc = begin
-      eval(prc_src)
-    rescue ArgumentError => e
-      binding.pry
-    end
+    prc = eval(prc_src)
     prc.instance_variable_set(:@source, prc_src)
     prc
   end

data/lib/express_templates/compiler.rb

@@ -1,19 +1,20 @@
 module ExpressTemplates
   module Compiler
     def compile(template_or_src=nil, &block)
+
+      if block
+        begin
+          block.source
+        rescue
+          raise "block must have source - did you do compile(&:label) ?"
+        end
+      end
+
       template, src = _normalize(template_or_src)
 
       expander = Expander.new(template)
 
-      Thread.current[:first_whitepace_removed] ||= 0
-      Thread.current[:first_whitepace_removed] += 1
-      begin
-        compiled = expander.expand(src, &block).map(&:compile)
-        compiled.first.sub!(/^"\n+/, '"') if Thread.current[:first_whitepace_removed].eql?(1)
-        Thread.current[:first_whitepace_removed] -= 1
-      ensure
-        Thread.current[:first_whitepace_removed] = nil if Thread.current[:first_whitepace_removed].eql?(0)
-      end
+      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')

data/lib/express_templates/components.rb

@@ -12,7 +12,7 @@ require 'express_templates/components/unless_block'
 require 'express_templates/components/row'
 require 'express_templates/components/column'
 require 'express_templates/components/form_rails_support'
-require 'express_templates/components/form_for'
 require 'express_templates/components/content_for'
 require 'express_templates/components/table_for'
 require 'express_templates/components/tree_for'
+require 'express_templates/components/forms'

data/lib/express_templates/components/capabilities/adoptable.rb

@@ -0,0 +1,20 @@
+module ExpressTemplates
+  module Components
+    module Capabilities
+      module Adoptable
+        # Adoptable adds the capability for a child to refer
+        # to its parent.  This is used by more complex
+        # components which are intended to work together
+        # such as form components where form elements may need
+        # to use information known only to the parent.
+
+        def self.included(base)
+          base.class_eval do
+            attr_accessor :parent
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/express_templates/components/capabilities/building.rb

@@ -2,6 +2,12 @@ module ExpressTemplates
   module Components
     module Capabilities
       module Building
+        # commented this out because it's intercepting calls to rails helpers
+        # TODO: fix this... I think the whole buiding approach is broken.
+        #       this class is empty and should probably go away.
+        # def method_missing(name, *args)
+        #   raise "#{self.class.to_s} has no method '#{name}'"
+        # end
       end
     end
   end

data/lib/express_templates/components/capabilities/parenting.rb

@@ -40,11 +40,16 @@ module ExpressTemplates
           end
 
           def children=(children)
-            @children =children
+            @children = children
+            children.each do |child|
+              if child.kind_of?(Adoptable)
+                child.parent = self
+              end
+            end
           end
 
           def compile
-            null_wrapped_children = "null_wrap { #{compile_children} }"
+            null_wrapped_children = "null_wrap(%q(#{compile_children}))"
             wrap_children_src = self.class[:markup].source.gsub(/(\s)_yield(\s)/, '\1'+null_wrapped_children+'\2')
             _compile_fragment(Proc.from_source(wrap_children_src))
           end

data/lib/express_templates/components/capabilities/templating.rb

@@ -118,7 +118,7 @@ module ExpressTemplates
             # Returns a string containing ruby code which evaluates to markup.
             def _lookup(name, options = {})
               @fragments ||= Hash.new
-              @fragments[name] or binding.pry #raise "no template fragment supplied for: #{name}"
+              @fragments[name] or raise "no template fragment supplied for: #{name}"
             end
 
           private

data/lib/express_templates/components/for_each.rb

@@ -20,9 +20,11 @@ module ExpressTemplates
         end
       end
 
+
       def compile
         %Q((#{@collection}.each_with_index.map do |#{@member}, #{@member}_index|#{compile_children}\nend).join)
       end
+
     end
   end
 end

data/lib/express_templates/components/form_rails_support.rb

@@ -10,7 +10,10 @@ module ExpressTemplates
       emits -> {
         div(style: 'display:none') {
           utf8_enforcer_tag
-          method_tag(my[:id] || :post)
+          # 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
         }
       }

data/lib/express_templates/components/forms.rb

@@ -0,0 +1,15 @@
+module ExpressTemplates
+  module Components
+    module Forms
+    end
+  end
+end
+
+require 'express_templates/components/forms/express_form'
+require 'express_templates/components/forms/form_component'
+require 'express_templates/components/forms/option_support'
+require 'express_templates/components/forms/submit'
+require 'express_templates/components/forms/select'
+require 'express_templates/components/forms/radio'
+require 'express_templates/components/forms/checkbox'
+require 'express_templates/components/forms/basic_fields'

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

@@ -0,0 +1,53 @@
+module ExpressTemplates
+  module Components
+    module Forms
+      module BasicFields
+        ALL = %w(email phone text password color date datetime
+                datetime_local number range
+                search telephone time url week)
+
+        ALL.each do |type|
+          class_definition = <<-RUBY
+            class #{type.classify} < FormComponent
+              emits -> {
+                div(class: field_wrapper_class) {
+                  label_tag(label_name, label_text)
+                  #{type}_field resource_var, field_name.to_sym
+                }
+              }
+            end
+RUBY
+
+          eval(class_definition)
+
+        end
+      end
+
+      # class Email < FormComponent
+      #   emits -> {
+      #     div(class: field_wrapper_class) {
+      #       email_field resource_var, field_name.to_sym
+      #     }
+      #   }
+      # end
+
+      class Textarea < FormComponent
+        emits -> {
+          div(class: field_wrapper_class) {
+            label_tag(label_name, label_text)
+            text_area resource_var, field_name.to_sym
+          }
+        }
+      end
+
+      class Hidden < FormComponent
+        emits -> {
+          hidden_field resource_var, field_name.to_sym
+        }
+      end
+
+
+    end
+  end
+end
+

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

@@ -0,0 +1,37 @@
+module ExpressTemplates
+  module Components
+    module Forms
+      class Checkbox < FormComponent
+
+        emits -> {
+          div(class: field_wrapper_class) {
+            label_tag(label_name, label_text) if label_before?
+            check_box(resource_var, field_name.to_sym, field_options, checked_value, unchecked_value)
+            label_tag(label_name, label_text) if label_after?
+          }
+        }
+
+        def label_before?
+          !label_after?
+        end
+
+        def label_after?
+          !!@config[:label_after]
+        end
+
+        def field_options
+          {}
+        end
+
+        def checked_value
+          "1"
+        end
+
+        def unchecked_value
+          "0"
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+module ExpressTemplates
+  module Components
+    module Forms
+      class ExpressForm < Base
+        include Capabilities::Configurable
+        include Capabilities::Parenting
+
+        emits -> {
+          form( form_args ) {
+            form_rails_support form_method
+            _yield
+          }
+        }
+
+        def form_id
+          "#{resource_name}_{{@#{resource_name}.id}}"
+        end
+
+        def form_method
+          @config[:method]
+        end
+
+        def form_action
+          if _modifying_resource?
+            "{{#{resource_name_for_path}_path(@#{resource_name})}}"
+          else # posting a new to a collection
+            # We also have to take in to account singular resources 
+            # e.g. resource :config -> will throw an unknown method error of configs_path
+            "{{#{resource_name_for_path.pluralize}_path}}"
+          end
+        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)
+
+          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
+        end
+
+        def resource_name
+          (@config[:resource_name] || @config[:id]).to_s
+        end
+
+
+        private
+
+          def _modifying_resource?
+            [:put, :patch].include? form_method
+          end
+
+      end
+    end
+  end
+end
+

data/lib/express_templates/components/forms/form_component.rb

@@ -0,0 +1,60 @@
+module ExpressTemplates
+  module Components
+    module Forms
+      class FormComponent < Base
+        include Capabilities::Configurable
+        include Capabilities::Adoptable
+
+        def compile(*args)
+          raise "#{self.class} requires a parent ExpressForm" if parent.nil? or parent_form.nil?
+          super(*args)
+        end
+
+        # Lookup the resource_name from the parent ExpressForm.
+        def resource_name
+          parent_form.resource_name
+        end
+
+        def resource_var
+          resource_name.to_sym
+        end
+
+        # Return the name attribute for the lable
+        def label_name
+          "#{resource_name.singularize}_#{field_name}"
+        end
+
+        # Return the text content for the label
+        def label_text
+          @options[:label] || field_name.titleize
+        end
+
+        # Return the field_name as a string.  This taken from the first argument
+        # to the component macro in the template or fragment.
+        def field_name
+          (@config[:id] || (@args.first.is_a?(String) && @args.first)).to_s
+        end
+
+        # Return the field name attribute.  Currently handles only simple attributes
+        # on the resource.  Does not handle attributes for associated resources.
+        def field_name_attribute
+          "#{resource_name.singularize}[#{field_name}]"
+        end
+
+        def field_wrapper_class
+          @config[:wrapper_class] || 'field-wrapper'
+        end
+
+        # Search the parent graph until we find an ExpressForm.  Returns nil if none found.
+        def parent_form
+          @my_form ||= parent
+          until @my_form.nil? || @my_form.kind_of?(ExpressForm)
+            @my_form = @my_form.parent
+          end
+          return @my_form
+        end
+
+      end
+    end
+  end
+end

data/lib/express_templates/components/forms/option_support.rb

@@ -0,0 +1,43 @@
+module ExpressTemplates
+  module Components
+    module Forms
+      # Provides a form component with knowledge of any association
+      # on the field and an means of loading the collection for supplying
+      # options to the user.
+      module OptionSupport
+        # Reflect on any association and return it if the association type
+        # is :belongs_to.  Returns false if the association is not :belongs_to.
+        # Returns nil if there was a problem reflecting.
+        def belongs_to_association
+          begin
+            reflection = resource_name.classify.constantize.reflect_on_association(field_name.to_sym)
+            if reflection.macro.eql?(:belongs_to)
+              return reflection
+            end
+          rescue
+            nil
+          end
+        end
+
+        # Provide ActiveRecord code to load the associated collection as
+        # options for display.
+        def related_collection
+          if reflection = belongs_to_association
+            "#{reflection.klass}.all.select(:#{option_value_method}, :#{option_name_method}).order(:name)"
+          end
+        end
+
+        protected
+
+          def option_value_method
+            :id
+          end
+
+          def option_name_method
+            :name
+          end
+
+      end
+    end
+  end
+end

data/lib/express_templates/components/forms/radio.rb

@@ -0,0 +1,84 @@
+module ExpressTemplates
+  module Components
+    module Forms
+      class Radio < FormComponent
+        include OptionSupport
+
+        emits -> {
+          div(class: field_wrapper_class) {
+            label_tag(label_name, label_text)
+            if option_values_specified?
+              generate_options_from_specified_values
+            else
+              use_options_from_collection_radio_buttons_helper
+            end
+          }
+        }
+
+        def use_options_from_collection_radio_buttons_helper
+          # Note {{ }} will get stripped.  This prevents the collection finder string being passed as string.
+          collection_radio_buttons(resource_var, field_name.to_sym, "{{#{collection_from_association}}}",
+                                   option_value_method, option_name_method,
+                                   field_options, html_options) do |b|
+            b.label(class: "radio") {
+              b.radio_button + b.text
+            }
+          end
+        end
+
+        def option_values_specified?
+          [Array, Hash].include?(option_collection.class)
+        end
+
+        def option_collection
+          @args.second
+        end
+
+        def wrapper_class
+          @config[:wrapper_class] || 'wrapper-class'
+        end
+
+        def generate_options_from_specified_values
+          case
+          when option_collection.kind_of?(Array)
+            option_collection.each_with_index do |option, index|
+              label(class: wrapper_class) {
+                radio_button(resource_var, field_name.to_sym, option, class: 'radio')
+                null_wrap { option }
+              }
+            end
+          when option_collection.kind_of?(Hash)
+            option_collection.each_pair do |key, value|
+              label(class: wrapper_class) {
+                radio_button(resource_var, field_name.to_sym, key, class: 'radio')
+                null_wrap { value }
+              }
+            end
+          else
+            raise "Radio collection should be Array or Hash: #{option_collection.inspect}"
+          end
+        end
+
+        def collection_from_association
+          related_collection or raise "No association collection for: #{resource_name}.#{field_name}"
+        end
+
+        def field_options
+          # If field_otions is omitted the Expander will be
+          # in last or 3rd position and we don't want that
+          if @args.size > 3 && @args[2].is_a?(Hash)
+            @args[2]
+          else
+            {}
+          end
+        end
+
+        # TODO: implement
+        def html_options
+          {}
+        end
+
+      end
+    end
+  end
+end