dot_why 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39eb8e2e9d1c535efe41ff75c1db523e8d2d2105
-  data.tar.gz: 71f1e98fcd52dbebe24278e43808d15b6fc2cb80
+  metadata.gz: b6fb94638063c0d9a67d3b79a0bbdd7e49764fde
+  data.tar.gz: 4f1dda2ccdf62014e3f061e6a28911cc8da77293
 SHA512:
-  metadata.gz: b463ed51aca8275ce7057890b56774f1555991f3f435750d1b789921ca24e91befe91f7f58f8bd991ef6e87bc794df20f80dbf34b8eefcec7e300a526a9be7e0
-  data.tar.gz: be89a4120da9a7ffe4eea11c6f2b23678b5ccee163065482473949a80fbad7ef20389306031a3671168d22e34d6322d01b3edd49b09842599e75042a6c2be43d
+  metadata.gz: 41b8237b838df21a51e6bc5af28d6ad205f39ca33a9b7690c42d641f94b37616ed7bea4bf2b11b4b7b9c1871f2abe5ab31e3ce3d4b5aa3a973b533858981b2c3
+  data.tar.gz: 97993ed44ea0610e210941c551a9b232048cfb2e71d1eb8f9a073fdd4c6e682b6448dab69b2eae49c3b6b1f01da1990b0daa3f2afa0b9f57e4b35dd8fac89db2

data/lib/dot_why.rb

@@ -8,17 +8,25 @@ module Dot_Why
 
     class << self # ================================================================
 
-      def blocks *args
-        args.each do |word|
-          define_method(word.to_sym) do |pos = :bottom, &b|
-          block word, pos, &b
-          end
-        end
+      attr_reader :sections
+
+      def def_sections *args
+        @sections ||= {}
+        args.each { |v|
+          @sections[v] = true
+        }
       end
 
+      alias_method :def_section, :def_sections
+
     end # ==========================================================================
 
-    blocks :main
+    def_section :main
+
+    def def_sections *args
+      self.class.def_sections *args
+    end
+    alias_method :def_section, :def_sections
 
     def initialize raw_file, *args
       @file = file = File.expand_path(raw_file).sub(".rb", "") + '.rb'
@@ -30,44 +38,70 @@ module Dot_Why
       @file
     end
 
-    def block raw_name, pos = :bottom, *args, &b
-      name = raw_name.to_sym
-      if (b)
-        @_blocks[name] ||= []
-        if (pos == :top)
-          @_blocks[name].unshift(b)
-        elsif (pos == :replace)
-          @_blocks[name] = [b]
-        else
-          @_blocks[name].push(b)
-        end
-      else
-        (@_blocks[name] || []).each  do |bl|
-          bl.call
-        end
-      end
+    def eval_main
+      eval(File.read("#{@file}"), nil, @file, 1)
+    end
+
+    def content
+      main
     end
 
-    def styles *args, &b
-      @_link_type = :css
-      block :styles, *args, &b
-      @_link_type = nil
+    def use_file name
+      @files ||= {}
+      raise "File already used: #{name.inspect}" if @files[name]
+      @files[name] = true
+      name
     end
 
-    def link *args
-      if (@_link_type == :css && args.length == 1 && args[0].instance_of?(String))
-        super(:rel=>"stylesheet", :type=>"text/css", :href=>args[0])
+    def section name, pos = :bottom, *args, &b
+      raise "Section not defined: #{name}" if !self.class.sections[name]
+
+      if not block_given?
+        (@_blocks[name] || []).each  { |bl| bl.call }
+        return
+      end
+
+      @_blocks[name] ||= []
+      if (pos == :top)
+        @_blocks[name].unshift(b)
+      elsif (pos == :replace)
+        @_blocks[name] = [b]
       else
-        super
+        @_blocks[name].push(b)
       end
+    end # === def section
+
+    def view_name
+      @view_name ||= begin
+                       base = File.basename(main_file).sub(".rb", '')
+                       dir  = File.dirname(main_file)
+                       "#{dir}/#{base}"
+                     end
     end
 
-    def eval_main
-      eval(File.read("#{@file}"), nil, @file, 1)
+    # === automate some tags =================================================================
+
+    def stylesheet name
+      filename = if name[/\:/]
+                   name
+                 else
+                   if name['/']
+                      "#{name}.css?#{STAMP}"
+                    else
+                      "/css/#{name}.css?#{STAMP}"
+                    end
+                 end
+      link(:rel=>'stylesheet', :type=>'text/css', :href=>use_file(filename), :media=>'screen')
     end
 
-    def content
-      main
+    def script *args
+      if args.size == 1 && args.first.is_a?(String)
+        name = args.first
+        full = "#{name}.js"
+        super(:type=>"text/javascript", :src=>"#{use_file full}")
+      else
+        super
+      end
     end
 
   end # === Layout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dot_why
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - da99