osc_machete_rails 1.3.1 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9892ae7412d5d8d8973582ff8bc32b9e897d6bc95cd2cd5a5f96f52435fcef4d
-  data.tar.gz: 38195307959e85aacb48961cba1f0034735be6a61317535dcd7a40c07ef7105b
+SHA1:
+  metadata.gz: 532dd20ce410fdf6ef08f67364f2bc0f3f5ffd68
+  data.tar.gz: 0b2e520c82c4f185e8b70c0a1725b5becf656f64
 SHA512:
-  metadata.gz: 491d4f56701312843836a6c4ac92f61c3238cd5c1c967accb5e8e3d46088651547ccd88cd8d7ed14e22a0cefe836bd621c9559bec8d7553bbeadc115c2116d9c
-  data.tar.gz: 7129f42bc62d006eaa0122cbb6a569b4af78243b737f983f73da4955cac8d243a2a2b19889115c6f2b38eb2aaf6aa1d57da6a191360eea24c07ca8842f45a330
+  metadata.gz: 450668a0aebdd9c4691cb29ee7ddd62a337b980db69bc6ed0d40432a74bde44c4976ee4572d7c299b5289591f9dd778d13076f13aac32ff61fd9e6bbe78c0259
+  data.tar.gz: 6e7fe6f48805ac128673610b3bc2eb36d1951087e87069d69c255bbe607d996d5854e40a23de4d396f9c18bfb940de3a2bfec041295f0de0621ab770dd5bc019

data/CHANGELOG.md

@@ -4,43 +4,10 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
-## [1.3.1] - 2020-04-02
-### Fixed
-
-- Fixed [#71](https://github.com/OSC/osc_machete_rails/pull/71).
-
-## [1.3.0] - 2020-01-21
-
-### Changed
-
-- dependency on rails has been increased from 4.2 to > 5.
-  -  this changed a lot in the test cases, nothing in the actual library.
-
-## [1.2.2] - 2016-07-26
-
-### Changed
-
-- dependency from osc-machete 1.1 to 1.2 which ups the pbs dependency to 2.0
-
-### Fixed
-
-- use latest version of osc-machete gem so `Job#host` exists so after submitting a
-  job we save the host to the database
-
-## [1.2.1] - 2016-07-26
-
-### Fixed
-
-- bug where `results_valid?` might not call results validation method
-
-## [1.2.0] - 2016-06-07
 
 ### Changed
 
 - remove `AwesimRails` as a dependency
-- README and spec changes for rubygems release
-- `Workflow#staging_target_dir` now accepts `dataroot` path keyword argument
-- change Rails dependency to allow any minor version of Rails 4
 
 ## [1.1.0] - 2016-03-03
 
@@ -103,12 +70,7 @@ statusable.rb (from v0.6.3 of osc-machete to latest osc_machete_rails)
 ### Removed
 
 
-[Unreleased]: https://github.com/OSC/osc_machete_rails/compare/v1.3.1...master
-[1.3.1]: https://github.com/OSC/osc_machete_rails/compare/v1.3.0...v1.3.1
-[1.3.0]: https://github.com/OSC/osc_machete_rails/compare/v1.2.2...v1.3.0
-[1.2.2]: https://github.com/OSC/osc_machete_rails/compare/v1.2.1...v1.2.2
-[1.2.1]: https://github.com/OSC/osc_machete_rails/compare/v1.2.0...v1.2.1
-[1.2.0]: https://github.com/OSC/osc_machete_rails/compare/v1.1.0...v1.2.0
-[1.1.0]: https://github.com/OSC/osc_machete_rails/compare/v1.0.1...v1.1.0
-[1.0.1]: https://github.com/OSC/osc_machete_rails/compare/v1.0.0...v1.0.1
+[Unreleased]: https://github.com/AweSim-OSC/osc_machete_rails/compare/v1.1.0...master
+[1.1.0]: https://github.com/AweSim-OSC/osc_machete_rails/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/AweSim-OSC/osc_machete_rails/compare/v1.0.0...v1.0.1
 

data/README.md

@@ -12,8 +12,3 @@ And then execute:
 
     $ bundle install
 
-## Usage
-
-### Generators
-
-See [USAGE](lib/generators/osc_machete_rails/USAGE) guidelines for details and examples.

data/lib/osc_machete_rails/statusable.rb

@@ -133,7 +133,7 @@ module OscMacheteRails
     # @return [String] A string representing a validation method name from script_name attr
     # using ActiveSupport methods
     def results_validation_method_name
-      File.basename(script_name, ".*").underscore.parameterize(separator: '_') + "_results_valid?"
+      File.basename(script_name, ".*").underscore.parameterize('_') + "_results_valid?"
     end
 
     # A hook that can be overidden with custom code

data/lib/osc_machete_rails/version.rb

@@ -1,3 +1,3 @@
 module OscMacheteRails
-  VERSION = "1.3.1"
+  VERSION = "2.0.0.pre1"
 end

data/test/dummy/app/controllers/simulations_controller.rb

@@ -55,20 +55,12 @@ class SimulationsController < ApplicationController
   # DELETE /simulations/1.json
   def destroy
     respond_to do |format|
-      # this shouldn't need a rescue, should just be if/else but the rails-controller-testing added
-      # in rails 5 doesn't seem to want to actually rescue exceptions in simulation.destroy and do it's
-      # rails magic, but instead they bubble up into the test case. so we force the rescue here
-      # and add it to simulation.errors.
-      begin
-        @simulation.destroy
+      if @simulation.destroy
         format.html { redirect_to simulations_url, notice: 'Simulation was successfully destroyed.' }
         format.json { head :no_content }
-
-      rescue PBS::BadhostError => e
-        @simulation.errors.add(:name, :not_implemented, message: e.to_s)
+      else
         format.html { render :show, status: 500, alert: 'A problem occurred when trying to destroy the simulation.' }
         format.json { render json: @simulation.errors, status: 500 }
-        next
       end
     end
   end

data/test/dummy/app/models/simulation.rb

@@ -1,4 +1,4 @@
-class Simulation < ApplicationRecord
+class Simulation < ActiveRecord::Base
   has_many :simulation_jobs, dependent: :destroy
   has_machete_workflow_of :simulation_jobs
 
@@ -23,5 +23,4 @@ class Simulation < ApplicationRecord
   def copy
     self.dup
   end
-
 end

data/test/dummy/app/models/simulation_job.rb

@@ -1,4 +1,4 @@
-class SimulationJob < ApplicationRecord
+class SimulationJob < ActiveRecord::Base
   # Here we test the deprecated include method instead of the new
   # OscMacheteRails::Statusable
   # We will want both to work...

data/test/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')

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/config/application.rb

@@ -1,23 +1,23 @@
-require_relative 'boot'
+require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
+require "osc_machete_rails"
 
 module Dummy
   class Application < Rails::Application
-    # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
-
     # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration can go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded after loading
-    # the framework and any gems in your application.
-    config.active_record.sqlite3.represent_boolean_as_integer = true
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
 
-    # rails 5 update. tests don't create the belongs_to models
-    config.active_record.belongs_to_required_by_default = false
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
   end
 end
+

data/test/dummy/config/boot.rb

@@ -1,4 +1,5 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require File.expand_path('../application', __FILE__)
 
 # Initialize the Rails application.
-Rails.application.initialize!
+Dummy::Application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -9,53 +9,21 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports.
-  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?
-    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}"
-    }
-  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
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  config.action_mailer.perform_caching = false
-
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations.
+  # 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.
   config.assets.debug = true
