mumukit-platform 6.1.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aa8d319e6390b781d8da0e7d33f720cf6b093c0d43ba432ca27666da514191d
-  data.tar.gz: d124ebd5601c68dcdb97a51de9a0a42319a3f0d83a92a88ab1aa2b8198d8d514
+  metadata.gz: 39a52de81a0b2c6efb83bcc9a7e23b8e59715c42f83cd667813ea00c34fe1880
+  data.tar.gz: 6ba950cc3889ca4aedae2f48ad94c3011ebb8196bd57f8aed9ef48509a5f947c
 SHA512:
-  metadata.gz: 97fd564e02205ec571c81b12560fa1939dd03bd5cd651ecd17b09c670602ca4a06e8564ee171f6042219fd8f5327974988155611a85c6791b447a3d4536a81d4
-  data.tar.gz: 99c5f0bed18cad1bb402e47371a16ab9b4e9e641471ffaa8414901b55702771df1239f47ab809b0b0333caa40b5e6b071e118301e9e15f67b49a0a3b7e1444fe
+  metadata.gz: 0c434715414edfa1af06bafe9a92e6c1a5fd23435e7c7408bc70005c84f90a7bc5512597c8f0aaa2188bb71aa12f60c5b1f610fdf59d21e2447e598184eb4d58
+  data.tar.gz: f4142a30260afa2b54d7addb7fd48ffd4a523e71948f4243c4088043cad49851cdfe8549b1abc06ba9253701c4c7a54eb03e54e66dc501551116de4ae762682d

data/.github/workflows/test_and_deploy.yml

@@ -0,0 +1,32 @@
+name: Test and deploy
+
+on:
+- push
+- workflow_dispatch
+
+jobs:
+  test_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      with:
+        ruby-version: 2.6.3
+        bundler: 2.1.4
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake
+    - name: Deploy
+      if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
+

data/lib/mumukit/platform.rb

@@ -17,9 +17,9 @@ module Mumukit::Platform
 
       config.laboratory_url = ENV['MUMUKI_LABORATORY_URL'] || "http://#{domain}"
       config.thesaurus_url = ENV['MUMUKI_THESAURUS_URL'] || "http://thesaurus.#{domain}"
-      config.bibliotheca_ui_url = ENV['MUMUKI_BIBLIOTHECA_UI_URL'] || "http://bibliotheca.#{domain}"
+      config.bibliotheca_ui_url = ENV['MUMUKI_BIBLIOTHECA_UI_URL'] || "http://bibliotheca.#{domain}/#/"
       config.bibliotheca_api_url = ENV['MUMUKI_BIBLIOTHECA_API_URL'] || "http://bibliotheca-api.#{domain}"
-      config.classroom_ui_url = ENV['MUMUKI_CLASSROOM_UI_URL'] || "http://classroom.#{domain}"
+      config.classroom_ui_url = ENV['MUMUKI_CLASSROOM_UI_URL'] || "http://classroom.#{domain}/#/"
       config.classroom_api_url = ENV['MUMUKI_CLASSROOM_API_URL'] || "http://classroom-api.#{domain}"
       config.organization_mapping = Mumukit::Platform::OrganizationMapping.from_env
     end
@@ -41,8 +41,11 @@ module Mumukit::Platform
     #
     define_singleton_method("#{klass}_class") do
       begin
-        config["#{klass}_class"] ||= config["#{klass}_class_name"].constantize
-      rescue
+        return config["#{klass}_class"] if config["#{klass}_class"].present?
+        config["#{klass}_class_name"].to_s.constantize.tap do |klass_instance|
+          config["#{klass}_class"] = klass_instance unless %w(RACK_ENV RAILS_ENV).any? { |it| ENV[it] == 'development' }
+        end
+      rescue NameError => e
         raise "You must configure your #{klass} class first"
       end
     end

data/lib/mumukit/platform/application.rb

@@ -28,7 +28,15 @@ class Mumukit::Platform::Application
   end
 
   def organic_url_for(organization, path)
-    organic_uri(organization).url_for(relative_path path)
+    uri = organic_uri(organization)
+    # warning: this code is tightly
+    # coupled to the fact that applications can only rebuild urls
+    # in fragmented-mode
+    if uri.fragment
+      uri.to_s + relative_path(path)
+    else
+      uri.url_for(relative_path path)
+    end
   end
 
   def relative_path(path)

