card 1.20.3 → 1.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d473e0a3e8d38c3f5b10001ca763558362242ed4
-  data.tar.gz: b5a28aad03fb7a61bbbcab0fb2b96517ad82eee4
+  metadata.gz: bc831339e2819ac6a6ea6e2d4b4a2213c5c683ad
+  data.tar.gz: 433407d4dd89299309079c2be3483b5185a8d93b
 SHA512:
-  metadata.gz: '003328d8f53ba75f789b16ab4b89b4f350e34212416b6c90b7f7fa8517b494e2c717c94e61fbd2e062291d93db723e2c3d01a6bbb83481548061843471b1c4e3'
-  data.tar.gz: d4ef331eb073a750e13433ae3292f74cc79870b27d0f887e34d5dbf3d24de02aec574e926ce103a085aff12f5ca24c25fe9fc71deb237eafd3cb6d727873a22d
+  metadata.gz: f6ed5a62f46acd1188f4cb77f408d59ebaed043634616ec68d3060ea812f063daa948c4c4e224bf9039900afc1029a9e8a2ffbb93d98fe3f2c27dd7f3b774fdb
+  data.tar.gz: 0d51251838f7fd2fde52471b2c91b025f08f71b690af62665fbe5f85e2d8df4697390d1e53aa9276bbb3a2985630bc727e75444e4b252fa7b958539c9a4225e1

data/VERSION

@@ -1 +1 @@
-1.20.3
+1.20.4

data/config/initializers/01_core_extensions/kernel.rb

@@ -0,0 +1,11 @@
+module CoreExtensions
+  module Kernel
+    def suppress_warnings
+      original_verbosity = $VERBOSE
+      $VERBOSE = nil
+      yield
+    ensure
+      $VERBOSE = original_verbosity
+    end
+  end
+end

data/config/initializers/core_extensions.rb

@@ -2,13 +2,14 @@
 
 # extend core Ruby object classes
 
-class Class
+class Module
   def include_extension extension
     include extension
   end
 end
 
 module CoreExtensions
+  ::Kernel.include_extension Kernel
   ::Object.include_extension Object
   ::Module.include_extension Module
   ::Array.include_extension Array

data/config/initializers/patches.rb

@@ -9,7 +9,7 @@ end
 if defined? BetterErrors
   module BetterErrors
     class StackFrame
-      include Patches::BetterErrors::StackFrame::TmpPath
+      suppress_warnings { include Patches::BetterErrors::StackFrame::TmpPath }
     end
   end
 end

data/lib/card/act_manager.rb

@@ -114,6 +114,7 @@ class Card
       end
 
       def add director
+        # Rails.logger.debug "added: #{director.card.name}".green
         directors[director.card] = director
       end
 
@@ -140,7 +141,8 @@ class Card
       end
 
       def to_s
-        directors.values.map(&:to_s).join "\n"
+        act_director.to_s
+        #directors.values.map(&:to_s).join "\n"
       end
     end
   end

data/lib/card/act_manager/stage_director.rb

@@ -163,11 +163,10 @@ class Card
         end
       end
 
-      def to_s
+      def to_s level=1
         str = @card.name.to_s.clone
         if @subdirectors
-          subs = subdirectors.map(&:card)
-                             .map { |card| "  #{card.name}" }.join "\n"
+          subs = subdirectors.map { |d| "  " * level + d.to_s(level + 1) }.join "\n"
           str << "\n#{subs}"
         end
         str

data/lib/card/auth/proxy.rb

@@ -49,7 +49,7 @@ class Card
         case user
         when NilClass then nil
         when Card     then user.id
-        when Fixnum   then user
+        when Integer   then user
         else Card.fetch_id(user)
         end
       end

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

@@ -9,7 +9,7 @@ format :csv  do
     @depth.zero? ? :csv_row : :name
   end
 
-  view :csv_row do |_args|
+  view :csv_row do
     array = _render_raw.scan(/\{\{[^\}]*\}\}/).map do |inc|
       process_content(inc).strip
     end
@@ -22,28 +22,13 @@ format :csv  do
     ""
   end
 
