openstax_utilities 4.2.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7336e5f9c9952756f9a981da7b79d5dece466022
-  data.tar.gz: e6a8621a11547eae03d63fc0d94e05053cc86664
+SHA256:
+  metadata.gz: 23bd083b2474dd40ea6848f919c4adbc50cc1cbaa927b8de0f968888100a3f8d
+  data.tar.gz: 0a35031fbb7df47f6675307130187e24e9bf4bec4699c8a129c0697832877653
 SHA512:
-  metadata.gz: 7b17cb61f65fe32b021ce90b736ff163fedc34ffcb3173f9ba0af024d165a4b53ea586547df15cda7b3d787bcf2afc3cf5a2c39a69ce1bc546ddce1056c6a6cf
-  data.tar.gz: a5a03f359924bc9de55fd70e3b433fd3ef84dbed7c94d1c7ff40e802b1c5cc65d452a6bf09d77198872d94f82f3e3da6ca65a773f1becd7d6b003a122605c16c
+  metadata.gz: b3bee8a0ca7d846e020da56ff82a50bde40317e772e7287d8853c8847009fa1ec857bc79865c8850f9f69a7e50817c1e3e2a85188ab35de21607fa0038b32397
+  data.tar.gz: 3a11784b8209459777082d0939c5d2ad6e2ee5373476f518056586b5ceb0d2371ecf2362ee8ffee1755e1321bf6e30d09be32e5ef791958782a801f19131b2f5

data/README.md

@@ -1,7 +1,7 @@
 OpenStax Utilities
 ==================
 
