hlt-site_builder 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 736ec078a25c113112cc9e9a60739084d375a101
-  data.tar.gz: 57319bf9238f5251998921206e7cf3776ec57f6d
+  metadata.gz: 2378bae5a9396bdcce8195b6b33eeedcf075e7ca
+  data.tar.gz: 3e10f98d2cd9eb62849e999dbee056daa37b397d
 SHA512:
-  metadata.gz: 93993343fe83f6062e06bbb5b7bb161b7ac452c09f9ca4bc5acae544cc9d32b9dac12a4d7c29609c92f4614584741661f9aab93b52f7b0dd52d4c8eadf20c120
-  data.tar.gz: 58c6becf585cd09acce00d73b4286101baae1c4e2e1c3ceedc371c897e2b3c38db841ccc0d38e25b09d5b4d15aa15cabe116ce2e91e00a61c84fafe9c86cbe4f
+  metadata.gz: 50a61a3738792d6b7b2afc9bb2057763947ac7a967e9163b17bf4f93a530c7ed925696981645fa3f9d2986acf70d6c4f130df7f50b8e396117da21f3e5113e14
+  data.tar.gz: 7a6d7088ca71c3c8197480d5e867f0337c70172f77c3aa5b44ffd59ce2e68a68127fb665d50890785834fda402d32d40ceac36c0f237cb855a4c28378806d40b

data/lib/hlt-site_builder.rb

@@ -37,6 +37,7 @@ class HltSiteBuilder
     end
 
     keys = @dynarex.records.keys
+
     @template = keys.shift
 
     @pages = keys.inject({}) do |r, x| 
@@ -53,14 +54,8 @@ class HltSiteBuilder
 
   def docs_each()
 
-    pages = @pages.to_a
-    pages[0][0] = 'index'
-
-    pages.keys.each do |pg_name| 
-
-      filename = format_filename(pg_name)
-      doc = Rexle.new(File.read filename)
-      yield(filename, doc) 
+    self.pages_each do |filename, filecontents| 
+      yield(filename, Rexle.new(filecontents))
     end
 
   end
@@ -76,7 +71,8 @@ class HltSiteBuilder
     if opt[:css] == true then
 
 
-      @opt[:style] = true 
+      @opt[:style] = true
+
       generate_pages @pages.keys, &blk
       @htc = HtmlToCss.new
 
@@ -90,7 +86,7 @@ class HltSiteBuilder
     end
 
     generate_pages @pages.keys, &blk
-    puts 'files generated'
+
   end
 
   def to_layout()  @htc.to_layout   end
@@ -100,7 +96,9 @@ class HltSiteBuilder
 
     pages = @pages.to_a
     pages[0][0] = 'index'
-    pages.keys.each do |pg_name| 
+    pages.each do |page| 
+      
+      pg_name = page[0]
       filename = format_filename(pg_name)
       content = File.read filename
       yield(filename, content) 
@@ -120,14 +118,14 @@ class HltSiteBuilder
   #
   def generate_pages(a, &blk)
 
-    container_id = @opt[:container_id]
+    container_selector = @opt[:container_selector]
 
     a.each do |name|
-
+      
       doc = @template.to_doc
-      doc2 = ("div {id: '#{container_id}'}\n" + @pages[name]).to_doc
+      doc2 = ("main\n" + @pages[name]).to_doc
 
-      e = doc.element("//div[@id='#{container_id}']")
+      e = doc.css(container_selector).first
       e2 = e.element('./.')
       
       # if there is child elements within the target element then we add
@@ -138,8 +136,9 @@ class HltSiteBuilder
           e2.insert_before node
         end
       else
-        e.insert_before doc2.root
-        e.delete
+        doc2.root.elements.each do |node|
+          e.add node
+        end
       end
 
       title = doc.root.element('head/title')
@@ -152,11 +151,17 @@ class HltSiteBuilder
       filename = format_filename(name)
 
       if @opt[:style] == false then
-        doc.root.xpath('//.[@style]').each {|e| e.attributes.delete :style}
+        
+        doc.root.xpath('//.[@style]').each do |e| 
+          
+          unless e.attributes[:style][/^clear:/] then
+            e.attributes.delete :style 
+          end
+        end
       end
 
       #puts 'saving ' + filename
-      File.write filename, doc.content
+      File.write filename, doc.content(pretty: true)
     end
 
     FileUtils.mv f(a[0]), 'index.html'
@@ -167,7 +172,7 @@ end
 
 if __FILE__ == $0 then
 
-  hsb = HltSiteBuilder.new('pages.txt', style: false, container_id: 'main')
+  hsb = HltSiteBuilder.new('pages.txt', style: false, container_selector: 'main')
   hsb.generate css: true
 =begin
   hsb.pages_each do |filename, buffer| 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt-site_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   mkWEixIobTEV/FcfiNCEpKNfCA5llUve7iRh1zARAkDT0EYTHgRtftY87yBNEDPN
   GFcWHnpHdfRUPw==
   -----END CERTIFICATE-----
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hlt
@@ -42,7 +42,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.90
+        version: 1.2.94
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.90
+        version: 1.2.94
 - !ruby/object:Gem::Dependency
   name: html-to-css
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.1.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="