github-to-canvas 0.0.51 → 0.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd3ab1c6c19565bf5e03e674831589f0ab407f65afeb3cc6aadf14c28c2dfa7
-  data.tar.gz: ba9661ec0bc2824d6d42fecf0c904232a2cc323c1dedc4803dafc7347959e992
+  metadata.gz: 35b2320509da12ac07b0a2905c4302b8a2d3d492f2fc04bcd5dc606b8fb36cb3
+  data.tar.gz: 7964bd362c1315ddf7203f6f9599e8a69469d59579457fb6dd632c80c0127be5
 SHA512:
-  metadata.gz: ababba4146ccb17bdd7779600697d964b13f7a86827fcb3b6ecb05fdcea8cb34b4ab6153f994bbce8dc4c6b42acb45793f3b2eabff787a5161b664ba2b183282
-  data.tar.gz: ed1939d585348330f4c7e39f66485093de9ef9f7af359ae55830e447a567040de97b4ad754d93a6a7a50ef910c181cf5933f0c0f48bbd02265ca8eea0df7961d
+  metadata.gz: c55a64f4a56fcb795af943a9db7e9799164cd19c5119738c0899ce3b73e1b8998a5c16ce676d5553828bf6d0f54b55d804c2066c2702e113ace009649e0ece3d
+  data.tar.gz: 37e1f2a57675d8ec0cb9dc6e36716b35b7ca8ab38b243e4cb6186a17fe0894c4b1ef8fde65dc0fbdaf3bb242d0bafcd08dd243abbb83acf03139de75597f95a4

data/bin/github-to-canvas

@@ -84,7 +84,7 @@ OptionParser.new do |opts|
           "Adds additional Flatiron School HTML after markdown conversion") do |f|
             options[:fis] = true
           end
-  opts.on("--fork",
+  opts.on("--forkable",
           "Used with --fis-links, adds fork button to HTML header injected into Canvas lesson") do |remote|
             options[:forkable] = true
           end
@@ -135,6 +135,7 @@ end
 if !options[:type]
   if Dir.glob("**/*/").empty?
     options[:type] = "page"
+    options[:forkable] = false
   else
     options[:type] = "assignment"
   end
@@ -182,8 +183,8 @@ if options[:create_lesson]
                     save_to_github: !!options[:save_to_github], 
                     fis_links: !!options[:fis], 
                     remove_header_and_footer: !!options[:remove_header_and_footer],
-                    only_update_content: !!options[:only_content]),
-                    forkable: !!options[:forkable]
+                    only_update_content: !!options[:only_content],
+                    forkable: !!options[:forkable])
 end
 
 if options[:align]
@@ -198,6 +199,6 @@ if options[:align]
                     save_to_github: !!options[:save_to_github], 
                     fis_links: !!options[:fis], 
                     remove_header_and_footer: !!options[:remove_header_and_footer],
-                    only_update_content: !!options[:only_content]),
-                    forkable: !!options[:forkable]
+                    only_update_content: !!options[:only_content],
+                    forkable: !!options[:forkable])
 end

data/lib/github-to-canvas.rb

@@ -19,8 +19,8 @@ class GithubToCanvas
                 save_to_github:false, 
                 fis_links:false,
                 remove_header_and_footer:false,
-                only_update_content: false),
-                forkable: false
+                only_update_content: false,
+                forkable: false)
 
     if mode == 'version'
       puts VERSION

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

@@ -74,13 +74,15 @@ class RepositoryConverter
 
   def self.add_fis_links(filepath, readme, forkable)
     repo_path = self.get_repo_url(filepath)
+    repo_name = repo_path.split('/')[-1]
+    repo_org = repo_path.split('/')[-2]
+
     header = self.create_github_link_header(repo_path, forkable)
-    header + readme
+    data_element = self.create_data_element(repo_org, repo_name)
+    data_element + header + readme
   end
 
   def self.create_github_link_header(repo_path, forkable)
-    repo_name = repo_path.split('/')[-1]
-
     # 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>"
     
@@ -88,12 +90,16 @@ 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' data-repo='#{repo_name}' href='#' target='_blank' rel='noopener'><img id='fork-img' title='Fork This Assignment' alt='Fork This Assignment' /></a>"
+    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>"
       "<header class='fis-header' style='visibility: hidden;'>#{github_fork_link}#{github_issue_link}</header>"
-    } else {
+    else
       "<header class='fis-header' style='visibility: hidden;'>#{github_issue_link}</header>"
-    }
+    end
+  end
+
+  def self.create_data_element(repo_org, repo_name)
+    "<div id='git-data-element' data-org='#{repo_org}' data-repo='#{repo_name}'></div>"
   end
 
 end

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

@@ -1,3 +1,3 @@
 class GithubToCanvas
-  VERSION = "0.0.51"
+  VERSION = "0.0.56"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: github-to-canvas
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.56
 platform: ruby
 authors:
 - maxwellbenton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-05-12 00:00:00.000000000 Z
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-description: 
+description:
 email: maxwell@flatironschool.com
 executables:
 - github-to-canvas
@@ -91,7 +91,7 @@ homepage: https://github.com/learn-co-curriculum/github-to-canvas
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: github-to-canvas is a tool for migrating and aligning GitHub content with
   the Canvas LMS