mumuki-laboratory 5.6.1 → 5.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c5189b48ca183cc5e8a18e32bd521ef6fd8ec7c5c86b5dde80860b0f77bbabb
-  data.tar.gz: 9ca11265a9b2a7beaefd93eb596fc75a09ab47356c51558391a3a4e9043d2dd1
+  metadata.gz: abf1e7ba469d8ee20ad2a43ef9f59b83d746c43d0a9ce388a7a5c4c6c0c1dbf6
+  data.tar.gz: 976f739faaae534f9cb5a7a9cfb32683fddb6be42b8d5db37b458209b014a160
 SHA512:
-  metadata.gz: 975947dc234fcd2ee37bb8b08e487b2fcbf45b5d7a138af168df743e664d661869293b0ca30ac5481468bf5ea5d8ec35b05fe2190ce73906bc50512abd8e7f22
-  data.tar.gz: 71ce59ecee694bc8acde167cd33e4a15743eb1b970a0aa44d7fcf69e0694e20596a7c85fb43d5432108542035abe7a559f8b6e7f6dfad1a19e410c162d3e1a7d
+  metadata.gz: 94b3f5a4455054e596bd5800e7fd3638e425c0e041efb92b27124df292ecfd05b66086881dfa1d52a043f0f0249fce6a56b583dcccd8f23c227641feb0390829
+  data.tar.gz: 9efb17c56cd9b95086e9d01e0b0a64851209d69244bf6e579b96cf427169126eb3c722628cc28b550bb96c1cdeb530996a1facfcd50c506f07e1ece5a698cd26

data/app/models/guide.rb

@@ -72,7 +72,9 @@ class Guide < Content
       exercise.import_from_json! (i+1), e
     end
 
-    self.exercises.where('number > ?', json['exercises'].size).destroy_all
+    new_ids = json['exercises'].map { |it| it['id'] }
+    self.exercises.where.not(bibliotheca_id: new_ids).destroy_all
+
     reload
   end
 

data/lib/mumuki/laboratory/seed.rb

@@ -1,8 +1,26 @@
 require 'mumukit/bridge'
 
 module Mumuki::Laboratory::Seed
-  def self.import_contents!
-    Mumukit::Platform.bibliotheca_bridge.import_contents! do |resource_type, slug|
+  # Those are organizations that provide content
+  # that was actually curated by the Mumuki Project and
+  # as such must be supported by each platform release
+  MAIN_CONTENT_ORGANIZATIONS = %w(
+    mumuki
+    mumukiproject
+    sagrado-corazon-alcal
+    pdep-utn
+    smartedu-mumuki
+    10pines-mumuki
+    arquitecturas-concurrentes
+    flbulgarelli
+  )
+
+  def self.import_main_contents!
+    import_contents! /^#{MAIN_CONTENT_ORGANIZATIONS.join('|')}\/.*$/i
+  end
+
+  def self.import_contents!(slug_regex = /.*/)
+    Mumukit::Platform.bibliotheca_bridge.import_contents!(slug_regex) do |resource_type, slug|
       resource_type.classify.constantize.import!(slug)
     end
   end

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.6.1'
+    VERSION = '5.6.2'
   end
 end

data/spec/dummy/db/schema.rb

@@ -105,7 +105,7 @@ ActiveRecord::Schema.define(version: 20180704150839) do
     t.string "queries", default: [], array: true
     t.text "query_results"
     t.text "manual_evaluation_comment"
-    t.integer "upvotes_count"
+    t.integer "upvotes_count", default: 0
     t.index ["initiator_id"], name: "index_discussions_on_initiator_id"
     t.index ["item_type", "item_id"], name: "index_discussions_on_item_type_and_item_id"
   end

data/spec/dummy/db/seeds.rb

@@ -1,8 +1,7 @@
 require 'mumuki/laboratory/seed'
 
 Mumuki::Laboratory::Seed.import_languages!
-
-Mumuki::Laboratory::Seed.import_contents!
+Mumuki::Laboratory::Seed.import_main_contents!
 
 Organization.find_or_create_by!(name: 'base') do |org|
   org.contact_email = 'issues@mumuki.org'

data/spec/models/guide_import_spec.rb

@@ -115,7 +115,7 @@ describe Guide do
       end
 
       describe 'it is removed from the guide' do
-        it { expect(guide.exercises.count).to eq 6 }
+        it { expect(guide.exercises.count).to eq 5 }
         it { expect(guide.exercises).not_to include exercise_6 }
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.6.2
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement