card 1.19.3 → 1.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057086042ff26905bb50428aa1e697887464f1ed
-  data.tar.gz: 159c9cd1236f61f566ed10a4b132e84aadc3c369
+  metadata.gz: 2438311a0c0d3270f1d65eb41fbe38914740135f
+  data.tar.gz: 75fa9bdbf0fd463f171b47875624bb96025b50c9
 SHA512:
-  metadata.gz: 7d9330f1f0e0e30a5bf642e80695ec4b460534e04c34843b9f316b154eb72aa56f3feb1d47b639bee6a55568e2e8fef3d14e1391eb8a406656aa86e2f26702ef
-  data.tar.gz: cf1908a395f06b908b57f9dbbfcf67ef0d734ee51f30a93272725ddfe27d583256e326a416a149fd91ac4db5fc971eb0da1c8a1c957b38ccb9d6855094426062
+  metadata.gz: bec0abeaa624791be2ba54a2709fd6c3d75f39b07c53f758e7464c75ede3573eb84c16c048be5f3843141f9e4d715d5744004f3009c6a935c370d405fd4f02fe
+  data.tar.gz: 49c9dcec44ea2e97f112e14c8e5f7c1b7281fb07445172c2b7b3eda79cba2ea67116dc1a32b133039387050674b4c6cf8b96087f700066126fafe3e8b36ac8bd

data/.yardopts

