terminal 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d9969578830c35e3587d7eb183a5ddca80faf78
-  data.tar.gz: 9c18bf8cc1e40b0b02a50d153291ddd678cce02e
+  metadata.gz: b8ff0192c84e2fe3da5e33be6c1e7c0e8abded70
+  data.tar.gz: 4b5dafa0764496c4810b0d505e3c55dfe6076e2f
 SHA512:
-  metadata.gz: f84f5c8f4b3a26e5ca5c49d05d78ffdc99879e2e3087494f140054bfcac10f76b8c34ec3458a94161a0ebaed6504b09f31a8caa5e92718582a8bea1cb72a4db2
-  data.tar.gz: 7897b30eb970b80ec2cd72c212ef190eeb538f2c023b629e671168078f8dfab9f0e72ef6a665d531a8f1314efcaf32311a2e4526b8f1381c5b8df783e457d86d
+  metadata.gz: 1136373e0556d6a0bbde37f1e4630c89a38d3dd470fa59151bc5048fc37b2234e999c21432f7b6b3245b47cda146b7bef70cae08a23e4492828ea34cb1cab695
+  data.tar.gz: 1038c20539c1a2c6574b5facfe98903ae9dffdf4c0789d02e34c148bd3d5e26407893467158ac2304900708e910f068c347a4108628d0e042d6c192f7fc2d3f7

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    terminal (1.0.2)
+    terminal (2.0.0)
       escape_utils (~> 1.0)
