mumukit-platform 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024bf781a48ada1f1e2536ece324a305771a6d4d
-  data.tar.gz: 69c6dfb30d9dcaf02fd59000c3dc5c8c4e2356be
+  metadata.gz: e279cf66b86c01b1ef8a679f28e735a674dc0d62
+  data.tar.gz: 34a0ed5c9e8ebfbab74db60a908882b9129aec8d
 SHA512:
-  metadata.gz: 1e22b6cb08f1df7284ed97b60d66280f158e3bc892279614700b4952b23b6ddb9ef6732e43fbc5e827e15ed04d5e0cd47256b3f643b616bd491131e5c6d4d5a8
-  data.tar.gz: 35b20ce05e326cd56a73e064d86c9189c55167b90f70a488fe866b11dc676c54090c0dba88052e2c3efc49a8be0d9b0d596f1fbe1704a911eaf315918631ec3c
+  metadata.gz: 97daabdb3988020b9e88958c04a61e072af7db9c603110cb37435af4e0a0e268b2d2a6fd399c78568d1e17538b118a71456f1e2c7cd9b97ab653ae6d1a13d7b0
+  data.tar.gz: 1d4d2a21c9c68b0417d5d3eff597da5035a494208fa0eaf8e6ef44912a01566d7a4e9caa1e3679f202033ff1335843e7da207b0aa0bfdc7b357cd7e10f1b048f

data/lib/mumukit/platform.rb

@@ -11,7 +11,7 @@ module Mumukit::Platform
 
   def self.defaults
     struct.tap do |config|
-      domain = platform_domain_from_env
+      domain = Mumukit::Platform::Domain.from_env
 
       config.laboratory_url = ENV['MUMUKI_LABORATORY_URL'] || "http://#{domain}"
       config.thesaurus_url = ENV['MUMUKI_THESAURUS_URL'] || "http://thesaurus.#{domain}"
@@ -24,21 +24,14 @@ module Mumukit::Platform
     end
   end
 
-  def self.platform_domain_from_env
-    if ENV['RACK_ENV'] == 'test' || ENV['RAILS_ENV'] == 'test'
-      'localmumuki.io'
-    else
-      ENV['MUMUKI_PLATFORM_DOMAIN'] || 'mumuki.io'
-    end
-  end
-
   def self.config
     @config
   end
 end
 
-require_relative './platform/application'
+require_relative './platform/domain'
 require_relative './platform/organization_mapping'
+require_relative './platform/application'
 require_relative './platform/web_framework'
 require_relative './platform/with_applications'
 require_relative './platform/with_organization_mapping'

data/lib/mumukit/platform/domain.rb

@@ -0,0 +1,9 @@
+module Mumukit::Platform::Domain
+  def self.from_env
+    if ENV['RACK_ENV'] == 'test' || ENV['RAILS_ENV'] == 'test'
+      'localmumuki.io'
+    else
+      ENV['MUMUKI_PLATFORM_DOMAIN'] || 'mumuki.io'
+    end
+  end
+end

data/lib/mumukit/platform/organization_mapping.rb

@@ -1,7 +1,15 @@
 module Mumukit::Platform::OrganizationMapping
   def self.from_env
-    mapping = ENV['MUMUKI_ORGANIZATION_MAPPING']&.strip
-    if ENV['RACK_ENV'] == 'test' || ENV['RAILS_ENV'] == 'test' || mapping == 'subdomain'
+    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 == 'subdomain'
       Subdomain
     elsif mapping == 'path'
       Path

data/lib/mumukit/platform/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Platform
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-platform
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-core
@@ -85,6 +85,7 @@ files:
 - bin/setup
 - lib/mumukit/platform.rb
 - lib/mumukit/platform/application.rb
+- lib/mumukit/platform/domain.rb
 - lib/mumukit/platform/organization_mapping.rb
 - lib/mumukit/platform/uri.rb
 - lib/mumukit/platform/version.rb
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Shared Mumuki Platform Components