lib/template-inheritance/alfa_helpers.rb in alfa-0.0.5.pre vs lib/template-inheritance/alfa_helpers.rb in alfa-0.0.6.pre

@@ -1,27 +1,29 @@
 # Monkeypatch functionalfix for gem TemplateInheritance v0.3.1
 module TemplateInheritance
-  class Template
-    attr_writer :resources
-    def resources
-      @resources ||= {styles: [], scripts:[], added_scripts: []}
-    end
+  # class Template
+  #   attr_writer :resources
+  #   def resources
+  #
+  #   end
+  #
+  #   def instantiate_supertemplate
+  #     supertemplate = self.class.new(self.supertemplate, self.scope)
+  #     supertemplate.blocks = self.blocks
+  #     supertemplate.resources = self.resources
+  #     supertemplate
+  #   end
+  # end
 
-    def instantiate_supertemplate
-      supertemplate = self.class.new(self.supertemplate, self.scope)
-      supertemplate.blocks = self.blocks
-      supertemplate.resources = self.resources
-      supertemplate
-    end
-  end
 
-
   class RenderScope
-    attr_reader :controller
+    attr_reader :controller, :wrapper
 
-    def initialize(controller = nil)
+    def initialize(controller = nil, wrapper = nil, resourcer = nil)
       @controller = controller
+      @wrapper = wrapper
+      @resourcer = resourcer
     end
   end
 
 
   module TemplateHelpers
@@ -36,17 +38,17 @@
           require_style '/~assets/css/960gs/text.css' if modes.include?(:text)
           require_style '/~assets/css/960gs/960_24_col.css'
         when :alfa_classic, 'alfa_classic'
 
         else
-          self.template.resources[:styles] << src
+          @resourcer[:styles] << src
       end
     end
 
     def styles
-      self.template.resources[:styles].uniq.map{|s|
-        if s.match(/^\/~assets\/(.*)/)
+      @resourcer.styles.uniq.map{|s|
+        if s.match(/\A\/~assets\/(.*)/)
           f = File.join(File.expand_path('../../../assets/', __FILE__), $1)
         else
           f = File.join(Alfa::WebApplication.config[:document_root], s)
         end
         mtime = File.exist?(f) ? File.mtime(f).to_i : nil
@@ -58,36 +60,115 @@
 
     end
 
     def require_script(src, type: 'text/javascript')
       raise ArgumentError, 'src required' if src.nil?
-      self.template.resources[:scripts] << src
+      case src
+        when :jquery, 'jquery'
+          @resourcer[:scripts] << {src: '/~assets/js/jquery/jquery-1.11.0.min.js', type: 'text/javascript'}
+        else
+          @resourcer[:scripts] << {src: src, type: type}
+      end
     end
 
     def add_script(type: 'text/javascript', &block)
-      self.template.resources[:scripts] << self.template.scope.capture(&block)
+      @resourcer[:scripts] << {code: self.template.scope.capture(&block), type: type}
     end
 
     def scripts
-      self.template.resources[:scripts].reverse.uniq.map{|s| "<script type='text/javascript' src='#{s}'></script>\n" }.join('')
+      @resourcer.scripts.uniq.map{|s|
+        if (s[:src])
+          if s[:src].match(/\A\/~assets\/(.*)/)
+            f = File.join(File.expand_path('../../../assets/', __FILE__), $1)
+          else
+            f = File.join(Alfa::WebApplication.config[:document_root], s[:src])
+          end
+          mtime = File.exist?(f) ? File.mtime(f).to_i : nil
+          "<script type='#{s[:type]}' src='#{s[:src]}?#{mtime}'></script>\n"
+        else
+          "<script type='#{s[:type]}'>\n#{s[:code].rstrip}\n</script>\n"
+        end
+      }.join('')
     end
 
     def href(*o)
-      @controller.href(*o)
+      @wrapper.href(*o)
     end
 
-    def a(text, url)
-      "<a href='#{url}'>#{Haml::Helpers.html_escape(text)}</a>"
+    # TODO: Fix casual white-spaces around returned tag string
+    def a(text, url, attributes = {})
+      active_class = 'active'
+      if url.is_a?(Array)
+        args, params = ::Alfa::Support.args_kwargs(*url)
+        url = args.first
+      else
+        params = {}
+      end
+      if url.is_a?(Symbol)
+        active_class = attributes[:active_class] if attributes.has_key?(:active_class)
+        zp = @wrapper._string_to_aca(url.to_s)
+        attributes[:class] = "#{attributes[:class]} #{active_class}".strip if breadcrumb_match?(controller: zp[:controller], action: zp[:action])
+        url = href(url.to_s, params)
+      end
+      attributes.delete(:active_class)
+      attributes[:href] = url
+      capture_haml do
+        haml_tag(:a, text, attributes)
+      end
     end
 
+    def a_post(text, url, attributes = {})
+      if url.is_a?(Array)
+        args, params = ::Alfa::Support.args_kwargs(*url)
+        urlf = args.first
+      else
+        urlf = url
+        params = {}
+      end
+      url_str = urlf.is_a?(Symbol) ? href(urlf.to_s, params) : urlf.to_s
+      attributes[:onclick] = "{var form=document.createElement(\"form\"); form.setAttribute(\"method\", \"post\"); form.setAttribute(\"action\", \"#{url_str}\"); document.body.appendChild(form); form.submit(); return false;}"
+      a(text, url, attributes)
+    end
+
     alias :link_to :a
 
+    # TODO: Fix casual white-spaces around returned tag string
+    def img(attributes = {})
+      capture_haml do
+        haml_tag(:img, attributes)
+      end
+    end
+
+    def application
+      @wrapper.application
+    end
+
     def controller
       @controller
     end
 
     def user
-      @controller.user
+      @wrapper.user
+    end
+
+    def grant?(*o)
+      user.grant?(*o)
+    end
+
+    def snippet(name)
+      @wrapper.application.snippet(name, @wrapper)
+    end
+
+    def breadcrumb_match?(controller: nil, action: nil)
+      @wrapper.breadcrumb_match?(controller: controller, action: action)
+    end
+
+    def csrf_token_tag
+      "<input type='hidden' name='csrf_token' value='#{@wrapper.csrf_token}'/>"
+    end
+
+    def csrf_token
+      @wrapper.csrf_token
     end
   end
 end
 # End of patch
\ No newline at end of file