github-to-canvas 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f61edcbd53e1e26f59fe6767ae09b3bb227dee2f6529797a1f0fc6ace94b00
-  data.tar.gz: 0757bd6b39a7fd9e4bb996156db33309cd96afbe2f8274c1261e95b4aad210e4
+  metadata.gz: 71e183a1ea3659fdc71af9af4c1ce0370be119f4241e8773ac82fdee9400cf48
+  data.tar.gz: ce08e0ec8f3f64471a4966a955e454d8a25cd95e9b9555dd61ca550ec77fe41b
 SHA512:
-  metadata.gz: 593e15eb02ee30c7d45b3ffb479efcd69ab3b80436a23b81f6f731e3ad7a2a3a81d05601baf15cd893a86a54029a919ac45617a20cdb4a2c5ad4e441b8529c4e
-  data.tar.gz: 8306e5d652b5e61c3aba33e09a70e0f8aa3a1455dea60269c685983793c443f7065944cf157aa365c693cec9ae12d49a579aec66efc73e390e2643c3fa07b198
+  metadata.gz: 2b04300b61b6301f32512ca328f27affaa186082e0e35d8eeab7c748b77ba3c10a07a7309ba1d3e92563007910da3c9e70a7a1db37ce184b48763cc8d455ffb7
+  data.tar.gz: 2cbe19f6cd61338619072f9f07e215762ce45ffbd3b3aa0672d3f77a1c3bd3a8e7837b5e237bf6b01bd4058ac05afaf5c547b82c1b829a8787b344c88fc21276

data/bin/github-to-canvas

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'byebug'
 
 require 'optparse'
 require 'github-to-canvas'
@@ -78,7 +77,6 @@ OptionParser.new do |opts|
           end
   opts.on("-tTYPE", "--type TYPE", 
           "Sets the type Canvas lesson to be created (page or assignment). If no type, type decided based on repository structure") do |type| 
-            # byebug
             options[:type] = type.downcase
             abort if type == 'quiz' || type == 'discussion'
             # if type == 'page' || type == 'assignment' || type == 'discussion' || type == 'quiz' || type == 'Page' || type == 'Assignment' || type == 'Discussion' || type == 'Quiz'
@@ -152,10 +150,10 @@ OptionParser.new do |opts|
           "Use with --map. Outputs repo URLs instead of YAML") do |urls|
             options[:urls_only] = urls
           end
-#  opts.on("--csv COURSE", 
-#          "Returns a course's lesson struction as CSV") do |course|
-#            options[:csv] = course
-#          end
+ opts.on("--csv", 
+         "Returns a course's lesson struction as CSV") do |csv|
+           options[:csv] = csv
+         end
   opts.on("--read-from-canvas CANVAS_URL",
           "Retrieves an existing Canvas lesson using the provided URL") do |url|
             options[:read_from_canvas] = url
@@ -201,9 +199,13 @@ OptionParser.new do |opts|
             options[:canvas_to_canvas] = canvas_to_canvas
           end
   opts.on("--build-from-csv CSV",
-          "Build a course usin a CSV of lesson repos, names, modules, and types") do |csv_build|
+          "Build a course using a CSV of lesson repos, names, modules, and types") do |csv_build|
             options[:csv_build] = csv_build
           end
+  opts.on("--update-from-csv CSV",
+          "Update a course using a CSV of lesson repos, names, modules, types, lesson IDs, and course IDs") do |csv_align|
+            options[:csv_align] = csv_align
+          end
   
   
 end.parse!
@@ -288,14 +290,15 @@ end
 if options[:map]
   GithubToCanvas.new(mode: 'map', 
                       file_to_convert: options[:map],
-                      urls_only: !!options[:urls_only])
+                      urls_only: !!options[:urls_only],
+                      csv: !!options[:csv])
   abort
 end
 
