card 1.95.3 → 1.96.0

data/mod/settings/set/right/style/editor.haml

@@ -1,6 +1,6 @@
-.album.py-5.bg-light
+.album.bg-light
   .container
     .row
-      - themes.each do |theme|
-        .col-md-3
-          = nest theme, view: :thumbnail
+      - selectable_themes.each do |theme|
+        .col-md-4
+          = nest theme, view: :box

data/mod/standard/set/all/path.rb

@@ -117,6 +117,12 @@ end
 
 public
 
+format :json do
+  def add_unknown_name_to_opts name, opts
+    # noop
+  end
+end
+
 format :html do
   # in HTML, decko paths rendered as relative to the site's root.
   def contextualize_path relative_path

data/mod/standard/set/type/list.rb

@@ -82,12 +82,13 @@ def update_all_items
 end
 
 def update_listed_by_cache_for item_keys, args={}
-  type_key = args[:type_key] || left.type_card.key
+  type_key = args[:type_key] || left&.type_card&.key
+  return unless type_key
 
   item_keys.each do |item_key|
     key = "#{item_key}+#{type_key}"
     next unless Card::Cache[Card::Set::Type::ListedBy].exist? key
-    if (card = Card.fetch(key))
+    if (card = Card.fetch(key)) && card.left
       card.update_cached_list
       card.update_references_out
     else

data/mod/standard/set/type/listed_by.rb

@@ -76,7 +76,11 @@ def listed_by
 end
 
 def update_cached_list
-  Card::Cache[Card::Set::Type::ListedBy].write key, generate_content
+  if trunk
+    Card::Cache[Card::Set::Type::ListedBy].write key, generate_content
+  else
+    Card::Cache[Card::Set::Type::ListedBy].delete key
+  end
 end
 
 def list_card item

data/mod/standard/spec/content/chunk/include_spec.rb

@@ -126,7 +126,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
 
       r = bob_address.reload.format.render_core
       assert_view_select r, "div[class~=d0-card-content]", "Sparta"
-      expect(Card.fetch("bob+address").includees.map(&:name))
+      expect(Card.fetch("bob+address").nestees.map(&:name))
         .to eq([bob_city.name])
     end
 
@@ -180,7 +180,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       wooga = Card.create! name: "Wooga", type: "SpecialType"
       wooga_age = create! "#{wooga.name}#{Card::Name.joint}age", "39"
       expect(wooga_age.format.render_core).to eq("39")
-      expect(wooga_age.includers.map(&:name)).to eq(["Wooga"])
+      expect(wooga_age.nesters.map(&:name)).to eq(["Wooga"])
     end
   end
 end

data/mod/standard/spec/set/all/rich_html/editing_spec.rb

@@ -1,81 +1,16 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::RichHtml::Editing do
-  extend Card::SpecHelper::ViewHelper::ViewDescriber
-
-  let(:mycard) { Card["A"] }
-  let(:myformat) { mycard.format }
-
-  def assert_active_toolbar_pill view, content, related_view=false
-    view_selector = related_view ? "related" : view
-    assert_view_select myformat.render!(view),
-                       "div[class~='card-slot #{view_selector}-view']" do
-      assert_select 'nav[class="slotter toolbar navbar navbar-inverse"]' do
-        assert_select 'ul[class="nav navbar-nav nav-pills"]' do
-          assert_select 'li[class~="active"] > a', content
-        end
-      end
-    end
-  end
-
   describe "edit_nests view" do
     it "shows editors for both absolute and relative nests" do
-      mycard.content = "{{absolute}} AND {{+relative}}"
-      view = myformat.render :edit_nests
-      expect(view).to have_tag "div.SELF-a" do
+      card_subject.content = "{{absolute}} AND {{+relative}}"
+      expect_view(:edit_nests).to have_tag "div.SELF-a" do
         with_tag "div.card-editor", with: { card_name: "absolute" }
         with_tag "div.card-editor", with: { card_name: "A+relative" }
       end
     end
   end
 