@@ -1,6 +1,7 @@
 lib/**/*.rb                       \
 mod/*/format/*.rb                 \
 mod/*/chunk/*.rb                  \
+mod/*/lib/**/*.rb                 \
 tmpsets/set*/**/*.rb -            \
 **/*.rdoc                         \
 GPL                               \

data/VERSION

@@ -1 +1 @@
-1.19.3
+1.19.4

data/card.gemspec

@@ -38,9 +38,7 @@ Gem::Specification.new do |s|
   [
     ["smartname",                  "0.3.1"],
     ["uuid",                       "~> 2.3"],
-    # if carrierwave > 11 is availabe remove carrierwave git submodule and
-    # load it here as gem
-    # ["carrierwave",                "<= 0.11.0"],
+    ["carrierwave",                "1.0.0.beta"],
     ["htmlentities",               "~> 4.3"],
     ["mini_magick",                "~> 4.2"],
     # recaptcha 0.4.0 is last version that doesn't require ruby 2.0

data/db/migrate_core_cards/20160914132636_fix_mod_files.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+
+class FixModFiles < Card::Migration::Core
+  def up
+    Card.search(type: "image").each do |card|
+      next unless card.coded?
+      next unless card.content.include?("05_standard") ||
+                  card.content.include?("06_bootstrap")
+      new_content = card.content.sub("05_standard", "standard")
+                        .sub("06_bootstrap", "bootstrap")
+      card.update_column :db_content, new_content
+
+      update_history card
+    end
+  end
+
+  def update_history card
+    card.actions.each do |action|
+      next unless (content_change = action.change(:db_content))
+      new_value = content_change.value.gsub("05_standard", "standard")
+                                .gsub("06_bootstrap", "bootstrap")
+      content_change.update_column :value, new_value
+    end
+  end
+end

data/lib/card.rb

@@ -1,6 +1,4 @@
 # -*- encoding : utf-8 -*-
-cw_path = File.expand_path "../../vendor/carrierwave/lib", __FILE__
-$LOAD_PATH.unshift(cw_path) unless $LOAD_PATH.include?(cw_path)
 require "carrierwave"
 
 # if Cardio.file_buckets.present?

data/lib/card/content/diff.rb

@@ -32,11 +32,10 @@ class Card
       #   :raw     = escape html tags and compare everything
       #
       # summary: {length: <number> , joint: <string> }
-
       def initialize old_version, new_version, opts={}
         @result = Result.new opts[:summary]
         if new_version
-          lcs_opts = lcs_opts_for_format opts[:format]
+          lcs_opts = lcs_opts_for_format opts[:diff_format]
           LCS.new(lcs_opts).run(old_version, new_version, @result)
         end
       end
@@ -51,9 +50,9 @@ class Card
 
       private
 
-      def lcs_opts_for_format format
+      def lcs_opts_for_format diff_format
         opts = {}
-        case format
+        case diff_format
         when :html
           opts[:exclude] = /^</
         when :text

data/lib/card/format/error.rb

@@ -9,7 +9,7 @@ class Card
       end
 
       def debug_error e, view
-        Rails.logger.info "\nError rendering #{error_cardname} / #{view}: "\
+        Rails.logger.info "#{rendering_error e, view}:\n" \
                           "#{e.class} : #{e.message}"
         debug = Card[:debugger]
         raise e if debug && debug.content == "on"

data/mod/admin/set/self/admin.rb

@@ -51,11 +51,11 @@ format :html do
     stats = [
       { title: "solid cache",
         count: solid_cache_count, unit: " cards",
-        link_text: "clear cache",
+        link_text: "clear solid cache",
         task: "clear_solid_cache" },
       { title: "machine cache",
         count: machine_cache_count, unit: " cards",
-        link_text: "clear cache",
+        link_text: "clear machine cache",
         task: "clear_machine_cache" }
     ]
     return stats unless Card.config.view_cache

data/mod/admin/set/self/trash.rb

@@ -17,7 +17,7 @@ format :html do
       card.name,
       "#{time_ago_in_words(card.updated_at)} ago",
       Card[card.updater_id].name,
-      restore_link(card)
+      "#{history_link(card)} | #{restore_link(card)}"
     ]
   end
 
@@ -40,10 +40,16 @@ format :html do
     content_tag :p, button
   end
 
+  def history_link trashed_card
+    card_link trashed_card, path_opts: { view: :history, look_in_trash: true },
+                            text: "history"
+  end
+
   def restore_link trashed_card
     before_delete = trashed_card.actions[-2]
-    link_path = path action: :update, view: :open, restore: trashed_card.id,
-                     action_ids: [before_delete]
+    link_path = path id: trashed_card.id, look_in_trash: true, action: :update,
+                     view: :open, restore: trashed_card.id,
+                     action_ids: [before_delete], success: { id: "~#{card.id}" }
     link_to "restore", link_path, method: :post, rel: "nofollow",
                                   remote: true, class: "slotter"
   end

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

@@ -5,7 +5,7 @@ def clean_html?
 end
 
 def diff_args
-  { format: :raw }
+  { diff_format: :raw }
 end
 
 format do

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

@@ -0,0 +1,58 @@
+
+format :html do
+  # generate bootstrap column layout
+  # @example
+  #   layout container: true, fluid: true, class: "hidden" do
+  #     row 6, 6, class: "unicorn"
+  #       column "horn",
+  #       column "rainbow", class: "colorful"
+  #     end
+  #   end
+  # @example
+  #   layout do
+  #     row 3, 3, 4, 2, class: "unicorn" do
+  #       [ "horn", "body", "tail", "rainbow"]
+  #     end
+  #     row 6, 6, ["unicorn", "rainbow"], class: "horn"
+  #   end
+  def layout opts={}
+    @rows = "".html_safe
+    yield
+    opts.delete(:container) ? container(@rows, opts) : @rows
+  end
+
+  def container content, opts={}
+    add_class opts, opts.delete(:fluid) ? "container-fluid" : "container"
+    content_tag :div, content, opts
+  end
+
+  def row *args
+    opts, cols, @col_widths = process_row_args args
+    @rows ||= "".html_safe
+    @columns = "".html_safe
+    cols ||= yield
+    cols.each { |col_content| column(col_content) } if cols.is_a? Array
+    add_class opts, "row"
+    @rows << content_tag(:div, @columns, opts)
+  end
+
+  def process_row_args args
+    opts = args.last.is_a?(Hash) ? args.pop : {}
+    cols = args.last.is_a?(Array) && args.pop
+    [opts, cols, check_col_widths(args)]
+  end
+
+  def check_col_widths args
+    raise Error, "bad argument" unless args.all? { |a| a.is_a? Fixnum }
+    total_width = args.inject(0) { |a, e| a + e }
+    raise Error, "column widths must sum up to 12" unless total_width == 12
+    args
+  end
+
+  # default column width type is for medium devices (col-md-)
+  def column content, opts={}
+    @columns ||= "".html_safe
+    add_class opts, "col-md-#{@col_widths.shift}"
+    @columns << content_tag(:div, content.html_safe, opts)
+  end
+end

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

@@ -0,0 +1,32 @@
+describe Card::Set::All::Bootstrap::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"]
+        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"
+        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"
+        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"
+      end
+    end
+  end
+end

data/mod/carrierwave/lib/carrier_wave/cardmount.rb

@@ -1,5 +1,3 @@
-cw_path = File.expand_path "../../../../../vendor/carrierwave/lib", __FILE__
-$LOAD_PATH.unshift(cw_path) unless $LOAD_PATH.include?(cw_path)
 require "carrierwave"
 
 module CarrierWave

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

@@ -60,7 +60,8 @@ end
 
 # used for uploads for new cards until the new card is created
 def upload_cache_card
-  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym]
+  @upload_cache_card ||=
+    Card["new_#{attachment_name}".to_sym] || Card[:new_file]
 end
 
 def preliminary_upload?

data/mod/core/set/all/stages.rb

@@ -7,10 +7,12 @@ end
 
 def identify_action
   @action =
-    case
-    when trash     then :delete
-    when new_card? then :create
-    else :update
+    if trash && trash_changed?
+      :delete
+    elsif new_card?
+      :create
+    else
+      :update
     end
 end
 

data/mod/history/lib/card/act.rb

@@ -53,16 +53,17 @@ class Card
       # all actions that current user has permission to view
       # @return [Array of Actions]
       def all_viewable
-        joins = "JOIN card_actions ON card_acts.id = card_act_id " \
-                "JOIN cards ON cards.id = card_actions.card_id"
-        where = [
-          "card_actions.id is not null", # data check. should not be needed
-          "cards.id is not null",    # ditto
+        card_join = "JOIN cards ON cards.id = card_actions.card_id"
+        action_conditions = [
+          "card_acts.id = card_act_id",
+          "card_actions.card_id is not null",
           "draft is not true",
-          Card::Query::SqlStatement.new.permission_conditions("cards")
+          Query::SqlStatement.new.permission_conditions("cards")
         ].compact.join " AND "
 
-        joins(joins).where(where).uniq
+        viewable_actions =
+          Action.joins(card_join).where(action_conditions).to_sql
+        where("card_id is not null AND EXISTS (#{viewable_actions})")
       end
     end
 

data/mod/history/set/all/history.rb

@@ -233,7 +233,7 @@ format :html do
   end
 
   view :act_header do |_args|
-    %(<h5 "class=act-header">#{card_link card}</h5>)
+    %(<h5 class="act-header">#{card_link card}</h5>)
   end
 
   view :act_metadata do |args|
@@ -283,10 +283,9 @@ format :html do
               = glyphicon 'plus-sign', (action.green? ? 'added-mark' : 'diff-invisible')
             = wrap_diff :name, name_diff
             = wrap_diff :type, type_diff
-            -if content_diff
+            -if content_diff && action_view == :summary
               = glyphicon 'arrow-right', 'arrow'
-              -if action_view == :summary
-                = wrap_diff :content, content_diff
+              = wrap_diff :content, content_diff
           -if content_diff and action_view == :expanded
             .expanded
               = wrap_diff :content, content_diff
@@ -326,9 +325,12 @@ format :html do
   end
 
   def content_diff action, action_view, hide_diff
-    action.new_content? && action.card.format.render_content_changes(
-      action: action, diff_type: action_view, hide_diff: hide_diff
-    )
+    diff = action.new_content? &&
+           action.card.format.render_content_changes(
+             action: action, diff_type: action_view, hide_diff: hide_diff
+           )
+    return "<i>empty</i>" unless diff.present?
+    diff
   end
 
   def wrap_diff field, content, extra_class=nil
@@ -412,7 +414,7 @@ format :html do
 end
 
 def diff_args
-  { format: :text }
+  { diff_format: :text }
 end
 
 def has_edits?

data/mod/machines/set/abstract/script.rb

@@ -38,5 +38,5 @@ format :html do
 end
 
 def diff_args
-  { format: :text }
+  { diff_format: :text }
 end

data/mod/machines/set/type/css.rb

@@ -56,5 +56,5 @@ format :html do
 end
 
 def diff_args
-  { format: :text }
+  { diff_format: :text }
 end

data/mod/pointer/set/abstract/01_pointer.rb

@@ -125,7 +125,7 @@ event :standardize_items, :prepare_to_validate,
 end
 
 def diff_args
-  { format: :pointer }
+  { diff_format: :pointer }
 end
 
 def item_cards args={}

data/mod/standard/set/self/recent.rb

@@ -16,8 +16,8 @@ format :html do
     acts = Act.all_viewable.order(id: :desc).page(page).per(ACTS_PER_PAGE)
     acts.map do |act|
       if (act_card = act.card)
-        format = act_card.format :html
-        format.render_act args.merge(act: act, act_context: :absolute)
+        act_view_args = args.merge(act: act, act_context: :absolute)
+        act_card.format(:html).render_act act_view_args
       else
         Rails.logger.info "bad data, act: #{act}"
         ""

data/spec/lib/card/diff_spec.rb

@@ -64,7 +64,7 @@ describe Card::Content::Diff do
 
   describe "summary" do
     before(:all) do
-      @opts = { format: :html }
+      @opts = { diff_format: :html }
     end
 
     it "omits unchanged text" do
@@ -118,7 +118,7 @@ describe Card::Content::Diff do
     it "removes html tags" do
       a = "<a>A</a>"
       b = "<b>B</b>"
-      expect(summary a, b, format: :html).to eq(
+      expect(summary a, b, diff_format: :html).to eq(
         "#{del 'A'}#{ins 'B'}"
       )
     end
@@ -126,7 +126,7 @@ describe Card::Content::Diff do
     it "with html tags in raw format" do
       a = "<a>1</a>"
       b = "<b>1</b>"
-      expect(summary a, b, format: :raw).to eq(
+      expect(summary a, b, diff_format: :raw).to eq(
         "#{del(tag 'a')}#{ins(tag 'b')}...#{del(tag '/a')}#{ins(tag '/b')}"
       )
     end
@@ -134,7 +134,7 @@ describe Card::Content::Diff do
 
   context "html format" do
     before(:all) do
-      @opts = { format: :html }
+      @opts = { diff_format: :html }
     end
 
     it "doesn't change a text without changes" do
@@ -164,7 +164,7 @@ describe Card::Content::Diff do
 
   context "text format" do
     before(:all) do
-      @opts = { format: :text }
+      @opts = { diff_format: :text }
     end
 
     it "removes html" do
@@ -172,19 +172,19 @@ describe Card::Content::Diff do
     end
 
     it "compares complete links" do
-      diff = Card::Content::Diff.complete("[[A]]\n[[B]]", "[[A]]\n[[C]]", format: :html)
+      diff = Card::Content::Diff.complete("[[A]]\n[[B]]", "[[A]]\n[[C]]", diff_format: :html)
       expect(diff).to eq("[[A]]\n#{del '[[B]]'}#{ins '[[C]]'}")
     end
 
     it "compares complete nests" do
-      diff = Card::Content::Diff.complete("{{A}}\n{{B}}", "{{A}}\n{{C}}", format: :html)
+      diff = Card::Content::Diff.complete("{{A}}\n{{B}}", "{{A}}\n{{C}}", diff_format: :html)
       expect(diff).to eq("{{A}}\n#{del '{{B}}'}#{ins '{{C}}'}")
     end
   end
 
   context "raw format" do
     before(:all) do
-      @opts = { format: :raw }
+      @opts = { diff_format: :raw }
     end
 
     it "excapes html" do
@@ -198,7 +198,7 @@ describe Card::Content::Diff do
 
   context "pointer format" do
     before(:all) do
-      @opts = { format: :pointer }
+      @opts = { diff_format: :pointer }
     end
 
     it "removes square brackets" do