caboose-cms 0.8.79 → 0.8.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd447044fa644c9f566598042ea9b67b7f23faa
-  data.tar.gz: 4cf0ab42e9c3abb072dbb4a6a738d8a1026b2292
+  metadata.gz: bd650e7422bd0162938f8d1478473b941330e299
+  data.tar.gz: b90ef95467affa299943c9d950b232f288944630
 SHA512:
-  metadata.gz: 28d6a8ae3983ca9b3856ce3951878223c5789794c06d1aa949bf577513fa167e505852d5cd47e29e632127b3ef7e9099cb7204e5963e337d3b7418f800a7e354
-  data.tar.gz: 7e958ad18045db7b8b6dadf7fca9e12b13ee00a59ad2784ad0335a182f9ba128f2b582f988fda26a885646e9daa9eb204dc7f90a30dca6a7e77ac0cbe8c33490
+  metadata.gz: 0410f10cb892116bdbe0b19746b11841dfcf1f21e2c16237f29815755353ff6588d954bc6f9cb047d3207d85043494ceb66c54fc3d91515465b226d16af19729
+  data.tar.gz: e07c5de3582548172e8b0fc9ac65fd3b35a19bfc8ac313849ca423c29509a92c11fa0e1b5d47becce4752e943f26173318088b9ae9fe3fbcc3512bacdbce88af

data/app/assets/javascripts/caboose/admin_block_type_parser_controller.js

@@ -0,0 +1,157 @@
+
+var AdminBlockTypeParserController = function(params) { this.init(params); };
+
+AdminBlockTypeParserController.prototype = {
+  
+  container: 'block_type_parser',
+  authenticity_token: false,
+  //original_html: "<div data-num='30' data-thumb='assets/minimalist-basic/thumbnails/p02.png' data-cat='0,13'>\n  <div class='row clearfix'>\n    <div class='column half'>\n      <div class='display'>\n        <h1>Beautiful content. Responsive.</h1>\n        <p>Lorem Ipsum is simply dummy text.</p>\n        <div style='margin:1em 0 2.5em;'>\n          <a href='#' class='btn btn-primary edit'>Read More</a>\n        </div>\n      </div>\n    </div>\n    <div class='column half'>\n      <img src='assets/minimalist-basic/p02-1.jpg'>\n    </div>\n  </div>\n</div>\n",
+  //original_html: "<div data-num='1' data-thumb='assets/minimalist-basic/thumbnails/a01.png' data-cat='1'>\n  <div class='row clearfix'>\n    <div class='column full'>\n      <h1 class='size-96 is-title1-96 is-title-lite'>Lorem Ipsum</h1>\n    </div>\n  </div>\n</div>\n",
+  original_html: "" +
+    "<div data-num='30' data-thumb='assets/minimalist-basic/thumbnails/p02.png' data-cat='0,13'>\n" +
+    "  <div class='row clearfix'>\n" +
+    "    <div class='column half'>\n" +
+    "      <div class='display'>\n" +
+    "        <h1>Beautiful content. Responsive.</h1>\n" +
+    "        <p>Lorem Ipsum is simply dummy text.</p>\n" +
+    "        <div style='margin:1em 0 2.5em;'>\n" +
+    "          <a href='#' class='btn btn-primary edit'>Read More</a>\n" +
+    "        </div>\n" +
+    "      </div>\n" +
+    "    </div>\n" +
+    "    <div class='column half'>\n" +
+    "      <img src='assets/minimalist-basic/p02-1.jpg'>\n" +
+    "    </div>\n" +
+    "	</div>\n" +
+    "</div>\n",  
+  parsable_tags: { heading: 'Headings' , richtext: 'Rich Text' , img: 'Images' , link: 'Links' },
+  tags_to_parse: { heading: true       , richtext: true        , img: true     , link: true    },
+  render_function: false,
+  children: false,
+  
+  init: function(params) {
+    var that = this;
+    for (var i in params)
+      this[i] = params[i];
+    
+    that.print_step1();   
+  },
+  
+  print_step1: function()
+  {
+    var that = this;
+        
+    var tr = $('<tr/>');
+    var all_checked = true;
+    $.each(that.parsable_tags, function(tag, name) { if (!that.tags_to_parse[tag]) { all_checked = false; return false; }});    
+    tr.append($('<td/>').append($('<input/>').attr('type', 'checkbox').attr('id', 'all').prop('checked', all_checked).click(function() {
+        var checked = $(this).is(':checked');
+        $.each(that.parsable_tags, function(tag, name) { $('#'+tag).prop('checked', checked); });                 
+      })))      
+      .append($('<td/>').append($('<label/>').attr('for', 'all').append('All')));        
+    $.each(that.parsable_tags, function(tag, name) {      
+      tr.append($('<td/>').append($('<input/>').attr('type', 'checkbox').attr('id', tag).val('1').prop('checked', that.tags_to_parse[tag])))
+        .append($('<td/>').append($('<label/>').attr('for', tag).append(name)));
+    });
+    var tags_table = $('<table/>').append($('<tbody/>').append(tr));
+                
+    var div = $('<div/>')      
+      .append(tags_table)
+      .append($('<p/>').append($('<textarea/>').attr('id', 'html').css('width', '90%').css('height', '400px').attr('placeholder', 'HTML to Parse').html(that.original_html)))            
+      .append($('<div/>').attr('id', 'message'))
+      .append($('<p/>').append($('<input/>').attr('type', 'button').val("Parse!").click(function() {
+        that.original_html = $('#html').val();
+        $.each(that.parsable_tags, function(tag, name) { that.tags_to_parse[tag] = $('#'+tag).is(':checked'); }); 
+        that.parse_tags(); 
+      })));
+    $('#'+that.container).empty().append(div);    
+  },
+  
+  parse_tags: function(show_json)
+  {
+    var that = this;
+            
+    var tags = [];
+    $.each(that.tags_to_parse, function(tag, checked) { if (checked) tags.push(tag); });
+    $.ajax({
+      url: '/admin/block-types/parse-tags',
+      type: 'post',
+      data: {
+        html: that.original_html,
+        tags: tags,
+        children: that.children
+      },
+      success: function(resp) {
+        that.last_response = resp;              
+        that.original_html   = resp.original_html;
+        that.render_function = resp.render_function;
+        that.children        = resp.children;
+      },
+      async: false
+    });
+    
+    if (show_json)
+    {
+      $('#'+that.container).empty()      
+      .append($('<textarea/>').attr('id', 'json').css('width', '90%').css('height', '400px').html(JSON.stringify(that.last_response)))      
+      .append($('<p/>')
+        .append($('<input/>').attr('type', 'button').val("< Back to HTML").click(function() { that.print_step1(); })).append(' ')
+        .append($('<input/>').attr('type', 'button').val("Show Parsed").click(function() { that.parse_tags(); }))
+      );      
+      return;
+    }
+    
+    var tbody = $('<tbody/>')
+      .append($('<tr/>')
+        .append($('<th/>').append('Field Type'))
+        .append($('<th/>').append('Name'))
+        .append($('<th/>').append('Description'))        
+        .append($('<th/>').append('Default Value'))
+        .append($('<th/>').attr('colspan', '2').append('Child Values'))
+      );      
+      
+    var field_types = {
+      heading:  'Heading',   
+      image2:   'Image',
+      button:   'Link',
+      richtext: 'Rich Text'
+    };            
+    $.each(that.children, function(i, v) {
+      
+      var tr = $('<tr/>')
+        .append(field_types[v.field_type])
+        .append($('<td/>').attr('valign', 'top').append($('<input/>').data('i', i).val(v.name        ).on('keyup', function(e) { var x = $(this).val().toLowerCase().replace(' ', '_'); $(this).val(x); that.children[parseInt($(this).data('i'))].name        = x; })))
+        .append($('<td/>').attr('valign', 'top').append($('<input/>').data('i', i).val(v.description ).on('keyup', function(e) { that.children[parseInt($(this).data('i'))].description = $(this).val(); })))                              
+        .append($('<td/>').attr('valign', 'top').append($('<input/>').data('i', i).val(v.default     ).on('keyup', function(e) { that.children[parseInt($(this).data('i'))].default     = $(this).val(); })));
+        
+      if (v.child_values)
+      {
+        j = 0;
+        $.each(v.child_values, function(k,v) {
+          if (j > 0)
+            tr.append($('<td/>').attr('colspan', '4').html("&nbsp;")); 
+          tr.append($('<td/>').attr('align', 'right').append(k))
+            .append($('<td/>').append($('<input/>').data('i', i).data('k', k).val(v).on('keyup', function(e) { that.children[parseInt($(this).data('i'))].child_values[$(this).data('k')] = $(this).val(); })));          
+          tbody.append(tr);
+          tr = $('<tr/>');
+          j++;
+        });
+      }
+      else
+        tbody.append(tr);
+    });                
+    var vars_table = $('<table/>').append(tbody);
+              
+    $('#'+that.container).empty()
+      .append(vars_table)
+      .append($('<textarea/>').attr('id', 'parsed').css('width', '90%').css('height', '400px').html(that.render_function))      
+      .append($('<p/>')
+        .append($('<input/>').attr('type', 'button').val("< Back to HTML").click(function() { that.print_step1(); })).append(' ')
+        .append($('<input/>').attr('type', 'button').val("Re-parse with Updated Variables").click(function() { that.parse_tags(); })).append(' ')
+        .append($('<input/>').attr('type', 'button').val("Show JSON").click(function() { that.parse_tags(true); }))
+      );
+  },
+};
+
+
+

