github-to-canvas 0.1.3 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d7cf49277d1fb40bb6a956a16865fded3e5a722b115313ab598c8b0ac16338
-  data.tar.gz: '01129c91256e4391343d2dd4bafc0c87acf57d7f8e0a4f3b040289ab045b6dea'
+  metadata.gz: 71e183a1ea3659fdc71af9af4c1ce0370be119f4241e8773ac82fdee9400cf48
+  data.tar.gz: ce08e0ec8f3f64471a4966a955e454d8a25cd95e9b9555dd61ca550ec77fe41b
 SHA512:
-  metadata.gz: ead1b6073842a1d3c65214ffc3e3cd8bd20048df97a878d8f12dd522655090e02b98f9fb2d45be70a16a044d05aea682bf5c6c71cd31ccd8a6ab9fb215591948
-  data.tar.gz: cb340a9d7f4910116ede731ad44cb44a02f90bf77dae5e632669d2b54879af2eab38a8ff1ebf4e1fd639ee1c68ac22fdd5ded4d3ae5f57cd283696b4e32b0834
+  metadata.gz: 2b04300b61b6301f32512ca328f27affaa186082e0e35d8eeab7c748b77ba3c10a07a7309ba1d3e92563007910da3c9e70a7a1db37ce184b48763cc8d455ffb7
+  data.tar.gz: 2cbe19f6cd61338619072f9f07e215762ce45ffbd3b3aa0672d3f77a1c3bd3a8e7837b5e237bf6b01bd4058ac05afaf5c547b82c1b829a8787b344c88fc21276

data/bin/github-to-canvas

@@ -1,5 +1,6 @@
-require 'byebug'
 #!/usr/bin/env ruby
+
+
 require 'optparse'
 require 'github-to-canvas'
 
@@ -76,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'
@@ -106,10 +106,18 @@ OptionParser.new do |opts|
           "Adds additional Flatiron School HTML after markdown conversion") do |f|
             options[:fis] = true
           end
+  opts.on("-g", "--git-links",
+          "Adds additional GitHub after markdown conversion") do |f|
+            options[:git_links] = true
+          end
   opts.on("--aaq", 
           "Adds AAQ flag to HTML header appended with --fis-links") do |aaq|
             options[:aaq] = aaq
           end
+  opts.on("--prework", 
+          "Adds prework flag to HTML header appended with --fis-links") do |prework|
+            options[:prework] = prework
+          end
   opts.on("--forkable",
           "Used with --fis-links, adds fork button to HTML header injected into Canvas lesson") do |remote|
             options[:forkable] = true
@@ -138,10 +146,14 @@ OptionParser.new do |opts|
           "REQUIRES -f or --file Associates canvas lessons with repositories. Use query to create required YAML file") do |file|
             options[:map] = file
           end
-  opts.on("--csv COURSE", 
-          "Returns a course's lesson struction as CSV") do |course|
-            options[:csv] = course
+  opts.on("--urls-only", 
+          "Use with --map. Outputs repo URLs instead of YAML") do |urls|
+            options[:urls_only] = urls
           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
@@ -182,6 +194,19 @@ OptionParser.new do |opts|
           "Escapes all HTML included in source markdown by replacing '<' and '>' with HTML charset values") do |html|
             options[:contains_html] = html
           end
+  opts.on("--canvas-to-canvas COURSE",
+          "Copies an existing Canvas lesson into another Canvas lesson") do |canvas_to_canvas|
+            options[:canvas_to_canvas] = canvas_to_canvas
+          end
+  opts.on("--build-from-csv CSV",
+          "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!
 
@@ -196,6 +221,16 @@ if options[:read_from_canvas]
   abort
 end
 
+if options[:canvas_to_canvas]
+  GithubToCanvas.new(mode: 'canvas_copy',
+                    filepath: options[:canvas_to_canvas],
+                    course_id: options[:course_id], 
+                    type: options[:type],
+                    id: options[:id]
+                    )
+  abort
+end
+
 if options[:read_from_github]
   GithubToCanvas.new(mode: 'github_read', 
                     filepath: options[:read_from_github],
@@ -203,6 +238,7 @@ if options[:read_from_github]
                     forkable: !!options[:forkable],
                     fis_links: !!options[:fis],
                     aaq: !!options[:aaq],
+                    prework: !!options[:prework],
                     contains_html: options[:contains_html])
   abort
 end
@@ -218,6 +254,7 @@ if options[:create_from_github]
                       forkable: !!options[:forkable],
                       fis_links: !!options[:fis],
                       aaq: !!options[:aaq],
+                      prework: !!options[:prework],
                       contains_html: options[:contains_html])
   else
     puts 'Canvas course ID and lesson type required. Example: github-to-canvas --create-from-github URL --course ID --type TYPE'
