card 1.91 → 1.92

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

@@ -261,7 +261,7 @@ module CarrierWave
     end
 
     def action_id
-      model.selected_content_action_id
+      model.selected_content_action_id || action_id_stand_in
     end
 
     # delegate carrierwave's fog config methods to cardio's config methods
@@ -271,6 +271,12 @@ module CarrierWave
 
     private
 
+    # used as action_id in the filename
+    # if card is not #actionable?
+    def action_id_stand_in
+      Time.now.to_i
+    end
+
     def storage
       case @model.storage_type
       when :cloud

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

@@ -15,14 +15,14 @@ end
 
 # place for files of mod file cards
 def coded_dir new_mod=nil
-  dir = File.join mod_dir(new_mod), MOD_FILE_DIR, codename
+  dir = File.join mod_dir(new_mod), MOD_FILE_DIR, codename.to_s
   FileUtils.mkdir_p dir
   dir
 end
 
 def mod_dir new_mod=nil
   mod_name = new_mod || mod
-  dir = Card::Mod::Loader.mod_dirs.path(mod_name) || (mod_name.to_sym == :test && "test")
+  dir = 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/upload_cache.rb

@@ -1,13 +1,19 @@
 # action id of the cached upload
 attr_accessor :action_id_of_cached_upload
 
+def actionable?
+  super || preliminary_upload?
+end
+
 event :upload_attachment, :prepare_to_validate,
       on: :save, when: proc { |c| c.preliminary_upload? } do
   save_original_filename  # save original filename as comment in action
+  # binding.pry
   write_identifier        # set db_content
   # (needs original filename to determine extension)
   store_attachment!
-  finalize_action         # create Card::Change entry for db_content
+  store_card_changes
+  # finalize_action         # create Card::Change entry for db_content
 
   card_id = new_card? ? upload_cache_card.id : id
   @current_action.update_attributes! draft: true, card_id: card_id
@@ -40,7 +46,7 @@ end
 def assign_attachment file, original_filename
   send "#{attachment_name}=", file
   write_identifier
-  @current_action.update_attributes! comment: original_filename
+  @current_action.update_attributes! comment: original_filename if @current_action
 end
 
 event :delete_cached_upload_file_on_create, :integrate,
@@ -66,8 +72,9 @@ end
 
 # used for uploads for new cards until the new card is created
 def upload_cache_card
+  cache_card_codename ="new_#{attachment_name}".to_sym
   @upload_cache_card ||=
-    Card["new_#{attachment_name}".to_sym] || Card[:new_file]
+    Card::Codename[cache_card_codename] ? Card[cache_card_codename] : Card[:new_file]
 end
 
 def preliminary_upload?

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

@@ -34,7 +34,7 @@ format do
     source = source_url
     source ? yield(source) : ""
   rescue
-    "File Error"
+    tr :file_error
   end
 end
 
@@ -78,7 +78,7 @@ end
 format :html do
   view :core do |_args|
     handle_source do |source|
-      "<a href=\"#{source}\">Download #{showname voo.title}</a>"
+      "<a href=\"#{source}\">#{tr :download, title: title_in_context(voo.title)}</a>"
     end
   end
 
@@ -106,7 +106,7 @@ format :html do
                              value="#{card.selected_action_id}">
         <table role="presentation" class="table table-striped">
           <tbody class="files">
-            <tr class="template-download fade in">
+            <tr class="template-download fade show">
               <td>
                 <span class="preview">
                   #{preview}
@@ -126,7 +126,7 @@ format :html do
                 <button class="btn btn-danger delete cancel-upload"
                         data-type="DELETE">
                   <i class="glyphicon glyphicon-trash"></i>
-                  <span>Delete</span>
+                  <span>#{tr(:delete)}</span>
                 </button>
               </td>
             </tr>
@@ -153,7 +153,7 @@ format :html do
              #{hidden_field_tag 'file_card_name', card.cardname.url_key}
         </span>
       </div>
-      <div id="progress" class="progress" style="display: none;">
+      <div id="progress" class="progress mb-2" style="display: none;">
         <div class="progress-bar progress-bar-success" style="width: 0%;"></div>
       </div>
       <div class="chosen-file"></div>

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

@@ -34,10 +34,10 @@ format do
   def determine_image_size
     voo.size =
       case
-      when @mode == :closed   then :icon
-      when voo.size           then voo.size.to_sym
-      when main?              then :large
-      else                         :medium
+      when nest_mode == :closed then :icon
+      when voo.size             then voo.size.to_sym
+      when main?                then :large
+      else                           :medium
       end
     voo.size = :original if voo.size == :full
   end

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

@@ -29,6 +29,7 @@ describe CarrierWave::FileCardUploader do
       end
 
       it "handles storage options" do
+        subject.last_action_id
         expect(subject.attachment.db_content(storage_type: :local))
           .to eq "~#{subject.id}/#{subject.last_action_id}.png"
       end

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

@@ -0,0 +1,90 @@
+
+describe "#bucket config" do
+  subject do
+    Card.new(name: "test", type_id: Card::FileID,
+             empty_ok: true, storage_type: :cloud,
+             bucket: :test_bucket).bucket_config
+  end
+
+  let(:bucket_config) do
+    {
+      test_bucket: {
+        provider: "fog/aws",
+        credentials: {
+          provider: "credential_provider",
+          region: "region",
+          host: "host",
+          endpoint: "endpoint",
+          aws_access_key_id: "aws_access_key_id",
+          aws_secret_access_key: "aws_secret_access_key"
+        },
+        subdirectory: "files",
+        directory: "directory",
+        public: true,
+        attributes: { "Cache-Control" => "max-age=#{365.day.to_i}" },
+        authenticated_url_expiration: 180,
+        use_ssl_for_aws: true
+      }
+    }
+  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|
+      ENV.delete key
+    end
+  end
+
+  it "takes config from Cardio.config" do
+    is_expected.to eq bucket_config[:test_bucket]
+  end
+
+  it "raises error if no bucket config given" do
+    Cardio.config.file_buckets = {}
+    expect { subject }.to raise_error(Card::Error)
+  end
+
+  it "takes config from env variables" do
+    Cardio.config.file_buckets = {}
+    ENV["PROVIDER"] = "env provider"
+    ENV["CREDENTIALS_PROVIDER"] = "env cred provider"
+    is_expected.to eq provider: "env provider",
+                      credentials: { provider:  "env cred provider" }
+  end
+
+  it "overrides Cardio.config with env variables" do
+    ENV["PROVIDER"] = "env provider"
+    ENV["CREDENTIALS_PROVIDER"] = "env cred provider"
+    changed_config = bucket_config[:test_bucket]
+    changed_config[:provider] =  "env provider"
+    changed_config[:credentials][:provider] = "env cred provider"
+    is_expected.to eq changed_config
+  end
+
+  it "prefers bucket specific env variables" do
+    ENV["PROVIDER"] = "ignore"
+    ENV["CREDENTIALS_PROVIDER"] = "ignore"
+    ENV["TEST_BUCKET_PROVIDER"] = "bucket provider"
+    ENV["TEST_BUCKET_CREDENTIALS_PROVIDER"] = "bucket cred provider"
+    changed_config = bucket_config[:test_bucket]
+    changed_config[:provider] =  "bucket provider"
+    changed_config[:credentials][:provider] = "bucket cred provider"
+    is_expected.to eq changed_config
+  end
+
+  it "finds any credential env variable" do
+    ENV["CREDENTIALS_MY_OWN_CLOUD_BUCKET"] = "my provider"
+    ENV["CREDENTIALS_MY_OWN_CLOUD"] = "ignore me"
+    ENV["TEST_BUCKET_CREDENTIALS_MY_OWN_CLOUD"] = "find me"
+    changed_config = bucket_config[:test_bucket]
+    changed_config[:credentials][:my_own_cloud_bucket] =  "my provider"
+    changed_config[:credentials][:my_own_cloud] = "find me"
+    is_expected.to eq changed_config
+  end
+end

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

