card 1.19.6 → 1.20.0

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

@@ -1,11 +1,17 @@
 format :html do
-  def frame args={}, &_block
-    args.reverse_merge!(
-      panel_class:  "panel panel-default",
-      header_class: "panel-heading",
-      title_class:  "panel-title",
-      body_class:   "panel-body"
-    )
-    super args
+  def frame
+    class_up "card-header", "panel-heading"
+    class_up "card-header-title", "panel-title"
+    class_up "card-body", "panel-body"
+    super
+  end
+
+  def standard_frame
+    class_up "card-frame", "panel panel-#{panel_state}"
+    super
+  end
+
+  def panel_state
+    "default"
   end
 end

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

@@ -1,6 +1,8 @@
 format :html do
-  view :closed do |args|
-    args[:body_class] = "closed-content"
-    super args
+  view :closed do
+    class_up "card-body", "closed-content"
+    super()
   end
+
+  include Bootstrapper
 end

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

@@ -0,0 +1,31 @@
+describe 'bootstrap builder' do
+  class BuilderTest < Card::Format::HtmlFormat::Bootstrap::Component
+    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 } }
+      opts
+    end
+  end
+
+  describe "tag create helper methods" do
+    subject do
+      fo = Card["A"].format(:html)
+      tag = BuilderTest.render(fo) { test_tag }
+      "<buildertest>#{tag}<buildertest>"
+    end
+    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 'test_tag[class="test-class"]' do
+          assert_select 'insert[class="insert-class]"'
+        end
+
+        assert_select 'append[class="append-class]"'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+describe Card::Bootstrap do
+  subject { described_class.new(format) }
+  let(:format) { Card["A"].format(:html) }
+
+  def render
+    subject.render do
+      yield
+    end
+  end
+
+  it "loads components" do
+    expect(subject).to respond_to(:form)
+    expect(subject.form).to be_instance_of ActiveSupport::SafeBuffer
+  end
+  describe "html" do
+    it "renderes plain text" do
+      #expect(render { html "test" }).to eq "test"
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Bootstrap::Form  do
+describe Bootstrap::Component::Form do
   describe "input" do
     it "has form-group css class" do
       assert_view_select render_editor("Phrase"),
@@ -14,4 +14,62 @@ describe Card::Set::All::Bootstrap::Form  do
                          'textarea[class~="form-control"]'
     end
   end
+
+  describe "form" do
+    subject { Card["A"].format(:html) }
+    it "creates form" do
+      form =
+        subject.bs_form do
+          group do
+            input "email", "Email Address", id: "theemail"
+            input "password", "Password", id: "thepassword"
+          end
+        end
+      expect(form).to have_tag :form 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" }
+        end
+      end
+    end
+  end
+
+  describe "horizontal form" do
+    subject { Card["A"].format(:html) }
+    let(:form) do
+      subject.bs_horizontal_form 2, 10 do
+        group do
+          input "email", "Email Address", id: "theemail"
+          input "password", "Password", id: "thepassword"
+        end
+        group do
+          checkbox "test", "checkbox label", id: "thecheckbox"
+        end
+      end
+    end
+    let(:bsform) do
+      subject.bs do
+        horizontal_form 2, 10 do
+          group do
+            input "email", "Email Address", id: "theemail"
+            input "password", "Password", id: "thepassword"
+          end
+          group do
+            checkbox "test", "checkbox label", id: "thecheckbox"
+          end
+        end
+      end
+    end
+    it "creates form" do
+      assert_view_select bsform, 'form[class="form-horizontal"]' do
+        assert_select 'div[class="form-group"]' do
+          assert_select 'label[for="theemail"', text: "Email Address"
+          assert_select 'div[class="col-sm-10"]' do
+            assert_select 'input[type="email",id="theemail",class="form-control"]'
+          end
+        end
+      end
+    end
+  end
 end

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

@@ -1,31 +1,120 @@
-describe Card::Set::All::Bootstrap::Layout do
+describe Bootstrap::Component::Layout do
   describe "layout dsl" do
     subject { Card["A"].format(:html) }
     it "creates correct layout with column array" do
-      layout = subject.layout container: true, fluid: true do
-        subject.row 6, 4, 2, class: "six-times-six" do
-          ["first column", "second column", "third column"]
+      layout = subject.bs_layout container: true, fluid: true do
+        row 6, 4, 2, class: "six-times-six" do
+          ["c1", "c2", "c3"]
         end
       end
       assert_view_select layout, 'div[class="container-fluid"]' do
-        assert_select 'div[class="six-times-six row"]' do
-          assert_select 'div[class="col-md-6"]', text: "first column"
-          assert_select 'div[class="col-md-4"]', text: "second column"
-          assert_select 'div[class="col-md-2"]', text: "third column"
+        assert_select 'div[class="row six-times-six"]' do
+          assert_select 'div[class="col-md-6"]', text: "c1"
+          assert_select 'div[class="col-md-4"]', text: "c2"
+          assert_select 'div[class="col-md-2"]', text: "c3"
         end
       end
     end
 
     it "creates correct layout with column calls" do
-      layout = subject.layout do
-        subject.row 8, 4, class: "six-times-six" do
-          subject.column "first column"
-          subject.column "second column", class: "extra-class"
+      layout = subject.bs_layout do
+        row 8, 4, class: "six-times-six" do
+          column "c1"
+          column "c2", class: "extra-class"
         end
       end
-      assert_view_select layout, 'div[class="six-times-six row"]' do
-        assert_select 'div[class="col-md-8"]', text: "first column"
-        assert_select 'div[class="extra-class col-md-4"]', text: "second column"
+      assert_view_select layout, 'div[class="row six-times-six"]' do
+        assert_select 'div[class="col-md-8"]', text: "c1"
+        assert_select 'div[class="col-md-4 extra-class"]',
+                      text: "c2"
+      end
+    end
+
+    it "handles different medium sizes" do
+      layout = subject.bs_layout do
+        row md: [8, 4], xs: [6, 6], class: "six-times-six" do
+          column "c1"
+          column "c2", class: "extra-class"
+        end
+      end
+      assert_view_select layout, 'div[class="row six-times-six"]' do
+        assert_select 'div[class="col-md-8 col-xs-6"]', text: "c1"
+        assert_select 'div[class="col-md-4 col-xs-6 extra-class"]',
+                      text: "c2"
+      end
+    end
+
+    it "works without column" do
+      layout = subject.bs_layout do
+        row  do
+          "test"
+        end
+      end
+      assert_view_select layout, 'div[class="row"]', text: "test"
+    end
+
+    it "handles layout sequence" do
+      # format = Card["A"].form
+      lay = subject.bs do
+        layout do
+          row 8, 4 do
+            column "c1"
+            column "c2"
+          end
+        end
+
+        layout do
+          row 12, class: "six-times-six" do
+            column "new column"
+          end
+        end
+      end
+      # assert_view_select lay, 'div[class="row"]' do
+      #   assert_select 'div[class="col-md-8"]', text: "c1"
+      #   assert_select 'div[class="col-md-4"]', text: "c2"
+      # end
+      assert_view_select lay, 'div[class="row six-times-six"]' do
+        assert_select 'div[class="col-md-12"]', text: "new column"
+      end
+    end
+
+    it "handles nested layouts" do
+      # format = Card["A"].format :html
+      lay = subject.bs do
+        layout do
+          row 8, 4 do
+            column do
+              layout { row 12, ["c1"] }
+            end
+            column do
+              row 12, ["c2"]
+              row 6 do
+                html "<span>s1</span>"
+                column "c3"
+              end
+              row 8 do
+                "some content"
+              end
+            end
+          end
+        end
+      end
+      assert_view_select lay, 'div[class="row"]' do
+        assert_select 'div[class="col-md-8"]' do
+          assert_select 'div[class="row"]' do
+            assert_select 'div[class="col-md-12"]', text: "c1"
+          end
+        end
+        assert_select 'div[class="col-md-4"]' do
+          assert_select 'div[class="row"]' do
+            assert_select 'div[class="col-md-12"]', text: "c2"
+          end
+          assert_select 'div[class="row"]' do
+            assert_select 'div[class="col-md-6"]', text: "c3"
+            assert_select 'span', text: "s1"
+          end
+          assert_select 'div[class="row"]', text: "some content"
+        end
       end
     end
   end

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

@@ -88,9 +88,10 @@ def delete_files_for_action action
   end
 end
 
-# create filesystem links to files from prior action
-def rollback_to action
-  update_attributes! revision(action).merge(empty_ok: true)
+def revision action
+  result = super action
+  result[:empty_ok] = true
+  result
 end
 
 def attachment_format ext

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

@@ -42,7 +42,7 @@ def file_dir
 end
 
 def public?
-  who_can(:read).include? Card[:anyone].id
+  who_can(:read).include? Card::AnyoneID
 end
 
 def file_id

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

@@ -37,28 +37,22 @@ event :validate_storage_type_update, :validate,
   end
 end
 
-event :loose_coded_status_on_update, :initialize,
-      on: :update, when: proc { |c| c.coded? } do
+event :loose_coded_status_on_update, :initialize, on: :update, when: :coded? do
   return if @new_mod
   @new_storage_type ||= storage_type_from_config
 end
 
-event :update_public_link_on_create, :integrate,
-      on: :create,
-      when: proc { |c| c.local? } do
+event :update_public_link_on_create, :integrate, on: :create, when: :local? do
   update_public_link
 end
 
-event :remove_public_link_on_delete, :integrate,
-      on: :delete,
-      when: proc { |c| c.local? } do
+event :remove_public_link_on_delete, :integrate, on: :delete, when: :local? do
   remove_public_links
 end
 
-event :update_public_link, after: :update_read_rule,
-                           when: proc { |c| c.local? } do
+event :update_public_link, after: :update_read_rule, when: :local? do
   return if content.blank?
-  if who_can(:read).include? Card[:anyone].id
+  if who_can(:read).include? Card::AnyoneID
     create_public_links
   else
     remove_public_links

data/mod/carrierwave/set/type/file.rb

@@ -16,18 +16,22 @@ end
 include SelectedAction
 
 format do
-  view :source do |_args|
+  view :source do
+    source_url
+  end
+
+  def source_url
     card.attachment.url
   end
 
-  view :core do |args|
-    handle_source args do |source|
+  view :core do
+    handle_source do |source|
       card_url source
     end
   end
 
-  def handle_source args
-    source = _render_source args
+  def handle_source
+    source = source_url
     source ? yield(source) : ""
   rescue
     "File Error"
@@ -36,31 +40,34 @@ end
 
 format :file do
   # returns send_file args.  not in love with this...
-  view :core do |_args|
+  view :core, cache: :never do |_args|
     # this means we only support known formats.  dislike.
     attachment_format = card.attachment_format(params[:format])
     return _render_not_found unless attachment_format
     return card.format(:html).render_core(args) if card.remote_storage?
+    set_response_headers
+    args_for_send_file
+  end
 
-    if params[:explicit_file] && (r = controller.response)
-      r.headers["Expires"] = 1.year.from_now.httpdate
-      # currently using default "private", because proxy servers could block
-      # needed permission checks
-      # r.headers["Cache-Control"] = "public"
-    end
-
-    # formerly supported redirecting to correct file format
-    # elsif ![format, 'file'].member? params[:format]
-    #   path = request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format )
-    #   return redirect_to(path) #card.attachment.url(style) )
+  def args_for_send_file
     file = selected_file_version
-    [file.path,
-     {
-       type: file.content_type,
-       filename:  "#{card.cardname.safe_key}#{file.extension}",
-       x_sendfile: true,
-       disposition: (params[:format] == "file" ? "attachment" : "inline")
-     }]
+    [
+      file.path,
+      {
+        type: file.content_type,
+        filename:  "#{card.cardname.safe_key}#{file.extension}",
+        x_sendfile: true,
+        disposition: (params[:format] == "file" ? "attachment" : "inline")
+      }
+    ]
+  end
+
+  def set_response_headers
+    return unless params[:explicit_file] && (r = controller.response)
+    r.headers["Expires"] = 1.year.from_now.httpdate
+    # currently using default "private", because proxy servers could block
+    # needed permission checks
+    # r.headers["Cache-Control"] = "public"
   end
 
   def selected_file_version
@@ -70,19 +77,19 @@ end
 
 format :html do
   view :core do |args|
-    handle_source args do |source|
-      "<a href=\"#{source}\">Download #{showname args[:title]}</a>"
+    handle_source do |source|
+      "<a href=\"#{source}\">Download #{showname voo.title}</a>"
     end
   end
 
-  view :editor do |args|
+  view :editor do
     if card.web? || card.no_upload?
       return text_field(:content, class: "card-content")
     end
-    file_chooser args
+    file_chooser
   end
 
-  def preview  _args
+  def preview
     ""
   end
 
@@ -98,7 +105,7 @@ format :html do
             <tr class="template-download fade in">
               <td>
                 <span class="preview">
-                  #{preview(args)}
+                  #{preview}
                 </span>
               </td>
               <td>
@@ -125,10 +132,10 @@ format :html do
     HTML
   end
 
-  def file_chooser args
+  def file_chooser
     <<-HTML
       <div class="choose-file">
-        #{preview(args)}
+        #{preview}
         <span class="btn btn-success fileinput-button">
             <i class="glyphicon glyphicon-cloud-upload"></i>
             <span>