mumukit-platform 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ceea0a25894aaab70d6c56aa1b1103ffb601af71a82c528c48d6fbbc13ead9f
-  data.tar.gz: c3ad6e6823687a1cbd706516ffb9b817859f4c2ec821dbdfbb454512702066cf
+  metadata.gz: 574f72c7c3ab80aef56cad27a205efae2e8c04ecd09de31ff4ba995985874b93
+  data.tar.gz: 0de57daef5785a7dc75c67792c31d42d274a281516287bf03c8ef9f49330b732
 SHA512:
-  metadata.gz: 85d2db7b9590924e59650eb4ccea66f83b3081a56556472ff511bd5f83dba44d68b3341e100befe511712111ed1493646dae07672a3b5348de448265df01da5a
-  data.tar.gz: a2acb72616d62179c9ba4c6da847eb7b51962fa64748d01e310305b5483cc4bd9ce7f61cc13d893fd599254b3bf26fe99a7b6ef88548e4a8bc30151bf3c5caef
+  metadata.gz: cde7ce902fb18d86863fe2248702d600c061e58cb92c773db206dc08f0bb665f59f9678a34bd237ab8e565d319407d2fffe5dc6e6e9bcef37587a0bc60c291ff
+  data.tar.gz: fa02fa95a47b817f168397a277359026c950e5727bc9c5c4d661c71c13027b27be9bc3894dc652afd3fc5b1a405d46a18c0f1c809a52b63de66b847a45f2eb76

data/.github/workflows/test_and_deploy.yml

@@ -10,12 +10,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.3
+        ruby-version: 2.7.7
         bundler: 2.1.4
-    - name: Install dependencies
-      run: bundle install
+        bundler-cache: true
     - name: Run tests
       run: bundle exec rake
     - name: Deploy

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.7

data/lib/mumukit/platform/application.rb

@@ -50,15 +50,12 @@ class Mumukit::Platform::Application
   end
 
   class Organic < Mumukit::Platform::Application
-    attr_reader :organization_mapping
-
-    def initialize(url, organization_mapping)
+    def initialize(url)
       super(url)
-      @organization_mapping = organization_mapping
     end
 
     def organic_uri(organization)
-      organization_mapping.organic_uri(uri, organization)
+      Mumukit::Platform::PathMapping.organic_uri(uri, organization)
     end
   end
 end

data/lib/mumukit/platform/path_mapping.rb

@@ -0,0 +1,36 @@
+require 'pathname'
+
+module Mumukit::Platform::PathMapping
+  def self.path_for(request)
+    request.path_info
+  end
+
+  def self.implicit_organization?(_request, _domain)
+    false
+  end
+
+  def self.map_organization_routes!(native, framework, &block)
+    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)
+    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.tenantize organization, fragmented: true
+  end
+
+  def self.path_under_namespace?(organization_name, path, namespace)
+    path.start_with? "/#{organization_name}/#{namespace}/"
+  end
+end

data/lib/mumukit/platform/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Platform
-    VERSION = '7.0.1'
+    VERSION = '7.1.0'
   end
 end

data/lib/mumukit/platform/with_applications.rb

@@ -2,15 +2,15 @@ module Mumukit::Platform::WithApplications
   delegate :application, to: :config
 
   def laboratory
-    Mumukit::Platform::Application::Organic.new config.laboratory_url, organization_mapping
+    Mumukit::Platform::Application::Organic.new config.laboratory_url
   end
 
   def classroom_ui
-    Mumukit::Platform::Application::Organic.new config.classroom_ui_url, organization_mapping
+    Mumukit::Platform::Application::Organic.new config.classroom_ui_url
   end
 
   def classroom_api
-    Mumukit::Platform::Application::Organic.new config.classroom_api_url, organization_mapping
+    Mumukit::Platform::Application::Organic.new config.classroom_api_url
   end
 
   def bibliotheca_ui

data/lib/mumukit/platform/with_path_mapping.rb

@@ -0,0 +1,13 @@
+module Mumukit::Platform::WithPathMapping
+  def implicit_organization?(request)
+    Mumukit::Platform::PathMapping.implicit_organization? request, application.domain
+  end
+
+  def organization_name(request)
+    Mumukit::Platform::PathMapping.organization_name(request, application.domain)
+  end
+
+  def map_organization_routes!(native_mapper, &block)
+    Mumukit::Platform::PathMapping.map_organization_routes!(native_mapper, web_framework, &block)
+  end
+end

