flowcation 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2e51ea8371dda9e9681420be1bf5952e652dca8
-  data.tar.gz: fa3c4f855cfd2c95a2cc2f526539ad8f9ec4bc8e
+  metadata.gz: c2b5f6400fc880f4774beb7b2cfd623f257cd6a3
+  data.tar.gz: d9174f5b83e5385b78e387eb841139327926f354
 SHA512:
-  metadata.gz: 8d69ea6443345fadfd78c7cb30fd52ddffdeaad28642e2bb8cfb419899e16767a9cb4e7124384c857f1532cdb5e436bb2fad2ccf141e828b1f5a29698377731f
-  data.tar.gz: fb4a591712a21717ea434d007562044c4abb90433646cf9d89d95d92c2be173d179d3233c24adf51e298145946bcab8ad88af2060718a77ebd668651bed4d218
+  metadata.gz: '078ccdfb5abd001c67da8e954cef22e18ff1c22705cd3dd5f967c5836860be2085daffb337a6109488c8d196aba4a47acd3d47ad67878f13cefcafee5bd6c0e1'
+  data.tar.gz: 94ccc5d2abf988099eba38a99c0bb5a32304c86546f50d29b7336cf8122d665a4c5026c45240a7e5e0bbfae441d50b73ebb64818ad13905aad36073bf9508f23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flowcation (0.2.18)
+    flowcation (0.2.19)
       activesupport (~> 5.1.5)
       nokogiri (~> 1.8.2)
 

data/exe/flowcation

@@ -40,7 +40,9 @@ rescue Exception => e
   return 1
 end
 
-if config
+if config 
+  Flowcation::set_user_object name: 'helper', config: config, path: File.dirname(config_path)
+  Flowcation::set_user_object name: 'processor', config: config, path: File.dirname(config_path)
   Flowcation::generate config
   Flowcation::Runtime.instance.write_files
 end

data/lib/flowcation.rb

@@ -21,10 +21,25 @@ require 'flowcation/overwrite_exception'
 require 'flowcation/block_not_found_exception'
 require 'flowcation/substitution_not_found_exception'
 require 'flowcation/assets'
+require 'flowcation/layout_helper'
+require 'flowcation/processor'
 
 module Flowcation
   DEFAULT_GENERATED_TEXT = "GENERATED_BY_FLOWCATION"
   DEFAULT_COMMENT = "<!-- ::comment:: -->"
+  
+  def self.set_user_object(name:, config:, path:)
+    if settings = config['flowcation']
+      file = File.join(path, settings[name])
+      if File.exist?(file)
+        existing_classes = ObjectSpace.each_object(Class).to_a
+        require file
+        helper_class = (ObjectSpace.each_object(Class).to_a - existing_classes)[0]
+        Flowcation::Settings.set(name + '_object', helper_class.new)
+      end
+    end
+  end
+  
   def self.generate(config)
     Flowcation::Settings.from_config(config['flowcation'])
     Flowcation::Assets.from_config(config['assets'])

data/lib/flowcation/assets.rb

@@ -3,7 +3,7 @@ module Flowcation
     
     def self.from_config(config={})
       config&.each do |name, options|
-        options['folders'].each do |path, asset_folder_name|
+        options['folders']&.each do |path, asset_folder_name|
           asset_folder_path = File.join(options['output'], asset_folder_name)
           FileUtils.mkdir_p(asset_folder_path)
           asset_folder = File.new(asset_folder_path)
@@ -11,7 +11,25 @@ module Flowcation
             source: File.join(options['input'], path), 
             target: asset_folder
         end
-        options['files'].each do |file_name|
+        
+        if processor = Settings.get('processor_object')
+          options['post-process']&.each do |asset_path, file_process|
+            asset_folder_path = File.join(options['output'], asset_path)
+            file_process.each do |file_name, process_method|
+              #file = File.new(File.join(asset_folder_path, file_name))
+              path = File.join(asset_folder_path, file_name)
+              puts "Post Process #{File.join(asset_folder_path, file_name)}"
+              lines = IO.readlines(path).map do |line|
+                processor.send(process_method, line)
+              end
+              File.open(path, 'w') do |file|
+                file.puts lines
+              end
+            end
+          end
+        end
+        
+        options['single-files']&.each do |file_name|
           output_folder_path = File.join(options['output'])
           FileUtils.mkdir_p(output_folder_path)
           output_folder = File.new(output_folder_path)

data/lib/flowcation/file_writer.rb

@@ -15,6 +15,7 @@ module Flowcation
     end
     
     def write_files
+      # todo rescue/finally close file
       self.class.file_writer_collections.each do |writables|
         send(writables).each do |writeable|
           file_name = writeable.path
@@ -26,7 +27,7 @@ module Flowcation
             c = add_generated_comment c
             File.write(file, c.encode(cr_newline: true))
           else
-            STDERR.puts "File #{path} not generated by flowcation. Use -f to overwrite or add Setting 'force-overwrite: true' to configuration yaml file entry 'flowcation:'"
+            STDERR.puts "File #{file_name} not generated by flowcation. Use -f to overwrite or add Setting 'force-overwrite: true' to configuration yaml file entry 'flowcation:'"
           end
         end
       end

data/lib/flowcation/layout_helper.rb

@@ -0,0 +1,4 @@
+module Flowcation
+  class LayoutHelper
+  end
+end