-if options[:csv]
-  GithubToCanvas.new(mode: 'csv', file_to_convert: options[:csv])
-  abort
-end
+# if options[:csv]
+#   GithubToCanvas.new(mode: 'csv', file_to_convert: options[:csv])
+#   abort
+# end
 
 if options[:csv_build]
   GithubToCanvas.new(mode: 'csv_build', 
@@ -311,6 +314,20 @@ if options[:csv_build]
   abort
 end
 
+if options[:csv_align]
+  GithubToCanvas.new(mode: 'csv_align', 
+                    file_to_convert: options[:csv_align],
+                    course_id: options[:course_id],
+                    fis_links: !!options[:fis], 
+                    remove_header_and_footer: !!options[:remove_header_and_footer],
+                    aaq: !!options[:aaq],
+                    forkable: !!options[:forkable],
+                    branch: options[:branch],
+                    contains_html: options[:contains_html],
+                    git_links: !!options[:git_links])
+  abort
+end
+
 if options[:build_course]
   GithubToCanvas.new(mode: 'build_course', 
                     file_to_convert: options[:build_course],

data/lib/github-to-canvas.rb

@@ -215,6 +215,47 @@ class GithubToCanvas
         puts "Creating lesson - #{options[:name]}"
         response = CanvasInterface.add_to_module(options[:course_id], created_module_info, created_lesson_info)
         
+      }
+    when 'csv_align'
+      
+      csv_data = CSV.read(options[:file_to_convert])
+      created_module_info = {
+        "id" => "",
+        "name" => ""
+      }
+      
+      csv_data.each { |lesson|
+        # lesson[0] == repo
+        # lesson[1] == name
+        # lesson[2] == module
+        # lesson[3] == type
+        # lesson[4] == yes/no contains HTML
+        # lesson[5] == lesson id
+        # lesson[6] == course id
+
+        module_info = {
+          name: lesson[2]
+        }
+
+        options[:filepath] = lesson[0]
+        options[:name] = lesson[1]
+        options[:type] = lesson[3]
+        options[:id] = lesson[5]
+        options[:course_id] = lesson[6]
+        options[:branch] = "master" if !options[:branch]
+        if !options[:contains_html]
+          options[:contains_html] = (lesson[4] == "yes" || lesson[4] == "Yes") ? true : false
+        end
+        
+
+        html = RepositoryConverter.remote_file_conversion(options)
+        html = RepositoryConverter.adjust_converted_html(options, html)
+        updated_lesson_info = CanvasInterface.update_existing_lesson(options, lesson[1], html)
+        updated_lesson_info["page_url"] = updated_lesson_info["url"] if !updated_lesson_info["page_url"]
+        updated_lesson_info["id"] = updated_lesson_info["page_url"] if !updated_lesson_info["id"]
+        updated_lesson_info["type"] = options[:type]
+        puts "Updating lesson - #{options[:name]}"
+        
       }
     else
       puts VERSION

data/lib/github-to-canvas/canvas_interface.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'rest-client'
 require 'yaml'
+require 'byebug'
 class CanvasInterface
 
   def self.create_course(course_info)
@@ -94,14 +95,15 @@ class CanvasInterface
       if options[:type] == 'page' || options[:type] == 'Page'
         response = RestClient.get(url, headers)
         lesson_info = JSON.parse(response)
+        lesson_info = lesson_info[0] if lesson_info.kind_of?(Array)
         url = url.sub(/[^\/]+$/, lesson_info["page_id"].to_s)
       end
+      
       response = RestClient.put(url, payload, headers)
     rescue
       puts "Something went wrong while pushing lesson #{options[:id]} to course #{options[:course_id]}"
       puts "Make sure you are working on lessons that are not locked"
       abort
-      ""
     end
     JSON.parse(response.body)
   end
@@ -279,8 +281,9 @@ class CanvasInterface
             lesson["repository"] = repo
           else
             lesson["repository"] = "https://github.com/learn-co-curriculum/" + repo
-            puts lesson["repository"] if options[:urls_only]
           end
+          puts lesson["repository"] if options[:urls_only]
+          puts "#{lesson["repository"]}, #{lesson["title"]}, #{mod[:name]}, #{lesson["type"].downcase}, , #{lesson["id"]}, #{course_info[:id]}" if options[:csv]
         end
         sleep(1)
         lesson

data/lib/github-to-canvas/repository_converter.rb

@@ -1,5 +1,5 @@
 require 'redcarpet'
-
+# require 'byebug'
 class CustomRender < Redcarpet::Render::HTML
   def block_code(code, lang)
     "<pre>" \
@@ -14,7 +14,7 @@ end
 
 class RepositoryConverter
   def self.local_file_conversion(options)
-    GithubInterface.get_updated_repo(options[:filepath], options[:branch])
+    # GithubInterface.get_updated_repo(options[:filepath], options[:branch])
     markdown = RepositoryInterface.read_local_file(options[:filepath], options[:file_to_convert])
     raw_remote_url = self.set_raw_image_remote_url(options[:filepath])
     markdown = self.escape_existing_html(markdown) if options[:contains_html]
@@ -46,7 +46,8 @@ class RepositoryConverter
     renderer = CustomRender.new(escape_html: true, prettify: true, hard_wrap: true)
     redcarpet = Redcarpet::Markdown.new(CustomRender, options={tables: true, autolink: true, fenced_code_blocks: true, disable_indented_code_blocks: true})
     html = redcarpet.render(markdown)
-    # self.remove_line_breaks(html)
+    puts "Markdown converted to HTML"
+    self.remove_line_breaks(html)
   end
 
   def self.adjust_converted_html(options, html)
@@ -69,12 +70,15 @@ class RepositoryConverter
   def self.fix_escaped_inline_html_code(html)
     
     # stops HTML/JSX code blocks from rendering as HTML in Canvas
-    html = html.gsub("&amp;gt;</code>", "&gt;</code>")
-    html = html.gsub("&amp;gt;</code>", "&gt;</code>")
+    # html = html.gsub("&amp;gt;</code>", "&gt;</code>")
+    # html = html.gsub("&amp;gt;</code>", "&gt;</code>")
 
     # fixes < and > code snippets
-    html = html.gsub("&amp;lt;", "&lt;")
-    html = html.gsub("&amp;gt;", "&gt;")
+
+    # html = html.gsub(/<pre><code>(.*?)<\/code><\/pre>/) { |string|
+    #   byebug
+    # }
+    # html = html.gsub("&amp;gt;", "&gt;")
 
     # # fixes blockquotes
     # html = html.gsub(/\n<p>&gt\;(.*)\n&gt\;/) { |bq|
@@ -96,9 +100,13 @@ class RepositoryConverter
 
 
   def self.escape_existing_html(markdown)
-    markdown = markdown.gsub(/<\/(?!iframe)/, "&lt;/")
-    markdown = markdown.gsub(/<(?!iframe)/, "&lt;")
-    markdown = markdown.gsub(/(?<!iframe)>/, "&gt;")
+    # markdown = markdown.gsub(/<\/(?!iframe)/, "&lt;/")
+    # markdown = markdown.gsub(/<(?!iframe)/, "&lt;")
+    # markdown = markdown.gsub(/(?<!iframe)>/, "&gt;")
+    # byebug
+    # markdown = markdown.gsub(/```(.*?)```/) {|s|
+    #   byebug
+    # }
   end
 
   def self.remove_header_and_footer(html)
@@ -154,7 +162,7 @@ class RepositoryConverter
       remote = GithubInterface.git_remote(filepath)
     end
     raw_remote = remote.gsub("git@github.com:","https://raw.githubusercontent.com/")
-    raw_remote = raw_remote.gsub("https://github.com/","https://raw.githubusercontent.com/")
+    raw_remote = raw_remo te.gsub("https://github.com/","https://raw.githubusercontent.com/")
     raw_remote = raw_remote.gsub(/\/blob\/master\/.*$/,"")
     raw_remote = raw_remote.gsub(/\/blob\/main\/.*$/,"")
     raw_remote = raw_remote.gsub(/.git$/,"")

data/lib/github-to-canvas/version.rb

@@ -1,3 +1,3 @@
 class GithubToCanvas
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-to-canvas
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - maxwellbenton