@@ -1,6 +1,8 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::File do
+  DIRECTORY = "deckodev-test"
+
   def test_file no=1
     File.new(File.join(FIXTURES_PATH, "file#{no}.txt"))
   end
@@ -100,7 +102,7 @@ describe Card::Set::Type::File do
 
       it "renders absolute url to cloud" do
         is_expected
-          .to eq "http://#{directory}.s3.amazonaws.com/"\
+          .to eq "http://#{DIRECTORY}.s3.amazonaws.com/"\
                  "files/#{cloud_file.id}/#{cloud_file.last_action_id}.txt"
       end
     end
@@ -216,11 +218,11 @@ describe Card::Set::Type::File do
           # File.open(File.join(file_dir, "test_mod.txt"),"w") do |f|
           #   f.puts "test"
           # end
-          Card::Mod::Loader.mod_dirs.mod "test_mod"
+          Card::Mod.dirs.mod "test_mod"
         end
         after do
           FileUtils.rm_rf mod_path
-          Card::Mod::Loader.mod_dirs.mods.delete "test_mod"
+          Card::Mod.dirs.mods.delete "test_mod"
         end
         subject do
           create_file_card :coded, test_file,
@@ -254,6 +256,37 @@ describe Card::Set::Type::File do
         end
       end
 
+    #   describe "cloud" do
+    #     before(:context) do
+    #       storage_config :cloud
+    #       @cloud_card = create_file_card :cloud, test_file, bucket: :test_bucket
+    #       storage_config :local
+    #     end
+    #     after(:context) do
+    #       Card::Auth.as_bot do
+    #         update "file card", codename: nil
+    #         Card["file card"].delete!
+    #       end
+    #     end
+    #     #subject { cloud_file }
+    #
+    #     it "stores correct identifier "\
+    #        "((<bucket>)/<card id>/<action id>.<ext>)" do
+    #       expect(@cloud_card.content)
+    #         .to eq "(test_bucket)/#{@cloud_card.id}/#{@cloud_card.last_action_id}.txt"
+    #     end
+    #
+    #     it "stores file" do
+    #       expect(@cloud_card.file.read.strip).to eq "file1"
+    #     end
+    #
+    #     it "generates correct absolute url" do
+    #       expect(@cloud_card.file.url)
+    #         .to eq "http://#{DIRECTORY}.s3.amazonaws.com/"\
+    #            "files/#{@cloud_card.id}/#{@cloud_card.last_action_id}.txt"
+    #     end
+    #   end
+    # end
       describe "cloud" do
         subject { cloud_file }
 
@@ -269,7 +302,7 @@ describe Card::Set::Type::File do
 
         it "generates correct absolute url" do
           expect(subject.file.url)
-            .to eq "http://#{directory}.s3.amazonaws.com/"\
+            .to eq "http://#{DIRECTORY}.s3.amazonaws.com/"\
                "files/#{subject.id}/#{subject.last_action_id}.txt"
         end
       end
@@ -315,11 +348,11 @@ describe Card::Set::Type::File do
     context "if storage type is coded" do
       before do
         FileUtils.mkdir_p mod_path
-        Card::Mod::Loader.mod_dirs.mod "test_mod"
+        Card::Mod.dirs.mod "test_mod"
       end
       after do
         FileUtils.rm_rf mod_path
-        Card::Mod::Loader.mod_dirs.mods.delete "test_mod"
+        Card::Mod.dirs.mods.delete "test_mod"
       end
 
       subject do
@@ -460,95 +493,6 @@ describe Card::Set::Type::File do
     end
   end
 