data/lib/flowcation/processor.rb

@@ -0,0 +1,4 @@
+module Flowcation
+  class Processor
+  end
+end

data/lib/flowcation/render.rb

@@ -6,7 +6,11 @@ module Flowcation
       gsub("&lt;%", "<%").
       gsub("\r\n", "\n").
       gsub("%20", " ").
-      gsub("&amp;", "&")
+      gsub("&amp;", "&").
+      gsub("=&gt;", "=>").
+      gsub("-&gt;", "->").
+      gsub("&gt;", ">").
+      gsub("&lt;", "<")
     end
   end
 end

data/lib/flowcation/substitution.rb

@@ -1,27 +1,51 @@
 module Flowcation
   class Substitution
     attr_reader :name, :xpath, :type, :value
-    def initialize(name, xpath, type, value, key)
-      @name, @xpath, @type, @value, @key = name, xpath, type, value, key
+    def initialize(name, xpath, type, value, key, use_helper)
+      @name, @xpath, @type, @value, @key, @use_helper = name, xpath, type, value, key, use_helper
+    end
+    def value(node)
+      if @use_helper && helper = Settings.get('helper_object')
+        helper.send(@value, node)
+      else
+        @value
+      end
     end
     def apply(doc)
+      # todo Refactor to SubstitutionType class with ContentSubstitution, AttributeSubstitution...
+      
+      # todo Better type names. More Like Targets in Stimulus? each->attribute
+      #   Even Helpers could be included in type: each-replace->LayoutHelper#image_tag
+      
       element = doc.at_xpath(@xpath)
       raise SubstitutionNotFoundException.build(xpath: @xpath, name: @name) unless element
       case @type
       when 'content'
-        doc.at_xpath(@xpath).content = @value
+        doc.at_xpath(@xpath).content = value(doc.at_xpath(@xpath))
+      when 'content_collection'
+        doc.xpath(@xpath).each do |node|
+          node.content = value(node)
+        end
       when 'attribute'
-        doc.at_xpath(@xpath).attributes[@key].value = @value
+        doc.at_xpath(@xpath).attributes[@key].value = value(doc.at_xpath(@xpath))
+      when 'attribute_collection'
+        doc.xpath(@xpath).each do |node|
+          node.attributes[@key].value = value(node)
+        end
       when 'replace'
-        doc.at_xpath(@xpath).replace Nokogiri::XML::Text.new(@value, doc.document)
-      when 'append'
-        puts "APPEND #{doc.at_xpath(@xpath).class}"
-        doc.at_xpath(@xpath).after Nokogiri::XML::Text.new(@value, doc.document)
+        doc.at_xpath(@xpath).replace Nokogiri::XML::Text.new(value(doc.at_xpath(@xpath)), doc.document)
+      when 'replace_each'
+        doc.xpath(@xpath).each do |node|
+          node.replace Nokogiri::XML::Text.new(value(node), doc.document)
+        end
       when 'replace_collection'
         doc.xpath(@xpath).first.replace Nokogiri::XML::Text.new(@value, doc.document)
         doc.xpath(@xpath).each do |node|
           node.remove if node.is_a? Nokogiri::XML::Element
         end
+      when 'append'
+        puts "APPEND #{doc.at_xpath(@xpath).class}"
+        doc.at_xpath(@xpath).after Nokogiri::XML::Text.new(value(doc.at_xpath(@xpath)), doc.document)
       end
       doc
     end

data/lib/flowcation/substitutions.rb

@@ -7,7 +7,8 @@ module Flowcation
           settings['xpath'], 
           settings['substitute'], 
           settings['value'], 
-          settings['key']
+          settings['key'],
+          settings['helper']
           
         substitution.apply(doc)
       end

data/lib/flowcation/version.rb

@@ -1,3 +1,3 @@
 module Flowcation
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

data/lib/generators/flowcation/generate/config_generator.rb

@@ -7,7 +7,8 @@ module Flowcation
       desc "This generator creates a basic rails.yml file at config/flowcation"
       source_root File.expand_path("../templates", __FILE__)
       def copy_config_file
-        copy_file "rails.yml", "config/flowcation/rails.yml"
+        copy_file "rails.yml",  "config/flowcation/rails.yml"
+        copy_file "public.yml", "config/flowcation/public.yml"
       end
     end
   end

data/lib/generators/flowcation/generate/templates/public.yml

@@ -0,0 +1,6 @@
+files:
+  input: frontend
+  output: public/mockup
+  folders: 
+  single-files: 
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowcation
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Matthias Hennemeyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,8 +108,10 @@ files:
 - lib/flowcation/callbacks.rb
 - lib/flowcation/file_writer.rb
 - lib/flowcation/layout.rb
+- lib/flowcation/layout_helper.rb
 - lib/flowcation/overwrite_exception.rb
 - lib/flowcation/partial.rb
+- lib/flowcation/processor.rb
 - lib/flowcation/registry.rb
 - lib/flowcation/render.rb
 - lib/flowcation/runtime.rb
@@ -120,6 +122,7 @@ files:
 - lib/flowcation/template.rb
 - lib/flowcation/version.rb
 - lib/generators/flowcation/generate/config_generator.rb
+- lib/generators/flowcation/generate/templates/public.yml
 - lib/generators/flowcation/generate/templates/rails.yml
 homepage: http://www.flowcation.com
 licenses: