codeless_code 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc18a71aa3e43895db1c702116523d456e8f583efcb341e4c8eb74d7a764a22e
-  data.tar.gz: '05595e53a98c72b33a7d776bdd4f5795ba608d7c6b333b6d6cc6b67308e57828'
+  metadata.gz: 9db33a7d878ec62fe6764ac8c19e36c54e79b27bd6a5a27c74c2ddf3ac339105
+  data.tar.gz: 02c2096353f43e96970ab65b9f38de50f0f27cb3c4e018cb4beae317241c29eb
 SHA512:
-  metadata.gz: a884f539c917ad7d2c9e1a1aac1b11a29abd8f28c4a9cb0d5418cc3a7f9c7602e11ff2d962b796557dce82a4e85e84d350224f18ecefc3e07f87d0c55317c37b
-  data.tar.gz: 4000cd5a1e2613e04c0525fdd382b4c779e4b381b6c90d5b06a805935d545529793358d47794ae58851b215a4412983f6fa4894554ccf02f2c8731d2a0b99527
+  metadata.gz: 11f14612021cd8c058a288094f8da15aebc7468406eae664c2f9a92a79f444b2fda2fd2b9e608b7ba57b38c29ef0a64a6c1c7e418369753874ceeb4489423b9e
+  data.tar.gz: 6c1c83e013f53e93494a92b18a0c2348eeda737d095b4598dd5dde37ca32a2b44b4f04da2e7a8099726801c186f3fbe460564ce93778ed2873fecfac06098e55

data/README.md

@@ -33,11 +33,12 @@ codeless_code -h        # get help
 There are different translations available, but different people
 
 ```sh
+codeless_code -p /some/dir         # source the fables from a different folder
 codeless_code --list-translations  # see what languages you can use
 codeless_code -L zh                # list fables translated into Chinese
 codeless_code -L ru -R edro        # list fables translated into Russian by edro
 
-codeless_code -L fr --daily        # Print today's French fable
+codeless_code -L fr --daily        # print today's French fable
 ```
 
 ### Filtering

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/codeless_code.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: codeless_code 0.1.4 ruby lib
+# stub: codeless_code 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "codeless_code".freeze
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -1492,6 +1492,8 @@ Gem::Specification.new do |s|
     "lib/codeless_code/filters/lang.rb",
     "lib/codeless_code/filters/translator.rb",
     "lib/codeless_code/formats/base.rb",
+    "lib/codeless_code/formats/plain.rb",
+    "lib/codeless_code/formats/plain_generator.rb",
     "lib/codeless_code/formats/raw.rb",
     "lib/codeless_code/formats/term.rb",
     "lib/codeless_code/formats/term_generator.rb",

data/lib/codeless_code/cli.rb

@@ -70,8 +70,9 @@ module CodelessCode
 
     def output_format
       case options[:format]
-      when 'raw' then Formats::Raw
-      else Formats::Term
+      when 'plain' then Formats::Plain
+      when 'raw'   then Formats::Raw
+      else              Formats::Term
       end
     end
 
@@ -95,7 +96,7 @@ module CodelessCode
     end
 
     def version_str
