card 1.20.4 → 1.21.0

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

@@ -14,8 +14,9 @@ format :rss do
   # FIXME: integrate this with common XML features when it is added
   view :feed, cache: :never do
     begin
-      @xml.instruct! :xml, version: "1.0"
-      @xml.rss version: "2.0" do
+      @xml.instruct! :xml, version: "1.0", standalone: "yes"
+      @xml.rss version: "2.0",
+               "xmlns:content" => "http://purl.org/rss/1.0/modules/content/" do
         @xml.channel do
           @xml.title       render_feed_title
           @xml.description render_feed_description
@@ -39,8 +40,8 @@ format :rss do
   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)
+        subformat(item).render(:feed_item,
+                               description_view: feed_item_description_view)
       end
     end
   end
@@ -52,13 +53,26 @@ format :rss do
   view :feed_item, cache: :never do |args|
     @xml.title card.name
     add_name_context
-    @xml.description render((args[:view_changes] ? :change : :open_content))
-    @xml.pubDate card.revised_at.to_s(:rfc822)  # updated_at fails on virtual
-    # cards, because not all to_s's take args (just actual dates)
+    @xml.description description(args)
+    @xml.pubDate pub_date
     @xml.link render_url
     @xml.guid render_url
   end
 
+  def pub_date
+    (card.updated_at || Time.zone.now).to_s(:rfc822)
+    # updated_at fails on virtual
+    # cards, because not all to_s's take args (just actual dates)
+  end
+
+  def description args
+    render(args[:description_view] || :open_content)
+  end
+
+  def feed_item_description_view
+    :open_content
+  end
+
   view :feed_description do "" end
   view :comment_box      do "" end
   view :menu             do "" end

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

@@ -25,7 +25,7 @@ format :html do
   end
 
   def wagn_variables
-    varvals = ["window.wagn={rootPath:'#{Card.config.relative_url_root}'}",]
+    varvals = ["window.wagn={rootPath:'#{Card.config.relative_url_root}'}"]
     card.have_recaptcha_keys? &&
       varvals << "wagn.recaptchaKey='#{Card.config.recaptcha_public_key}'"
     (c = Card[:double_click]) && !Card.toggle(c.content) &&

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

@@ -63,7 +63,7 @@ format :html do
   end
 
   def favicon
-    [:favicon, :logo].each do |name|
+    %i[favicon logo].each do |name|
       if (c = Card[name]) && c.type_id == ImageID && !c.db_content.blank?
         href = subformat(c)._render_source size: :small
         return %(<link rel="shortcut icon" href="#{href}" />)

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "rspec-html-matchers"
 
 describe Card::Set::All::Base do
@@ -90,4 +91,16 @@ describe Card::Set::All::Base do
                                     text: text)
     end
   end
+
+  describe "date views" do
+    it "can be formatted with variant option" do
+      rendered = render_content "{{A|created_at; variant: %m/%d/%Y}}"
+      expect(rendered).to match(%r{\d\d/\d\d/20\d\d})
+    end
+
+    it "can handle colons" do
+      rendered = render_content "{{A|created_at; variant: %I:%M%P}}"
+      expect(rendered).to match(/\d\d\:\d\d\w\w/)
+    end
+  end
 end

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

@@ -1,5 +1,3 @@
-include_set Abstract::AceEditor
-
 def clean_html?
   false
 end
@@ -17,3 +15,9 @@ format do
     :references
   end
 end
+
+format :html do
+  def editor
+    :ace_editor
+  end
+end

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

@@ -1,7 +1,6 @@
 format :html do
-  view :editor do
-    text_area :content, rows: 5, class: "card-content",
-              "data-card-type-code" => card.type_code
+  def editor
+    :text_area
   end
 
   view :core do

data/mod/bootstrap/lib/bootstrap.rb

