card 1.19.6 → 1.20.0

data/mod/basic_formats/set/all/rss.rb

@@ -12,7 +12,7 @@ format :rss do
   end
 
   # FIXME: integrate this with common XML features when it is added
-  view :feed do
+  view :feed, cache: :never do
     begin
       @xml.instruct! :xml, version: "1.0"
       @xml.rss version: "2.0" do
@@ -28,16 +28,16 @@ format :rss do
     end
   end
 
-  def raw_feed_items _args
+  def raw_feed_items
     [card]
   end
 
-  view :feed_body do |_args|
+  view :feed_body, cache: :never do
     render_feed_item_list
   end
 
-  view :feed_item_list do |args|
-    raw_feed_items(args).each do |item|
+  view :feed_item_list, cache: :never do
+    raw_feed_items.each do |item|
       @xml.item do
         # FIXME: yuck.
         subformat(item).render_feed_item view_changes: (card.id == RecentID)
@@ -49,7 +49,7 @@ format :rss do
     Card.global_setting(:title) + " : " + card.name.gsub(/^\*/, "")
   end
 
-  view :feed_item do |args|
+  view :feed_item, cache: :never do |args|
     @xml.title card.name
     add_name_context
     @xml.description render((args[:view_changes] ? :change : :open_content))

data/mod/basic_formats/set/all/text.rb

@@ -1,6 +1,7 @@
 
 format :text do
-  view :core do |args|
-    HTMLEntities.new.decode strip_tags(super args).to_s # need this string method to get out of html_safe mode
+  view :core do
+    HTMLEntities.new.decode strip_tags(super()).to_s
+    # need this string method to get out of html_safe mode
   end
 end

data/mod/basic_formats/set/self/01_head/javascript.rb

@@ -11,7 +11,7 @@ format :html do
 
     @js_tag =
       if params[:debug] == "script"
-        script_card.format(:js).render_core item: :include_tag
+        script_card.format(:js).render_core items: { view: :include_tag }
       elsif script_card
         javascript_include_tag script_card.machine_output_url
       end
@@ -70,4 +70,4 @@ format :html do
       javascript_tag { "wagn.#{js_wagn_function}('#{config_json}')" }
     end
   end
-end
+end

data/mod/basic_formats/set/self/head.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :raw do
+  view :raw, cache: :never do
     output [
       head_meta,
       head_title,
@@ -9,14 +9,8 @@ format :html do
     ]
   end
 
-  view :core do |args|
-    if focal?
-      CGI.escapeHTML _render_raw(args)
-    elsif @mainline
-      "(*head)"
-    else
-      _render_raw(args)
-    end
+  view :core, cache: :never do
+    root.first_head? ? _render_raw : CGI.escapeHTML(_render_raw)
   end
 
   def head_meta
@@ -86,7 +80,9 @@ format :html do
 
   def rss_link
     opts = { format: :rss }
-    root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
+    if root.search_params[:vars]
+      root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
+    end
     href = page_path root.card.cardname, opts
     tag "link", rel: "alternate", type: "application/rss+xml",
                 title: "RSS", href: href

data/mod/basic_formats/spec/set/all/all_css_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::AllCss do
-  it "should render content view" do
+  it "renders content view" do
     content = "#box { display: block }"
     rendered = render_card :content, { content: content }, format: :css
     #    rendered.should =~ /Style Card\:/

data/mod/basic_formats/spec/set/all/all_csv_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::All::AllCsv, "CSV mod" do
   context "csv_row view" do
-    it "should handle nests" do
+    it "handles nests" do
       rendered = render_card :csv_row, { content: "{{A+B}} {{T}}" },
                              format: :csv
       expect(rendered).to eq("AlphaBeta,Theta")

data/mod/basic_formats/spec/set/all/base_spec.rb

@@ -72,17 +72,20 @@ describe Card::Set::All::Base do
 
     it "renders template rule of embed cards based on set" do
       Card::Auth.as_bot
-      content = "{{_left+test_another_card|content|content;"\
-                "structure:test_another_card_structure}}"
-      card = Card.create! name: "test_card+*right+*structure",
-                          type_id: Card::HTMLID, content: content
+      structure_card = Card.create!(
+        name: "test_card+*right+*structure",
+        type_id: Card::HTMLID,
+        content: "{{_left+test_another_card|content|content;"\
+                 "structure:test_another_card_structure}}"
+      )
       Card.create! name: "test_another_card+*right+*structure",
                    type_id: Card::SearchTypeID,
                    content: ' {"type":"basic","left":"_1"}'
-      html = card.format.render_open
       href = "/test_another_card+*right?view=template_editor"
       text = "_left+test_another_card|content|content;"\
              "structure:test_another_card_structure"