-      format("%s %s\n\n%s\n\nSee <%s>", @command_name, VERSION,
+      format(['%s %s', '%s', 'See <%s>'].join("\n\n"), @command_name, VERSION,
              copyright_summary, 'https://github.com/sangster/codeless_code')
     end
 

data/lib/codeless_code/formats/base.rb

@@ -13,6 +13,9 @@
 #
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <https://www.gnu.org/licenses/>.
+require 'mediacloth'
+require 'nokogiri'
+
 module CodelessCode
   module Formats
     class Base
@@ -24,7 +27,14 @@ module CodelessCode
 
       protected
 
-      def formatted
+      def to_xhtml(str)
+        # MediaCloth expects XHTML-ish pages and chokes on ommited end tags
+        Nokogiri::HTML(str).css('body > *').to_xhtml
+      end
+
+      def from_wiki(str, generator)
+        return "" if str.length == 0
+        MediaCloth::wiki_to_html(str, generator: generator)
       end
     end
   end

data/lib/codeless_code/formats/plain.rb

@@ -0,0 +1,44 @@
+# codeless_code filters and prints fables from http://thecodelesscode.com
+# Copyright (C) 2018  Jon Sangster
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <https://www.gnu.org/licenses/>.
+require 'mediacloth'
+
+module CodelessCode
+  module Formats
+    class Plain < Base
+      def call
+        raw.split("\n\n")
+           .map { |str| from_wiki(to_xhtml(regex(str))) }
+           .join("\n\n")
+      end
+
+      private
+
+      def regex(str)
+        [
+          [/\/\/\w*$/, ''],
+          [/<i>([^<]+)<\/i>/mi, '\1'],
+          [/<b>([^<]+)<\/b>/mi, '\1'],
+          [/<a[^>]+>([^<]+)<\/a>/mi, '\1'],
+          [/\/(\w+)\//, '\1'],
+        ].inject(str) { |str, args| str = str.gsub(*args) }
+      end
+
+      def from_wiki(str)
+        super(str, PlainGenerator.new(self))
+      end
+    end
+  end
+end

data/lib/codeless_code/formats/plain_generator.rb

@@ -0,0 +1,157 @@
+# codeless_code filters and prints fables from http://thecodelesscode.com
+# Copyright (C) 2018  Jon Sangster
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <https://www.gnu.org/licenses/>.
+require 'mediacloth'
+
+module CodelessCode
+  module Formats
+    class PlainGenerator < MediaWikiWalker
+        def initialize(ctx)
+          @ctx = ctx
+        end
+
+        protected
+
+        def parse_wiki_ast(ast)
+          super(ast).join
+        end
+
+        #Reimplement this
+        def parse_paragraph(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_paste(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_formatted(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_text(ast)
+          ast.contents
+        end
+
+        #Reimplement this
+        def parse_list(ast)
+          ast.children.map do |c|
+            r = parse_list_item(c) if c.class == ListItemAST
+            r = parse_list_term(c) if c.class == ListTermAST
+            r = parse_list_definition(c) if c.class == ListDefinitionAST
+            r
+          end
+        end
+
+        #Reimplement this
+        def parse_list_item(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_list_term(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_list_definition(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_preformatted(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_section(ast)
+          parse_wiki_ast(ast).strip
+        end
+
+        #Reimplement this
+        def parse_link(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_internal_link(ast)
+          text = parse_wiki_ast(ast)
+          text.size > 0 ? text : ast.locator
+        end
+
+        #Reimplement this
+        def parse_resource_link(ast)
+          ast.children.map do |c|
+            parse_internal_link_item(c) if c.class == InternalLinkItemAST
+          end
+        end
+
+        #Reimplement this
+        def parse_category_link(ast)
+          ast.children.map do |c|
+            parse_internal_link_item(c) if c.class == InternalLinkItemAST
+          end
+        end
+
+        #Reimplement this
+        def parse_internal_link_item(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_table(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_table_row(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_table_cell(ast)
+          parse_wiki_ast(ast)
+        end
+
+        #Reimplement this
+        def parse_element(ast)
+          str = parse_wiki_ast(ast)
+          if ast.name == 'pre'
+            @ctx.generate(str.gsub(/\A\n*(.*?)\n*\z/m, '\1'))
+          else
+            str
+          end
+        end
+
+        #Reimplement this
+        def parse_template(ast)
+          ast.template_name
+        end
+
+        #Reimplement this
+        def parse_category(ast)
+          raise NotImplementedError
+        end
+
+        #Reimplement this
+        def parse_keyword(ast)
+          parse_wiki_ast(ast)
+        end
+    end
+  end
+end

data/lib/codeless_code/formats/term.rb

@@ -22,15 +22,10 @@ module CodelessCode
     class Term < Base
       def call
         raw.split("\n\n")
-           .map { |str| generate(to_xhtml(regex(str))) }
+           .map { |str| from_wiki(to_xhtml(regex(str))) }
            .join("\n\n")
       end
 
-      def to_xhtml(str)
-        # MediaCloth expects XHTML-ish pages and chokes on ommited end tags
-        Nokogiri::HTML(str).css('body > *').to_xhtml
-      end
-
       def regex(str)
         [
           [/\/\/\w*$/, ''],
@@ -42,9 +37,8 @@ module CodelessCode
         ].inject(str) { |str, args| str = str.gsub(*args) }
       end
 
-      def generate(str)
-        return "" if str.length == 0
-        MediaCloth::wiki_to_html(str, generator: TermGenerator.new(self))
+      def from_wiki(str)
+        super(str, TermGenerator.new(self))
       end
 
       def c(str)

data/lib/codeless_code.rb

@@ -30,10 +30,12 @@ module CodelessCode
   end
 
   module Formats
-    autoload  :Base,           'codeless_code/formats/base'
-    autoload  :Raw,            'codeless_code/formats/raw'
-    autoload  :Term,           'codeless_code/formats/term'
-    autoload  :TermGenerator,  'codeless_code/formats/term_generator'
+    autoload  :Base,            'codeless_code/formats/base'
+    autoload  :Plain,           'codeless_code/formats/plain'
+    autoload  :PlainGenerator,  'codeless_code/formats/plain_generator'
+    autoload  :Raw,             'codeless_code/formats/raw'
+    autoload  :Term,            'codeless_code/formats/term'
+    autoload  :TermGenerator,   'codeless_code/formats/term_generator'
   end
 
   module Renderers
@@ -67,7 +69,7 @@ module CodelessCode
     o.separator ''
     o.separator 'Options'
     o.string '-o', '--output', 'write to the given file. "-" for STDOUT'
-    o.string '-f', '--format', 'one of: raw, term (default)'
+    o.string '-f', '--format', 'one of: raw, plain, or term (default)'
     o.string '-p', '--path', 'path to directory of fables. ' \
                              'see github.com/aldesantis/the-codeless-code'
     o.boolean '--random', 'select one fable, randomly, from the filtered list'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeless_code
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jon Sangster
@@ -1718,6 +1718,8 @@ files:
 - lib/codeless_code/filters/lang.rb
 - lib/codeless_code/filters/translator.rb
 - lib/codeless_code/formats/base.rb
+- lib/codeless_code/formats/plain.rb
+- lib/codeless_code/formats/plain_generator.rb
 - lib/codeless_code/formats/raw.rb
 - lib/codeless_code/formats/term.rb
 - lib/codeless_code/formats/term_generator.rb