-  describe_views :edit, :edit_buttons, :edit_name, :edit_type, :edit_rules,
-                 :edit_structure, :edit_nests do
-    it "doesn't have errors" do
-      expect(mycard.format.render(view)).to lack_errors
-    end
-  end
-
-  # outdated
-  # TODO: write tests for new toolbar
-  # describe "edit view" do
-  #   it "has toolbar with active 'content' pill" do
-  #     assert_active_toolbar_pill :edit, 'content'
-  #   end
-  # end
-  #
-  # describe 'edit_type view' do
-  #   it "has toolbar with active 'type' pill" do
-  #     assert_active_toolbar_pill :edit_type, 'type'
-  #   end
-  # end
-  #
-  # describe 'edit_name view' do
-  #   it "has toolbar with active 'name' pill" do
-  #     assert_active_toolbar_pill :edit_name, 'name'
-  #   end
-  # end
-  #
-  # describe 'edit_structure view' do
-  #   before do
-  #     @mycard = Card["Iliad"].format
-  #   end
-  #   it "has toolbar with active 'rules' pill" do
-  #     Card::Auth.as_bot do
-  #       assert_active_toolbar_pill :edit_structure, 'rules', true
-  #     end
-  #   end
-  # end
-  #
-  # describe 'edit_nests view' do
-  #   before do
-  #     Card::Auth.as_bot do
-  #       Card.create! name: 'Iliad+author', content: 'Homer'
-  #     end
-  #     @mycard = Card["Iliad"].format
-  #   end
-  #   it "has toolbar with active 'nests' pill" do
-  #     assert_active_toolbar_pill :edit_nests, 'nests'
-  #   end
-  # end
+  check_views_for_errors :edit, :edit_buttons, :edit_name, :edit_type, :edit_rules,
+                         :edit_structure, :edit_nests
 end

data/mod/standard/spec/set/type/listed_by_spec.rb

@@ -26,8 +26,8 @@ RSpec.describe Card::Set::Type::ListedBy do
                        /Name must have a cardtype name as right part/)
   end
 
-  context 'when Darles Chickens is in the author list of \
-           "Parry Hotter" and "50 grades of shy"' do
+  context "when Darles Chickens is in the author list of" \
+          '"Parry Hotter" and "50 grades of shy"' do
     describe "Darles Chickens+books" do
       subject { listed_by }
 

data/mod/standard/spec/set/type/search_type_spec.rb

@@ -105,4 +105,60 @@ RSpec.describe Card::Set::Type::SearchType do
       end
     end
   end
+
+  describe "json" do
+    include_context "json context"
+
+    def card_subject
+      sample_search
+    end
+
+    let(:item_names) { ["50 grades of shy", "Iliad", "Parry Hotter"] }
+
+    specify "view: links" do
+      expect_view(:links, format: :json).to eq([])
+    end
+
+    describe "view: items" do
+      it "returns atom values for items" do
+        expect_view(:items, format: :json)
+          .to include(*item_names.map { |i| structured_atom_values Card[i] })
+      end
+
+      it "returns all items" do
+        expect(view(:items, card: card_subject, format: :json).size).to eq 3
+      end
+
+      context "with paging" do
+        def paging_url offset
+          json_url(card_subject.name.url_key, "limit=1&offset=#{offset}")
+        end
+
+        let(:paging_values) do
+          view(:molecule, card: card_subject, format: :json)[:paging]
+        end
+
+        before do
+          Card::Env.params[:limit] = 1
+        end
+
+        it "shows next link" do
+          expect(paging_values).to eq(next: paging_url(1))
+        end
+
+        it "shows next and previous link" do
+          Card::Env.params[:offset] = 1
+          expect(paging_values)
+            .to eq(next: paging_url(2),
+                   previous: paging_url(0))
+        end
+
+        it "shows previous link" do
+          Card::Env.params[:offset] = 2
+          expect(paging_values)
+            .to eq(previous: paging_url(1))
+        end
+      end
+    end
+  end
 end

data/mod/standard/spec/set/type/set/html_views_spec.rb

@@ -1,14 +1,10 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Set::HtmlViews do
-  extend Card::SpecHelper::ViewHelper::ViewDescriber
-
-  let(:sample_set) { Card.fetch("User+*type") }
-
-  describe_views :all_rules, :grouped_rules, :recent_rules, :common_rules,
-                 :field_related_rules, :set_label, :set_navbar, :rule_navbar do
-    it "doesn't have errors" do
-      expect(sample_set.format.render(view)).to lack_errors
-    end
+  def card_subject
+    Card.fetch("User+*type")
   end
+
+  check_views_for_errors :all_rules, :grouped_rules, :recent_rules, :common_rules,
+                         :field_related_rules, :set_label, :set_navbar, :rule_navbar
 end

data/mod/utility/set/abstract/bs_badge.rb

@@ -0,0 +1,21 @@
+format :html do
+  def labeled_badge count, label, opts={}
+    haml :labeled_badge, badge_haml_opts(count, label, opts)
+  end
+
+  def tab_badge count, label, opts={}
+    haml :tab_badge, badge_haml_opts(count, label, opts)
+  end
+
+  def badge_haml_opts count, label, opts
+    process_badge_opts count, opts
+    { count: count, label: label, klass: opts[:klass], color: opts[:color] }
+  end
+
+  def process_badge_opts count, opts
+    if count.zero? && !opts[:zero_ok]
+      opts[:klass] = [opts[:klass], "disabled-o"].compact.join " "
+    end
+    opts[:color] ||= "secondary"
+  end
+end

data/mod/utility/set/abstract/bs_badge/bs_badge.haml

@@ -0,0 +1,5 @@
+%span.labeled-badge{ class: klass }
+  %span.badge{ class: "badge-#{color}" }
+    = count
+  %label.mr-2.text-muted
+    = label

data/mod/utility/set/abstract/bs_badge/labeled_badge.haml

@@ -0,0 +1,5 @@
+%span.labeled-badge{ class: klass }
+  %span.badge{ class: "badge-#{color}" }
+    = count
+  %label.mr-2.text-muted
+    = label

data/mod/utility/set/abstract/bs_badge/tab_badge.haml

@@ -0,0 +1,5 @@
+%div.tab-badge.count-number.clearfix{ class: klass }
+  %span.badge.badge-secondary{ class: "badge-#{color}" }
+    = count
+  %span.badge-label
+    = label

data/mod/utility/set/abstract/media.rb

@@ -0,0 +1,27 @@
+format :html do
+  def image_card
+    @image_card ||= card.fetch(trait: :image)
+  end
+
+  def image_src opts
+    return "" unless image_card
+    nest(image_card, view: :source, size: opts[:size])
+  end
+
+  def image_alt
+    image_card&.name
+  end
+
+  def text_with_image_args opts
+    opts.reverse_merge! title: _render_title, text: "", src: image_src(opts),
+                        alt: image_alt, size: :original
+  end
+
+  def text_with_image opts={}
+    class_up "media-left", "m-2"
+    @image_card = Card.cardish(opts[:image]) if opts[:image]
+    opts[:media_opts] = {} unless opts[:media_opts]
+    text_with_image_args opts
+    haml :media_snippet, opts
+  end
+end

data/mod/utility/set/abstract/media/media_snippet.haml

@@ -0,0 +1,9 @@
+.media{media_opts}
+  .image-box{class: [classy("media-left"), size]}
+    %a{href: "#"}
+      %img.media-object{class: size, src: src.html_safe, alt: alt}
+  .media-body
+    - if title != ""
+      %h5.media-heading
+        = title
+    = text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.95.3
+  version: 1.96.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -73,16 +73,16 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -583,8 +583,11 @@ files:
 - lib/card/set/advanced_api.rb
 - lib/card/set/basket.rb
 - lib/card/set/event.rb