@@ -237,6 +274,7 @@ if options[:align_from_github]
                       forkable: !!options[:forkable],
                       fis_links: !!options[:fis],
                       aaq: !!options[:aaq],
+                      prework: !!options[:prework],
                       contains_html: options[:contains_html])
   else
     puts 'Canvas course ID, lesson ID, and type required. Example: github-to-canvas --create-from-github URL --course COURSE_ID --id LESSON_ID --type TYPE'
@@ -250,12 +288,43 @@ if options[:query]
 end
 
 if options[:map]
-  GithubToCanvas.new(mode: 'map', file_to_convert: options[:map])
+  GithubToCanvas.new(mode: 'map', 
+                      file_to_convert: options[:map],
+                      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_build]
+  GithubToCanvas.new(mode: 'csv_build', 
+                    file_to_convert: options[:csv_build],
+                    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[:csv]
-  GithubToCanvas.new(mode: 'csv', file_to_convert: options[:csv])
+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
 
@@ -265,7 +334,10 @@ if options[:build_course]
                     fis_links: !!options[:fis], 
                     remove_header_and_footer: !!options[:remove_header_and_footer],
                     aaq: !!options[:aaq],
-                    forkable: !!options[:forkable])
+                    prework: !!options[:prework],
+                    forkable: !!options[:forkable],
+                    contains_html: options[:contains_html],
+                    git_links: !!options[:git_links])
   abort
 end
 
@@ -278,7 +350,9 @@ if options[:add_to_course]
                       remove_header_and_footer: !!options[:remove_header_and_footer],
                       forkable: !!options[:forkable],
                       aaq: !!options[:aaq],
-                      contains_html: options[:contains_html])
+                      prework: !!options[:prework],
+                      contains_html: options[:contains_html],
+                      git_links: !!options[:git_links])
   else
     puts '--course required'
   end
@@ -292,7 +366,9 @@ if options[:update_course_lessons]
                     remove_header_and_footer: !!options[:remove_header_and_footer],
                     forkable: !!options[:forkable],
                     aaq: !!options[:aaq],
-                    contains_html: options[:contains_html])
+                    prework: !!options[:prework],
+                    contains_html: options[:contains_html],
+                    git_links: !!options[:git_links])
   abort
 end
 
@@ -352,10 +428,12 @@ if options[:create_lesson]
                     type: options[:type], 
                     save_to_github: !!options[:save_to_github], 
                     fis_links: !!options[:fis], 
+                    git_links: !!options[:git_links],
                     remove_header_and_footer: !!options[:remove_header_and_footer],
                     only_update_content: !!options[:only_content],
                     forkable: !!options[:forkable],
                     aaq: !!options[:aaq],
+                    prework: !!options[:prework],
                     contains_html: options[:contains_html])
 end
 
@@ -369,10 +447,12 @@ if options[:align]
                     name: options[:name],
                     type: options[:type],
                     save_to_github: !!options[:save_to_github], 
-                    fis_links: !!options[:fis], 
+                    fis_links: !!options[:fis],
+                    git_links: !!options[:git_links], 
                     remove_header_and_footer: !!options[:remove_header_and_footer],
                     only_update_content: !!options[:only_content],
                     forkable: !!options[:forkable],
                     aaq: !!options[:aaq],
+                    prework: !!options[:prework],
                     contains_html: options[:contains_html])
 end

data/lib/github-to-canvas.rb

@@ -1,4 +1,4 @@
-require 'byebug'
+require 'csv'
 require_relative './github-to-canvas/create_canvas_lesson'
 require_relative './github-to-canvas/update_canvas_lesson'
 require_relative './github-to-canvas/canvas_dotfile'
@@ -21,11 +21,13 @@ class GithubToCanvas
     when 'query'
       CanvasInterface.get_course_info(options[:course_id], options[:id])
     when 'map'
