bookfile 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4311caaae87c30b6ac285adb85a3495ddd177eaa
-  data.tar.gz: 4645efcb233160f0078bcc2d8919cda290d3c981
+  metadata.gz: 74b333b35376fce6fd4afde31fae74dab34ba163
+  data.tar.gz: 61c75af3c41c19bf6e722e061512fe19082548f9
 SHA512:
-  metadata.gz: c575efd458e00c39081e84ea811300de44736b5f79e7a44599438ceac6323f597fe10fbbdd468f06592244cdfe757eab6fb48e45b96be909d58388a02c55969c
-  data.tar.gz: b1df8f6c2766d0db1b51363c89ee8df6708d077fa28559a6f9eef674f18a781dfec4cd806dc8669500e9c68a04a251877f6718e4790fd354a8eaef82396a9438
+  metadata.gz: c221e53441b7f2ea5ef14ceb20fa9b967767f37dca002616c7da188ea4fb1b08a46e6e667fcde76619e032d5103a98b3d66edbc91e8e690dc3f4e900d58ed682
+  data.tar.gz: f2d98a2a3927abd4f265075473b3041259a75d772b9c43536dc330c03a0fac002e0ea4a1eccfe8e653ddfc24bffdf2171c91d25f855e79c09c05c087edebf3e4

data/lib/bookfile/book/book.rb

@@ -16,21 +16,30 @@ class PageCtx    ## page context for evaluate
 
   include HybookHelper
 
+  attr_reader :content
+
   def initialize( config )   ## BookConfig
-    ## pass in templates_dir here
-    ##   ## TEMPLATES_DIR = ??  -- passed in as config
-    ##  or pass in class to help find templates???
-    ##  TemplateMan( ??? )
-    @config = config
+    @config  = config
+    @content = ''    ## rename to body,text,buf,out - why, why not???
+    
+    ## track rendering (stack) level - only output if in top-level (1)
+    ##  -- check/todo - is there a better way???
+    ##  use a (separate) partial method  or keep using on render method etc. ???
+    ##   any other ways??
+    @level = 0
   end
 
+
   def write( text )
     puts "*** write:"
-    puts "  #{text}"
+    ## puts "  #{text}"
+    
+    @content << text
   end
 
   def render( name, opts={}, locals={} )  ## possible? - make opts required ??
-    puts "*** render #{name}:"
+    @level +=1
+    puts "*** render(#{@level})  #{name}:"
 
     tmpl  = File.read_utf8( "#{@config.templates_dir}/#{name}.md" )  ## name e.g. includes/_city
 
@@ -42,7 +51,15 @@ class PageCtx    ## page context for evaluate
 
     text  = TextUtils::PageTemplate.new( tmpl ).render( binding )
 
-    puts "  #{text}"
+    ## note: only add text to content if top-level render call
+    ##   (do NOT add for partials/includes/etc.) 
+    if @level == 1
+      @content << text
+    end
+
+    @level -=1
+
+    ## puts "  #{text}"
     text
   end
 
@@ -68,17 +85,25 @@ end  # class PageCtx
 
 class BookCtx
 
-  def initialize( config )
-    @config = config
+  def initialize( config, book_opts={} )
+    @config  = config
+    ## todo: add opts to config ???
+    ##  e.g. title, layout, inline ??? - why? why not??
+    @builder = BookBuilder.new( config.pages_dir, book_opts )
   end
 
-  def page( name, opts={} )  ## &block
-    puts "[BookCtx#page] #{name} opts:#{opts.inspect}"
-    
+  ## change name to path - why, why not??
+  def page( name, page_opts={} )  ## &block
+    puts "[BookCtx#page] #{name} opts:#{page_opts.inspect}"
+
     puts "[BookCtx#page] before yield"
-    ctx = PageCtx.new( @config )   ## pass along book configs
+    ctx = PageCtx.new( @config )   ## pass along self (bookctx) as parent
     yield( ctx )  ## same as - ctx.instance_eval( &block )
     puts "[BookCtx#page] after yield"
+
+    @builder.page( name, page_opts ) do |page|
+      page.write ctx.content
+    end
   end
 
 end  # class BootCtx
@@ -92,9 +117,19 @@ class BookDef
   end
 
   def build( unzip_dir )
-    config = BookConfig.new( templates_dir: "#{unzip_dir}/_templates" )
-    ctx = BookCtx.new( config )
-    @proc.call( ctx )  ## same as - ctx.instance_eval( &@codeblock ) -- use instance_eval - why, why not??
+    defaults = {  templates_dir: "#{unzip_dir}/_templates",
+                  pages_dir:     "#{unzip_dir}/_pages"  }
+
+    ## note:
+    ##   (auto)build two versions:
+    ##   1) multi-page version - for (easy) browsing
+    ##   2) all-in-one-page version - for (easy)pdf conversion
+
+    multi_page_ctx = BookCtx.new( BookConfig.new( defaults ))
+    @proc.call( multi_page_ctx )  ## same as - ctx.instance_eval( &@codeblock ) -- use instance_eval - why, why not??
+
+    one_page_ctx = BookCtx.new( BookConfig.new( defaults ), inline: true )
+    @proc.call( one_page_ctx )  ## same as - ctx.instance_eval( &@codeblock ) -- use instance_eval - why, why not??
   end
 end  # class BookDef
 

data/lib/bookfile/book/config.rb

@@ -11,7 +11,12 @@ class BookConfig
   def templates_dir
     @hash[:templates_dir]
   end
+  
+  def pages_dir
+    @hash[:pages_dir]
+  end
 end
 
 
 end # module Bookfile
+

data/lib/bookfile/helpers/markdown.rb

@@ -19,21 +19,14 @@ end
 def columns_begin( opts={} )
   # note: will add  columns2 or columns3 etc. depending on columns option passed in
 
-  columns = opts[:columns] || 2
+  ## note: default was 2 (columns) for world.db, 300 (px) for beer.db
+  columns = opts[:columns] || 300
 
-  buf = ''
-  buf << "\n"
-  buf << "<div class='columns#{columns}' markdown='1'>\n"
-  buf << "\n"
-  buf
+  "\n<div class='columns#{columns}' markdown='1'>\n\n"
 end
 
 def columns_end
-  buf = ''
-  buf << "\n"
-  buf << "</div>\n"
-  buf << "\n"
-  buf
+  "\n</div>\n\n"
 end
 
 ### todo: check if we can use columns simply w/ yield for body ??

data/lib/bookfile/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Bookfile
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end
 
 ## add module alias

data/test/bookfile/beer.rb

@@ -9,13 +9,16 @@ beer adapter: 'sqlite3', database: './beer.db'
 
 book do |b|
 
-  ### generate what's news in 2014
+  ## todo/fix:
+  ##  find a way to pass along opts - why, why not??
+  opts = {}
 
-  years = [2014,2013,2012,2011,2010]
+  ### generate what's news in 2015
+  years = [2015,2014,2013,2012,2011,2010]
   years.each do |year|
     b.page( "#{year}", title:  "What's News in #{year}?",
                        id: "#{year}" ) do |page|
-      page.write render_whats_news_in_year( year, opts )
+      page.render_whats_news_in_year( year, opts )
     end
   end
 
@@ -24,21 +27,21 @@ book do |b|
 
   b.page( 'breweries', title: 'Breweries Index',
                         id: 'breweries' ) do |page|
-    page.write render_breweries_idx( opts )
+    page.render_breweries_idx( opts )
   end
 
   ### generate beers index
 
   b.page( 'beers', title: 'Beers Index',
                    id: 'beers' ) do |page|
-    page.write render_beers_idx( opts )
+    page.render_beers_idx( opts )
   end
 
   ### generate brands index
 
   b.page( 'brands', title: 'Brands Index',
                     id: 'brands' ) do |page|
-    page.write render_brands_idx( opts )
+    page.render_brands_idx( opts )
   end
 
 
@@ -46,7 +49,7 @@ book do |b|
 
   b.page( 'index', title: 'Contents',
                    id: 'index' ) do |page|
-    page.write render_toc( opts )
+    page.render_toc( opts )
   end
 
 
@@ -66,7 +69,7 @@ book do |b|
     puts "path=#{path}"
     b.page( path, title: "#{country.title} (#{country.code})",
                   id:    "#{country.key}" ) do |page|
-      page.write render_country( country, opts )
+      page.render_country( country, opts )
     end
 
     ## todo - add  b.divider() - for inline version - why, why not ????

data/test/bookfile/world.rb

@@ -30,11 +30,20 @@ end
 =end
 
 
+#################
+# self.class.name (in top level): Bookfile::Builder
+# self.class.name (in book block): Bookfile::Builder
+# self.class.name (in page block): Bookfile::Builder
+
 puts "self.class.name (in top level): #{self.class.name}"
 
 
 book do |b|
- 
+
+  ## todo/fix:
+  ##  find a way to pass along opts - why, why not??
+  opts = {}
+
   puts "before first page"
   puts "self.class.name (in book block): #{self.class.name}"
  
@@ -45,7 +54,7 @@ book do |b|
     page.write "render_toc() 2x"
     page.write "render_toc() 3x"
 
-    page.render_toc( {} )
+    page.render_toc( opts )
     ## render :toc   -- auto includes opts???
 
     puts "self.class.name (in page block): #{self.class.name}"
@@ -69,7 +78,7 @@ book do |b|
       b.page path, title: "#{country.name} (#{country.code})",
                id:    country.key do |page|
         page.write "render_country(#{country.name})"  ## render_country( country )  ## render_country( country, opts )
-        page.render_country( country, {} )  ### fix: auto-include opts in render - how??
+        page.render_country( country, opts )  ### fix: auto-include opts in render - how??
       end
     end
   end

data/test/test_world.rb

@@ -14,8 +14,8 @@ class TestWorld < MiniTest::Test
 
     bookfile = Bookfile::Bookfile.load_file( './test/bookfile/world.rb' )
 
-#    bookfile.download   # download book packages (templates n scripts)
-    bookfile.unzip( book_templates_unzip_dir ) 
+    ## bookfile.download   # download book packages (templates n scripts)
+    ## bookfile.unzip( book_templates_unzip_dir ) 
 
     bookfile.prepare( book_templates_unzip_dir )
     bookfile.connect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookfile
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props