mumukit-platform 5.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff5505e3d0593e7928058ec91492a3cee48e8bbf7032a4bb991a066ad6367a05
-  data.tar.gz: 16b8d4e4fc5edc1437332e27283ab26d5a47ebfa2fd88d611215b89b68941ac9
+  metadata.gz: 39a52de81a0b2c6efb83bcc9a7e23b8e59715c42f83cd667813ea00c34fe1880
+  data.tar.gz: 6ba950cc3889ca4aedae2f48ad94c3011ebb8196bd57f8aed9ef48509a5f947c
 SHA512:
-  metadata.gz: 7af159ccbb971a130b4cb56145527884a4f8f90005f73462b74484719dd6d38c885106b8ba5e2c6b1c08593a89dc44271215340a5bd2cc0ce0f0c6989e8e652c
-  data.tar.gz: 0215da67f0cc8b35daedb5ed8b9074be5d43d80d6f22c8f881978deb2bd9ba58bb30945620df8c1c0ad499d18f2bfdd8f709ffd5acae2ddba307c282fb5f8d29
+  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
@@ -51,6 +54,7 @@ end
 
 require_relative './platform/notifiable'
 
+require_relative './platform/global'
 require_relative './platform/domain'
 require_relative './platform/model'
 require_relative './platform/locale'

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)
@@ -53,4 +61,4 @@ class Mumukit::Platform::Application
       organization_mapping.organic_uri(uri, organization)
     end
   end
-end
+end

data/lib/mumukit/platform/course.rb

@@ -1,5 +1,11 @@
 module Mumukit::Platform::Course
+  extend Mumukit::Platform::Global
+
   def self.find_by_slug!(slug)
     Mumukit::Platform.course_class.find_by_slug!(slug)
   end
+
+  def self.__global_thread_variable_key__
+    :course
+  end
 end

data/lib/mumukit/platform/global.rb

@@ -0,0 +1,19 @@
+module Mumukit::Platform::Global
+  def switch!(global)
+    raise "#{__global_thread_variable_key__} must not be nil" unless global
+    Thread.current[__global_thread_variable_key__] = global
+  end
+
+  def leave!
+    Thread.current[__global_thread_variable_key__] = nil
+  end
+
+  def current
+    Thread.current[__global_thread_variable_key__] || raise("#{__global_thread_variable_key__} not selected")
+  end
+
+  def current?
+    !!Thread.current[__global_thread_variable_key__]
+  end
+end
+

data/lib/mumukit/platform/locale.rb

@@ -2,6 +2,7 @@ module Mumukit::Platform::Locale
   SPECS = {
     en: { facebook_code: :en_US, auth0_code: :en, name: 'English' },
     es: { facebook_code: :es_LA, auth0_code: :es, name: 'Español' },
+    'es-CL': { facebook_code: :es_LA, auth0_code: :es, name: 'Español chileno' },
     pt: { facebook_code: :pt_BR, auth0_code: 'pt-br', name: 'Português' }
   }.with_indifferent_access
 

data/lib/mumukit/platform/organization.rb

@@ -1,27 +1,30 @@
 module Mumukit::Platform::Organization
-  def self.switch!(organization)
-    raise 'Organization must not be nil' unless organization
-    Thread.current[:organization] = organization
+  extend Mumukit::Platform::Global
+
+  def self.current_locale
+    Thread.current[:organization]&.locale || 'en'
   end
 
-  def self.leave!
-    Thread.current[:organization] = nil
+  def self.find_by_name!(name)
+    Mumukit::Platform.organization_class.find_by_name!(name)
   end
 
-  def self.current
-    Thread.current[:organization] || raise('organization not selected')
+  def self.__global_thread_variable_key__
+    :organization
   end
 
-  def self.current?
-    !!Thread.current[:organization]
+  ## Name validation
+
+  def self.valid_name?(name)
+    !!(name =~ anchored_valid_name_regex)
   end
 
-  def self.current_locale
-    Thread.current[:organization]&.locale || 'en'
+  def self.anchored_valid_name_regex
+    /\A#{valid_name_regex}\z/
   end
 
-  def self.find_by_name!(name)
-    Mumukit::Platform.organization_class.find_by_name!(name)
+  def self.valid_name_regex
+    /([-a-z0-9_]+(\.[-a-z0-9_]+)*)?/
   end
 end
 

data/lib/mumukit/platform/organization_mapping.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Mumukit::Platform::OrganizationMapping
   def self.from_env
     if ENV['RACK_ENV'] == 'test' || ENV['RAILS_ENV'] == 'test'
@@ -18,7 +20,15 @@ module Mumukit::Platform::OrganizationMapping
     end
   end
 
+  module Base
+    def path_for(request)
+      request.path_info
+    end
+  end
+
   module Subdomain
+    extend Base
+
     def self.implicit_organization?(request, domain)
       request.empty_subdomain_after?(domain)
     end
@@ -32,15 +42,21 @@ 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)
       path.start_with? "/#{namespace}/"
     end
+
+    def self.inorganic_path_for(request)
+      path_for(request)
+    end
   end
 
   module Path
+    extend Base
+
     def self.implicit_organization?(_request, _domain)
       false
     end
@@ -49,12 +65,21 @@ module Mumukit::Platform::OrganizationMapping
       framework.configure_tenant_path_routes! native, &block
     end
 
+    def self.path_composition_for(request)
+      organization, *path_parts = Pathname(path_for(request)).each_filename.to_a
+      [organization, path_parts.join('/')]
+    end
+
     def self.organization_name(request, _domain)
-      request.path.split('/')[1]
+      path_composition_for(request).first
+    end
+
+    def self.inorganic_path_for(request)
+      path_composition_for(request).second
     end
 
     def self.organic_uri(uri, organization)
-      uri.subroute(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 subroute(route)
-    if path.start_with? '/'
-      new_path = "/#{route}#{path}"
+  def tenantize(route, **options)
+    if path.end_with? '/'
+      new_path = "#{path}#{route}/"
     else
-      new_path = "/#{route}/#{path}"
+      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 = '5.0.1'
+    VERSION = '7.0.0'
   end
 end

data/lib/mumukit/platform/web_framework.rb

@@ -21,7 +21,7 @@ module Mumukit::Platform::WebFramework
     def self.tenant_scope_options
       {
           defaults: { tenant: lazy_string { Mumukit::Platform.current_organization_name } },
-          constraints: { tenant: Mumukit::Platform::Organization::Helpers.valid_name_regex }
+          constraints: { tenant: Mumukit::Platform::Organization.valid_name_regex }
       }
     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', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.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: 5.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
@@ -92,28 +92,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   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
@@ -151,6 +157,7 @@ files:
 - lib/mumukit/platform/bridge.rb
 - lib/mumukit/platform/course.rb
 - lib/mumukit/platform/domain.rb
+- lib/mumukit/platform/global.rb
 - lib/mumukit/platform/locale.rb
 - lib/mumukit/platform/model.rb
 - lib/mumukit/platform/notifiable.rb
@@ -184,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+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 1.14.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