-      CanvasInterface.map_course_info(options[:file_to_convert])
+      CanvasInterface.map_course_info(options)
     when 'csv'
       CanvasInterface.csv(options[:file_to_convert])
     when 'canvas_read'
       puts CanvasInterface.read_lesson(options[:filepath])
+    when 'canvas_copy'
+      CanvasInterface.copy_lesson(options)
     when 'github_read'
       html = RepositoryConverter.remote_file_conversion(options)
       puts RepositoryConverter.adjust_converted_html(options, html)
@@ -43,16 +45,24 @@ class GithubToCanvas
       CanvasInterface.update_all_related_lessons(options, name, html)
       
     when 'github_create'
+      if (!options[:branch])
+        options[:branch] = 'master'
+      end
       html = RepositoryConverter.remote_file_conversion(options)
-      name = options[:name] ? options[:name] : RepositoryInterface.get_name(options[:filepath], html)
-      html = RepositoryConverter.adjust_converted_html(options, html)
       
+      html = RepositoryConverter.adjust_converted_html(options, html)
+      name = options[:name] ? options[:name] : RepositoryInterface.get_name(options[:filepath], html)
+      puts name
       response = CanvasInterface.create_lesson(options, name, html)
       
       puts "Canvas lesson created. Lesson available at #{response['html_url']}"
     when 'github_align'
+      if (!options[:branch])
+        options[:branch] = 'master'
+      end
       html = RepositoryConverter.remote_file_conversion(options)
       name = options[:name] ? options[:name] : RepositoryInterface.get_name(options[:filepath], html)
+      
       html = RepositoryConverter.adjust_converted_html(options, html)
       response = CanvasInterface.update_existing_lesson(options, name, html)
       puts "Canvas lesson updated. Lesson available at #{response['html_url']}"
@@ -152,6 +162,101 @@ class GithubToCanvas
         end
         }
       }
+    when 'csv_build'
+      if !options[:course_id]
+        course_info = {
+          name: "CSV Build Test",
+          course_code: "CSV-TEST"
+        }
+        created_course_info = CanvasInterface.create_course(course_info)
+        puts "Course created - #{created_course_info["id"]}"
+        puts "Make sure to add yourself as a teacher to this course before continuing, then press Enter/Return"
+        input = gets
+        options[:course_id] = created_course_info["id"]
+      else
+        puts "Adding to course #{options[:course_id]}"
+      end
+      
+      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
+        module_info = {
+          name: lesson[2]
+        }
+        if created_module_info["name"] != module_info[:name]
+          created_module_info = CanvasInterface.create_module(options[:course_id], module_info)
+          puts "New module created - #{created_module_info["id"]} - #{created_module_info["name"]}"
+        end
+
+        options[:filepath] = lesson[0]
+        options[:name] = lesson[1]
+        options[:type] = lesson[3]
+        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)
+        created_lesson_info = CanvasInterface.create_lesson(options, lesson[1], html)
+        created_lesson_info["page_url"] = created_lesson_info["url"] if !created_lesson_info["page_url"]
+        created_lesson_info["id"] = created_lesson_info["page_url"] if !created_lesson_info["id"]
+        created_lesson_info["type"] = options[:type]
+        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
     end

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

@@ -1,7 +1,7 @@
-require 'byebug'
 require 'json'
 require 'rest-client'
 require 'yaml'
+require 'byebug'
 class CanvasInterface
 
   def self.create_course(course_info)
@@ -51,21 +51,21 @@ class CanvasInterface
     # POST /api/v1/courses/:course_id/modules/:module_id/items
     url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/modules/#{module_info["id"]}/items"
     