-  view :csv_title_row do |_args|
-    # NOTE: assumes all cards have the same structure!
-    begin
-      card1 = search_with_params.first
+  view :name_with_fields do
+    CSV.generate_line name_with_fields_row
+  end
 
-      parsed_content = Card::Content.new card1.raw_content, self
-      if parsed_content.__getobj__.is_a? String
-        ""
-      else
-        titles = parsed_content.map do |chunk|
-          next if chunk.class != Card::Content::Chunk::Nest
-          opts = chunk.options
-          if %w(name link).member? opts[:view]
-            opts[:view]
-          else
-            opts[:nest_name].to_name.tag
-          end
-        end.compact
-        CSV.generate_line titles.map { |title| title.to_s.upcase }
-      end
-    rescue
-      ""
+  def name_with_fields_row
+    nested_fields.each_with_object([card.name]) do |(field_name, options), row|
+      row << nest(field_name)
     end
   end
 end

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

@@ -21,9 +21,11 @@ def coded_dir new_mod=nil
 end
 
 def mod_dir new_mod=nil
-  find_mod = new_mod || mod
-  Card::Mod::Loader.mod_dirs.path(find_mod) ||
-    raise(Error, "can't find mod \"#{find_mod}\"")
+  mod_name = new_mod || mod
+  dir = Card::Mod::Loader.mod_dirs.path(mod_name) || (mod_name == :test && "test")
+
+  raise Error, "can't find mod \"#{mod_name}\"" unless dir
+  dir
 end
 
 def files_base_dir

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

@@ -191,7 +191,7 @@ format do
   end
 
   def implicit_item_view
-    view = voo_items_view || default_item_view
+    view = params[:item] || voo_items_view || default_item_view
     Card::View.canonicalize view
   end
 
@@ -344,3 +344,61 @@ format :html do
     static_tabs tabs, tab_type
   end
 end
+
+format :csv do
+  view :core do
+    if (item_view_options[:view] == :name_with_fields) && focal?
+      title_row("item name") + name_with_field_rows
+    else
+      super()
+    end
+  end
+
+  def name_with_field_rows
+    list = card.item_names
+    columns = columns_from_referees list.first
+
+    list.map do |item_name|
+      CSV.generate_line row_from_field_names(item_name, columns)
+    end.join
+  end
+
+  def columns_from_referees referer
+    columns = []
+    Card.fetch(referer).format.each_nested_field do |chunk|
+      columns << chunk.referee_name.tag
+    end
+    columns
+  end
+
+  def row_from_field_names parent_name, field_names, view=:core
+    field_names.each_with_object([parent_name]) do |field, row|
+      row << nest([parent_name, field], view: view)
+    end
+  end
+
+  def title_row extra_titles=nil
+    titles = column_titles extra_titles
+    return "" unless titles.present?
+    CSV.generate_line titles.map { |title| title.to_s.upcase }
+  rescue
+    ""
+  end
+
+  def column_titles extra_titles=nil
+    res = Array extra_titles
+    card1 = Card.fetch card.item_names(limit: 1).first
+    card1.each_nested_chunk do |chunk|
+      res << column_title(chunk.options)
+    end
+    res.compact
+  end
+
+  def column_title opts
+    if %w(name link).member? opts[:view]
+      opts[:view]
+    else
+      opts[:nest_name].to_name.tag
+    end
+  end
+end

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

@@ -119,7 +119,7 @@ end
 
 def [] *args
   case args[0]
-  when Fixnum, Range
+  when Integer, Range
     fetch_name = Array.wrap(cardname.parts[args[0]]).compact.join "+"
     Card.fetch(fetch_name, args[1] || {}) unless simple?
   else

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

@@ -173,6 +173,11 @@ end
 
 def cache_output_part input_card, output
   Auth.as_bot do
+    # save virtual cards first
+    # otherwise the cache card will save it to get the left_id
+    # and trigger the cache update again
+    input_card.save! if input_card.new_card?
+
     cache_card = fetch_cache_card(input_card, true)
     cache_card.update_attributes! content: output
   end