@@ -1,5 +1,5 @@
-require 'bootstrap/component_loader'
-require 'bootstrap/component'
+require "bootstrap/component_loader"
+require "bootstrap/component"
 
 class Bootstrap
   include Delegate

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

@@ -1,4 +1,4 @@
-#require 'component'
+# require 'component'
 
 class Bootstrap
   module BasicTags

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

@@ -69,7 +69,7 @@ class Bootstrap
     private
 
     def render_content
-      #if @build_block.arity > 0
+      # if @build_block.arity > 0
       instance_exec *@args, &@build_block
     end
 
@@ -87,7 +87,6 @@ class Bootstrap
       res
     end
 
-
     def add_content content
       @content[-1] << "\n#{content}".html_safe if content.present?
     end
@@ -109,7 +108,7 @@ class Bootstrap
     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
+              args.pop
       if block.present?
         opts, args = instance_exec opts, args, &block
         unless opts.is_a?(Hash)

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

@@ -2,12 +2,13 @@ class Bootstrap
   class Component
     class Form < Component
       def render_content *args
-          form *args, &@build_block
+        form *args, &@build_block
       end
 
       add_tag_method :form, nil, optional_classes: {
         horizontal: "form-horizontal",
-        inline: "form-inline" }
+        inline: "form-inline"
+      }
       add_div_method :group, "form-group"
       add_tag_method :label, nil
       add_tag_method :input, "form-control" do |opts, extra_args|
@@ -17,10 +18,10 @@ class Bootstrap
         opts
       end
 
-      [:text, :password, :datetime, :"datetime-local", :date, :month, :time,
-       :week, :number, :email, :url, :search, :tel, :color].each do |tag|
+      %i[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|
+                                            tag: :input do |opts, extra_args|
           label, = extra_args
           prepend { label label, for: opts[:id] } if label
           opts

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

@@ -11,7 +11,7 @@ class Bootstrap
 
       add_tag_method :form, "form-horizontal"
 
-      add_tag_method :label, "control-label" do |opts, extra_args|
+      add_tag_method :label, "control-label" do |opts, _extra_args|
         prepend_class opts, "col-sm-#{left_col_width}"
         opts
       end

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

@@ -62,17 +62,17 @@ class Bootstrap
       def standardize_row_args args
         opts = args.last.is_a?(Hash) ? args.pop : {}
         cols = (args.last.is_a?(Array) || args.last.is_a?(String)) &&
-            Array.wrap(args.pop)
+               Array.wrap(args.pop)
         [cols, opts, col_widths(args, opts)]
       end
 
       def col_widths args, opts
         opts = args.pop if args.one? && args.last.is_a?(Hash)
         if args.present?
-          raise Error, "bad argument" unless args.all? { |a| a.is_a? Fixnum }
+          raise Error, "bad argument" unless args.all? { |a| a.is_a? Integer }
           { md: Array.wrap(args) }
         else
-          [:lg, :xs, :sm, :md].each_with_object({}) do |k, cols_w|
+          %i[lg xs sm md].each_with_object({}) do |k, cols_w|
             next unless (widths = opts.delete(k))
             cols_w[k] = Array.wrap widths
           end

data/mod/bootstrap/lib/bootstrap/component_loader.rb

@@ -26,5 +26,3 @@ class Bootstrap
     end
   end
 end
-
-

data/mod/bootstrap/lib/bootstrap/delegate.rb

@@ -1,7 +1,7 @@
 class Bootstrap
   module Delegate
-    def method_missing(method_name, *args, &block)
-      #return super unless @context.respond_to? method_name
+    def method_missing method_name, *args, &block
+      # return super unless @context.respond_to? method_name
       if block_given?
         @context.send(method_name, *args, &block)
       else

data/mod/bootstrap/lib/bootstrapper.rb

@@ -1,4 +1,4 @@
-require 'bootstrap'
+require "bootstrap"
 module Bootstrapper
   extend Bootstrap::ComponentLoader
 

data/mod/bootstrap/set/all/bootstrap/accordion.rb

@@ -33,7 +33,7 @@ format :html do
     HTML
   end
 
-  def accordion_panel title, body, collapse_id, panel_heading_link=false
+  def accordion_panel title, body, collapse_id, _panel_heading_link=false
     if body
       <<-HTML
         <div class="panel-heading" role="tab" id="heading-#{collapse_id}">

data/mod/bootstrap/set/all/bootstrap/form.rb

@@ -21,11 +21,11 @@ format :html do
     options
   end
 
-  FIELD_HELPERS = %w(hidden_field color_field date_field datetime_field
+  FIELD_HELPERS = %w[hidden_field color_field date_field datetime_field
                      datetime_local_field email_field month_field number_field
                      password_field phone_field range_field search_field
                      telephone_field text_area text_field time_field
-                     url_field week_field file_field).freeze
+                     url_field week_field file_field].freeze
 
   FIELD_HELPERS.each do |method_name|
     define_method(method_name) do |name, options={}|

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -1,5 +1,6 @@
 format :html do
   def glyphicon icon_type, extra_class=""
+    return "" unless icon_type
     wrap_with :span, "",
               "aria-hidden" => true,
               class: "glyphicon glyphicon-#{icon_type} #{extra_class}"

data/mod/bootstrap/set/all/bootstrap/wrapper.rb

@@ -6,7 +6,7 @@ format :html do
     super
   end
 
-  def standard_frame
+  def standard_frame slot=true
     class_up "card-frame", "panel panel-#{panel_state}"
     super
   end

data/mod/bootstrap/set/self/bootstrap_js.rb

@@ -1,5 +1,5 @@
 include_set Abstract::CodeFile
 
 def source_files
-  %w(bootstrap.js bootstrap_modal_wagn.js)
+  %w[bootstrap.js bootstrap_modal_wagn.js]
 end

data/mod/bootstrap/set/self/bootswatch_shared.rb

@@ -17,17 +17,17 @@ view :raw do |_args|
   end.join("\n")
   content += [
     # Reset and dependencies
-    %w(normalize print glyphicons),
+    %w[normalize print glyphicons],
     # Core CSS
-    %w(scaffolding type code grid tables forms buttons),
+    %w[scaffolding type code grid tables forms buttons],
     # Components
-    %w(component-animations dropdowns button-groups input-groups navs navbar
+    %w[component-animations dropdowns button-groups input-groups navs navbar
        breadcrumbs pagination pager labels badges jumbotron thumbnails alerts
-       progress-bars media list-group panels responsive-embed wells close),
+       progress-bars media list-group panels responsive-embed wells close],
     # Components w/ JavaScript
-    %w(modals tooltip popovers carousel),
+    %w[modals tooltip popovers carousel],
     # Utility classes
-    %w(utilities responsive-utilities)
+    %w[utilities responsive-utilities]
   ].map do |names|
     names.map do |name|
       path = File.join(bootstrap_path, "_#{name}.scss")

data/mod/bootstrap/set/self/script_mods.rb

@@ -1 +1 @@
-add_to_basket :item_codenames, :bootstrap_js
+add_to_basket :item_codenames, :bootstrap_js

data/mod/bootstrap/spec/set/all/bootstrap/bootstrap_builder_spec.rb

@@ -1,10 +1,10 @@
-describe 'bootstrap builder' do
+describe "bootstrap builder" do
   class BuilderTest < Card::Format::HtmlFormat::Bootstrap::Component
-    add_tag_method :test_tag, "test-class" do |opts, extra_args|
+    add_tag_method :test_tag, "test-class" do |opts, _extra_args|
       prepend { tag :prepend, "prepend-class" }
       append { tag :append, "append-class" }
       insert { tag :insert, "insert-class" }
-      #wrap { |content| tag :wrap, "wrap-class" { content } }
+      # wrap { |content| tag :wrap, "wrap-class" { content } }
       opts
     end
   end
@@ -15,10 +15,11 @@ describe 'bootstrap builder' do
       tag = BuilderTest.render(fo) { test_tag }
       "<buildertest>#{tag}<buildertest>"
     end
-    it 'appends work' do
-      #assert_select 'prepend[class="prepend-class"]'
+
+    it "appends work" do
+      # assert_select 'prepend[class="prepend-class"]'
       assert_view_select subject, "buildertest" do
-        #assert_select 'prepend[class="prepend-class]"'
+        # assert_select 'prepend[class="prepend-class]"'
         assert_select 'prepend[class="prepend-class]"'
         assert_select 'test_tag[class="test-class"]' do
           assert_select 'insert[class="insert-class]"'

data/mod/bootstrap/spec/set/all/bootstrap/bootstrap_spec.rb

@@ -1,5 +1,6 @@
 describe Card::Bootstrap do
   subject { described_class.new(format) }
+
   let(:format) { Card["A"].format(:html) }
 
   def render
@@ -14,7 +15,7 @@ describe Card::Bootstrap do
   end
   describe "html" do
     it "renderes plain text" do
-      #expect(render { html "test" }).to eq "test"
+      # expect(render { html "test" }).to eq "test"
     end
   end
 end

data/mod/bootstrap/spec/set/all/bootstrap/form_spec.rb

@@ -17,6 +17,7 @@ describe Bootstrap::Component::Form do
 
   describe "form" do
     subject { Card["A"].format(:html) }
+
     it "creates form" do
       form =
         subject.bs_form do
@@ -26,10 +27,10 @@ describe Bootstrap::Component::Form do
           end
         end
       expect(form).to have_tag :form do
-        with_tag 'div.form-group' do
+        with_tag "div.form-group" do
           with_tag :label, with: { for: "theemail" },
-                   text: "\nEmail Address"
-          with_tag 'input.form-control', with: { type: "email", id: "theemail" }
+                           text: "\nEmail Address"
+          with_tag "input.form-control", with: { type: "email", id: "theemail" }
         end
       end
     end
@@ -37,6 +38,7 @@ describe Bootstrap::Component::Form do
 
   describe "horizontal form" do
     subject { Card["A"].format(:html) }
+
     let(:form) do
       subject.bs_horizontal_form 2, 10 do
         group do
@@ -61,6 +63,7 @@ describe Bootstrap::Component::Form do
         end
       end
     end
+
     it "creates form" do
       assert_view_select bsform, 'form[class="form-horizontal"]' do
         assert_select 'div[class="form-group"]' do

data/mod/bootstrap/spec/set/all/bootstrap/layout_spec.rb

@@ -1,10 +1,11 @@
 describe Bootstrap::Component::Layout do
   describe "layout dsl" do
     subject { Card["A"].format(:html) }
+
     it "creates correct layout with column array" do
       layout = subject.bs_layout container: true, fluid: true do
         row 6, 4, 2, class: "six-times-six" do
-          ["c1", "c2", "c3"]
+          %w[c1 c2 c3]
         end
       end
       assert_view_select layout, 'div[class="container-fluid"]' do
@@ -111,7 +112,7 @@ describe Bootstrap::Component::Layout do
           end
           assert_select 'div[class="row"]' do
             assert_select 'div[class="col-md-6"]', text: "c3"
-            assert_select 'span', text: "s1"
+            assert_select "span", text: "s1"
           end
           assert_select 'div[class="row"]', text: "some content"
         end

data/mod/carrierwave/set/abstract/attachment.rb

@@ -73,9 +73,7 @@ end
 
 def assign_set_specific_attributes
   # reset content if we really have something to upload
-  if @set_specific.present? && @set_specific[attachment_name.to_s].present?
-    self.content = nil
-  end
+  self.content = nil if set_specific[attachment_name.to_s].present?
   super
 end