mumukit-platform 5.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1e1ce06ac9d7055da2a3f86b3a865630a7788e182e0c021485c9b2b638df543
-  data.tar.gz: d1ab26c3c29648fea155c0aef57315b57e1405efab03b44fadfa2f8e06c0724c
+  metadata.gz: 1aa8d319e6390b781d8da0e7d33f720cf6b093c0d43ba432ca27666da514191d
+  data.tar.gz: d124ebd5601c68dcdb97a51de9a0a42319a3f0d83a92a88ab1aa2b8198d8d514
 SHA512:
-  metadata.gz: 74adaec00a74e0774e0136b6295462a0f47d26380b915cdef19e04a1a7458de90987a599c25c6843362d21bd1626819e5fcfaed6b23d21e9f0b109d4eae77dac
-  data.tar.gz: d40805aa710719fef5c0a78a306787946f312e8d685ed927501696045e1754a3a6f56c855ec3d8f8e9fe02c1a92fd1bf9b8661a00b373576a22ccd0bba65d7b5
+  metadata.gz: 97fd564e02205ec571c81b12560fa1939dd03bd5cd651ecd17b09c670602ca4a06e8564ee171f6042219fd8f5327974988155611a85c6791b447a3d4536a81d4
+  data.tar.gz: 99c5f0bed18cad1bb402e47371a16ab9b4e9e641471ffaa8414901b55702771df1239f47ab809b0b0333caa40b5e6b071e118301e9e15f67b49a0a3b7e1444fe

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 rvm:
 - 2.6.3
-before_install: gem install bundler -v 1.14.2
+before_install: gem install bundler -v 2.0.2
 deploy:
   provider: rubygems
   api_key:

data/README.md

@@ -33,7 +33,6 @@ In order to properly use this gem, you must declare _organization_, _course_ and
    * `.find_by_name!`
 
  _user_:
-   * `.for_profile`
    * `.find_by_uid!`
 
  _course_:

data/lib/mumukit/platform.rb

@@ -34,7 +34,6 @@ module Mumukit::Platform
     #   * `.find_by_name!`
     #
     # _user_:
-    #   * `.for_profile`
     #   * `.find_by_uid!`
     #
     # _course_:
@@ -52,6 +51,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

@@ -53,4 +53,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
@@ -38,9 +48,15 @@ module Mumukit::Platform::OrganizationMapping
     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
     end
 
     def self.path_under_namespace?(organization_name, path, namespace)

data/lib/mumukit/platform/uri.rb

@@ -8,11 +8,11 @@ class URI::HTTP
     rebuild(host: new_host)
   end
 
-  def subroute(route)
-    if path.start_with? '/'
-      new_path = "/#{route}#{path}"
+  def tenantize(route)
+    if path.end_with? '/'
+      new_path = "#{path}#{route}/"
     else
-      new_path = "/#{route}/#{path}"
+      new_path = "#{path}/#{route}/"
     end
     rebuild(path: new_path)
   end

data/lib/mumukit/platform/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Platform
-    VERSION = '5.0.0'
+    VERSION = '6.1.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

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mumukit-nuntius', '~> 6.0'
   spec.add_dependency 'mumukit-core', '~> 1.2'
   spec.add_dependency 'mumukit-auth', '~> 7.6'
-  spec.add_dependency 'mumukit-bridge', '~> 3.5'
+  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'
+  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.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-nuntius
@@ -56,16 +56,22 @@ dependencies:
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !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
@@ -145,6 +151,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
@@ -178,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Shared Mumuki Platform Components