data/mod/settings/lib/card/setting.rb

@@ -36,7 +36,7 @@ class Card
     end
 
     def to_type_id type
-      type.is_a?(Fixnum) ? type : Card::Codename[type]
+      type.is_a?(Integer) ? type : Card::Codename[type]
     end
 
     # usage:

data/mod/standard/set/abstract/search.rb

@@ -20,7 +20,7 @@ def item_cards args={}
 end
 
 def item_names args={}
-  args[:limit] = 0
+  args[:limit] ||= 0
   returning(:name, args) { search args }
 end
 
@@ -92,10 +92,12 @@ format :data do
 end
 
 format :csv do
-  view :card_list do |args|
-    items = super args
+  view :core, mod: All::Collection::CsvFormat
+
+  view :card_list do
+    items = super()
     if @depth.zero?
-      render_csv_title_row + items
+      title_row + items
     else
       items
     end

data/mod/standard/set/all/rich_html/content.rb

@@ -161,8 +161,7 @@ format :html do
   end
 
   def related_card_and_options args
-    options = (args[:related] || params[:related]).symbolize_keys
-    return unless options
+    return unless (options = related_options(args))
     related_card = related_card_from_options options
     options[:view] ||= :open
     options[:show] ||= []
@@ -170,6 +169,13 @@ format :html do
     [related_card, options]
   end
 
+  def related_options args
+    options = (args[:related] || params[:related])
+    options = { name: options } if options.is_a? String
+    return unless options.is_a? Hash
+    options.symbolize_keys
+  end
+
   def related_card_from_options options
     related_card = options.delete :card
     return related_card if related_card

data/mod/standard/set/all/rich_html/editing.rb

@@ -156,7 +156,7 @@ format :html do
     voo.show :toolbar
     frame do
       with_nest_mode :edit do
-        process_nested_fields hide: :toolbar
+        process_nested_fields
       end
     end
   end

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

@@ -56,7 +56,7 @@ describe Card::Set::Type::SearchType do
       expect(subject.content).to eq '{"name":"YYY"}'
     end
   end
-  context "rss format" do
+  describe "rss format" do
     it "render rss without errors" do
       search_card = Card.create type: "Search", name: "Asearch",
                                 content: %({"id":"1"})
@@ -64,4 +64,45 @@ describe Card::Set::Type::SearchType do
       expect(rss).to have_tag("title", text: "Wagn Bot")
     end
   end
+
+  describe "csv format" do
+    describe "view :content" do
+      subject do
+        render_view :content, { name: "Book+*type+by name" },
+                    format: :csv
+      end
+
+      it "has title row with nest names" do
+        is_expected.to include "AUTHOR,ILLUSTRATOR"
+      end
+
+      it "has nests contents" do
+        create "Guide",
+               type: "Book",
+               subfields: { "author" => "Hitchhiker",
+                            "illustrator" => "Galaxy" }
+        is_expected.to include "Hitchhiker,Galaxy"
+      end
+    end
+
+    describe "view :nested_fields" do
+      subject do
+        Card::Env.params[:item] = :name_with_fields
+        render_card_with_args :core, { name: "Book+*type+by name" },
+                    { format: :csv },  items: { view: :name_with_fields }
+      end
+
+      it "has title row item name and field names" do
+        is_expected.to include "ITEM NAME,AUTHOR,ILLUSTRATOR"
+      end
+
+      it "has field contents" do
+        create "Guide",
+               type: "Book",
+               subfields: { "author" => "Hitchhiker",
+                            "illustrator" => "Galaxy" }
+        is_expected.to include "Guide,Hitchhiker,Galaxy"
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.20.3
+  version: 1.20.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -283,6 +283,7 @@ files:
 - config/i18n-tasks.yml
 - config/initializers/01_core_extensions/array.rb
 - config/initializers/01_core_extensions/hash.rb
+- config/initializers/01_core_extensions/kernel.rb
 - config/initializers/01_core_extensions/module.rb
 - config/initializers/01_core_extensions/object.rb
 - config/initializers/01_core_extensions/persistent_identifiers.rb