+- lib/card/set/event/callbacks.rb
 - lib/card/set/event/delayed_event.rb
+- lib/card/set/event/options.rb
 - lib/card/set/format.rb
+- lib/card/set/format/abstract_format.rb
 - lib/card/set/format/haml_views.rb
 - lib/card/set/helpers.rb
 - lib/card/set/i18n_scanner.rb
@@ -1071,6 +1074,7 @@ files:
 - mod/basic_formats/spec/set/all/json_spec.rb
 - mod/basic_formats/spec/set/all/rss_spec.rb
 - mod/basic_formats/spec/set/all/text_spec.rb
+- mod/basic_formats/spec/shared_context/json_shared_context.rb
 - mod/basic_formats/template/all/head/meta_tags.haml
 - mod/basic_types/set/type/html.rb
 - mod/basic_types/set/type/json.rb
@@ -1252,6 +1256,7 @@ files:
 - mod/bootstrap/script/update_skin_thumbnails.rb
 - mod/bootstrap/set/abstract/bootstrap_code_file.rb
 - mod/bootstrap/set/abstract/bootswatch_theme.rb
+- mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb
 - mod/bootstrap/set/abstract/bootswatch_theme/thumbnail.haml
 - mod/bootstrap/set/all/bootstrap/accordion.rb
 - mod/bootstrap/set/all/bootstrap/form.rb
@@ -1276,6 +1281,8 @@ files:
 - mod/bootstrap/set/self/style_select2_bootstrap.rb
 - mod/bootstrap/set/type/bootswatch_skin.rb
 - mod/bootstrap/set/type/customized_bootswatch_skin.rb
+- mod/bootstrap/set/type/customized_bootswatch_skin/core.haml
+- mod/bootstrap/set/type/customized_bootswatch_skin/html_views.rb
 - mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb
 - mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/_colorpicker.haml
 - mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/editor.haml
@@ -4695,6 +4702,11 @@ files:
 - mod/history/set/all/acts.rb
 - mod/history/set/all/content_history.rb
 - mod/history/set/all/history.rb
+- mod/item/set/all/bar.haml
+- mod/item/set/all/bar.rb
+- mod/item/set/all/box.haml
+- mod/item/set/all/box.rb
+- mod/item/set/all/expanded_bar.haml
 - mod/machines/file/all_script_machine_output/file.js
 - mod/machines/file/all_style_machine_output/file.css
 - mod/machines/file/script_html5shiv_printshiv_machine_output/file.js
@@ -4734,8 +4746,8 @@ files:
 - mod/machines/set/abstract/machine/output_update.rb
 - mod/machines/set/abstract/machine_input.rb
 - mod/machines/set/abstract/script.rb
-- mod/machines/set/abstract/skin_thumbnail.rb
-- mod/machines/set/abstract/skin_thumbnail/thumbnail.haml
+- mod/machines/set/abstract/skin_box.rb
+- mod/machines/set/abstract/skin_box/box_bottom.haml
 - mod/machines/set/all/reset_machines.rb
 - mod/machines/set/right/machine_cache.rb
 - mod/machines/set/right/machine_input.rb
@@ -5176,6 +5188,12 @@ files:
 - mod/twitter/Gemfile
 - mod/twitter/db/migrate_core_cards/20170305112346_add_twitter_cards.rb
 - mod/twitter/set/type/twitter_template.rb
+- mod/utility/set/abstract/bs_badge.rb
+- mod/utility/set/abstract/bs_badge/bs_badge.haml
+- mod/utility/set/abstract/bs_badge/labeled_badge.haml
+- mod/utility/set/abstract/bs_badge/tab_badge.haml
+- mod/utility/set/abstract/media.rb
+- mod/utility/set/abstract/media/media_snippet.haml
 - mod/utility/set/abstract/utility.rb
 - mod/utility/spec/set/abstract/utility_spec.rb
 - mod/virtual/lib/card/virtual.rb