data/lib/mumukit/platform/organization_mapping.rb

@@ -42,7 +42,7 @@ module Mumukit::Platform::OrganizationMapping
     end
 
     def self.organic_uri(uri, organization)
-      uri.subdominate(organization)
+      uri.subdominate(organization, fragmented: true)
     end
 
     def self.path_under_namespace?(_organization_name, path, namespace)
@@ -79,7 +79,7 @@ module Mumukit::Platform::OrganizationMapping
     end
 
     def self.organic_uri(uri, organization)
-      uri.tenantize organization
+      uri.tenantize organization, fragmented: true
     end
 
     def self.path_under_namespace?(organization_name, path, namespace)

data/lib/mumukit/platform/uri.rb

@@ -1,23 +1,30 @@
 class URI::HTTP
-  def subdominate(subdomain)
+  def subdominate(subdomain, **options)
     if host.start_with? 'www.'
       new_host = host.gsub('www.', "www.#{subdomain}.")
     else
       new_host = "#{subdomain}.#{host}"
     end
-    rebuild(host: new_host)
+    rebuild({host: new_host}, **options)
   end
 
-  def tenantize(route)
+  def tenantize(route, **options)
     if path.end_with? '/'
       new_path = "#{path}#{route}/"
     else
       new_path = "#{path}/#{route}/"
     end
-    rebuild(path: new_path)
+    rebuild({path: new_path}, **options)
   end
 
-  def rebuild(updates)
+  def rebuild(updates, fragmented: false)
+    if fragmented && fragment
+      fragment = "#{self.fragment}/#{updates[:path]}/".squeeze('/')
+      updates = updates.except(:path)
+    else
+      fragment = self.fragment
+    end
+
     self.class.build({
       scheme: scheme,
       host: host,
@@ -30,4 +37,4 @@ class URI::HTTP
   def url_for(path)
     URI.join(self, path).to_s
   end
-end
+end

data/lib/mumukit/platform/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Platform
-    VERSION = '6.1.0'
+    VERSION = '7.0.0'
   end
 end

data/mumukit-platform.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mumukit-bridge', '>= 3.5', '< 5'
   spec.add_dependency 'activemodel', '>= 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '~> 2.0', '< 2.2'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-platform
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
@@ -93,6 +93,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,6 +103,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,10 +141,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test_and_deploy.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -185,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Shared Mumuki Platform Components

data/.travis.yml

@@ -1,13 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-- 2.6.3
-before_install: gem install bundler -v 2.0.2
-deploy:
-  provider: rubygems
-  api_key:
-    secure: peqcsnX2NXwCvy20HfitFl7Dhhi4jrkeu2ZuJz6eEVml5xkkGOuTiAXiSFMvysuV1uCueWNKvQJzNl6u82cwM/InYjFj1kG3SRLIZCkEKks2tOxtJmky7CpIh9jI5SZKOL/DKuMRIuYJwhN0WURi58aCybqyhAsh0XQYGN0EFo6jwnJHehe1KEwgxaTFFB1Q1bn41o+7LWw4r39j7mj28x+WTnl11iM/CRndrQj/YSB8Xk92il8W2vfEWbn4xY2rK/joQ9Doi+rbrW90J7ArGkiMbbsofKkt2snOjrO5UDqqDGWi1/iQmBwtf2qgqB+TmTELrqd4ehRraq4P7dgW3uWGQe/0gR5xoYDusimcBQ5N+JDZbac/YKMRYG0+Ce09ggIaGjq2iEyn9zus00aaaoEGixqVtTwMtkvApmlM/c7CaeSmKSUhYdYE8ayOuCqHgIhCKoZPhADylTc3NL5qizk3/3/wrCyAf9Slq/Oa04Wa4NRXfC5yDkdJggaIzYwq03mc1diechM1ZrovZHNOWznbtjq1JrbEDQk95A29BsrTRLCk98QnChaTHrGmwvlk7g40iUurDplfg5IpUHnSc9BBQg+hcKd5IjKVkrHH5cUHq+U8pXIXgf4vs8cYFX8B1asIO7ApiSABxnC8bsjBZx4ccu303LWILiFBurQQn7w=
-  gem: mumukit-platform
-  on:
-    tags: true
-    repo: mumuki/mumukit-platform