canvas_cc 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2feb0091945201639c9ac6979145ac654621232d
-  data.tar.gz: 1201761ccbf06821771f2960cd5cf456cffbab8a
+  metadata.gz: be03da1087647bda88d651eb4c5864b6cd079081
+  data.tar.gz: 7f65e6d609b7693980c656728f9f6873d4aa6620
 SHA512:
-  metadata.gz: dbf6e6cc521afc31f27aa4f49641f17794dfc063b3080d45b80901eb7651363ee532f20001ff6806d54f302dacd3e78194bc3087619642319f06429e879022ac
-  data.tar.gz: c81cf9ac0a83029ec4602cb9281fe607cb23ad7fafce95e15182dac7a1b25a7a27c0c25eb13eda7db5597f5fb3fa077152a00e10c235467d799141b48ca82617
+  metadata.gz: 62e6a1aabede03fb93939edd46d76ad246a95a33860f9423ac80d1748361a0df13e9eac80b0f95ef995ad01792d445f6634dad9ea7ed0e9eb785fe636836badd
+  data.tar.gz: 51919500c772c0914fad0b1be6679ad949214650e22f360e99f6bfc8967c121649aade8fcaa65e6c2193860e240892dad06624b6ed3925734ba7c5148f27e751

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    canvas_cc (0.0.36)
+    canvas_cc (0.0.37)
       builder
       happymapper
       nokogiri

data/lib/canvas_cc/canvas_cc/models/page.rb

@@ -31,12 +31,126 @@ module CanvasCc::CanvasCC::Models
     end
 
     def self.convert_name_to_url(name)
-      url = CGI::escape(name.downcase.gsub(/\s/, '-').gsub('.', 'dot'))
+      url = urlify(name)
       if url.length > MAX_URL_LENGTH
         url = url[0,MAX_URL_LENGTH][/.{0,#{MAX_URL_LENGTH}}/mu]
       end
       url
     end
 
+    def self.urlify(name)
+      name = name.downcase.gsub(/\s/, '-').gsub('.', '-dot-')
+      name.gsub!('(', '-')
+      name.gsub!(')', '-')
+      name.gsub!('_', '-')
+      name.gsub!('--', '-')
+      name.gsub!('"', '')
+      name.gsub!('$', ' dollars ')
+      name.gsub!(/[äöüß]/) do |match|
+        case match
+        when "ä" then 'a'
+        when "ö" then 'o'
+        when "ü" then 'u'
+        when "ß" then 'ss'
+        end
+      end
+      name = to_url(name)
+      CGI::escape(name)
+    end
+
+    def self.to_url(title)
+      title = remove_formatting(title).downcase
+      title = replace_whitespace(title, "-")
+      title = collapse(title, "-")
+    end
+
+    def self.remove_formatting(title)
+      title = strip_html_tags(title)
+      title = convert_accented_entities(title)
+      title = convert_misc_entities(title)
+      title = convert_misc_characters(title)
+      collapse(title)
+    end
+
+    def self.strip_html_tags(title, leave_whitespace = false)
+      name = /[\w:_-]+/
+      value = /([A-Za-z0-9]+|('[^']*?'|"[^"]*?"))/
+      attr = /(#{name}(\s*=\s*#{value})?)/
+      rx = /<[!\/?\[]?(#{name}|--)(\s+(#{attr}(\s+#{attr})*))?\s*([!\/?\]]+|--)?>/
+      (leave_whitespace) ?  title.gsub(rx, "").strip : title.gsub(rx, "").gsub(/\s+/, " ").strip
+    end
+
+    def self.convert_accented_entities(title)
+      title.gsub(/&([A-Za-z])(grave|acute|circ|tilde|uml|ring|cedil|slash);/, '\1')
+    end
+
+    def self.convert_misc_entities(title)
+      {
+        "#822[01]" => "\"",
+        "#821[67]" => "'",
+        "#8230" => "...",
+        "#8211" => "-",
+        "#8212" => "--",
+        "#215" => "x",
+        "gt" => ">",
+        "lt" => "<",
+        "(#8482|trade)" => "(tm)",
+        "(#174|reg)" => "(r)",
+        "(#169|copy)" => "(c)",
+        "(#38|amp)" => "and",
+        "nbsp" => " ",
+        "(#162|cent)" => " cent",
+        "(#163|pound)" => " pound",
+        "(#188|frac14)" => "one fourth",
+        "(#189|frac12)" => "half",
+        "(#190|frac34)" => "three fourths",
+        "(#176|deg)" => " degrees"
+      }.each do |textiled, normal|
+        title.gsub!(/&#{textiled};/, normal)
+      end
+      title.gsub(/&[^;]+;/, "")
+    end
+
+    def self.convert_misc_characters(title)
+      title = title.gsub(/\.{3,}/, " dot dot dot ")
+      # Special rules for money
+      {
+        /(\s|^)\$(\d+)\.(\d+)(\s|$)/ => '\2 dollars \3 cents',
+        /(\s|^)£(\d+)\.(\d+)(\s|$)/u => '\2 pounds \3 pence',
+      }.each do |found, replaced|
+        replaced = " #{replaced} " unless replaced =~ /\\1/
+        title.gsub!(found, replaced)
+      end
+      # Back to normal rules
+      {
+        /\s*&\s*/ => "and",
+        /\s*#/ => "number",
+        /\s*@\s*/ => "at",
+        /(\S|^)\.(\S)/ => '\1 dot \2',
+        /(\s|^)\$(\d*)(\s|$)/ => '\2 dollars',
+        /(\s|^)£(\d*)(\s|$)/u => '\2 pounds',
+        /(\s|^)¥(\d*)(\s|$)/u => '\2 yen',
+        /\s*\*\s*/ => "star",
+        /\s*%\s*/ => "percent",
+        /\s*(\\|\/)\s*/ => "slash",
+      }.each do |found, replaced|
+        replaced = " #{replaced} " unless replaced =~ /\\1/
+        title.gsub!(found, replaced)
+      end
+      title.gsub(/(^|\w)'(\w|$)/, '\1\2').gsub(/[\.,:;()\[\]\/\?!\^'"_]/, " ")
+    end
+
+    def self.replace_whitespace(title, replace = " ")
+      title.gsub(/\s+/, replace)
+    end
+
+    def self.collapse(title, character = " ")
+      title.sub(/^#{character}*/, "").sub(/#{character}*$/, "").squeeze(character)
+    end
+
+    def self.path_safe
+      gsub(/[^a-zA-Z0-9\-_]+/, '-')
+    end
+
   end
 end

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/spec/moodle2cc/canvas_cc/models/page_spec.rb

@@ -28,5 +28,11 @@ module CanvasCc::CanvasCC::Models
       expect(page.href).to eq expected
     end
 
+    it "generates urls from page name" do
+      name = '2.1_nutrition(mythbustercarbohydrates).html'
+      url = Page.convert_name_to_url(name)
+      expect(url).to eq '2-dot-1-nutrition-mythbustercarbohydrates-dot-html'
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip