hobby-pages 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463049d724d82260a66dc52ae4ad9d8f4d8f32e4
-  data.tar.gz: d6d67c9f4f053c4031d72810ee9c2651fd0d8ee0
+  metadata.gz: 6e6db678112c7d9a11a8281c4131e607e9b1d155
+  data.tar.gz: 6df58f7fa8122d8e7865af55536854282161292e
 SHA512:
-  metadata.gz: 9b580ee8384a29b83a93c1b47745bf2adfd1b31a3ea94ed2d2346765785927b1edb8a328a6a4c3dad03545ce472d9f7b54c1539f44bf810f56574adfa9c1079c
-  data.tar.gz: f04bf5352ef488ac0bfaf6c56c18b36f93798290ae6dd3afcaf82a51d9f974dd76ce4f9a1500a5018fbfe9bfc33d3944575bb7fbf958f26145b69a627b7f87db
+  metadata.gz: c836329640bebae055ba35dfb703333812b6bbbd9f95a06f097e2983066cc7fa017adab173affb548b336b4e7d741aa15c544802068f2de0fbbf991398642720
+  data.tar.gz: 9ae7499ce9b23776f3dbd712d64fe3b354b34e4ac0b75ea3bdd49595da8af17206ef423db4d839192d58d2a87cf54bad7bd21e4ab08e30051f452ee4e796dd18

data/hobby-pages.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |g|
   g.name    = 'hobby-pages'
   g.files   = `git ls-files`.split($/)
-  g.version = '0.0.3'
+  g.version = '0.0.4'
   g.summary = 'A Hobby app to return a bunch of HTML pages from a directory.'
   g.authors = ['Anatoly Chernow']
 

data/lib/hobby/pages.rb

@@ -46,6 +46,35 @@ module Hobby
       end
     end
 
+    def css_tag
+      @css_tag ||= if css
+                     "<style>#{css}</style>"
+                   else
+                     ''
+                   end
+    end
+
+    def js_tag
+      @js_tag ||= if js
+                    "<script>#{js}</script>"
+                  else
+                    ''
+                  end
+    end
+
+    def css
+      style_file = "#{directory}/css/pages/#{name}.sass"
+      if File.exist? style_file
+        sass_string = IO.read style_file
+        load_path = "#{directory}/css/pages/#{name}"
+        Sass::Engine.new(sass_string, load_paths: [load_path]).render
+      end
+    end
+
+    def js
+      directory.sprockets["pages/#{name}.js"]
+    end
+
     class Directory
       def initialize root
         @root = root
@@ -97,25 +126,13 @@ module Hobby
 
           script_file = "#{directory.to_s}/html/ruby/#{name}.rb"
           @script = IO.read script_file if File.exist? script_file
-
-          style_file = "#{directory.to_s}/css/pages/#{name}.sass"
-          if File.exist? style_file
-            sass_string = IO.read style_file
-            load_path = "#{directory.to_s}/css/pages/#{name}"
-            css = Sass::Engine.new(sass_string, load_paths: [load_path]).render
-            @css_tag = "<style id='for_page_#{name}'>#{css}</style>"
-          end
-
-          if js = directory.sprockets["pages/#{name}.js"]
-            @js_tag = "<script id='js_for_page_#{name}'>#{js}</script>"
-          end
         end
 
         def render app
           app.instance_eval @script if @script
 
           @layout.render app do
-            "#{@css_tag}#{@js_tag}#{@template.render app}"
+            @template.render app
           end
         end
       end

data/spec/dirs/main/config.ru

@@ -0,0 +1,3 @@
+require 'hobby/pages'
+
+run Hobby::Pages.new '.'

data/spec/dirs/main/html/layouts/default.slim

@@ -5,6 +5,8 @@ html
       title= @head
     - else
       title Default layout
+    == css_tag
+    == js_tag
 
   body
     == yield

data/spec/main_spec.rb

@@ -51,7 +51,7 @@ describe Hobby::Pages do
     response = @conn.get path: '/with-css'
     doc = Nokogiri.HTML response.body
 
-    text = doc.at_css('style#for_page_with-css').text
+    text = doc.at_css('style').text
     expect(text).to eq "input {\n  width: 100%; }\n"
   end
 
@@ -59,7 +59,7 @@ describe Hobby::Pages do
     response = @conn.get path: '/with-js'
     doc = Nokogiri.HTML response.body
 
-    text = doc.at_css('script#js_for_page_with-js').text
+    text = doc.at_css('script').text
     expect(text).to eq <<~S
       (function() {
         alert('something');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobby
@@ -104,6 +104,7 @@ files:
 - Gemfile
 - hobby-pages.gemspec
 - lib/hobby/pages.rb
+- spec/dirs/main/config.ru
 - spec/dirs/main/css/pages/with-css.sass
 - spec/dirs/main/css/pages/with-css/width.sass
 - spec/dirs/main/html/layouts/default.slim