-[![Build Status](https://travis-ci.org/openstax/openstax_utilities.svg?branch=master)](https://travis-ci.org/openstax/openstax_utilities)
+[![Tests](https://github.com/openstax/openstax_utilities/workflows/Tests/badge.svg)](https://github.com/openstax/openstax_utilities/actions?query=workflow:Tests)
 [![Code Climate](https://codeclimate.com/github/openstax/openstax_utilities.png)](https://codeclimate.com/github/openstax/openstax_utilities)
 
 A set of common utilities for the various OpenStax projects.

data/app/controllers/openstax/utilities/status_controller.rb

@@ -0,0 +1,66 @@
+require 'aws-sdk-autoscaling'
+
+class OpenStax::Utilities::StatusController < ActionController::Base
+  layout 'openstax/utilities/status'
+
+  def index
+    @application_name = Rails.application.class.parent_name
+    @environment_name = Rails.application.secrets.environment_name
+
+    @statuses = if @environment_name == 'development'
+      [ [ 'local', 1, 1, :ok ] ]
+    else
+      queues = Delayed::Worker.queue_attributes.keys.map(&:to_s) - [ 'migration' ]
+      asgs = [ 'migration', 'web', 'cron', 'background' ] + queues.map do |queue|
+        "background-#{queue}"
+      end
+
+      Aws::AutoScaling::Client.new.describe_auto_scaling_groups(
+        auto_scaling_group_names: asgs.map do |asg|
+          "#{@environment_name}-#{@application_name.downcase}-#{asg}-asg"
+        end
+      ).auto_scaling_groups.map do |asg|
+        name = asg.auto_scaling_group_name.sub(
+          "#{@environment_name}-#{@application_name.downcase}-", ''
+        ).chomp('-asg')
+
+        status = if asg.desired_capacity == 0
+          if asg.instances.size > 0
+            :shutting_down
+          elsif [ 'web', 'background', 'cron' ].include?(name)
+            :configuration_error
+          else
+            :sleeping
+          end
+        elsif asg.instances.all? do |instance|
+                instance.health_status != 'Healthy' || instance.lifecycle_state != 'InService'
+              end
+          :down
+        elsif name == 'migration'
+          :migrating
+        elsif asg.max_size > 1 && asg.desired_capacity == asg.max_size
+          :at_capacity
+        elsif asg.instances.size < asg.desired_capacity
+          :scaling_up
+        elsif asg.instances.size > asg.desired_capacity
+          :scaling_down
+        else
+          :ok
+        end
+
+        [ name, asg.instances.size, asg.max_size, status ]
+      end.sort_by do |name, _, _, _|
+        case name
+        when 'migration'
+          '0'
+        when 'web'
+          '1'
+        when 'cron'
+          '2'
+        else
+          "3#{name}"
+        end
+      end
+    end
+  end
+end

data/app/routines/openstax/utilities/search_relation.rb

@@ -53,8 +53,13 @@ module OpenStax
 
         # Scoping
 
-        ::KeywordSearch.search(query.to_s) do |with|
-          instance_exec(with, &search_proc)
+        begin
+          ::KeywordSearch.search(query.to_s) do |with|
+            instance_exec(with, &search_proc)
+          end
+        rescue KeywordSearch::ParseError
+          fatal_error(code: :invalid_query,
+                      message: 'The search query string provided is invalid')
         end
 
         outputs[:items] = @items

data/app/views/layouts/openstax/utilities/status.html.erb

@@ -0,0 +1,26 @@
+<% title = "OpenStax #{@application_name} (#{@environment_name}) Status" %>
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= title %></title>
+    <meta name="robots" content="noindex">
+    <meta http-equiv="content-type" content="text/html; charset=UTF8" />
+
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= csrf_meta_tags %>
+  </head>
+
+  <body id="status" class="status">
+    <header>
+      <h2 style="margin-left: 16px;"><%= title %></h2>
+    </header>
+
+    <div class="body" style="margin-left: 16px;">
+      <div class="body-container">
+        <%= yield %>
+      </div>
+    </div>
+  </body>
+</html>

data/app/views/openstax/utilities/status/index.html.erb

@@ -0,0 +1,45 @@
+<%
+  status_icons = {
+    down: '💀',
+    configuration_error: '⚠️',
+    shutting_down: '😪',
+    at_capacity: '🥵',
+    scaling_down: '📉',
+    scaling_up: '📈',
+    migrating: '💾',
+    ok: '✅',
+    sleeping: '💤'
+  }
+
+  backend = @application_name == 'Tutor' ? 'tutor-server' : @application_name.downcase
+%>
+
+<h3>Versions</h3>
+
+<ul>
+  <li>
+    Backend (<%= backend %>): <%= Rails.application.secrets.release_version || 'not deployed' %>
+  </li>
+  <li>
+    Frontend (tutor-js): <%= OpenStax::Utilities::Assets.manifest.version || 'not deployed' %>
+  </li>
+</ul>
+
+<% status = status_icons.find { |key, _| @statuses.any? { |_, _, _, status| status == key } } %>
+<h3>Status: <% unless status.nil? %><span title="<%=
+  status.first.to_s.humanize
+%>"><%= status.second %></span><% end %></h3>
+
+<ul>
+  <% @statuses.map do |name, num_instances, max_size, status| %>
+    <% title = status.to_s.humanize %>
+    <li>
+      <%= name.to_s.underscore.humanize %>: <%= num_instances %>/<%= max_size %>
+      <% if status_icons.has_key? status %>
+        <span title="<%= title %>"><%= status_icons[status] %></span>
+      <% else %>
+        (<%= title %>)
+      <% end %>
+    </li>
+  <% end %>
+</ul>

data/config/routes.rb

@@ -0,0 +1,3 @@
+OpenStax::Utilities::Engine.routes.draw do
+  root to: 'status#index'
+end

data/lib/openstax/utilities/access_policy.rb

@@ -24,7 +24,8 @@ module OpenStax
       end
 
       def self.require_action_allowed!(action, requestor, resource)
-        raise SecurityTransgression unless action_allowed?(action, requestor, resource)
+        msg = "\"#{requestor.inspect}\" is not allowed to perform \"#{action}\" on \"#{resource.inspect}\""
+        raise(SecurityTransgression, msg) unless action_allowed?(action, requestor, resource)
       end
 
       def self.action_allowed?(action, requestor, resource)
@@ -38,7 +39,7 @@ module OpenStax
         end
 
         resource_class = resource.is_a?(Class) ? resource : resource.class
-        policy_class = instance.resource_policy_map[resource_class.to_s]
+        policy_class = instance.resource_policy_map[resource_class.to_s].try(:constantize)
 
         # If there is no policy registered, we by default deny access
         return false if policy_class.nil?
@@ -47,7 +48,7 @@ module OpenStax
       end
 
       def self.register(resource_class, policy_class)
-        self.instance.resource_policy_map[resource_class.to_s] = policy_class
+        self.instance.resource_policy_map[resource_class.to_s] = policy_class.to_s
       end
 
     end

data/lib/openstax/utilities/assets.rb

@@ -0,0 +1,29 @@
+require 'request_store'
+require_relative 'assets/manifest'
+
+module OpenStax::Utilities
+  module Assets
+    def self.url
+      url = Rails.application.secrets.assets_url
+      url.ends_with?('/') ? url : "#{url}/"
+    end
+
+    def self.url_for(asset)
+      "#{url}#{asset}"
+    end
+
+    def self.manifest
+      RequestStore.store[:assets_manifest] ||= OpenStax::Utilities::Assets::Manifest.new
+    end
+
+    def self.tags_for(asset)
+      manifest[asset].map do |chunk|
+        "<script type='text/javascript' src='#{chunk}' crossorigin='anonymous' async></script>"
+      end.join("\n").html_safe
+    end
+
+    def self.digest_for(asset)
+      Digest::MD5.hexdigest tags_for(asset)
+    end
+  end
+end

data/lib/openstax/utilities/assets/manifest.rb

@@ -0,0 +1,66 @@
+require 'faraday'
+require 'faraday-http-cache'
+
+module OpenStax::Utilities
+  module Assets
+    # Reads and parses the assets manifest
+    class Manifest
+      attr_reader :version
+
+      def initialize
+        @assets = HashWithIndifferentAccess.new
+
+        url = OpenStax::Utilities::Assets.url_for('assets.json')
+
+        begin
+          response = self.class.client.get url
+
+          if response.success?
+            contents = JSON.parse response.body
+
+            @version = contents['version']
+
+            if contents['entrypoints'].blank?
+              Rails.logger.error { "failed to parse manifest from #{url}" }
+            else
+              contents['entrypoints'].each do |entry_key, chunks|
+                @assets[entry_key] = chunks['js'].map do |chunk|
+                  OpenStax::Utilities::Assets.url_for(chunk)
+                end
+              end
+            end
+          else
+            Rails.logger.error { "status #{response.status} when reading remote url: #{url}" }
+          end
+        rescue Faraday::ConnectionFailed, Addressable::URI::InvalidURIError, Errno::ECONNREFUSED
+        end
+
+        Rails.logger.info do
+          "running in development mode with assets served by webpack at #{
+            OpenStax::Utilities::Assets.url
+          }"
+        end if @assets.blank?
+      end
+
+      def [](asset)
+        return [ OpenStax::Utilities::Assets.url_for("#{asset}.js") ] if @assets.blank?
+
+        @assets[asset] || []
+      end
+
+      protected
+
+      # Faraday is probably thread-safe but makes no guarantees
+      # https://github.com/lostisland/faraday/issues/370
+      # We could potentially reuse the client object
+      # However, bugs happen: https://github.com/lostisland/faraday/issues/1068
+      def self.client
+        Faraday.new do |builder|
+          builder.use :http_cache, store: Rails.cache
+
+          builder.adapter Faraday.default_adapter
+        end
+      end
+    end
+  end
+end

data/lib/openstax/utilities/engine.rb

@@ -2,6 +2,7 @@ require "openstax/utilities/action_list"
 
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'OpenStax'
+  inflect.acronym 'OSU'
 end
 
 module OpenStax
@@ -14,10 +15,10 @@ module OpenStax
       end
 
       config.generators do |g|
-        g.test_framework :rspec, :fixture => false
+        g.test_framework :rspec, fixture: false
         g.assets false
         g.helper false
       end
     end
   end
-end
+end

data/lib/openstax/utilities/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Utilities
-    VERSION = "4.2.0"
+    VERSION = '4.4.0'
   end
 end

data/lib/openstax_utilities.rb

@@ -19,6 +19,7 @@ require "openstax/utilities/acts_as_numberable"
 require "openstax/utilities/delegate_access_control"
 require "openstax/utilities/access_policy"
 require "openstax/utilities/osu_helper"
+require "openstax/utilities/assets"
 
 module OpenStax
   module Utilities
@@ -35,7 +36,7 @@ module OpenStax
       #
       # Configuration machinery.
       #
-      # To configure OpenStax Utilities, put the following code in your applications 
+      # To configure OpenStax Utilities, put the following code in your applications
       # initialization logic (eg. in the config/initializers in a Rails app)
       #
       #   OpenStax::Utilities.configure do |config|
@@ -43,7 +44,7 @@ module OpenStax
       #     ...
       #   end
       #
-      
+
       def configure
         yield configuration
       end
@@ -56,8 +57,8 @@ module OpenStax
         attr_accessor :standard_date_format
         attr_accessor :standard_datetime_format
         attr_accessor :standard_time_format
-        
-        def initialize      
+
+        def initialize
           @standard_date_format = "%b %d, %Y"
           @standard_datetime_format = "%b %d, %Y %l:%M %p %Z"
           @standard_time_format = "%l:%M %p %Z"
@@ -69,4 +70,3 @@ module OpenStax
 
   end
 end
-

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openstax_utilities
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: lev
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-http-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-autoscaling
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: squeel
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -132,16 +202,22 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/openstax/utilities/status_controller.rb
 - app/routines/openstax/utilities/limit_and_paginate_relation.rb
 - app/routines/openstax/utilities/order_relation.rb
 - app/routines/openstax/utilities/search_and_organize_relation.rb
 - app/routines/openstax/utilities/search_relation.rb
+- app/views/layouts/openstax/utilities/status.html.erb
+- app/views/openstax/utilities/status/index.html.erb
 - app/views/osu/shared/_action_list.html.erb
+- config/routes.rb
 - lib/openstax/utilities/access.rb
 - lib/openstax/utilities/access_policy.rb
 - lib/openstax/utilities/action_list.rb
 - lib/openstax/utilities/active_record_extensions.rb
 - lib/openstax/utilities/acts_as_numberable.rb
+- lib/openstax/utilities/assets.rb
+- lib/openstax/utilities/assets/manifest.rb
 - lib/openstax/utilities/classy_helper.rb
 - lib/openstax/utilities/delegate_access_control.rb
 - lib/openstax/utilities/engine.rb
@@ -158,53 +234,6 @@ files:
 - lib/openstax/utilities/text.rb
 - lib/openstax/utilities/version.rb
 - lib/openstax_utilities.rb
-- spec/dummy/README.md
-- spec/dummy/Rakefile
-- spec/dummy/app/access_policies/dummy_access_policy.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/access_policies.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/search_users.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/db/migrate/0_create_users.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/factories/user.rb
-- spec/lib/openstax/utilities/access_policy_spec.rb
-- spec/rails_helper.rb
-- spec/routines/openstax/utilities/limit_and_paginate_relation_spec.rb
-- spec/routines/openstax/utilities/order_relation_spec.rb
-- spec/routines/openstax/utilities/search_and_organize_relation_spec.rb
-- spec/routines/openstax/utilities/search_relation_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/openstax/openstax_utilities
 licenses:
 - MIT
@@ -224,56 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Utilities for OpenStax web sites
-test_files:
-- spec/dummy/app/access_policies/dummy_access_policy.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/access_policies.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/search_users.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config.ru
-- spec/dummy/db/migrate/0_create_users.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.md
-- spec/factories/user.rb
-- spec/lib/openstax/utilities/access_policy_spec.rb
-- spec/rails_helper.rb
-- spec/routines/openstax/utilities/limit_and_paginate_relation_spec.rb
-- spec/routines/openstax/utilities/order_relation_spec.rb
-- spec/routines/openstax/utilities/search_and_organize_relation_spec.rb
-- spec/routines/openstax/utilities/search_relation_spec.rb
-- spec/spec_helper.rb
+test_files: []