data/lib/mumukit/platform.rb

@@ -21,7 +21,6 @@ module Mumukit::Platform
       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_api_url = ENV['MUMUKI_CLASSROOM_API_URL'] || "http://classroom-api.#{domain}"
-      config.organization_mapping = Mumukit::Platform::OrganizationMapping.from_env
     end
   end
 
@@ -61,19 +60,19 @@ require_relative './platform/locale'
 require_relative './platform/course'
 require_relative './platform/organization'
 require_relative './platform/user'
-require_relative './platform/organization_mapping'
+require_relative './platform/path_mapping'
 require_relative './platform/application'
 require_relative './platform/web_framework'
 require_relative './platform/bridge'
 
 require_relative './platform/with_organization'
 require_relative './platform/with_applications'
-require_relative './platform/with_organization_mapping'
+require_relative './platform/with_path_mapping'
 require_relative './platform/with_web_framework'
 
 module Mumukit::Platform
   extend Mumukit::Platform::WithApplications
   extend Mumukit::Platform::WithOrganization
-  extend Mumukit::Platform::WithOrganizationMapping
+  extend Mumukit::Platform::WithPathMapping
   extend Mumukit::Platform::WithWebFramework
 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', '< 2.2'
+  spec.add_development_dependency 'bundler', '>= 1.7', '< 3'
   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: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
@@ -90,22 +90,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ files:
 - lib/mumukit/platform/model.rb
 - lib/mumukit/platform/notifiable.rb
 - lib/mumukit/platform/organization.rb
-- lib/mumukit/platform/organization_mapping.rb
+- lib/mumukit/platform/path_mapping.rb
 - lib/mumukit/platform/uri.rb
 - lib/mumukit/platform/user.rb
 - lib/mumukit/platform/version.rb
 - lib/mumukit/platform/web_framework.rb
 - lib/mumukit/platform/with_applications.rb
 - lib/mumukit/platform/with_organization.rb
-- lib/mumukit/platform/with_organization_mapping.rb
+- lib/mumukit/platform/with_path_mapping.rb
 - lib/mumukit/platform/with_web_framework.rb
 - mumukit-platform.gemspec
 homepage: https://mumuki.io
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Shared Mumuki Platform Components

data/lib/mumukit/platform/organization_mapping.rb

@@ -1,89 +0,0 @@
-require 'pathname'
-
-module Mumukit::Platform::OrganizationMapping
-  def self.from_env
-    if ENV['RACK_ENV'] == 'test' || ENV['RAILS_ENV'] == 'test'
-      Subdomain
-    else
-      parse ENV['MUMUKI_ORGANIZATION_MAPPING']
-    end
-  end
-
-  def self.parse(name)
-    mapping = name.try { |it| it.strip.downcase }
-    if mapping.blank? || mapping == 'path'
-      Path
-    elsif mapping == 'subdomain'
-      Subdomain
-    else
-      raise "Unrecognized organization mapping #{mapping}"
-    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
-
-    def self.map_organization_routes!(native, _framework, &block)
-      native.instance_eval(&block)
-    end
-
-    def self.organization_name(request, domain)
-      request.subdomain_after(domain) || 'central'
-    end
-
-    def self.organic_uri(uri, 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
-
-    def self.map_organization_routes!(native, framework, &block)
-      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)
-      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.tenantize organization, fragmented: true
-    end
-
-    def self.path_under_namespace?(organization_name, path, namespace)
-      path.start_with? "/#{organization_name}/#{namespace}/"
-    end
-  end
-end

data/lib/mumukit/platform/with_organization_mapping.rb

@@ -1,15 +0,0 @@
-module Mumukit::Platform::WithOrganizationMapping
-  delegate :organization_mapping, to: :config
-
-  def implicit_organization?(request)
-    organization_mapping.implicit_organization? request, application.domain
-  end
-
-  def organization_name(request)
-    organization_mapping.organization_name(request, application.domain)
-  end
-
-  def map_organization_routes!(native_mapper, &block)
-    organization_mapping.map_organization_routes!(native_mapper, web_framework, &block)
-  end
-end