-      gemoji (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -11,7 +10,6 @@ GEM
     benchmark-ips (2.1.1)
     diff-lcs (1.2.5)
     escape_utils (1.0.1)
-    gemoji (2.1.0)
     hirb (0.7.3)
     memory_profiler (0.0.4)
     method_profiler (2.0.1)

data/Readme.md

@@ -51,15 +51,6 @@ Now in your views:
 <div class="term-container"><%= Terminal.render(output) %></div>
 ```
 
-### Emojis :+1:
-
-Terminal converts unicode to proper `<img>` tags. We use the [gemoji](https://github.com/github/gemoji)
-gem to do this. The path to the assets can be customized by passing the `:emoji_asset_path` option to `Terminal.render`
-
-```ruby
-Terminal.render(output, emoji_asset_path: "https://your.cdn.com/images/emoji")
-```
-
 ### Command Line
 
 Terminal ships with a command line utility. For example, you can pipe `rspec` output to it:

data/bin/terminal

@@ -6,8 +6,7 @@ $:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib'))
 require 'terminal'
 require 'optparse'
 
-options = Struct.new(:preview,
-                     :emoji_asset_path).new
+options = Struct.new(:preview).new
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{opts.program_name} [options] <input file>"
@@ -16,10 +15,6 @@ option_parser = OptionParser.new do |opts|
     options.preview = true
   end
 
-  opts.on("--emoji-asset-path=PATH", "Path or URL to emoji image files") do |path|
-    options.emoji_asset_path = path
-  end
-
   opts.on_tail("-h", "--help", "Show this help documentation") do
     puts opts
     exit
@@ -36,7 +31,7 @@ if ($stdin.tty? && ARGV.empty?)
 end
 
 raw = ARGF.read
-rendered = Terminal.render(raw, emoji_asset_path: options[:emoji_asset_path])
+rendered = Terminal.render(raw)
 
 if options[:preview]
   require 'tempfile'

data/lib/terminal/renderer.rb

@@ -1,16 +1,12 @@
 # encoding: UTF-8
 
 require 'escape_utils'
-require 'emoji'
 require 'strscan'
 
 module Terminal
   class Renderer
     MEGABYTES = 1024 * 1024
 
-    EMOJI_UNICODE_REGEXP = /[\u{1f600}-\u{1f64f}]|[\u{2702}-\u{27b0}]|[\u{1f680}-\u{1f6ff}]|[\u{24C2}-\u{1F251}]|[\u{1f300}-\u{1f5ff}]/
-    EMOJI_IGNORE = [ "heavy_check_mark".freeze, "heavy_multiplication_x".freeze ]
-
     ESCAPE_CONTROL_CHARACTERS = "qQmKGgKAaBbCcDd".freeze
     ESCAPE_CAPTURE_REGEX = /\e\[(.*)([#{ESCAPE_CONTROL_CHARACTERS}])/
 
@@ -18,23 +14,15 @@ module Terminal
 
     def initialize(output, options = {})
       @output = output
-
       @options = options
-      @options[:emoji_asset_path] ||= "/assets/emojis"
-
       @screen = Screen.new
     end
 
     def render
       return "" if @output.nil?
 
-      # Don't allow parsing of outputs longer than 4 meg
-      output = dup_check_and_chomp_length(@output)
+      output = @output.dup
 
-      # Force encoding on the output first
-      force_encoding!(output)
-
-      # Now do the render the output to the screen
       render_to_screen(output)
 
       # Convert the screen to a string
@@ -46,36 +34,11 @@ module Terminal
       # Now convert the colors to HTML
       convert_to_html!(escaped_html)
 
-      # And emojify
-      replace_unicode_with_emoji!(escaped_html)
-
       escaped_html
     end
 
     private
 
-    def dup_check_and_chomp_length(output)
-      # Limit the entire size of the output to 4 meg
-      max_total_size = 4 * MEGABYTES
-      if output.bytesize > max_total_size
-        new_output = output.byteslice(0, max_total_size)
-        new_output << "\n\nWarning: Terminal has chopped off the rest of the build as it's over the allowed 4 megabyte limit for logs."
-        new_output
-      else
-        output.dup
-      end
-    end
-
-    def force_encoding!(string)
-      string.force_encoding('UTF-8')
-
-      if string.valid_encoding?
-        string
-      else
-        string.force_encoding('ASCII-8BIT').encode!('UTF-8', invalid: :replace, undef: :replace)
-      end
-    end
-
     def render_to_screen(string)
       scanner = StringScanner.new(string)
 
@@ -147,27 +110,5 @@ module Terminal
       # Replace empty lines with a non breaking space.
       string.gsub!(/$^/, "&nbsp;")
     end
-
-    def replace_unicode_with_emoji!(string)
-      string.gsub!(EMOJI_UNICODE_REGEXP) do |match|
-        Terminal::Cache.cache(:emoji, match) { emoji_image_from_unicode(match) }
-      end
-    end
-
-    # The Emoji API will be transitioning to a nil-based find API, at the
-    # moment it raies exceptions for Emojis that can't be found:
-    # https://github.com/github/gemoji/commit/b1736a387c7c1c2af300506fea5603e2e1fb89d8
-    # Will support both for now.
-    def emoji_image_from_unicode(unicode)
-      emoji = Emoji.find_by_unicode(unicode)
-
-      if emoji && !EMOJI_IGNORE.include?(emoji.name)
-        path = File.join(@options[:emoji_asset_path], emoji.image_filename)
-
-        %(<img alt="#{emoji.name}" title="#{emoji.name}" src="#{path}" class="emoji" width="20" height="20" />)
-      else
-        unicode
-      end
-    end
   end
 end

data/lib/terminal/version.rb

@@ -1,3 +1,3 @@
 module Terminal
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/spec/terminal/renderer_spec.rb

@@ -20,13 +20,6 @@ describe Terminal::Renderer do
   end
 
   describe "#render" do
-    it "chops off logs longer than 4 megabytes" do
-      long_string = "x" * 5 * 1024 * 1024
-      last_part_of_long_string = render(long_string).split("").last(1000).join("")
-
-      expect(last_part_of_long_string).to end_with("Warning: Terminal has chopped off the rest of the build as it's over the allowed 4 megabyte limit for logs.")
-    end
-
     it "closes colors that get opened" do
       raw = "he\033[32mllo"
 
@@ -196,31 +189,6 @@ describe Terminal::Renderer do
       expect(render(raw)).to eql("hi amazing \e[12 nom nom nom friends")
     end
 
-    it "renders unicode emoji" do
-      raw = "this is great 👍"
-
-      expect(render(raw)).to eql(%{this is great <img alt="+1" title="+1" src="/assets/emojis/unicode/1f44d.png" class="emoji" width="20" height="20" />})
-    end
-
-    it "returns nothing if the unicode emoji can't be found" do
-      expect(Emoji).to receive(:unicodes_index) { {} }
-      raw = "this is great 😎"
-
-      expect(render(raw)).to eql(%{this is great 😎})
-    end
-
-    it "leaves the tick emoji alone (it looks better and is colored)" do
-      raw = "works ✔"
-
-      expect(render(raw)).to eql(%{works ✔})
-    end
-
-    it "leaves the ✖ emoji alone as well" do
-      raw = "broke ✖"
-
-      expect(render(raw)).to eql(%{broke ✖})
-    end
-
     it "handles colors with 3 attributes" do
       raw = "\e[0;10;4m\e[1m\e[34mgood news\e[0;10m\n\neveryone"
 

data/terminal.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "escape_utils", "~> 1.0"
-  spec.add_dependency "gemoji", "~> 2.1"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: gemoji
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement