openstax_utilities 4.2.3 → 4.3.0

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     username { SecureRandom.hex.to_s }
     password_hash { SecureRandom.hex.to_s }

data/spec/lib/openstax/utilities/access_policy_spec.rb

@@ -5,7 +5,7 @@ module OpenStax
 
     describe AccessPolicy do
 
-      let!(:user) { FactoryGirl.create :user }
+      let!(:user) { FactoryBot.create :user }
 
       it 'responds to any _allowed? calls' do
         AccessPolicy.register(User, DummyAccessPolicy)

data/spec/lib/openstax/utilities/assets_spec.rb

@@ -0,0 +1,40 @@
+require 'rails_helper'
+require 'vcr_helper'
+
+RSpec.describe OpenStax::Utilities::Assets, vcr: VCR_OPTS do
+  before { RequestStore.store[:assets_manifest] = nil }
+
+  it 'defaults to name.js when manifest is missing' do
+    expect_any_instance_of(Faraday::Connection).to receive(:get).and_return(
+      OpenStruct.new success?: false
+    )
+    expect(described_class.tags_for(:foo)).to include "src='http://localhost:8000/dist/foo.js'"
+  end
+
+  it 'reads asset url from manifest' do
+    expect_any_instance_of(Faraday::Connection).to receive(:get).and_return(
+      OpenStruct.new(
+        success?: true,
+        body: { entrypoints: { foo: { js: [ 'foo-732c56c32ff399b62.min.bar' ] } } }.to_json
+      )
+    )
+    expect(described_class.tags_for(:foo)).to include(
+      "src='http://localhost:8000/dist/foo-732c56c32ff399b62.min.bar'"
+    )
+  end
+
+  context 'loading remote manifest' do
+    before do
+      @previous_assets_url = Rails.application.secrets.assets_url
+      Rails.application.secrets.assets_url = 'https://tutor-dev.openstax.org/assets'
+    end
+    after  { Rails.application.secrets.assets_url = @previous_assets_url }
+
+    it 'uses remote json' do
+      expect(described_class.manifest).to be_kind_of described_class::Manifest
+      expect(described_class.tags_for(:tutor)).to(
+        eq "<script type='text/javascript' src='https://tutor-dev.openstax.org/assets/tutor-b920eb0be760a7c440bf.min.js' crossorigin='anonymous' async></script>"
+      )
+    end
+  end
+end

data/spec/rails_helper.rb

@@ -3,9 +3,8 @@ ENV["RAILS_ENV"] ||= 'test'
 require 'spec_helper'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'faker'
-require 'squeel'
 
 # Add additional requires below this line. Rails is not loaded until this point!
 

data/spec/routines/openstax/utilities/limit_and_paginate_relation_spec.rb

@@ -4,21 +4,21 @@ module OpenStax
   module Utilities
     describe SearchRelation do
 
-      let!(:john_doe) { FactoryGirl.create :user, name: "John Doe",
+      let!(:john_doe) { FactoryBot.create :user, name: "John Doe",
                                            username: "doejohn",
                                            email: "john@doe.com" }
 
-      let!(:jane_doe) { FactoryGirl.create :user, name: "Jane Doe",
+      let!(:jane_doe) { FactoryBot.create :user, name: "Jane Doe",
                                            username: "doejane",
                                            email: "jane@doe.com" }
 
-      let!(:jack_doe) { FactoryGirl.create :user, name: "Jack Doe",
+      let!(:jack_doe) { FactoryBot.create :user, name: "Jack Doe",
                                            username: "doejack",
                                            email: "jack@doe.com" }
 
       before(:each) do
         100.times do
-          FactoryGirl.create(:user)
+          FactoryBot.create(:user)
         end
 
         @relation = User.unscoped

data/spec/routines/openstax/utilities/order_relation_spec.rb

@@ -3,32 +3,30 @@ require 'rails_helper'
 module OpenStax
   module Utilities
     describe SearchRelation do
+      let!(:john_doe) do
+        FactoryBot.create :user, name: "John Doe", username: "doejohn", email: "john@doe.com"
+      end
 
-      let!(:john_doe) { FactoryGirl.create :user, name: "John Doe",
-                                           username: "doejohn",
-                                           email: "john@doe.com" }
-
-      let!(:jane_doe) { FactoryGirl.create :user, name: "Jane Doe",
-                                           username: "doejane",
-                                           email: "jane@doe.com" }
+      let!(:jane_doe) do
+        FactoryBot.create :user, name: "Jane Doe", username: "doejane", email: "jane@doe.com"
+      end
 
-      let!(:jack_doe) { FactoryGirl.create :user, name: "Jack Doe",
-                                           username: "doejack",
-                                           email: "jack@doe.com" }
+      let!(:jack_doe) do
+        FactoryBot.create :user, name: "Jack Doe", username: "doejack", email: "jack@doe.com"
+      end
 
       before(:each) do
-        100.times do
-          FactoryGirl.create(:user)
-        end
+        100.times { FactoryBot.create(:user) }
 
-        @relation = User.where{username.like 'doe%'}
+        @relation = User.where(User.arel_table[:username].matches('doe%'))
       end
 
       it "orders results by multiple fields in different directions" do
-        items = OrderRelation.call(relation: @relation,
-                                   sortable_fields: SearchUsers::SORTABLE_FIELDS,
-                                   order_by: 'cReAtEd_At AsC, iD')
-                          .outputs[:items]
+        items = OrderRelation.call(
+          relation: @relation,
+          sortable_fields: SearchUsers::SORTABLE_FIELDS,
+          order_by: 'cReAtEd_At AsC, iD'
+        ).outputs[:items]
         expect(items).to include(john_doe)
         expect(items).to include(jane_doe)
         expect(items).to include(jack_doe)
@@ -38,10 +36,11 @@ module OpenStax
         expect(jane_index).to be > john_index
         expect(jack_index).to be > jane_index
 
-        items = OrderRelation.call(relation: @relation,
-                                   sortable_fields: SearchUsers::SORTABLE_FIELDS,
-                                   order_by: 'CrEaTeD_aT dEsC, Id DeSc')
-                          .outputs[:items]
+        items = OrderRelation.call(
+          relation: @relation,
+          sortable_fields: SearchUsers::SORTABLE_FIELDS,
+          order_by: 'CrEaTeD_aT dEsC, Id DeSc'
+        ).outputs[:items]
         expect(items).to include(john_doe)
         expect(items).to include(jane_doe)
         expect(items).to include(jack_doe)
@@ -51,7 +50,6 @@ module OpenStax
         expect(jane_index).to be < john_index
         expect(jack_index).to be < jane_index
       end
-
     end
   end
 end

data/spec/routines/openstax/utilities/search_and_organize_relation_spec.rb

@@ -11,21 +11,21 @@ module OpenStax
         max_items: SearchUsers::MAX_ITEMS
       }
 
-      let!(:john_doe) { FactoryGirl.create :user, name: "John Doe",
+      let!(:john_doe) { FactoryBot.create :user, name: "John Doe",
                                            username: "doejohn",
                                            email: "john@doe.com" }
 
-      let!(:jane_doe) { FactoryGirl.create :user, name: "Jane Doe",
+      let!(:jane_doe) { FactoryBot.create :user, name: "Jane Doe",
                                            username: "doejane",
                                            email: "jane@doe.com" }
 
-      let!(:jack_doe) { FactoryGirl.create :user, name: "Jack Doe",
+      let!(:jack_doe) { FactoryBot.create :user, name: "Jack Doe",
                                            username: "doejack",
                                            email: "jack@doe.com" }
 
       before(:each) do
         100.times do
-          FactoryGirl.create(:user)
+          FactoryBot.create(:user)
         end
       end
 

data/spec/routines/openstax/utilities/search_relation_spec.rb

@@ -3,22 +3,21 @@ require 'rails_helper'
 module OpenStax
   module Utilities
     describe SearchRelation do
+      let!(:john_doe) do
+        FactoryBot.create :user, name: "John Doe", username: "doejohn", email: "john@doe.com"
+      end
 
-      let!(:john_doe) { FactoryGirl.create :user, name: "John Doe",
-                                           username: "doejohn",
-                                           email: "john@doe.com" }
-
-      let!(:jane_doe) { FactoryGirl.create :user, name: "Jane Doe",
-                                           username: "doejane",
-                                           email: "jane@doe.com" }
+      let!(:jane_doe) do
+        FactoryBot.create :user, name: "Jane Doe", username: "doejane", email: "jane@doe.com"
+      end
 
-      let!(:jack_doe) { FactoryGirl.create :user, name: "Jack Doe",
-                                           username: "doejack",
-                                           email: "jack@doe.com" }
+      let!(:jack_doe) do
+        FactoryBot.create :user, name: "Jack Doe", username: "doejack", email: "jack@doe.com"
+      end
 
       before(:each) do
         100.times do
-          FactoryGirl.create(:user)
+          FactoryBot.create(:user)
         end
       end
 
@@ -64,9 +63,11 @@ module OpenStax
       end
 
       it "filters scoped results" do
-        items = SearchRelation.call(relation: User.where{name.like 'jOhN%'},
-                                    search_proc: SearchUsers::SEARCH_PROC,
-                                    query: 'last_name:dOe').outputs[:items]
+        items = SearchRelation.call(
+          relation: User.where(User.arel_table[:name].matches('jOhN%')),
+          search_proc: SearchUsers::SEARCH_PROC,
+          query: 'last_name:dOe'
+        ).outputs[:items]
 
         expect(items).to include(john_doe)
         expect(items).not_to include(jane_doe)
@@ -75,7 +76,6 @@ module OpenStax
           expect(item.name.downcase).to match(/\Ajohn[\w]* doe[\w]*\z/i)
         end
       end
-
     end
   end
 end

data/spec/vcr_helper.rb

@@ -0,0 +1,18 @@
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :webmock
+  c.configure_rspec_metadata!
+  c.allow_http_connections_when_no_cassette = Rails.env.development?
+  c.ignore_localhost = true
+  c.ignore_request { |request| Addressable::URI.parse(request.uri).path == '/oauth/token' } \
+    if Rails.env.development?
+  c.preserve_exact_body_bytes { |http_message| !http_message.body.valid_encoding? }
+end
+
+VCR_OPTS = {
+  # This should default to :none
+  record: ENV.fetch('VCR_OPTS_RECORD', :none).to_sym,
+  allow_unused_http_interactions: Rails.env.development?
+}

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openstax_utilities
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2020-09-28 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,48 @@ 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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +123,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 +151,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:
     - - ">="
@@ -142,6 +198,8 @@ files:
 - 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,10 +216,12 @@ files:
 - lib/openstax/utilities/text.rb
 - lib/openstax/utilities/version.rb
 - lib/openstax_utilities.rb
+- spec/cassettes/OpenStax_Utilities_Assets/loading_remote_manifest/uses_remote_json.yml
 - spec/dummy/README.md
 - spec/dummy/Rakefile
 - spec/dummy/app/access_policies/dummier_access_policy.rb
 - spec/dummy/app/access_policies/dummy_access_policy.rb
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -194,18 +254,23 @@ files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/0_create_users.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/cache/C09/760/6da7b2a29da9cb0f80ef102c7effb91fab3374db
 - spec/factories/user.rb
 - spec/lib/openstax/utilities/access_policy_spec.rb
+- spec/lib/openstax/utilities/assets_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
+- spec/vcr_helper.rb
 homepage: http://github.com/openstax/openstax_utilities
 licenses:
 - MIT
@@ -225,57 +290,63 @@ 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/dummier_access_policy.rb
-- spec/dummy/app/access_policies/dummy_access_policy.rb
+- spec/rails_helper.rb
+- spec/spec_helper.rb
+- spec/vcr_helper.rb
+- spec/factories/user.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/access_policies/dummier_access_policy.rb
+- spec/dummy/app/access_policies/dummy_access_policy.rb
 - 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/tmp/cache/C09/760/6da7b2a29da9cb0f80ef102c7effb91fab3374db
+- spec/dummy/db/migrate/0_create_users.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/db/schema.rb
+- spec/dummy/log/test.log
+- spec/dummy/README.md
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/config.ru
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
+- spec/dummy/bin/bundle
 - 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/filter_parameter_logging.rb
+- spec/dummy/config/initializers/search_users.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/backtrace_silencers.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/access_policies.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.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/lib/openstax/utilities/assets_spec.rb
 - spec/routines/openstax/utilities/limit_and_paginate_relation_spec.rb
+- spec/routines/openstax/utilities/search_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
+- spec/cassettes/OpenStax_Utilities_Assets/loading_remote_manifest/uses_remote_json.yml