mumuki-bibliotheca 6.2.2 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49be8ab2a2941f9bb2c48cd13eff5da71860392c15991f358ce89ec488cdee0
-  data.tar.gz: 54660a3c891a128a9284c32e38521c468a2bd3fda037dcaeef83c65c0626baad
+  metadata.gz: f154a0f7493c9b04b0f3c0e02491271e05760eb36deb8310575a2d8e97fae3b0
+  data.tar.gz: 17cbab22333dcacec4aab3d650a91925f5dbd7024b3ddb7321b7628c6be01740
 SHA512:
-  metadata.gz: 74d17df501da0253d8b8cf23af42ab6c36971b8ddac92b955ad20f6c18d4dc50b5a0b1f9999a0247b7053960c48d63b4ddfff770884bcc33375e86e84cde89cd
-  data.tar.gz: b8e8d51b6139d6a7cf0e1fd541d64a8d7ea3f9c81974c98a5104bede941d1f0a82b5a46a2fdc62ad3d81d4af2335be0c704dc8d71d82094463f8bfd5311c635c
+  metadata.gz: e59dc509afcd88bb86d461fdf4265479d50d45a54e4c6114882a1fddbc98bfd79d0c0d1e81008db3617b1dd623f799981b91d230d494d5ef028698348a9eb5aa
+  data.tar.gz: a56954abcc745f68b5e1b5bc6d6c118c4e4a2ea110a19723d7253f8e3060fb31e1e077ae5483a20ba230f700685201f20653bf7203cc8fe88400d2e488be4364

data/lib/mumuki/bibliotheca/sinatra/books.rb

@@ -1,5 +1,9 @@
 class Mumuki::Bibliotheca::App < Sinatra::Application
   helpers do
+    def book
+      Book.find_by_slug! slug.to_s
+    end
+
     def list_books(books)
       { books: books.as_json(only: [:name, :slug, :chapters]) }
     end
@@ -10,14 +14,22 @@ class Mumuki::Bibliotheca::App < Sinatra::Application
   end
 
   get '/books/writable' do
-    list_books Book.allowed(current_user.permissions)
+    list_books Book.allowed(permissions)
   end
 
   get '/books/:organization/:repository' do
-    Book.find_by_slug!(slug.to_s).to_resource_h
+    book.to_resource_h
+  end
+
+  get '/books/:organization/:repository/organizations' do
+    organizations_for book
   end
 
   post '/books' do
+    insert_and_notify! :book
+  end
+
+  put'/books' do
     upsert_and_notify! :book
   end
 

data/lib/mumuki/bibliotheca/sinatra/guides.rb

@@ -1,5 +1,9 @@
 class Mumuki::Bibliotheca::App < Sinatra::Application
   helpers do
+    def guide
+      Guide.find_by_slug!(slug.to_s)
+    end
+
     def list_guides(guides)
       { guides: guides.map { |it| it.as_json(only: [:name, :slug, :type]).merge(language: it.language.name) } }
     end
@@ -22,14 +26,22 @@ class Mumuki::Bibliotheca::App < Sinatra::Application
   end
 
   get '/guides/:organization/:repository/markdown' do
-    slice_guide_resource_h_for_api Guide.find_by_slug!(slug.to_s).to_markdownified_resource_h
+    slice_guide_resource_h_for_api guide.to_markdownified_resource_h
   end
 
   get '/guides/:organization/:repository' do
-    slice_guide_resource_h_for_api Guide.find_by_slug!(slug.to_s).to_resource_h
+    slice_guide_resource_h_for_api guide.to_resource_h
+  end
+
+  get '/guides/:organization/:repository/organizations' do
+    organizations_for guide
   end
 
   post '/guides' do
+    insert_and_notify! :guide
+  end
+
+  put '/guides' do
     upsert_and_notify! :guide
   end
 

data/lib/mumuki/bibliotheca/sinatra/topics.rb

@@ -1,5 +1,9 @@
 class Mumuki::Bibliotheca::App < Sinatra::Application
   helpers do
+    def topic
+      Topic.find_by_slug!(slug.to_s)
+    end
+
     def list_topics(topics)
       { topics: topics.as_json(only: [:name, :slug]) }
     end
@@ -10,14 +14,22 @@ class Mumuki::Bibliotheca::App < Sinatra::Application
   end
 
   get '/topics/writable' do
-    list_topics Topic.allowed(current_user.permissions)
+    list_topics Topic.allowed(permissions)
   end
 
   get '/topics/:organization/:repository' do
-    Topic.find_by_slug!(slug.to_s).to_resource_h
+    topic.to_resource_h
+  end
+
+  get '/topics/:organization/:repository/organizations' do
+    organizations_for topic
   end
 
   post '/topics' do
+    insert_and_notify! :topic
+  end
+
+  put '/topics' do
     upsert_and_notify! :topic
   end
 

data/lib/mumuki/bibliotheca/sinatra.rb

@@ -92,6 +92,10 @@ HTML
     halt 404
   end
 
+  error Mumukit::Sync::SyncError do
+    halt 400
+  end
+
   options '*' do
     response.headers['Allow'] = settings.allow_methods.map { |it| it.to_s.upcase }.join(',')
     response.headers['Access-Control-Allow-Headers'] = 'X-Mumuki-Auth-Token, X-Requested-With, X-HTTP-Method-Override, Content-Type, Cache-Control, Accept, Authorization'
@@ -131,6 +135,11 @@ HTML
       Mumuki::Bibliotheca.api_syncer(json_body)
     end
 
+    def insert_and_notify!(content_kind)
+      raise Mumukit::Auth::InvalidSlugFormatError, "#{content_kind.as_module_name} with slug #{slug} already exists!" if content_kind.as_module.find_by_slug(slug.to_s)
+      upsert_and_notify!(content_kind)
+    end
+
     def upsert_and_notify!(content_kind)
       resource_h = upsert! content_kind
 
@@ -156,6 +165,17 @@ HTML
       collection_class.find_by_slug!(slug.to_s).destroy!
       {}
     end
+
+    def permissions
+      current_user.permissions
+    end
+
+    def organizations_for(item)
+      Organization
+        .in_path(item)
+        .accessible_as(current_user, :student)
+        .map { |it| it.as_json(only: [:name]) }
+    end
   end
 
   post '/markdown' do
@@ -173,7 +193,7 @@ HTML
   get '/permissions' do
     authenticate!
 
-    {permissions: current_user.permissions}
+    {permissions: permissions}
   end
 end
 

data/lib/mumuki/bibliotheca/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Bibliotheca
-    VERSION = '6.2.2'
+    VERSION = '6.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-bibliotheca
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.4.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.2
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.2
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ files:
 - lib/tasks/guides.rake
 homepage: https://mumuki.org
 licenses:
-- GPL-3.0
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: API for editing content on mumuki