card 1.20.4 → 1.21.0

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

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

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

@@ -31,7 +31,12 @@ end
 
 event :validate_storage_type_update, :validate,
       on: :update do
-  if cloud? && storage_type_changed?
+  # FIXME: make it possible to retrieve the file from cloud storage
+  #   to store it somewhere else. Currently, it only works to change the
+  #   storage type if a new file is provided
+  #   i.e. `update_attributes storage_type: :local` fails but
+  #        `update_attributes storage_type: :local, file: [file handle]` is ok
+  if cloud? && storage_type_changed? && !file_changed?
     errors.add :storage_type, "moving files from cloud elsewhere "\
                               "is not supported"
   end
@@ -42,6 +47,11 @@ event :loose_coded_status_on_update, :initialize, on: :update, when: :coded? do
   @new_storage_type ||= storage_type_from_config
 end
 
+event :change_bucket_if_read_only, :initialize, on: :update, when: :cloud? do
+  return unless bucket_config[:read_only]
+  @new_storage_type = storage_type_from_config
+end
+
 event :update_public_link_on_create, :integrate, on: :create, when: :local? do
   update_public_link
 end

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

@@ -40,7 +40,7 @@ end
 
 format :file do
   # returns send_file args.  not in love with this...
-  view :core, cache: :never 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
@@ -76,7 +76,7 @@ format :file do
 end
 
 format :html do
-  view :core do |args|
+  view :core do |_args|
     handle_source do |source|
       "<a href=\"#{source}\">Download #{showname voo.title}</a>"
     end
@@ -93,7 +93,7 @@ format :html do
     ""
   end
 
-  view :preview_editor, tags: :unknown_ok, cache: :never do |args|
+  view :preview_editor, tags: :unknown_ok, cache: :never do |_args|
     cached_upload_card_name = Card::Env.params[:attachment_upload]
     cached_upload_card_name.gsub!(/\[\w+\]$/, "[action_id_of_cached_upload]")
     <<-HTML

data/mod/carrierwave/spec/lib/carrier_wave/file_card_uploader_spec.rb

@@ -22,6 +22,7 @@ describe CarrierWave::FileCardUploader do
   describe "#db_content" do
     context "coded file" do
       subject { coded_file }
+
       it "returns correct identifier" do
         expect(subject.attachment.db_content)
           .to eq ":logo/standard.png"
@@ -35,6 +36,7 @@ describe CarrierWave::FileCardUploader do
 
     context "local file" do
       subject { local_file }
+
       it "returns correct identifier" do
         expect(subject.attachment.db_content)
           .to eq "~#{subject.id}/#{subject.last_action_id}.txt"
@@ -58,6 +60,7 @@ describe CarrierWave::FileCardUploader do
 
     context "web file" do
       subject { web_file }
+
       it "returns correct identifier" do
         expect(subject.attachment.db_content)
           .to eq "http://web.de/test.txt"

data/mod/carrierwave/spec/set/type/file_spec.rb

@@ -58,6 +58,7 @@ describe Card::Set::Type::File do
     end
     context "storage type: protected" do
       subject { source_view protected_file }
+
       it "renders protected url to be processed by wagn" do
         is_expected.to(
           eq "/files/~#{protected_file.id}/#{protected_file.last_action_id}.txt"
@@ -67,6 +68,7 @@ describe Card::Set::Type::File do
 
     context "storage type: unprotected" do
       subject { source_view unprotected_file }
+
       it "renders relative url" do
         is_expected.to(
           eq "/files/~#{unprotected_file.id}/"\
@@ -77,6 +79,7 @@ describe Card::Set::Type::File do
 
     context "storage type: web" do
       subject { source_view web_file }
+
       it "renders saved url" do
         is_expected.to eq web_url
       end
@@ -84,6 +87,7 @@ describe Card::Set::Type::File do
 
     context "storage type: coded" do
       subject { source_view coded_file }
+
       it "renders protected url to be processed by wagn" do
         is_expected.to(
           eq "/files/:#{coded_file.codename}/standard-medium.png"
@@ -93,6 +97,7 @@ describe Card::Set::Type::File do
 
     context "storage type: cloud" do
       subject { source_view cloud_file }
+
       it "renders absolute url to cloud" do
         is_expected
           .to eq "http://#{directory}.s3.amazonaws.com/"\
@@ -131,6 +136,7 @@ describe Card::Set::Type::File do
     context "storage type:" do
       context "protected" do
         subject { protected_file }
+
         it "stores correct identifier (~<card id>/<action id>.<ext>)" do
           expect(subject.content)
             .to eq "~#{subject.id}/#{subject.last_action_id}.txt"
@@ -163,6 +169,7 @@ describe Card::Set::Type::File do
 
       context "unprotected" do
         subject { unprotected_file }
+
         it "creates public symlink" do
           subject
           expect(public_path_exist?).to be_truthy
@@ -171,6 +178,7 @@ describe Card::Set::Type::File do
 
       context "web" do
         subject { web_file }
+
         it "saves url as identifier" do
           expect(subject.content).to eq web_url
         end
@@ -214,12 +222,13 @@ describe Card::Set::Type::File do
           FileUtils.rm_rf mod_path
           Card::Mod::Loader.mod_dirs.mods.delete "test_mod"
         end
-        let(:file_path) { File.join mod_path, "file", "mod_file", "file.txt" }
-
         subject do
           create_file_card :coded, test_file,
                            codename: "mod_file", mod: "test_mod"
         end
+
+        let(:file_path) { File.join mod_path, "file", "mod_file", "file.txt" }
+
         it "stores correct identifier (:<codename>/<mod_name>.<ext>)" do
           expect(subject.content)
             .to eq ":#{subject.codename}/test_mod.txt"
@@ -247,6 +256,7 @@ describe Card::Set::Type::File do
 
       describe "cloud" do
         subject { cloud_file }
+
         it "stores correct identifier "\
            "((<bucket>)/<card id>/<action id>.<ext>)" do
           expect(subject.content)
@@ -316,6 +326,7 @@ describe Card::Set::Type::File do
         create_file_card :coded, test_file,
                          codename: "mod_file", mod: "test_mod"
       end
+
       it "changes storage type to default" do
         storage_config :local
         subject.update_attributes! file: test_file(2)
@@ -337,6 +348,7 @@ describe Card::Set::Type::File do
 
     context "when read rules are restricted" do
       subject { unprotected_file }
+
       it "removes public svmlink" do
         expect(public_path_exist?).to be_truthy
         Card::Auth.as_bot do
@@ -349,6 +361,7 @@ describe Card::Set::Type::File do
 
     context "when read rules changed to 'Anyone'" do
       subject { protected_file }
+
       it "creates public symlink" do
         expect(public_path_exist?).to be_falsey
         Card::Auth.as_bot do
@@ -378,12 +391,13 @@ describe Card::Set::Type::File do
                      storage_type: @storage_type || :cloud
       end
     end
+
     context "from cloud to local" do
       before { storage_config :cloud }
       after { Cardio.config.file_storage = :local }
       it "copies file to local file system" do
         # not yet supported
-        expect { subject.update_attributes!(storage_type: :local) }
+        expect { Card[subject.name].update_attributes!(storage_type: :local) }
           .to raise_error(ActiveRecord::RecordInvalid)
         # expect(subject.content)
         #   .to eq "~#{subject.id}/#{subject.last_action_id - 1}.txt"
@@ -416,6 +430,7 @@ describe Card::Set::Type::File do
 
     context "from coded to local" do
       subject { Card[:logo] }
+
       it "copies file to mod" do
         @storage_type = :local
         Card::Auth.as_bot do
@@ -450,6 +465,7 @@ describe Card::Set::Type::File do
                empty_ok: true, storage_type: :cloud,
                bucket: :test_bucket).bucket_config
     end
+
     let(:bucket_config) do
       {
         test_bucket: {
@@ -471,14 +487,15 @@ describe Card::Set::Type::File do
         }
       }
     end
+
     before do
       @old_bucket_config = Cardio.config.file_buckets
       Cardio.config.file_buckets = bucket_config
     end
     after do
       Cardio.config.file_buckets = @old_bucket_config
-      %w(PROVIDER CREDENTIALS_PROVIDER TEST_BUCKET_PROVIDER
-         TEST_BUCKET_CREDENTIALS_PROVIDER).each do |key|
+      %w[PROVIDER CREDENTIALS_PROVIDER TEST_BUCKET_PROVIDER
+         TEST_BUCKET_CREDENTIALS_PROVIDER].each do |key|
         ENV.delete key
       end
     end
@@ -492,7 +509,7 @@ describe Card::Set::Type::File do
       expect { subject }.to raise_error(Card::Error)
     end
 
-    it "it takes config from env variables" do
+    it "takes config from env variables" do
       Cardio.config.file_buckets = {}
       ENV["PROVIDER"] = "env provider"
       ENV["CREDENTIALS_PROVIDER"] = "env cred provider"
@@ -540,6 +557,7 @@ describe Card::Set::Type::File do
   end
 
   let(:directory) { "philipp-test" }
+
   def storage_config type=:local
     Cardio.config.file_storage = type
     Wagn.config.file_buckets = {

data/mod/carrierwave/spec/set/type/image_spec.rb

@@ -27,6 +27,7 @@ describe Card::Set::Type::Image do
       end
     end
     subject { Card["image card"] }
+
     it "stores correct identifier" do
       expect(subject.content)
         .to eq "~#{subject.id}/#{subject.last_action_id}.jpg"
@@ -98,6 +99,7 @@ describe Card::Set::Type::Image do
 
   describe "*logo mod image" do
     subject { Card[:logo] }
+
     it "exists" do
       expect(subject.image.size).to be > 0
     end
@@ -140,6 +142,7 @@ describe Card::Set::Type::Image do
                      image: File.new(File.join(FIXTURES_PATH, "mao2.jpg"))
       end
     end
+
     it "deletes all versions" do
       path = subject.image.path
       small_path = subject.image.small.path

data/mod/core/chunk/link.rb

@@ -37,7 +37,7 @@ module Card::Content::Chunk
       # there's probably a better way to do the following.
       # point is to find the first pipe that's not inside an nest
       return unless string.index "|"
-      string_copy = "#{string}" # had to do this to create new string?!
+      string_copy = string.dup
       string.scan(/\{\{[^\}]*\}\}/) do |incl|
         string_copy.gsub! incl, ("x" * incl.length)
       end

data/mod/core/chunk/nest.rb

@@ -97,7 +97,8 @@ class Card
         def each_option attr_string
           return if attr_string.blank?
           attr_string.strip.split(";").each do |pair|
-            value, key = pair.split(":").reverse
+            # key is optional for view option
+            value, key = pair.split(":", 2).reverse
             key ||= self.class::DEFAULT_OPTION.to_s
             yield key.strip, value.strip
           end

data/mod/core/chunk/query_reference.rb

@@ -22,7 +22,7 @@ module Card::Content::Chunk
         Card::Query::OPERATORS.keys +
         Card::Query::ATTRIBUTES.keys +
         Card::Query::CONJUNCTIONS.keys +
-        %w(desc asc count)
+        %w[desc asc count]
       ).map(&:to_name)
     )
 

data/mod/core/chunk/reference.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Content
     module Chunk

data/mod/core/chunk/uri.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "uri"
 
 # This wiki chunk matches arbitrary URIs, using patterns from the Ruby URI
@@ -20,7 +21,7 @@ require "uri"
 #   [iso3166]: http://geotags.com/iso3166/
 module Card::Content::Chunk
   class URI < Abstract
-    SCHEMES = %w(irc http https ftp ssh git sftp file ldap ldaps mailto).freeze
+    SCHEMES = %w[irc http https ftp ssh git sftp file ldap ldaps mailto].freeze
 
     REJECTED_PREFIX_RE = %w{! ": " ' ](}.map { |s| Regexp.escape s } * "|"
 
@@ -47,7 +48,7 @@ module Card::Content::Chunk
 
       def context_ok? content, chunk_start
         preceding_string = content[chunk_start - 2..chunk_start - 1]
-        !(preceding_string =~ /(?:#{REJECTED_PREFIX_RE})$/)
+        preceding_string !~ /(?:#{REJECTED_PREFIX_RE})$/
       end
     end
 
@@ -57,7 +58,7 @@ module Card::Content::Chunk
       chunk.gsub!(/(?:&nbsp;)+/, "")
 
       @trailing_punctuation =
-        if %w{, . ) ! ? :}.member?(last_char)
+        if %w[, . ) ! ? :].member?(last_char)
           @text.chop!
           chunk.chop!
           last_char

data/mod/core/set/abstract/lock.rb

@@ -0,0 +1,26 @@
+def lock
+  was_already_locked = locked?
+  return if was_already_locked
+  Auth.as_bot do
+    lock!
+    yield
+  end
+ensure
+  unlock! unless was_already_locked
+end
+
+def lock_cache_key
+  "UPDATE-LOCK:#{key}"
+end
+
+def locked?
+  Card.cache.read lock_cache_key
+end
+
+def lock!
+  Card.cache.write lock_cache_key, true
+end
+
+def unlock!
+  Card.cache.write lock_cache_key, false
+end

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

@@ -11,14 +11,13 @@ def assign_attributes args={}
 end
 
 def assign_set_specific_attributes
-  return unless @set_specific.present?
-  @set_specific.each_pair do |name, value|
+  set_specific.each_pair do |name, value|
     send "#{name}=", value
   end
 end
 
 def extract_subcard_args! args
-  subcards = args.delete("subcards") ||  args.delete(:subcards) || {}
+  subcards = args.delete("subcards") || args.delete(:subcards) || {}
   if (subfields = args.delete("subfields") || args.delete(:subfields))
     subfields.each_pair do |key, value|
       subcards[cardname.field(key)] = value
@@ -74,7 +73,7 @@ end
 def stash_set_specific_attributes args
   @set_specific = {}
   Card.set_specific_attributes.each do |key|
-    @set_specific[key] = args.delete(key) if args[key]
+    set_specific[key] = args.delete(key) if args.key?(key)
   end
 end
 
@@ -103,3 +102,8 @@ def extract_type_id! args={}
   end
   type_id
 end
+
+# 'set' refers to the noun not the verb
+def set_specific
+  @set_specific ||= {}
+end

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

@@ -355,22 +355,29 @@ format :csv do
   end
 
   def name_with_field_rows
-    list = card.item_names
-    columns = columns_from_referees list.first
+    return [] unless row_card_names.present?
 
-    list.map do |item_name|
+    row_card_names.map do |item_name|
       CSV.generate_line row_from_field_names(item_name, columns)
     end.join
   end
 
-  def columns_from_referees referer
+  def row_card_names
+    @row_cards ||= card.item_names
+  end
+
+  def columns
     columns = []
-    Card.fetch(referer).format.each_nested_field do |chunk|
+    csv_structure_card.format.each_nested_field do |chunk|
       columns << chunk.referee_name.tag
     end
     columns
   end
 
+  def csv_structure_card
+    card.rule_card(:csv_structure) || Card.fetch(row_card_names.first)
+  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)
@@ -395,10 +402,12 @@ format :csv do
   end
 
   def column_title opts
-    if %w(name link).member? opts[:view]
+    if opts[:title]
+      opts[:title]
+    elsif %w[name link].member? opts[:view]
       opts[:view]
     else
       opts[:nest_name].to_name.tag
     end
   end
-end
+end