mumukit-platform 4.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e249892bfa851c6d0a8bf033c1d768452b968f019d27857fc9277ae24a0b2250
-  data.tar.gz: 7e31fe679b7dcb8e50fd5d47e874268752240755552baec0446411ebcbab7204
+  metadata.gz: bc124483195c06cf33bf27f455441909cd2b2c125b267a55accc3648a7578719
+  data.tar.gz: 6e8c63c1dd6af7720411e7df5df9e29097c6527ac8a924830873fe87a6ba8686
 SHA512:
-  metadata.gz: 5497d47595b8b810f112759f2fd732240245dc151c1702bd504e6df9c454095925b34e15cf18d7c539bacc15c731f3f8e96e37847e85cb2de66a25aa2e28005c
-  data.tar.gz: e2eac480aeb4b9f381c110046a3eb3f9940a210dd19624c1fae2ed7eb4d8b527995c9fd505d66d770b08f3de49926abec9fd01f98a2c664c2a168986c14acb48
+  metadata.gz: ab495d8e8baffff929cdafd9546b1232656a73cec3065ea2d72fdff6966267681b130a7991aafab699be1301c2641ce9278ceea803fdabcb9ceb6ee24ece72dd
+  data.tar.gz: 7eb34685b1ae105e99a625995987605f2481f4251a80942681bf3988bda36f3f1ed1da5e5a0e53ced8d97a28da61565707de27e7944ffc89a3089d8038eccdf5

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.3

data/.travis.yml

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

data/README.md

@@ -23,6 +23,22 @@ Or install it yourself as:
 
     $ gem install mumukit-platform
 
+## Requeriments
+
+In order to properly use this gem, you must declare _organization_, _course_ and _user_ classes, and implement some required methods:
+
+ _organization_:
+   * `#name`
+   * `#locale`
+   * `.find_by_name!`
+
+ _user_:
+   * `.find_by_uid!`
+
+ _course_:
+   * `.find_by_slug!`
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mumuki/mumukit-platform. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
@@ -30,4 +46,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/mumuki
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/mumukit/platform.rb

@@ -26,6 +26,19 @@ module Mumukit::Platform
   end
 
   CORE_MODELS.each do |klass|
+    # Configured classes must implement the following methods:
+    #
+    # _organization_:
+    #   * `#name`
+    #   * `#locale`
+    #   * `.find_by_name!`
+    #
+    # _user_:
+    #   * `.find_by_uid!`
+    #
+    # _course_:
+    #   * `.find_by_slug!`
+    #
     define_singleton_method("#{klass}_class") do
       begin
         config["#{klass}_class"] ||= config["#{klass}_class_name"].constantize
@@ -38,12 +51,13 @@ end
 
 require_relative './platform/notifiable'
 
+require_relative './platform/global'
 require_relative './platform/domain'
 require_relative './platform/model'
 require_relative './platform/locale'
 require_relative './platform/course'
-require_relative './platform/user'
 require_relative './platform/organization'
+require_relative './platform/user'
 require_relative './platform/organization_mapping'
 require_relative './platform/application'
 require_relative './platform/web_framework'

data/lib/mumukit/platform/course.rb

@@ -1,7 +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
-end
 
-require_relative './course/helpers'
+  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,31 +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
 
-require_relative './organization/settings'
-require_relative './organization/profile'
-require_relative './organization/theme'
-require_relative './organization/helpers'

data/lib/mumukit/platform/organization_mapping.rb

@@ -9,10 +9,10 @@ module Mumukit::Platform::OrganizationMapping
 
   def self.parse(name)
     mapping = name.try { |it| it.strip.downcase }
-    if mapping.blank? || mapping == 'subdomain'
-      Subdomain
-    elsif mapping == 'path'
+    if mapping.blank? || mapping == 'path'
       Path
+    elsif mapping == 'subdomain'
+      Subdomain
     else
       raise "Unrecognized organization mapping #{mapping}"
     end
@@ -50,7 +50,7 @@ module Mumukit::Platform::OrganizationMapping
     end
 
     def self.organization_name(request, _domain)
-      request.path.split('/')[1]
+      request.path_info.split('/')[1]
     end
 
     def self.organic_uri(uri, organization)

data/lib/mumukit/platform/user.rb

@@ -3,5 +3,3 @@ module Mumukit::Platform::User
     Mumukit::Platform.user_class.find_by_uid!(uid)
   end
 end
-
-require_relative './user/helpers'

data/lib/mumukit/platform/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Platform
-    VERSION = '4.1.0'
+    VERSION = '5.2.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: 4.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2020-08-28 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
@@ -144,20 +150,15 @@ files:
 - lib/mumukit/platform/application.rb
 - lib/mumukit/platform/bridge.rb
 - lib/mumukit/platform/course.rb
-- lib/mumukit/platform/course/helpers.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
 - lib/mumukit/platform/organization.rb
-- lib/mumukit/platform/organization/helpers.rb
-- lib/mumukit/platform/organization/profile.rb
-- lib/mumukit/platform/organization/settings.rb
-- lib/mumukit/platform/organization/theme.rb
 - lib/mumukit/platform/organization_mapping.rb
 - lib/mumukit/platform/uri.rb
 - lib/mumukit/platform/user.rb
-- lib/mumukit/platform/user/helpers.rb
 - lib/mumukit/platform/version.rb
 - lib/mumukit/platform/web_framework.rb
 - lib/mumukit/platform/with_applications.rb
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Shared Mumuki Platform Components

data/lib/mumukit/platform/course/helpers.rb

@@ -1,43 +0,0 @@
-module Mumukit::Platform::Course::Helpers
-  include Mumukit::Platform::Notifiable
-
-  ## Implementors must declare the following methods:
-  #
-  #  * slug
-  #  * shifts
-  #  * code
-  #  * days
-  #  * period
-  #  * description
-
-  def platform_class_name
-    :Course
-  end
-
-  ## API Exposure
-
-  def to_param
-    slug
-  end
-
-  ## Resource Hash
-
-  def self.slice_resource_h(resource_h)
-    resource_h.slice(:slug, :shifts, :code, :days, :period, :description)
-  end
-
-  def to_resource_h
-    {
-      slug: slug,
-      shifts: shifts,
-      code: code,
-      days: days,
-      period: period,
-      description: description
-    }.except(*protected_resource_fields).compact
-  end
-
-  def protected_resource_fields
-    []
-  end
-end

data/lib/mumukit/platform/organization/helpers.rb

@@ -1,112 +0,0 @@
-module Mumukit::Platform::Organization::Helpers
-  extend ActiveSupport::Concern
-  include Mumukit::Platform::Notifiable
-
-  ## Implementors must declare the following methods:
-  #
-  #  * name
-  #  * book
-  #  * profile
-  #  * settings
-  #  * theme
-
-  included do
-    delegate *Mumukit::Platform::Organization::Theme.accessors, to: :theme
-    delegate *Mumukit::Platform::Organization::Settings.accessors, :private?, :login_settings, to: :settings
-    delegate *Mumukit::Platform::Organization::Profile.accessors, :locale_json, to: :profile
-  end
-
-  def platform_class_name
-    :Organization
-  end
-
-  def slug
-    Mumukit::Auth::Slug.join_s name
-  end
-
-  def central?
-    name == 'central'
-  end
-
-  def test?
-    name == 'test'
-  end
-
-  def base?
-    name == 'base'
-  end
-
-  def switch!
-    Mumukit::Platform::Organization.switch! self
-  end
-
-  def to_s
-    name
-  end
-
-  def url_for(path)
-    Mumukit::Platform.application.organic_url_for(name, path)
-  end
-
-  def url
-    url_for '/'
-  end
-
-  def domain
-    Mumukit::Platform.application.organic_domain(name)
-  end
-
-  ## API Exposure
-
-  def to_param
-    name
-  end
-
-  ## Name validation
-
-  def self.valid_name?(name)
-    !!(name =~ anchored_valid_name_regex)
-  end
-
-  def self.anchored_valid_name_regex
-    /\A#{valid_name_regex}\z/
-  end
-
-  def self.valid_name_regex
-    /([-a-z0-9_]+(\.[-a-z0-9_]+)*)?/
-  end
-
-  ## Resource Hash
-
-  def self.slice_resource_h(resource_h)
-    resource_h.slice(:name, :book, :profile, :settings, :theme)
-  end
-
-  def to_resource_h
-    {
-      name: name,
-      book: book.slug,
-      profile: profile,
-      settings: settings,
-      theme: theme
-    }.except(*protected_resource_fields).compact
-  end
-
-  def protected_resource_fields
-    []
-  end
-
-  module ClassMethods
-    def current
-      Mumukit::Platform::Organization.current
-    end
-
-    def parse(json)
-      json
-        .slice(:name)
-        .merge(theme: Mumukit::Platform::Organization::Theme.parse(json[:theme]))
-        .merge(settings: Mumukit::Platform::Organization::Settings.parse(json[:settings]))
-        .merge(profile: Mumukit::Platform::Organization::Profile.parse(json[:profile]))
-    end
-  end
-end

data/lib/mumukit/platform/organization/profile.rb

@@ -1,39 +0,0 @@
-class Mumukit::Platform::Organization::Profile < Mumukit::Platform::Model
-  LOCALES = Mumukit::Platform::Locale::SPECS
-
-  model_attr_accessor :logo_url,
-                      :banner_url,
-                      :favicon_url,
-                      :breadcrumb_image_url,
-                      :open_graph_image_url,
-                      :locale,
-                      :description,
-                      :contact_email,
-                      :terms_of_service,
-                      :community_link,
-                      :errors_explanations
-
-  def locale_json
-    locale_h.to_json
-  end
-
-  def locale_h
-    Mumukit::Platform::Locale::SPECS[locale]
-  end
-
-  def logo_url
-    @logo_url ||= 'https://mumuki.io/logo-alt-large.png' # Best image size: 350x75
-  end
-
-  def banner_url
-    @banner_url || logo_url  # Best image size: 350x75
-  end
-
-  def favicon_url
-    @favicon_url ||= '/favicon.ico'  # Best image size: 16x16, 32x32 or 48x48
-  end
-
-  def open_graph_image_url
-    @open_graph_image_url ||= Mumukit::Platform.application.url_for("logo-alt.png")  # Best image size: 256x256
-  end
-end

data/lib/mumukit/platform/organization/settings.rb

@@ -1,20 +0,0 @@
-class Mumukit::Platform::Organization::Settings < Mumukit::Platform::Model
-  model_attr_accessor :login_methods,
-                      :login_provider,
-                      :login_provider_settings,
-                      :raise_hand_enabled?,
-                      :feedback_suggestions_enabled?,
-                      :public?,
-                      :embeddable?,
-                      :immersive?,
-                      :forum_enabled?,
-                      :report_issue_enabled?
-
-  def private?
-    !public?
-  end
-
-  def login_methods
-    @login_methods ||= ['user_pass']
-  end
-end

data/lib/mumukit/platform/organization/theme.rb

@@ -1,4 +0,0 @@
-class Mumukit::Platform::Organization::Theme < Mumukit::Platform::Model
-  model_attr_accessor :theme_stylesheet,
-                      :extension_javascript
-end

data/lib/mumukit/platform/user/helpers.rb

@@ -1,127 +0,0 @@
-module Mumukit::Platform::User::Helpers
-  include Mumukit::Auth::Roles
-  include Mumukit::Platform::Notifiable
-
-  extend Gem::Deprecate
-
-  ## Implementors must declare the following methods:
-  #
-  #  * permissions
-  #  * uid
-  #  * social_id
-  #  * image_url
-  #  * email
-  #  * first_name
-  #  * last_name
-
-  ## Permissions
-
-  delegate :has_role?,
-           :add_permission!,
-           :remove_permission!,
-           :has_permission?,
-           :has_permission_delegation?,
-           :protect!,
-           :protect_delegation!,
-           :protect_permissions_assignment!,
-           to: :permissions
-
-  def platform_class_name
-    :User
-  end
-
-  def merge_permissions!(new_permissions)
-    self.permissions = permissions.merge(new_permissions)
-  end
-
-  [:student, :teacher, :headmaster, :janitor].each do |role|
-    role_of = "#{role}_of?"
-    role_here = "#{role}_here?"
-
-    define_method role_of do |organization|
-      has_permission? role, organization.slug
-    end
-
-    define_method role_here do
-      send role_of, Mumukit::Platform::Organization.current
-    end
-  end
-
-  def make_student_of!(slug)
-    add_permission! :student, slug
-  end
-
-  ## Profile
-
-  def full_name
-    "#{first_name} #{last_name}"
-  end
-
-  alias_method :name, :full_name
-
-  def profile_completed?
-    [first_name, last_name].all? &:present?
-  end
-
-  def to_s
-    "#{full_name} <#{email}> [#{uid}]"
-  end
-
-  ## Accesible organizations
-
-  def student_granted_organizations
-    permissions.student_granted_organizations.map do |org|
-      Mumukit::Platform::Organization.find_by_name!(org) rescue nil
-    end.compact
-  end
-
-  def has_student_granted_organizations?
-    student_granted_organizations.present?
-  end
-
-  [[:accessible_organizations, :student_granted_organizations],
-   [:has_accessible_organizations?, :has_student_granted_organizations?]].each do |it, replacement|
-    alias_method it, replacement
-    deprecate it, replacement, 2019, 6
-  end
-
-  def main_organization
-    student_granted_organizations.first
-  end
-
-  def has_main_organization?
-    student_granted_organizations.length == 1
-  end
-
-  def has_immersive_main_organization?
-    !!main_organization.try(&:immersive?)
-  end
-
-  ## API Exposure
-
-  def to_param
-    uid
-  end
-
-  ## Resource Hash
-
-  def self.slice_resource_h(resource_h)
-    resource_h.slice(:uid, :social_id, :image_url, :email, :first_name, :last_name, :permissions)
-  end
-
-  def to_resource_h
-    {
-      uid: uid,
-      social_id: social_id,
-      image_url: image_url,
-      email: email,
-      first_name: first_name,
-      last_name: last_name,
-      permissions: permissions
-    }.except(*protected_resource_fields).compact
-  end
-
-  def protected_resource_fields
-    []
-  end
-end