-
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end

data/test/dummy/config/environments/production.rb

@@ -1,11 +1,11 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
+  # your application in memory, allowing both thread web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -14,13 +14,13 @@ Rails.application.configure do
   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
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # Disable serving static files from the `/public` folder by default since
-  # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -29,66 +29,52 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+  # Generate digests for assets URLs.
+  config.assets.digest = true
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
 
   # Specifies the header that your server uses for sending files.
-  # 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'
-  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Use the lowest log level to ensure availability of diagnostic information
-  # when problems arise.
-  config.log_level = :debug
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
 
   # Prepend all log lines with the following tags.
-  config.log_tags = [ :request_id ]
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # 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}"
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
 
-  config.action_mailer.perform_caching = false
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
+  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
-
-  # Use a different logger for distributed setups.
-  # require 'syslog/logger'
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
-
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
-    logger.formatter = config.log_formatter
-    config.logger    = ActiveSupport::TaggedLogging.new(logger)
-  end
-
-  # Do not dump schema after migrations.
-  config.active_record.dump_schema_after_migration = false
 end

data/test/dummy/config/environments/test.rb

@@ -1,4 +1,4 @@
-Rails.application.configure do
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -12,11 +12,9 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # 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}"
-  }
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -28,11 +26,6 @@ Rails.application.configure do
   # 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.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
@@ -40,7 +33,4 @@ Rails.application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
 end

data/test/dummy/config/initializers/mime_types.rb

@@ -2,3 +2,4 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,10 +5,10 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
 # To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
-#   self.include_root_in_json = true
+#  self.include_root_in_json = true
 # end