+
+      html = structure_card.format.render_open
       expect(html).to have_tag("a", with: { class: "slotter", href: href },
                                     text: text)
     end

data/mod/basic_formats/spec/set/all/json_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::All::Json, "JSON mod" do
   context "status view" do
-    it "should handle real and virtual cards" do
+    it "handles real and virtual cards" do
       jf = Card::Format::JsonFormat
       real_json = jf.new(Card["T"]).show :status, {}
       expect(JSON[real_json]).to eq(
@@ -14,7 +14,7 @@ describe Card::Set::All::Json, "JSON mod" do
       )
     end
 
-    it "should treat both unknown and unreadable cards as unknown" do
+    it "treats both unknown and unreadable cards as unknown" do
       Card::Auth.as Card::AnonymousID do
         jf = Card::Format::JsonFormat
 

data/mod/basic_formats/spec/set/all/rss_spec.rb

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Rss do
-  it "should render recent.rss" do
+  it "renders recent.rss" do
     rendered = Card[:recent].format(:rss).show(nil, {})
     expect(rendered).to match(/xml/)
   end
 
-  it "should handle faulty search queries" do
+  it "handles faulty search queries" do
     bad_search = Card.create! name: "Bad Search",
                               type: "Search", content: "not no search"
     rendered = bad_search.format(:rss).render_feed_body
-    expect(rendered).to have_tag("item", text: /JSON::ParserError/)
+    expect(rendered).to have_tag("item", text: /Card::Error::BadQuery/)
   end
 
-  it "should handle bad queries" do
+  it "handles bad queries" do
     bad_search = Card.create! name: "Bad Search",
                               type: "Search", content: '{"found_by":"home"}'
     rendered = bad_search.format(:rss).render_feed_body

data/mod/basic_types/set/type/plain_text.rb

@@ -1,12 +1,10 @@
 format :html do
-  view :editor do |_args|
-    text_area :content,
-              rows: 5,
-              class: "card-content",
+  view :editor do
+    text_area :content, rows: 5, class: "card-content",
               "data-card-type-code" => card.type_code
   end
 
-  view :core do |_args|
+  view :core do
     process_content CGI.escapeHTML(_render_raw)
   end
 end

data/mod/basic_types/spec/set/type/plain_text_spec.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::PlainText do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor("Plain Text"), 'textarea[rows="5"]'
   end
 
-  it "should have special content that escapes HTML" do
+  it "has special content that escapes HTML" do
     expect(render_card(:core, type: "Plain Text", content: "<b></b>"))
       .to eq "&lt;b&gt;&lt;/b&gt;"
   end

data/mod/bootstrap/lib/bootstrap.rb

@@ -0,0 +1,16 @@
+require 'bootstrap/component_loader'
+require 'bootstrap/component'
+
+class Bootstrap
+  include Delegate
+  extend ComponentLoader
+  load_components
+
+  def initialize context=nil
+    @context = context
+  end
+
+  def render *args, &block
+    instance_exec *args, &block
+  end
+end

data/mod/bootstrap/lib/bootstrap/basic_tags.rb

@@ -0,0 +1,26 @@
+#require 'component'
+
+class Bootstrap
+  module BasicTags
+    def html content
+      add_content String(content).html_safe
+      ""
+    end
+
+    Component.add_div_method :div, nil do |opts, extra_args|
+      prepend_class opts, extra_args.first if extra_args.present?
+      opts
+    end
+
+    Component.add_div_method :span, nil do |opts, extra_args|
+      prepend_class opts, extra_args.first if extra_args.present?
+      opts
+    end
+
+    Component.add_tag_method :tag, nil, tag: :yield do |opts, extra_args|
+      prepend_class opts, extra_args[1] if extra_args[1].present?
+      opts[:tag] = extra_args[0]
+      opts
+    end
+  end
+end

data/mod/bootstrap/lib/bootstrap/component.rb

