RubyGems - coderay - Versions diffs - 1.0.0.864rc3 → 1.0.1 - Mend

coderay 1.0.0.864rc3 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/bin/coderay +1 -1
data/lib/coderay/encoder.rb +1 -1
data/lib/coderay/encoders/html/output.rb +9 -1
data/lib/coderay/scanners/java/builtin_types.rb +2 -0
data/lib/coderay/scanners/yaml.rb +1 -1
data/lib/coderay/styles/alpha.rb +0 -1
data/lib/coderay/tokens.rb +0 -91
data/lib/coderay/tokens_proxy.rb +23 -6
data/lib/coderay/version.rb +1 -1
data/test/functional/basic.rb +3 -1
data/test/functional/examples.rb +2 -2
data/test/functional/suite.rb +1 -0
metadata +13 -13

data/bin/coderay CHANGED Viewed

@@ -197,7 +197,7 @@ when 'li', 'list'
     end
   end
 when 'stylesheet', 'style', 'css'
-  puts CodeRay::Encoders[:html]::CSS.new(args.first).stylesheet
+  puts CodeRay::Encoders[:html]::CSS.new(args.first || :default).stylesheet
 when 'commands'
   commands
 when 'help'

data/lib/coderay/encoder.rb CHANGED Viewed

@@ -34,7 +34,7 @@ module CodeRay
         # downcase class name instead.
         def const_missing sym
           if sym == :FILE_EXTENSION
-            (@plugin_id || name[/\w+$/].downcase).to_s
+            (defined?(@plugin_id) && @plugin_id || name[/\w+$/].downcase).to_s
           else
             super
           end

data/lib/coderay/encoders/html/output.rb CHANGED Viewed

@@ -140,10 +140,18 @@ module Encoders
   text-decoration: inherit;
   color: inherit;
 }
+body {
+  background-color: white;
+  padding: 0;
+  margin: 0;
+}
 <%CSS%>
+.CodeRay {
+  border: none;
+}
   </style>
 </head>
-<body style="background-color: white;">
+<body>
 <%CONTENT%>
 </body>

data/lib/coderay/scanners/java/builtin_types.rb CHANGED Viewed

@@ -3,6 +3,7 @@ module Scanners
   module Java::BuiltinTypes  # :nodoc:
+    #:nocov:
     List = %w[
       AbstractAction AbstractBorder AbstractButton AbstractCellEditor AbstractCollection
       AbstractColorChooserPanel AbstractDocument AbstractExecutorService AbstractInterruptibleChannel
@@ -412,6 +413,7 @@ module Scanners
       XPathFactoryConfigurationException XPathFunction XPathFunctionException XPathFunctionResolver
       XPathVariableResolver ZipEntry ZipException ZipFile ZipInputStream ZipOutputStream ZoneView
     ]
+    #:nocov:
   end

data/lib/coderay/scanners/yaml.rb CHANGED Viewed

@@ -76,7 +76,7 @@ module Scanners
           when match = scan(/[,{}\[\]]/)
             encoder.text_token match, :operator
             next
-          when state == :initial && match = scan(/[\w.() ]*\S(?= *:(?: |$))/)
+          when state == :initial && match = scan(/[-\w.()\/ ]*\S(?= *:(?: |$))/)
             encoder.text_token match, :key
             key_indent = column(pos - match.size) - 1
             state = :colon

data/lib/coderay/styles/alpha.rb CHANGED Viewed

@@ -45,7 +45,6 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .CodeRay span.line-numbers { padding: 0px 4px; }
 .CodeRay .line { display: block; float: left; width: 100%; }
 .CodeRay .code { width: 100%; }
-.CodeRay .code pre { overflow: auto; }
     MAIN
     TOKEN_COLORS = <<-'TOKENS'

data/lib/coderay/tokens.rb CHANGED Viewed

@@ -83,97 +83,6 @@ module CodeRay
       super
     end