data/app/controllers/caboose/block_types_controller.rb

@@ -47,6 +47,20 @@ module Caboose
       block_type = BlockType.find(params[:id])
       render :json => block_type.as_json(:include => :sites)      
     end
+    
+    # @route GET /admin/block-types/parse
+    def admin_parse_form
+      return if !user_is_allowed('pages', 'view')      
+      render :layout => 'caboose/admin'      
+    end
+    
+    # @route POST /admin/block-types/parse-tags
+    def admin_parse_tags
+      return if !user_is_allowed('pages', 'view')      
+      children = params[:children] && params[:children] != 'false' ? params[:children] : nil
+      resp = BlockTypeParser.parse_html(params[:html], params[:tags], children)
+      render :json => resp
+    end
 
     # @route GET /admin/block-types/new
     # @route GET /admin/block-types/:id/new

data/app/models/caboose/block_type_parser.rb

@@ -0,0 +1,211 @@
+require 'nokogiri'
+require 'nokogiri-styles'
+
+module Caboose
+  class BlockTypeParser
+    
+    def BlockTypeParser.parse_html(str, tags, children = nil)
+
+      doc = Nokogiri::HTML.fragment(str)            
+      doc.children.first.set_attribute('id', "block_<%= block.id %>")
+
+      count = 0
+      rf_header = []
+      rf_body = "#{doc.to_html}"      
+      new_children = []
+      tags.each do |tag|        
+        case tag
+          when 'heading'
+            
+            headings = doc.search('h1') + doc.search('h2') + doc.search('h3') + doc.search('h4') + doc.search('h5') + doc.search('h6')            
+            headings.each_with_index do |h, i|
+              
+              info = children ? (children[count] ? children[count] : (children[count.to_s] ? children[count.to_s] : nil)) : nil
+              description = info && info['description'] ? info['description'] : "#{(i+1).ordinalize} Heading"
+              name        = info && info['name']        ? info['name']        : description.downcase.gsub(' ', '_')
+              
+              cv = StdClass.new
+              cv.heading_text = h.text	                
+	            cv.size          = h.name.gsub('h','').to_i
+              cv.align         = h.attributes['align'].to_s if h.attributes['align']
+              cv.extra_classes = h.attributes['class'].to_s if h.attributes['class']
+              if h['style']
+                cv.align         = h.styles['text-align'] if h.styles['text-align']
+	              cv.color         = h.styles['color']      if h.styles['color']
+	              cv.margin_bottom = h.styles['margin-bottom'] if h.styles['margin-bottom']
+	              cv.margin_top    = h.styles['margin-top']    if h.styles['margin-top']
+	              cv.underline     = true if h.styles['text-decoration']
+	            end
+
+              v = StdClass.new({              
+                :name         => name,
+                :description  => description,
+                :field_type   => 'heading',
+                :child_values => cv
+              })
+                            
+              rf_body.gsub!(h.to_s, "<%= block.render('#{name}') %>")              
+              new_children << v              
+                              
+              count = count + 1              
+            end
+            
+          when 'link'
+            
+            links = doc.search('a')            
+            links.each_with_index do |link, i|
+              
+              info = children ? (children[count] ? children[count] : (children[count.to_s] ? children[count.to_s] : nil)) : nil
+              description = info && info['description'] ? info['description'] : "#{(i+1).ordinalize} Link"
+              name        = info && info['name']        ? info['name']        : description.downcase.gsub(' ', '_')
+
+              cv = StdClass.new
+              cv.text          = link.text
+              cv.align         = link.attributes['align'  ].to_s if link.attributes['align'  ]
+              cv.target        = link.attributes['target' ].to_s if link.attributes['target' ]
+              cv.url           = link.attributes['href'   ].to_s if link.attributes['href'   ]
+	            cv.extra_classes = link.attributes['class'  ].to_s if link.attributes['class'  ]
+	            if link['style']
+                cv.align         = link.styles['text-align'   ] if link.styles['text-align'    ]
+	              cv.color         = link.styles['color'        ] if link.styles['color'         ]
+	              cv.margin        = link.styles['margin'       ] if link.styles['margin-bottom' ]
+	              cv.margin_top    = link.styles['margin-top'   ] if link.styles['margin-top'    ]
+	              cv.margin_bottom = link.styles['margin-bottom'] if link.styles['margin-bottom' ]	              
+	              cv.margin_left   = link.styles['margin-left'  ] if link.styles['margin-left'   ]
+	              cv.margin_right  = link.styles['margin-right' ] if link.styles['margin-right'  ]	              
+	            end
+
+              v = StdClass.new({              
+                :name         => name,
+                :description  => description,
+                :field_type   => 'button',
+                :child_values => cv
+              })
+                            
+              rf_body.gsub!(link.to_s, "<%= block.render('#{name}') %>")              
+              new_children << v              
+                              
+              count = count + 1              
+            end
+
+          when 'richtext'
+            
+            paragraphs = doc.search('p')            
+            paragraphs.each_with_index do |p, i|
+              
+              info = children ? (children[count] ? children[count] : (children[count.to_s] ? children[count.to_s] : nil)) : nil
+              description = info && info['description'] ? info['description'] : "#{(i+1).ordinalize} Richtext"
+              name        = info && info['name']        ? info['name']        : description.downcase.gsub(' ', '_')
+
+              v = StdClass.new({              
+                :name         => name,
+                :description  => description,
+                :field_type   => 'richtext',
+                :default      => p.text                
+              })
+                            
+              rf_body.gsub!(p.to_s, "<%= block.render('#{name}') %>")              
+              new_children << v              
+                              
+              count = count + 1              
+            end
+                        
+          when 'img'
+            
+            images = doc.search('img')            
+            images.each_with_index do |img, i|
+              
+              info = children ? (children[count] ? children[count] : (children[count.to_s] ? children[count.to_s] : nil)) : nil
+              description = info && info['description'] ? info['description'] : "#{(i+1).ordinalize} Image"
+              name        = info && info['name']        ? info['name']        : description.downcase.gsub(' ', '_')
+              
+              cv = StdClass.new              
+	            cv.image_src	    = img.attributes['src'    ].to_s
+	            cv.alt_text	      = img.attributes['alt'    ].to_s if img.attributes['alt'    ]
+	            cv.width	        = img.attributes['width'  ].to_s if img.attributes['width'  ]
+	            cv.height	        = img.attributes['height' ].to_s if img.attributes['height' ]	            
+	            cv.width          = img.styles['width'         ] if img.styles['width'         ]
+	            cv.height         = img.styles['height'        ] if img.styles['height'        ]	            
+	            cv.align          = img.styles['float'         ] if img.styles['float'         ]
+	            cv.margin_bottom  = img.styles['margin-bottom' ] if img.styles['margin-bottom' ]
+	            cv.margin_left    = img.styles['margin-left'   ] if img.styles['margin-left'   ]
+	            cv.margin_right   = img.styles['margin-right'  ] if img.styles['margin-right'  ]
+	            cv.margin_top     = img.styles['margin-top'    ] if img.styles['margin-top'    ]
+	            
+	            Caboose.log(cv)
+
+              v = StdClass.new({              
+                :name         => name,
+                :description  => description,
+                :field_type   => 'image2',
+                :child_values => cv
+              })
+                            
+              rf_body.gsub!(img.to_s, "<%= block.render('#{name}') %>")              
+              new_children << v              
+                              
+              count = count + 1              
+            end
+            
+        end
+      end
+
+      render_function = ""
+      render_function << "<%\n#{rf_header.join("\n")}\n%>\n" if rf_header.count > 0
+      render_function << rf_body
+      
+      return {
+        :original_html => str,
+        :render_function => render_function,
+        :children => new_children
+      }                                    
+    end
+    
+    def BlockTypeParser.parse(str)
+      
+      vars = {}
+      pattern = /<%= \|(.*?)\| %>/
+      new_lines = []
+      lines = str.split("\n")
+      lines.each do |line|        
+        matches = line.to_enum(:scan, pattern).map{$&}
+        if matches
+          matches.each do |match|
+            next if match.nil? || match.length == 0                        
+            arr = match[5..-5].split('|')
+                        
+            name        = arr.count > 0 ? arr[0] : nil
+            description = arr.count > 1 ? arr[1] : nil
+            field_type  = arr.count > 2 ? arr[2] : nil
+            default     = arr.count > 3 ? arr[3] : nil
+            default = default && ((default.starts_with?('"') && default.ends_with?('"')) || (default.starts_with?("'") && default.ends_with?("'"))) ? default[1..-2] : nil 
+            
+            if vars[name.to_sym].nil?
+              vars[name.to_sym] = StdClass.new({
+                :name        => name        ,        
+                :description => description ,
+                :field_type  => field_type  ,
+                :default     => default
+              })            
+            end
+            line.gsub!(match, "<%= #{name} %>")          
+          end
+        end
+        new_lines << line
+      end
+      
+      str2 = "<%\n"
+      vars.each do |k,var|
+        str2 << "#{var.name} = block.child_value('#{var.name}')\n"                        
+      end
+      str2 << "\n"
+      vars.each do |k,var|                
+        str2 << "#{var.name} = \"#{var.default.gsub('"', '\"')}\" if #{var.name}.nil? || #{var.name}.length == 0\n" if var.default        
+      end
+      str2 << "%>\n"
+      str2 << new_lines.join("\n")      
+      return str2                  
+    end
+    
+  end
+end

data/app/views/caboose/block_types/admin_index.html.erb

@@ -4,7 +4,12 @@
 </div>
 
 <h1>Block Types</h1>
+
+<!--
 <p><a href='/admin/block-types/store'>Block Type Store</a></p>
+-->
+<p><a href='/admin/block-types/parse'>Block Type Parser</a></p>
+
 <div id='block_types'></div>
 <% (0..100).each do |i| %><p>&nbsp;</p><% end %>
 

data/app/views/caboose/block_types/admin_parse_form.html.erb

@@ -0,0 +1,35 @@
+<div id='crumbtrail'>
+  <a href='/admin'>Admin</a> >
+  <a href='/admin/block-types'>Block Types</a> >
+  Parser
+</div>
+
+<h1>Block Type Parser</h1>
+<p>
+  <a href='/admin/block-types'>Block Types List</a> |
+  <a href='/admin/block-types/parse'>Parser</a>
+</p>
+
+<div id='block_type_parser'></div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/admin_block_type_parser_controller' %>
+<script type='text/javascript'>
+
+var controller = false; 
+$(document).ready(function() {
+  controller = new AdminBlockTypeParserController({          
+    form_authenticity_token: '<%= form_authenticity_token %>'
+  });
+});
+    
+</script>
+<% end %>
+<% content_for :caboose_css do %>
+<style type='text/css'>
+
+textarea { font-family: Courier; font-size: 10pt; white-space: pre; overflow-wrap: normal; overflow-x: scroll; }
+
+</style>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.79'
+  VERSION = '0.8.80'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.79
+  version: 0.8.80
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri-styles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -513,6 +527,7 @@ files:
 - app/assets/images/caboose/search.png
 - app/assets/javascripts/caboose/admin.js
 - app/assets/javascripts/caboose/admin_block_edit.js
+- app/assets/javascripts/caboose/admin_block_type_parser_controller.js
 - app/assets/javascripts/caboose/admin_edit_invoice.js
 - app/assets/javascripts/caboose/admin_edit_modifications.js
 - app/assets/javascripts/caboose/admin_main.js
@@ -841,6 +856,7 @@ files:
 - app/models/caboose/block_type.rb
 - app/models/caboose/block_type_category.rb
 - app/models/caboose/block_type_icons.rb
+- app/models/caboose/block_type_parser.rb
 - app/models/caboose/block_type_site_membership.rb
 - app/models/caboose/block_type_source.rb
 - app/models/caboose/block_type_summary.rb
@@ -956,6 +972,7 @@ files:
 - app/views/caboose/block_types/admin_edit_icon.html.erb
 - app/views/caboose/block_types/admin_index.html.erb
 - app/views/caboose/block_types/admin_new.html.erb
+- app/views/caboose/block_types/admin_parse_form.html.erb
 - app/views/caboose/blocks/_block.html.erb
 - app/views/caboose/blocks/_checkbox.html.erb
 - app/views/caboose/blocks/_controller_view_content.html.erb