railsbuilder 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a53d1909bcb338048d8b383aebdbcc35752e8fc
-  data.tar.gz: 0ff37fdb31bc77ccbe6386fb39de773db624d9fa
+  metadata.gz: 45d6b14d1a55a45a60dd93200ab4b6f9c74c55fd
+  data.tar.gz: b588dd06cba0132e028012a1face9cbbf20b632c
 SHA512:
-  metadata.gz: c4423924292843ca4037390cfac3235be78272ef916a5314369959d2e7c53f7a469f303fd8f6aab68f02e13f202904d2a0810dfff1483fda342fa5bba6ca748f
-  data.tar.gz: e548f193a35ed8356174bad133e2ca8f840aaa14a6ec0e2d941c630ac5b7583bd55d249108988c07f78db0844796525a6036321abe2e2b828396dfcbac9e44eb
+  metadata.gz: 88cf4b6d5956ec1d8b00351807ae78a4093482272a5095c0296d7d9aa106424212068acdf31ea29304a5514ee57b82e9793ae3c8636550c682d90b37e7815d5a
+  data.tar.gz: 06a5c0a37cf73071b4fd286772d109ac314ff75ffbd8cec82424e3ad12e3c633d2ec63dbb0181aa5dc1f91e7fa26c686d925fa1b8b869a82e8e8d34e6cc5001f

data/lib/railsbuilder.rb

@@ -5,6 +5,7 @@
 require 'fileutils'
 require 'io/console'
 require 'lineparser'
+require 'rdiscount'
 
 
 class RailsBuilder
@@ -24,10 +25,12 @@ class RailsBuilder
             [:model_class, /(\w+):\s*(string|text)/, :class_attribute],
         [:resource, /controller \+ views/, :resource_cv],
           [:resource_cv, /(\w+)(?:\s+([av]{1,2}))?/, :resource_cv_av],
-      [:all, /^\s*#/, :comment]
+            [:resource_cv_av, /(markdown):\s*(.*)/, :renderer],
+              [:renderer, /.*/, :render_block],
+      [:all, /^\s*;/, :comment]
     ]
 
-    parse(patterns, buffer)
+    parse(patterns, buffer.gsub(/^(\s{,5})#/,'\1;'))
   end
 
   def build()
@@ -73,7 +76,6 @@ class RailsBuilder
     end
 
     resources = doc.element('resources/@resources')
-    puts 'resources :'  + resources.inspect
 
     if resources then
 
@@ -130,7 +132,8 @@ class RailsBuilder
             puts ":: preparing to execute shell command: `#{command}`"
             puts 'Are you sure you want to generate a model? (Y/n)'
 
-            shell command
+            r = shell command
+            next if r == :abort
 
             # -- next command ---------------------
 
@@ -191,6 +194,34 @@ class RailsBuilder
                       File.write view_file, ''
                       puts ':: created ' + page
                     end                   
+
+                    # does it contain a renderer? e.g. markdown
+                    renderer = av.element 'renderer'
+                    next unless renderer
+
+                    type, text = renderer.attributes.values
+                    #   open the related page and add the content if it
+                    # doesn't already exist
+
+                    render_block = renderer.text('render_block')
+
+                    raw_text = if text and render_block then
+                      text + "\n" + render_block
+                    elsif text then text
+                    elsif render_block then render_block
+                    end
+                      
+                    if type == 'markdown' and raw_text then
+
+                      html = RDiscount.new(raw_text).to_html
+                      buffer = File.read view_file
+
+                      unless buffer[/#{html}/] then
+                        File.write view_file, html + "\n" + buffer
+                        puts ':: updated ' + view_file
+                      end
+                    end
+
                   end
                 end      
 
@@ -258,6 +289,7 @@ EOF
       IO.popen(command).each_line {|x| print "", x}
     else
       puts 'Abort'
+      :abort
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - James Robertson
@@ -61,6 +61,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  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'
 description: 
 email: james@r0bertson.co.uk
 executables: []