-    if lesson_info["type"] == "Page"
+    if lesson_info["type"] == "Page" || lesson_info["type"] == "page"
       payload = {
-      'module_item[title]' => lesson_info["title"],
-      'module_item[type]' => lesson_info["type"],
-      'module_item[indent]' => 0,
-      'module_item[page_url]' => lesson_info["id"],
-      'module_item[completion_requirement][type]' => 'must_view'
-    }
+        'module_item[title]' => lesson_info["title"],
+        'module_item[type]' => lesson_info["type"].capitalize,
+        'module_item[indent]' => 0,
+        'module_item[page_url]' => lesson_info["id"],
+        'module_item[completion_requirement][type]' => 'must_view'
+      }
     elsif lesson_info["type"] == "Quiz"
       puts "Quiz needs to be added manually - #{lesson_info['title']} - lesson_info["
     else
       
       payload = {
         'module_item[title]' => lesson_info["title"],
-        'module_item[type]' => lesson_info["type"],
+        'module_item[type]' => lesson_info["type"].capitalize,
         'module_item[indent]' => 1,
         'module_item[content_id]' =>  lesson_info["id"],
         'module_item[completion_requirement][type]' => 'must_submit'
@@ -95,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
@@ -193,6 +194,7 @@ class CanvasInterface
         while !!index
           url = "#{ENV['CANVAS_API_PATH']}/courses/#{course}/modules?page=#{index}&per_page=20"
           index += 1
+          
           response = RestClient.get(url, self.headers)
           modules = JSON.parse(response.body)
           
@@ -200,7 +202,7 @@ class CanvasInterface
             course_info[:modules] = course_info[:modules] + modules
           else
             index = nil
-          end 
+          end
         end
         
         course_info[:modules] = course_info[:modules].map do |mod|
@@ -213,11 +215,12 @@ class CanvasInterface
           while !!index
             url = "#{ENV['CANVAS_API_PATH']}/courses/#{course}/modules/#{mod['id']}/items?page=#{index}&per_page=20"
             index += 1
-            response = RestClient.get(url, headers={
-              "Authorization" => "Bearer #{ENV['CANVAS_API_KEY']}"
-            })
+            response = RestClient.get(url, self.headers)
             lessons = JSON.parse(response.body)
             lessons = lessons.map do |lesson|
+              if lesson["type"] == "ExternalUrl"
+                next
+              end
               lesson = lesson.slice("id","title","name","indent","type","html_url","page_url","url","completion_requirement", "published")
               lesson["repository"] = ""
               lesson['id'] = lesson['url'].gsub(/^(.*[\\\/])/,'')
@@ -232,7 +235,7 @@ class CanvasInterface
           end
           new_mod
         end
-
+        
         puts course_info.to_yaml
       
     rescue
@@ -241,8 +244,8 @@ class CanvasInterface
     end
   end
 
-  def self.map_course_info(file_to_convert)
-    course_info = YAML.load(File.read("#{Dir.pwd}/#{file_to_convert}"))
+  def self.map_course_info(options)
+    course_info = YAML.load(File.read("#{Dir.pwd}/#{options[:file_to_convert]}"))
     course_info[:modules] = course_info[:modules].map do |mod|
       mod[:lessons] = mod[:lessons].map do |lesson|
 
@@ -279,13 +282,15 @@ class CanvasInterface
           else
             lesson["repository"] = "https://github.com/learn-co-curriculum/" + repo
           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
       end
       mod
     end
-    puts course_info.to_yaml
+    puts course_info.to_yaml if !options[:urls_only]
   end
 
   def self.csv(file_to_convert)
@@ -332,12 +337,40 @@ class CanvasInterface
       end
       mod
     end
-    byebug
     puts course_info.to_yaml
   end
 
-  
+  def self.copy_lesson(options)
+    types = ["page", "assignment", "quiz", "discussion"]
+    url = options[:filepath]
+    type = types.find {|type| url.match(type)}
+    options[:type] = type
+    if !url.include?(ENV['CANVAS_API_PATH'])
+      url = url.sub(/^.*\/\/.*?\//,"#{ENV['CANVAS_API_PATH']}/")
+    end
 
+    response = RestClient.get(url, headers={
+      "Authorization" => "Bearer #{ENV['CANVAS_API_KEY']}"
+    })
+
+    lesson_info = JSON.parse(response)
+    lesson_info = lesson_info.slice("title",
+                                    "name",
+                                    "description",
+                                    "body",
+                                    "message",
+                                    "shuffle_answers",
+                                    "allowed_attempts",
+                                    "question_count"
+                                    )
+    if options[:type] == "page"
+      self.update_existing_lesson(options, lesson_info["title"], lesson_info["body"])
+    else
+      self.update_existing_lesson(options, lesson_info["name"], lesson_info["description"])
+    end
+    
+    
+  end
 
   def self.build_payload(options, name, html)
     if options[:only_update_content]

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

@@ -61,11 +61,11 @@ class GithubInterface
     rescue
       begin
         response = RestClient.get(url_fallback)
+        return response.body
       rescue
         puts 'Error reading ' + url
       end
     end
-    
     response.body
   end
 

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]
@@ -26,15 +26,27 @@ class RepositoryConverter
   def self.remote_file_conversion(options)
     markdown = GithubInterface.read_remote(options[:filepath])
     raw_remote_url = self.set_raw_image_remote_url(options[:filepath])
-    markdown = self.escape_existing_html(markdown) if options[:contains_html]
+    if options[:contains_html]
+      begin
+        markdown = self.escape_existing_html(markdown)
+      rescue
+        puts "Error reading remote markdown"
+        abort
+      end
+    end
+    if (!options[:branch])
+      options[:branch] = 'master'
+    end
     markdown = self.fix_local_images(options, markdown, raw_remote_url)
     html = self.convert_to_html(markdown)
     # self.fix_local_html_links(options, html, options[:filepath])
   end
 
   def self.convert_to_html(markdown)
-    redcarpet = Redcarpet::Markdown.new(CustomRender, options={tables: true, autolink: true, fenced_code_blocks: true})
+    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)
+    puts "Markdown converted to HTML"
     self.remove_line_breaks(html)
   end
 
@@ -44,25 +56,57 @@ class RepositoryConverter
       html = self.remove_header_and_footer(html)
     end
     
-    if options[:fis_links]
+    if options[:fis_links] || options[:git_links]
       html = self.add_fis_links(options, html)
     end
 
-    html = self.fix_escaped_inline_html_code(html)
+    if options[:contains_html]
+      html = self.fix_escaped_inline_html_code(html)
+    end
 
     html
   end
 
   def self.fix_escaped_inline_html_code(html)
-    html = html.gsub("<code>&amp;lt;", "<code>&lt;")
-    html = html.gsub("&amp;gt;</code>", "&gt;</code>")
+    
+    # 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>")
+
+    # fixes < and > code snippets
+
+    # 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|
+    #   bq.delete_prefix!("\n<p>&gt;")
+    #   "\n<blockquote>" + bq
+    # }
+    # html = html.gsub(/\n&gt\;(.*)\n&gt\;/) { |bq|
+    #   bq.delete_prefix!("\n&gt;")
+    #   " " + bq
+    # }
+    # html = html.gsub(/\n&gt\;(.*)<\/p>/) { |bq|
+    #   bq.delete_prefix!("\n&gt\;")
+    #   bq.delete_suffix!("</p>")
+    #   " " + bq + "</blockquote>"
+    # }
+
+    html
   end
 
 
   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)
@@ -78,6 +122,9 @@ class RepositoryConverter
 
   def self.remove_footer(readme)
     readme.gsub(/<p class='util--hide'(.+?)<\/p>/,"")
+    readme.gsub(/<p data-visibility='hidden'(.+?)<\/p>/,"")
+    readme.gsub(/<p>&lt\;p data-visibility=&#39\;hidden&#39(.+?)<\/p>/,"")
+    readme.gsub(/<p>&lt\;p class=&#39;util--hide&#39\;(.+?)<\/p>/,"")
   end
 
   def self.remove_html_header(html)
@@ -115,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$/,"")
@@ -130,7 +177,7 @@ class RepositoryConverter
   end
 
   def self.adjust_local_markdown_images(readme, raw_remote_url, branch)
-    readme.gsub!(/\!\[.+\]\(.+\)/) {|image_markdown|
+    readme.gsub(/\!\[.+\]\(.+\)/) {|image_markdown|
       if !image_markdown.match?('amazonaws.com') && !image_markdown.match?('https://') && !image_markdown.match?('http://') && !image_markdown.match?('youtube')
         image_markdown.gsub!(/\(.+\)/) { |path|
           path.delete_prefix!("(")
@@ -143,12 +190,18 @@ class RepositoryConverter
   end
 
   def self.adjust_local_html_images(readme, raw_remote_url, branch)
-    readme.gsub!(/src=(\'|\")[\s\S]*?(\'|\")/) { |image_source|
-      if !image_source.match?('amazonaws.com') && !image_source.match?('https://') && !image_source.match?('http://') && !image_source.match?('youtube')
-        image_source.gsub!(/(\'|\")/, "")
-        image_source.gsub!(/src=/, '')
-        image_source.strip!
-        'src="' + raw_remote_url + '/' + branch + '/' + image_source + '"'
+    readme.gsub(/src=(\'|\")[\s\S]*?(\'|\")/) { |image_source|
+      
+      if !image_source.match?('amazonaws.com') && !image_source.match?('https://') && !image_source.match?('http://') && !image_source.match?('youtube') && !image_source.match(/src=(\'|\")(?=<%)/)
+        image_source = image_source.gsub(/(\'|\")/, "")
+        image_source = image_source.gsub(/src=/, '')
+        image_source = image_source.strip
+
+        begin
+          'src="' + raw_remote_url + '/' + branch + '/' + image_source + '"'
+        rescue
+          puts "Error adjust HTML images - check images in Canvas"
+        end
       else
         image_source
       end
@@ -178,12 +231,12 @@ class RepositoryConverter
   def self.add_fis_links(options, html)
     repo_info = self.get_repo_info(options[:filepath])
     html = html.sub(/<div id="git-data-element.*<header class="fis-header.*<\/header>/,'') # remove existing fis header
-    header = self.create_github_link_header(repo_info[:repo_path], options[:forkable])
-    data_element = self.create_data_element(repo_info[:repo_org], repo_info[:repo_name], options[:aaq])
+    header = self.create_github_link_header(repo_info[:repo_path], options)
+    data_element = self.create_data_element(repo_info[:repo_org], repo_info[:repo_name], options[:aaq], options[:prework])
     data_element + header + html
   end
 
-  def self.create_github_link_header(repo_path, forkable)
+  def self.create_github_link_header(repo_path, options)
     # add link to associated repository
     github_repo_link = "<a class='fis-git-link' href='#{repo_path}' target='_blank' rel='noopener'><img id='repo-img' title='Open GitHub Repo' alt='GitHub Repo' /></a>"
     
@@ -191,20 +244,19 @@ class RepositoryConverter
     github_issue_link = "<a class='fis-git-link' href='#{repo_path}/issues/new' target='_blank' rel='noopener'><img id='issue-img' title='Create New Issue' alt='Create New Issue' /></a>"
     
     # add link to fork (forking handled by separate Flatiron server, generation of link handled via custom Canvas JS theme file)
-    if (forkable)
-      github_fork_link = "<a class='fis-fork-link' id='fork-link' href='#' target='_blank' rel='noopener'><img id='fork-img' title='Fork This Assignment' alt='Fork This Assignment' /></a>"
+
+    if (options[:forkable])
+      github_fork_link = "<a class='fis-fork-link' id='fork-link' href='#{repo_path}/fork' target='_blank' rel='noopener'><img id='fork-img' title='Fork This Assignment' alt='Fork This Assignment' /></a>"
       "<header class='fis-header' style='visibility: hidden;'>#{github_fork_link}#{github_repo_link}#{github_issue_link}</header>"
+    elsif options[:git_links]
+      "<header class='fis-header'>#{github_repo_link}#{github_issue_link}</header>"
     else
       "<header class='fis-header' style='visibility: hidden;'>#{github_repo_link}#{github_issue_link}</header>"
     end
   end
 
-  def self.create_data_element(repo_org, repo_name, aaq)
-    if (aaq)
-      "<div id='git-data-element' data-aaq='enabled' data-org='#{repo_org}' data-repo='#{repo_name}'></div>"
-    else
-      "<div id='git-data-element' data-org='#{repo_org}' data-repo='#{repo_name}'></div>"
-    end
+  def self.create_data_element(repo_org, repo_name, aaq, prework)
+    "<div id='git-data-element' #{prework ? "data-prework='true'" : ""} #{aaq ? "data-aaq='enabled'" : ""} data-org='#{repo_org}' data-repo='#{repo_name}'></div>"
   end
 
   

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

@@ -1,3 +1,3 @@
 class GithubToCanvas
-  VERSION = "0.1.3"
+  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.3
+  version: 0.1.9
 platform: ruby
 authors:
 - maxwellbenton
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: github-to-canvas is a tool for migrating and aligning GitHub content with