octopress-code-highlighter 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d735422e3324ead88b068fe845d4709639937a8d
-  data.tar.gz: b2a2478389f20fdf6dcb7a124f6654617588940e
+  metadata.gz: 33493bd9308df9d2b527e317df57f46a9216722c
+  data.tar.gz: 79bd0fecc2631516853fedec37fada2cad7ad7a6
 SHA512:
-  metadata.gz: b8580566712e1acd5d3500ca9def1b1042c402947048509d2ed5c28388006246ffd88ba5ce5b04a400035295fb4e4f0025805157d54d3cf73e6eacad6ea6f150
-  data.tar.gz: 2252aaa56e019095cfb53f255521c18041cf51d280f05bcfbc49fa19ce8f2602589900bd7509d51ae000425ab57c941f426c64bf8e25a5248a15f840035b238b
+  metadata.gz: c611d12ea6b6cfe97d7aa4b2ea6c4c63f6ecfd17f63c71ed6e215518c8415238b1ad468714eec06240e33e4bed5f62929dda7346a6d76b30f5baceb661e02434
+  data.tar.gz: 6f24e5ca6ceed1dab0ad15527628bdbcfc8dd4f2f85e098c940b5606c61cbf18fb50bc3f0c8b1253a85c20d1940bf6a6586339a6dac3be4e6d22131fa2837c18

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.0.1
+  - Changed `get_range` method to `select_lines` which returns a code partial when `start`, `end` or `range` options are defined.
+
 ## 4.0.0
   - Removed stylesheets. Now use gem octopress-solarized for stylesheets.
   - Removed dependency on Octopress Ink.

data/lib/octopress-code-highlighter.rb

@@ -39,6 +39,21 @@ module Octopress
       OptionsParser.new(input).clean_markup
     end
 
+    # Return a code partial when start, end, or range options are defined
+    #
+    def self.select_lines(code, options)
+      length   = code.lines.count
+      start    = options[:start] || 1
+      endline  = options[:end] || length
+
+      if start > 1 or endline < length
+        raise "Code is #{length} lines long, cannot begin at line #{start}." if start > length
+        raise "Code lines starting line #{start} cannot be after ending line #{endline}." if start > endline
+        code = code.lines[(start - 1), (endline + 1)].join
+      end
+      code
+    end
+
     def self.highlight_failed(error, syntax, markup, code, file = nil)
       code_snippet = code.split("\n")[0..9].map{|l| "    #{l}" }.join("\n")
       fail_message  = "\nError while parsing the following markup#{" in #{file}" if file}:\n\n".red

data/lib/octopress-code-highlighter/renderer.rb

@@ -19,17 +19,23 @@ module Octopress
       end
 
       def select_renderer
-        begin
-          require 'rouge'
-          return 'rouge' if defined?(Rouge)
-        rescue LoadError; end
-        begin
-          require 'pygments.rb'
-          return 'pygments' if defined?(Pygments)
-        rescue LoadError
-          puts "To highlight code, install the gem pygments.rb or rouge.".red
-          return 'plain'
+        case true
+          when renderer_available?('rouge')
+            require 'rouge'
+            return  'rouge'
+          when renderer_available?('pygments.rb')
+            require 'pygments'
+            return  'pygments'
+        else
+          $stderr.puts 'No syntax highlighting:'.yellow
+          $stderr.puts "\tInstall pygments.rb, rouge".yellow
         end
+  
+        'plain'
+      end
+      
+      def renderer_available?(which)
+        Gem::Specification::find_all_by_name(which).any?
       end
 
       def highlight
@@ -133,12 +139,12 @@ module Octopress
       #
       def get_range(code, start, endline)
         length    = code.lines.count
-        start
+        start   ||= 1
         endline ||= length
         if start > 1 or endline < length
           raise "#{filepath} is #{length} lines long, cannot begin at line #{start}" if start > length
           raise "#{filepath} is #{length} lines long, cannot read beyond line #{endline}" if endline > length
-          code = code.split(/\n/).slice(start - 1, endline + 1 - start).join("\n")
+          code = code.split(/\n/).slice(start - 1, endline + 1).join("\n")
         end
         code
       end

data/lib/octopress-code-highlighter/version.rb

@@ -1,6 +1,6 @@
 module Octopress
   module CodeHighlighter
-    VERSION = "4.0.0"
+    VERSION = "4.0.1"
   end
 end
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: octopress-code-highlighter
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.2
 description: Octopress's core plugin for rendering nice code blocks
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -113,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Octopress's core plugin for rendering nice code blocks