update dummy files

app/controllers/inventory_files_controller.rb

@@ -16,11 +16,22 @@ def index
   # GET /inventory_files/1
   # GET /inventory_files/1.json
   def show
+    if @inventory_file.inventory.path
+      unless ENV['ENJU_STORAGE'] == 's3'
+        file = @inventory_file.inventory.path
+      end
+    end
+
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @inventory_file }
       format.download {
-        send_data @inventory_file.inventory.download, filename: @inventory_file.inventory.filename.to_s, type: @inventory_file.inventory.content_type, disposition: disposition
+        if ENV['ENJU_STORAGE'] == 's3'
+          send_data Faraday.get(@inventory_file.inventory.expiring_url).body.force_encoding('UTF-8'),
+            filename: File.basename(@inventory_file.inventory_file_name), type: 'application/octet-stream'
+        else
+          send_file file, filename: @inventory_file.inventory_file_name, type: 'application/octet-stream'
+        end
       }
     end
   end

app/models/inventory_file.rb

@@ -16,7 +16,7 @@ class InventoryFile < ApplicationRecord
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
   validates_attachment_content_type :inventory, content_type: ['text/csv', 'text/plain', 'text/tab-separated-values']
-  validates_attachment_presence :inventory
+  validates_attachment_presence :inventory, on: :create
 
   paginates_per 10
 
@@ -35,27 +35,8 @@ def import
         end
       end
     end
-  end
-
-  def export(col_sep: "\t")
-    file = Tempfile.create do |f|
-      inventories.each do |inventory|
-        f.write inventory.to_hash.values.to_csv(col_sep)
-      end
-
-      f.rewind
-      f.read
-    end
-
-    file
-  end
-
-  def missing_items
-    Item.where(Inventory.where('items.id = inventories.item_id AND inventories.inventory_file_id = ?', id).exists.not)
-  end
-
-  def found_items
-    items
+    file.close
+    true
   end
 
   def missing_items
@@ -71,11 +52,14 @@ def found_items
 #
 # Table name: inventory_files
 #
-#  id                     :bigint           not null, primary key
-#  user_id                :bigint
+#  id                     :integer          not null, primary key
+#  filename               :string
+#  content_type           :string
+#  size                   :integer
+#  user_id                :integer
 #  note                   :text
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
+#  created_at             :datetime
+#  updated_at             :datetime
 #  inventory_file_name    :string
 #  inventory_content_type :string
 #  inventory_file_size    :integer

app/views/inventory_files/edit.html.erb

@@ -5,6 +5,26 @@
 <%= form_for(@inventory_file) do |f| -%>
   <%= f.error_messages -%>
 
+  <div class="field">
+    <%= f.label :inventory_file_name -%> <br />
+    <%= f.text_field :inventory_file_name -%>
+  </div>
+  <div class="field">
+    <%= f.label :inventory_content_type -%> <br />
+    <%= f.text_field :inventory_content_type -%>
+  </div>
+  <div class="field">
+    <%= f.label :inventory_file_size -%> <br />
+    <%= f.text_field :inventory_file_size -%>
+  </div>
+  <div class="field">
+    <%= f.label :inventory_fingerprint -%> <br />
+    <%= f.text_field :inventory_fingerprint -%>
+  </div>
+  <div class="field">
+    <%= f.label :user_id -%> <br />
+    <%= f.text_field :user_id -%>
+  </div>
   <div class="field">
     <%= f.label :note -%> <br />
     <%= f.text_area :note -%>

app/views/inventory_files/index.html.erb

@@ -12,10 +12,9 @@
   </tr>
 
 <%- @inventory_files.each do |inventory_file| -%>
-  <% next unless inventory_file.inventory.attached? -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%= link_to inventory_file.inventory.filename, inventory_file -%>
+      <%= link_to inventory_file.inventory_file_name, inventory_file -%>
       <br />
       <%= inventory_file.created_at -%>
     </td>

app/views/inventory_files/show.html.erb

@@ -5,17 +5,22 @@
 
 <p>
   <strong><%= t('activerecord.attributes.inventory_file.inventory_file_name') -%> :</strong>
-  <%= @inventory_file.inventory.filename -%>
+  <%= @inventory_file.inventory_file_name -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.inventory_file.inventory_content_type') -%> :</strong>
-  <%= @inventory_file.inventory.content_type -%>
+  <%= @inventory_file.inventory_content_type -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.inventory_file.inventory_file_size') -%> :</strong>
-  <%= @inventory_file.inventory.byte_size -%>
+  <%= @inventory_file.inventory_file_size -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.inventory_file.inventory_fingerprint') -%> :</strong>
+  <%= @inventory_file.inventory_fingerprint -%>
 </p>
 
 <p>

spec/controllers/inventory_files_controller_spec.rb

@@ -46,36 +46,33 @@
       login_fixture_admin
 
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, params: { id: inventory_files(:inventory_file_00001) }
-        expect(assigns(:inventory_file)).to eq(InventoryFile.find(inventory_files(:inventory_file_00001).id))
-        expect(response).to be_successful
+        get :show, params: { id: 1 }
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When logged in as Librarian" do
       login_fixture_librarian
 
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, params: { id: inventory_files(:inventory_file_00001) }
-        expect(assigns(:inventory_file)).to eq(InventoryFile.find(inventory_files(:inventory_file_00001).id))
-        expect(response).to be_successful
+        get :show, params: { id: 1 }
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When logged in as User" do
       login_fixture_user
 
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, params: { id: inventory_files(:inventory_file_00001) }
-        expect(assigns(:inventory_file)).to eq(InventoryFile.find(inventory_files(:inventory_file_00001).id))
-        expect(response).to be_forbidden
+        get :show, params: { id: 1 }
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, params: { id: inventory_files(:inventory_file_00001) }
-        expect(assigns(:inventory_file)).to eq(InventoryFile.find(inventory_files(:inventory_file_00001).id))
+        get :show, params: { id: 1 }
+        expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
         expect(response).to redirect_to(new_user_session_url)
       end
     end

spec/dummy/app/controllers/application_controller.rb

@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
   include EnjuLibrary::Controller
   include EnjuInventory::Controller
   after_action :verify_authorized
+  before_action :set_paper_trail_whodunnit
 
   include Pundit
 end

spec/dummy/app/models/user.rb

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, # :registerable,
-    :recoverable, :rememberable, # :validatable
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, # , :validatable
     :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser

spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')

spec/dummy/bin/setup

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -20,6 +21,7 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
+
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

spec/dummy/bin/update

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -17,9 +18,6 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
-  # system('bin/yarn')
-
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 

spec/dummy/bin/yarn

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-APP_ROOT = File.expand_path('..', __dir__)
-Dir.chdir(APP_ROOT) do
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
   begin
-    exec "yarnpkg", *ARGV
+    exec "yarnpkg #{ARGV.join(" ")}"
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

spec/dummy/config/application.rb

@@ -9,7 +9,7 @@
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 5.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

spec/dummy/config/environments/development.rb

@@ -13,23 +13,19 @@
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
     }
   else
     config.action_controller.perform_caching = false
 
     config.cache_store = :null_store
   end
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
-  config.active_storage.service = :local
-
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
@@ -41,9 +37,6 @@
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Highlight code that triggered database queries in logs.
-  config.active_record.verbose_query_logs = true
-
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.

spec/dummy/config/environments/production.rb

@@ -14,9 +14,10 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
-  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
-  # config.require_master_key = true
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
@@ -38,9 +39,6 @@
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
-  config.active_storage.service = :local
-
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
@@ -62,7 +60,6 @@
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "dummy_#{Rails.env}"
-
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.

spec/dummy/config/environments/test.rb

@@ -15,7 +15,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
   }
 
   # Show full error reports and disable caching.
@@ -27,10 +27,6 @@
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
-
-  # Store uploaded files on the local file system in a temporary directory
-  config.active_storage.service = :test
-
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
@@ -43,6 +39,4 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
-  config.action_mailer.default_url_options = {host: 'localhost:3000'}
-  config.active_job.queue_adapter = :inline
 end

spec/dummy/config/initializers/assets.rb

@@ -6,7 +6,7 @@
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('../../', 'node_modules')
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets