preproc 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0c96dff9fae900457ec375618a44563c3cd9e7
-  data.tar.gz: 9aee9864313c95764be72bfd825bc33ebeae7d55
+  metadata.gz: 010e8983d1847ac0c76197c74740339c3a8d8242
+  data.tar.gz: d219dec85408bcaffb072393780bc8eed62af109
 SHA512:
-  metadata.gz: 40030d64c5d5ca4e6191f6bf75496ca3a53bbfe9787ab18ecff5f5e5ae371261dffcad9ab4a43635e55a696cb6a22c70dd63cd451d99e39bd14933ca11e5eeb0
-  data.tar.gz: cecc2b5597007d2f03bc2da8b1bfb77189fb0bc66d5a14e2fc978b6f81556d2eb69e8ae1956e666bfa1e686f1da4785f7ae99c3c60e8cf758afe916e6cbb4777
+  metadata.gz: cf7a60481e2fd36a650c4c4ef8816449bd36388fd74a0faa4838b2dfab6d3fa84ee8ec7fecbc09b700867320f26d3ddae8610cd81639bbd94f4440ba7567b8bf
+  data.tar.gz: 5476cacabfac6632042ed5c02a4d6259c8bad143a3f845525fee70b0faa754286ceefcdac90b7e90c81cbedeb8e9f46cfbee16c1fa6607560acdffa1c183b1e5

data/lib/preproc.rb

@@ -10,6 +10,106 @@ require 'fetcher'
 require 'preproc/version'   # let version always go first
 
 
+
+module Preproc
+
+  #############
+  ### todo/fix: use/find better name? - e.g. Fetcher.read_utf8!()  move out of global ns etc.
+  ##    move to Fetcher gem; (re)use!!! remove here
+  ###   e.g. use Fetch.read_utf8!()  e.g. throws exception on error
+  ##                   read_blob!()
+  def self.fetcher_read_utf8!( src )
+    worker = Fetcher::Worker.new
+    res = worker.get_response( src )
+    if res.code != '200'
+      puts "sorry; failed to fetch >#{src} - HTTP #{res.code} - #{res.message}"
+      exit 1
+    end
+
+    ###
+    # Note: Net::HTTP will NOT set encoding UTF-8 etc.
+    #  will be set to ASCII-8BIT == BINARY == Encoding Unknown; Raw Bytes Here
+    #  thus, set/force encoding to utf-8
+    txt = res.body.to_s
+    txt = txt.force_encoding( Encoding::UTF_8 )
+    txt
+  end
+
+
+class IncludeReader
+
+  ###
+  ## concat files w/ @include directive
+  include LogUtils::Logging
+
+  def self.from_url( src )
+    uri = URI.parse( src )
+    text = Preproc.fetcher_read_utf8!( src )
+
+    base_path = uri.path[0..uri.path.rindex('/')]  # get everything upto incl. last slash (/)
+    self.new( text, base: "#{uri.scheme}://#{uri.host}:#{uri.port}#{base_path}" )
+  end
+
+
+  def initialize( text, opts={} )
+    @text = text
+    @base = opts[:base]
+
+    logger.debug("  base: #{@base}")
+  end
+
+  def read
+    preproc( @text )
+  end
+
+
+private
+  def preproc( text )
+    buf = ''
+    text.each_line do |line|
+      ### e.g. allows 
+      ##  @include 'test'  or
+      ##  @INCLUDE "test"
+      ##  note: for now we strip (allow) leading and trailing spaces (e.g. [ ]*)
+      ##
+      ##  todo/allow
+      ##  @include( test ) - alternative syntax - why? why not?
+      if line =~ /^[ ]*@include[ ]+("|')(.+?)\1[ ]*$/i
+        logger.info( "  try to include '#{$2}'")
+        ## buf << preproc( 'include here' )
+        buf << preproc( read_include( $2 ) )
+        buf << "\n"
+      else
+        buf << line
+        buf << "\n"
+      end
+    end
+    buf
+  end
+
+  def read_include( name )
+    ## for now assume fetch via url
+    ## note: assume partial e.g. add leading underscore (_)
+    ##   e.g. test => _test.ini
+
+    src = "#{@base}_#{name}.ini"
+    logger.info( "  try to fetch include #{src}")
+
+    Preproc.fetcher_read_utf8!( src )
+  end
+
+end # class IncludeReader
+
+
+end  # module Preproc
+
+
+## add top level (convenience) alias
+InclPreproc = Preproc::IncludeReader
+IncludePreproc = Preproc::IncludeReader
+
+
+
 ## say hello
 puts Preproc.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)
 

data/lib/preproc/version.rb

@@ -3,8 +3,8 @@
 module Preproc
 
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
-  PATCH = 1
+  MINOR = 1
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/test_incl.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_incl.rb
+#  or better
+#     rake test
+
+
+require 'helper'
+
+
+class TestIncl < MiniTest::Test
+
+  def test_ruby
+    src = 'https://raw.github.com/feedreader/planet-ruby/master/ruby.ini'
+    txt = InclPreproc.from_url( src ).read
+    pp txt
+
+    assert true    ## if we get here it should work
+  end
+
+end # class TestIncl
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: preproc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
@@ -76,12 +76,14 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
 - lib/preproc.rb
 - lib/preproc/version.rb
+- test/test_incl.rb
 homepage: https://github.com/rubylibs/preproc
 licenses:
 - Public Domain
@@ -108,4 +110,5 @@ rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: preproc - simple preprocessor (lets you include files in files in files etc.)
-test_files: []
+test_files:
+- test/test_incl.rb