@@ -0,0 +1,133 @@
+#! no set module
+class Bootstrap
+  class Component
+    def initialize context, *args, &block
+      @context = context
+      @content = ["".html_safe]
+      @args = args
+      @child_args = []
+      @append = []
+      @build_block = block
+    end
+
+    class << self
+      def render format, *args, &block
+        new(format, *args, &block).render
+      end
+
+      def add_div_method name, html_class, opts={}, &tag_block
+        add_tag_method name, html_class, opts.merge(tag: :div), &tag_block
+      end
+
+      def add_tag_method name, html_class, tag_opts={}, &tag_block
+        define_method name do |*args, &block|
+          process_tag tag_opts[:tag] || name do
+            content, opts, new_child_args = standardize_args args, &tag_block
+            add_classes opts, html_class, tag_opts.delete(:optional_classes)
+            if (attributes = tag_opts.delete(:attributes))
+              opts.merge! attributes
+            end
+
+            content = with_child_args new_child_args do
+              generate_content content,
+                               tag_opts[:content_processor],
+                               &block
+            end
+
+            [content, opts]
+          end
+        end
+      end
+    end
+
+    def render
+      @rendered = begin
+        render_content
+        @content[-1]
+      end
+    end
+
+    def prepend &block
+      tmp = @content.pop
+      instance_exec &block
+      @content << tmp
+    end
+
+    def insert &block
+      instance_exec &block
+    end
+
+    def append &block
+      @append[-1] << block
+    end
+
+    # def wrap
+    #   tmp = @content.pop
+    #   @content << yield(tmp)
+    # end
+
+    private
+
+    def render_content
+      #if @build_block.arity > 0
+      instance_exec *@args, &@build_block
+    end
+
+    def generate_content content, processor, &block
+      content = instance_exec &block if block.present?
+      return content if !processor || !content.is_a?(Array)
+      content.each { |item| send processor, item }
+      ""
+    end
+
+    def with_child_args args
+      @child_args << args if args.present?
+      res = yield
+      @child_args.pop if args.present?
+      res
+    end
+
+
+    def add_content content
+      @content[-1] << "\n#{content}".html_safe if content.present?
+    end
+
+    def process_tag tag_name
+      @content.push "".html_safe
+      @append << []
+      content, opts = yield
+      add_content content
+      collected_content = @content.pop
+      tag_name = opts.delete(:tag) if tag_name == :yield
+      add_content content_tag(tag_name, collected_content, opts, false)
+      @append.pop.each do |block|
+        add_content instance_exec(&block)
+      end
+      ""
+    end
+
+    def standardize_args args, &block
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      items = ((args.one? && args.last.is_a?(String)) || args.last.is_a?(Array)) &&
+          args.pop
+      if block.present?
+        opts, args = instance_exec opts, args, &block
+        unless opts.is_a?(Hash)
+          raise Card::Error, "first return value of a tag block has to be a hash"
+        end
+      end
+
+      [items, opts, args]
+    end
+
+    def add_classes opts, html_class, optional_classes
+      prepend_class opts, html_class if html_class
+      Array.wrap(optional_classes).each do |k, v|
+        prepend_class opts, v if opts.delete k
+      end
+    end
+
+    include BasicTags
+    include Delegate
+  end
+end

data/mod/bootstrap/lib/bootstrap/component/form.rb

@@ -0,0 +1,31 @@
+class Bootstrap
+  class Component
+    class Form < Component
+      def render_content *args
+          form *args, &@build_block
+      end
+
+      add_tag_method :form, nil, optional_classes: {
+        horizontal: "form-horizontal",
+        inline: "form-inline" }
+      add_div_method :group, "form-group"
+      add_tag_method :label, nil
+      add_tag_method :input, "form-control" do |opts, extra_args|
+        type, label = extra_args
+        prepend { label label, for: opts[:id] } if label
+        opts[:type] = type
+        opts
+      end
+
+      [:text, :password, :datetime, :"datetime-local", :date, :month, :time,
+       :week, :number, :email, :url, :search, :tel, :color].each do |tag|
+        add_tag_method tag, "form-control", attributes: { type: tag },
+                       tag: :input do |opts, extra_args|
+          label, = extra_args
+          prepend { label label, for: opts[:id] } if label
+          opts
+        end
+      end
+    end
+  end
+end

data/mod/bootstrap/lib/bootstrap/component/horizontal_form.rb

@@ -0,0 +1,38 @@
+class Bootstrap
+  class Component
+    class HorizontalForm < Form
+      def left_col_width
+        @child_args.last && @child_args.last[0] || 2
+      end
+
+      def right_col_width
+        @child_args.last && @child_args.last[1] || 10
+      end
+
+      add_tag_method :form, "form-horizontal"
+
+      add_tag_method :label, "control-label" do |opts, extra_args|
+        prepend_class opts, "col-sm-#{left_col_width}"
+        opts
+      end
+
+      add_div_method :input, nil do |opts, extra_args|
+        type, label = extra_args
+        prepend { tag :label, nil, for: opts[:id] } if label
+        insert { inner_input opts.merge(type: type) }
+        { class: "col-sm-#{right_col_width}" }
+      end
+      add_tag_method :inner_input, "form-control", tag: :input
+      add_div_method :inner_checkbox, "checkbox"
+
+      add_div_method :checkbox, nil do |opts, extra_args|
+        inner_checkbox do
+          label do
+            inner_input "checkbox", extra_args.first, opts
+          end
+        end
+        { class: "col-sm-offset-#{left_col_width} col-sm-#{right_col_width}" }
+      end
+    end
+  end
+end