-    # Returns the tokens compressed by joining consecutive
-    # tokens of the same kind.
-    #
-    # This can not be undone, but should yield the same output
-    # in most Encoders.  It basically makes the output smaller.
-    #
-    # Combined with dump, it saves space for the cost of time.
-    #
-    # If the scanner is written carefully, this is not required -
-    # for example, consecutive //-comment lines could already be
-    # joined in one comment token by the Scanner.
-    def optimize
-      raise NotImplementedError, 'Tokens#optimize needs to be rewritten.'
-      # last_kind = last_text = nil
-      # new = self.class.new
-      # for text, kind in self
-      #   if text.is_a? String
-      #     if kind == last_kind
-      #       last_text << text
-      #     else
-      #       new << [last_text, last_kind] if last_kind
-      #       last_text = text
-      #       last_kind = kind
-      #     end
-      #   else
-      #     new << [last_text, last_kind] if last_kind
-      #     last_kind = last_text = nil
-      #     new << [text, kind]
-      #   end
-      # end
-      # new << [last_text, last_kind] if last_kind
-      # new
-    end
-    # Compact the object itself; see optimize.
-    def optimize!
-      replace optimize
-    end
-    # Ensure that all begin_group tokens have a correspondent end_group.
-    #
-    # TODO: Test this!
-    def fix
-      raise NotImplementedError, 'Tokens#fix needs to be rewritten.'
-      # tokens = self.class.new
-      # # Check token nesting using a stack of kinds.
-      # opened = []
-      # for type, kind in self
-      #   case type
-      #   when :begin_group
-      #     opened.push [:begin_group, kind]
-      #   when :begin_line
-      #     opened.push [:end_line, kind]
-      #   when :end_group, :end_line
-      #     expected = opened.pop
-      #     if [type, kind] != expected
-      #       # Unexpected end; decide what to do based on the kind:
-      #       # - token was never opened: delete the end (just skip it)
-      #       next unless opened.rindex expected
-      #       # - token was opened earlier: also close tokens in between
-      #       tokens << token until (token = opened.pop) == expected
-      #     end
-      #   end
-      #   tokens << [type, kind]
-      # end
-      # # Close remaining opened tokens
-      # tokens << token while token = opened.pop
-      # tokens
-    end
-    def fix!
-      replace fix
-    end
-    # TODO: Scanner#split_into_lines
-    #
-    # Makes sure that:
-    # - newlines are single tokens
-    #   (which means all other token are single-line)
-    # - there are no open tokens at the end the line
-    #
-    # This makes it simple for encoders that work line-oriented,
-    # like HTML with list-style numeration.
-    def split_into_lines
-      raise NotImplementedError
-    end
-    def split_into_lines!
-      replace split_into_lines
-    end
     # Split the tokens into parts of the given +sizes+.
     #
     # The result will be an Array of Tokens objects. The parts have

data/lib/coderay/tokens_proxy.rb CHANGED Viewed

@@ -1,7 +1,23 @@
 module CodeRay
-  class TokensProxy < Struct.new :input, :lang, :options, :block
+  # The result of a scan operation is a TokensProxy, but should act like Tokens.
+  #
+  # This proxy makes it possible to use the classic CodeRay.scan.encode API
+  # while still providing the benefits of direct streaming.
+  class TokensProxy
+    attr_accessor :input, :lang, :options, :block
+    # Create a new TokensProxy with the arguments of CodeRay.scan.
+    def initialize input, lang, options = {}, block = nil
+      @input   = input
+      @lang    = lang
+      @options = options
+      @block   = block
+    end
+    # Call CodeRay.encode if +encoder+ is a Symbol;
+    # otherwise, convert the receiver to tokens and call encoder.encode_tokens.
     def encode encoder, options = {}
       if encoder.respond_to? :to_sym
         CodeRay.encode(input, lang, encoder, options)
@@ -10,29 +26,30 @@ module CodeRay
       end
     end
+    # Tries to call encode;
+    # delegates to tokens otherwise.
     def method_missing method, *args, &blk
-      encode method, *args
+      encode method.to_sym, *args
     rescue PluginHost::PluginNotFound
       tokens.send(method, *args, &blk)
     end
+    # The (cached) result of the tokenized input; a Tokens instance.
     def tokens
       @tokens ||= scanner.tokenize(input)
     end
+    # A (cached) scanner instance to use for the scan task.
     def scanner
       @scanner ||= CodeRay.scanner(lang, options, &block)
     end
+    # Overwrite Struct#each.
     def each *args, &blk
       tokens.each(*args, &blk)
       self
     end
-    def count
-      tokens.count
-    end
   end
 end

data/lib/coderay/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/functional/basic.rb CHANGED Viewed

@@ -148,7 +148,9 @@ more code  # and another comment, in-line.
       end
     end
     assert_equal 'reserved', CodeRay::TokenKinds[:reserved]
-    assert_equal false, CodeRay::TokenKinds[:shibboleet]
+    assert_warning 'Undefined Token kind: :shibboleet' do
+      assert_equal false, CodeRay::TokenKinds[:shibboleet]
+    end
   end
   class Milk < CodeRay::Encoders::Encoder

data/test/functional/examples.rb CHANGED Viewed

@@ -34,8 +34,8 @@ end
     # output as standalone HTML page (using CSS classes)
     page = CodeRay.scan('puts "Hello, world!"', :ruby).page
-    assert page[<<-PAGE]
-<body style="background-color: white;">
+    assert_match <<-PAGE, page
+<body>
 <table class="CodeRay"><tr>
   <td class="line-numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre>

data/test/functional/suite.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 require 'test/unit'
+$VERBOSE = $CODERAY_DEBUG = true
 $:.unshift File.expand_path('../../../lib', __FILE__)
 require 'coderay'

metadata CHANGED Viewed

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: coderay
 version: !ruby/object:Gem::Version
-  version: 1.0.0.864rc3
-  prerelease: 9
+  version: 1.0.1
+  prerelease:
 platform: ruby
 authors:
 - Kornelius Kalnbach
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-10-19 00:00:00.000000000Z
 dependencies: []
 description: Fast and easy syntax highlighting for selected languages, written in
   Ruby. Comes with RedCloth integration and LOC counter.
@@ -21,6 +21,10 @@ extensions: []
 extra_rdoc_files:
 - README_INDEX.rdoc
 files:
+- LICENSE
+- README_INDEX.rdoc
+- Rakefile
+- lib/coderay.rb
 - lib/coderay/duo.rb
 - lib/coderay/encoder.rb
 - lib/coderay/encoders/_map.rb
@@ -29,10 +33,10 @@ files:
 - lib/coderay/encoders/debug.rb
 - lib/coderay/encoders/div.rb
 - lib/coderay/encoders/filter.rb
+- lib/coderay/encoders/html.rb
 - lib/coderay/encoders/html/css.rb
 - lib/coderay/encoders/html/numbering.rb
 - lib/coderay/encoders/html/output.rb
-- lib/coderay/encoders/html.rb
 - lib/coderay/encoders/json.rb
 - lib/coderay/encoders/lines_of_code.rb
 - lib/coderay/encoders/null.rb
@@ -62,16 +66,16 @@ files:
 - lib/coderay/scanners/groovy.rb
 - lib/coderay/scanners/haml.rb
 - lib/coderay/scanners/html.rb
-- lib/coderay/scanners/java/builtin_types.rb
 - lib/coderay/scanners/java.rb
+- lib/coderay/scanners/java/builtin_types.rb
 - lib/coderay/scanners/java_script.rb
 - lib/coderay/scanners/json.rb
 - lib/coderay/scanners/php.rb
 - lib/coderay/scanners/python.rb
 - lib/coderay/scanners/raydebug.rb
+- lib/coderay/scanners/ruby.rb
 - lib/coderay/scanners/ruby/patterns.rb
 - lib/coderay/scanners/ruby/string_state.rb
-- lib/coderay/scanners/ruby.rb
 - lib/coderay/scanners/sql.rb
 - lib/coderay/scanners/text.rb
 - lib/coderay/scanners/xml.rb
@@ -83,10 +87,6 @@ files:
 - lib/coderay/tokens.rb
 - lib/coderay/tokens_proxy.rb
 - lib/coderay/version.rb
-- lib/coderay.rb
-- Rakefile
-- README_INDEX.rdoc
-- LICENSE
 - test/functional/basic.rb
 - test/functional/examples.rb
 - test/functional/for_redcloth.rb
@@ -106,13 +106,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: coderay
 rubygems_version: 1.8.10