-  describe "#bucket config" do
-    subject do
-      Card.new(name: "test", type_id: Card::FileID,
-               empty_ok: true, storage_type: :cloud,
-               bucket: :test_bucket).bucket_config
-    end
-
-    let(:bucket_config) do
-      {
-        test_bucket: {
-          provider: "fog/aws",
-          credentials: {
-            provider: "credential_provider",
-            region: "region",
-            host: "host",
-            endpoint: "endpoint",
-            aws_access_key_id: "aws_access_key_id",
-            aws_secret_access_key: "aws_secret_access_key"
-          },
-          subdirectory: "files",
-          directory: "directory",
-          public: true,
-          attributes: { "Cache-Control" => "max-age=#{365.day.to_i}" },
-          authenticated_url_expiration: 180,
-          use_ssl_for_aws: true
-        }
-      }
-    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|
-        ENV.delete key
-      end
-    end
-
-    it "takes config from Cardio.config" do
-      is_expected.to eq bucket_config[:test_bucket]
-    end
-
-    it "raises error if no bucket config given" do
-      Cardio.config.file_buckets = {}
-      expect { subject }.to raise_error(Card::Error)
-    end
-
-    it "takes config from env variables" do
-      Cardio.config.file_buckets = {}
-      ENV["PROVIDER"] = "env provider"
-      ENV["CREDENTIALS_PROVIDER"] = "env cred provider"
-      is_expected.to eq provider: "env provider",
-                        credentials: { provider:  "env cred provider" }
-    end
-
-    it "overrides Cardio.config with env variables" do
-      ENV["PROVIDER"] = "env provider"
-      ENV["CREDENTIALS_PROVIDER"] = "env cred provider"
-      changed_config = bucket_config[:test_bucket]
-      changed_config[:provider] =  "env provider"
-      changed_config[:credentials][:provider] = "env cred provider"
-      is_expected.to eq changed_config
-    end
-
-    it "prefers bucket specific env variables" do
-      ENV["PROVIDER"] = "ignore"
-      ENV["CREDENTIALS_PROVIDER"] = "ignore"
-      ENV["TEST_BUCKET_PROVIDER"] = "bucket provider"
-      ENV["TEST_BUCKET_CREDENTIALS_PROVIDER"] = "bucket cred provider"
-      changed_config = bucket_config[:test_bucket]
-      changed_config[:provider] =  "bucket provider"
-      changed_config[:credentials][:provider] = "bucket cred provider"
-      is_expected.to eq changed_config
-    end
-
-    it "finds any credential env variable" do
-      ENV["CREDENTIALS_MY_OWN_CLOUD_BUCKET"] = "my provider"
-      ENV["CREDENTIALS_MY_OWN_CLOUD"] = "ignore me"
-      ENV["TEST_BUCKET_CREDENTIALS_MY_OWN_CLOUD"] = "find me"
-      changed_config = bucket_config[:test_bucket]
-      changed_config[:credentials][:my_own_cloud_bucket] =  "my provider"
-      changed_config[:credentials][:my_own_cloud] = "find me"
-      is_expected.to eq changed_config
-    end
-  end
-
   def public_path_exist?
     File.exist? public_path
   end
@@ -557,9 +501,7 @@ describe Card::Set::Type::File do
     "public/files/~#{subject.id}/#{subject.last_action_id}.txt"
   end
 
-  let(:directory) { "deckodev-test" }
-
-  # expects access keys in card/spec/support/buckets_credentials.yml for the
+  # expects access keys in card/spec/support/bucket_credentials.yml for the
   # bucket defined in `directory` in the following format:
   # aws:
   #   provider: AWS
@@ -575,7 +517,7 @@ describe Card::Set::Type::File do
         provider: "fog/aws",
         credentials: bucket_credentials(:aws),
         subdirectory: "files",
-        directory: directory,
+        directory: DIRECTORY,
         public: true,
         attributes: { "Cache-Control" => "max-age=#{365.day.to_i}" },
         authenticated_url_expiration: 180

data/mod/core/chunk/link.rb

@@ -66,8 +66,7 @@ module Card::Content::Chunk
         @explicit_link = render_obj @explicit_link
         format.link_to_resource @explicit_link, @link_text
       elsif @name
-        known = referee_card.send_if :known?
-        format.link_to_card referee_name, @link_text, known: known
+        format.nest referee_name, options.merge(view: :link)
       end
     end