mumukit-service 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 897f8ec6497b490ab49e7bacfa160058f131e3a5
-  data.tar.gz: a25730383fcc8a862d4ccbdf2753aa2eb1614af8
+  metadata.gz: d6bf6480ae3161541ab76818bf3c371d8a33dc58
+  data.tar.gz: 39cf1dbfa393b16978ce16930d00a231504681cf
 SHA512:
-  metadata.gz: 3b0da98eba909a32141c4e6e49922962551adf6c7654637098903d476a746e7299f15430919f18481eb8703483fc99cd34cd3c7bf7a2c2c27ce1ae6261afca70
-  data.tar.gz: efe600c5cddd70204ae571c726c125291a9e88e135bf13476eb601a3af238391155889b794295afd856a1198351f31299e5e6b7ca6e4a08932317e586df23f9b
+  metadata.gz: b52f5934b147ad57acd5b5132d35d9470f33c4fff2c90b35aae5316fa230851a3203af658e95a43bf834a26deb7348ffb7dca4f781ac2a7e82c7647bfde1f639
+  data.tar.gz: fc9870456f43db6a7e9a37f20acb7d746d7137f8aa072f376b1ff601dcd542c7b8357ee41f737124214bf977a266d8e3797c71f3bab281025553d262b102d896

data/lib/mumukit/service.rb

@@ -11,9 +11,7 @@ end
 
 require 'mumukit/service/version'
 require_relative './service/id_generator'
-require_relative './service/slug'
 require_relative './service/database'
-require_relative './service/invalid_slug_format_error'
 require_relative './service/document'
 require_relative './service/document_array'
 require_relative './service/document_not_found_error'

data/lib/mumukit/service/collection.rb

@@ -90,6 +90,14 @@ module Mumukit::Service
       end
     end
 
+    def upsert_attributes!(query, attribute)
+      mongo_collection.update_one query, {'$set': attribute}, {upsert: true}
+    end
+
+    def update_attributes!(query, attribute)
+      mongo_collection.update_one query, '$set': attribute
+    end
+
     private
 
     def validate_presence(args, first)

data/lib/mumukit/service/routes.rb

@@ -1,6 +1,7 @@
 require 'sinatra'
 require 'sinatra/cross_origin'
 require 'logger'
+require 'mumukit/auth'
 
 require 'json'
 require 'yaml'
@@ -26,11 +27,11 @@ helpers do
 
   def slug
     if route_slug_parts.present?
-      Mumukit::Service::Slug.new(*route_slug_parts)
+      Mumukit::Auth::Slug.join(*route_slug_parts)
     elsif subject
-      Mumukit::Service::Slug.from(subject.slug)
+      Mumukit::Auth::Slug.parse(subject.slug)
     elsif json_body
-      Mumukit::Service::Slug.from(json_body['slug'])
+      Mumukit::Auth::Slug.parse(json_body['slug'])
     else
       raise Mumukit::Service::InvalidSlugFormatError.new('Slug not available')
     end
@@ -59,10 +60,6 @@ error JSON::ParserError do
   halt 400
 end
 
-error Mumukit::Service::InvalidSlugFormatError do
-  halt 400
-end
-
 error Mumukit::Service::DocumentValidationError do
   halt 400
 end
@@ -71,6 +68,18 @@ error Mumukit::Service::DocumentNotFoundError do
   halt 404
 end
 
+error Mumukit::Auth::InvalidTokenError do
+  halt 401
+end
+
+error Mumukit::Auth::UnauthorizedAccessError do
+  halt 403
+end
+
+error Mumukit::Auth::InvalidSlugFormatError 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'

data/lib/mumukit/service/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Service
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-service
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,10 +163,7 @@ files:
 - lib/mumukit/service/document_validation_error.rb
 - lib/mumukit/service/env.rb
 - lib/mumukit/service/id_generator.rb
-- lib/mumukit/service/invalid_slug_format_error.rb
 - lib/mumukit/service/routes.rb
-- lib/mumukit/service/routes/auth.rb
-- lib/mumukit/service/slug.rb
 - lib/mumukit/service/version.rb
 - mumukit-service.gemspec
 homepage: https://github.com/mumuki/mumukit-service

data/lib/mumukit/service/invalid_slug_format_error.rb

@@ -1,4 +0,0 @@
-module Mumukit::Service
-  class InvalidSlugFormatError < StandardError
-  end
-end

data/lib/mumukit/service/routes/auth.rb

@@ -1,27 +0,0 @@
-require 'mumukit/auth'
-
-helpers do
-  def authorization_header
-    env['HTTP_AUTHORIZATION']
-  end
-
-  def token
-    @token ||= Mumukit::Auth::Token.decode_header(authorization_header).tap(&:verify_client!)
-  end
-
-  def permissions
-    @permissions ||= token.permissions
-  end
-
-  def protect!(scope)
-    permissions.protect! scope, slug.to_s
-  end
-end
-
-error Mumukit::Auth::InvalidTokenError do
-  halt 401
-end
-
-error Mumukit::Auth::UnauthorizedAccessError do
-  halt 403
-end

data/lib/mumukit/service/slug.rb

@@ -1,43 +0,0 @@
-module Mumukit::Service
-  class Slug
-    attr_accessor :organization, :repository
-
-    def initialize(organization, repository)
-      @organization = organization
-      @repository = repository
-    end
-
-    def to_s
-      "#{organization}/#{repository}"
-    end
-
-    def bibliotehca_guide_web_hook_url
-      "http://bibliotheca.mumuki.io/guides/import/#{to_s}"
-    end
-
-    def bibliotehca_book_web_hook_url
-      "http://bibliotheca.mumuki.io/books/import/#{to_s}"
-    end
-
-    def classroom_course_url
-      "http://classroom.mumuki.io/courses/#{to_s}"
-    end
-
-    def self.from(slug)
-      validate_slug! slug
-
-      self.new *slug.split('/')
-    end
-
-    private
-
-    def self.validate_slug!(slug)
-      unless slug =~ /.*\/.*/
-        raise Mumukit::Service::InvalidSlugFormatError, 'Slug must be in organization/repository format'
-      end
-    end
-  end
-end
-
-
-