railsbuilder 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6430a6d36593142f11d2d8318b611c18b4c28470
-  data.tar.gz: 9838ec71b3239d0fbad3171547fda6d094aa51cf
+  metadata.gz: 6e53164476e19ca5d875a68d2fed6d91dbf6ca00
+  data.tar.gz: 7e12c6239b7748800ab509f0378e4f0f19f601f1
 SHA512:
-  metadata.gz: 94f48108e33e558efa561531ac0074ab3eb029021125d07320ad33bdab1a5ac76aba2e0453096c59ec9208c264f56821e6bc08eeb6e5dc609d92327f6a500d7c
-  data.tar.gz: 771896f874d215cc4c69af7fd8dae2952562c9e52ffca2251cfe7104754edb4d6e6acab84f49caf7b7eae86769a565c3a99864fde7719242a3c6770401e8a114
+  metadata.gz: dfc24e298082046e9cb2a8c0eef8b6e5b8e7da3907138d93950a349954895bd19d91bf31b90b597b7b812591438a6b42c70277215c856698050bf98e2dff0757
+  data.tar.gz: 44ee196ba21efb7fa38dc9bdff0aaba2477ddc2e91f1a671f9c9d4dba2410ec284c445bfdb0374bbdf12d61eedda7a97be4434f7fba7b9fa44eb7033b9a5e018

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-�<r���d��ݜ�ְ��[�¿�Mz
-��yC��X�5.&��'	�>6?�0�DjY�Ke�%
-�#"������&a��Ÿf�yP9�l_�^����	��z_�(d��
 &BY-��$�"���KU���+����Vt9�Ё�$��v:�MJ�̓�]'���d\u�n#!����I�V&5a�u)Ӄ�q�$��=�"	�Bj���7mmF&��!7A23I�NZߔ)Ŕ����H:+%�nU�9"	��B}KB6蝗5���
+�G�
+����6�c#R����b�Yhk����O���H�폫���f�/3����Q�©���:�EN_k=�����%�h�t�ݧ���d���;w�>�2j�ཬ�G *�t�@�?

data/lib/railsbuilder.rb

@@ -9,8 +9,6 @@ require 'lineparser'
 
 class RailsBuilder
   
-  attr_reader :to_h
-
   def initialize(filepath=nil)
 
     buffer = File.read File.expand_path(filepath) if filepath
@@ -24,37 +22,44 @@ class RailsBuilder
         [:resource, 'model', :model],
           [:model, ':class_name', :model_class],
         [:resource, /controller \+ views/, :resource_cv],
-          [:resource_cv, /(\w+)\s+[av]{1,2}/, :resource_cv_av],
+          [:resource_cv, /(\w+)(?:\s+[av]{1,2})?/, :resource_cv_av],
       [:all, /^\s*#/, :comment]
     ]
 
-    @to_h = @h = parse(patterns, buffer)
+    parse(patterns, buffer)
   end
 
   def build()
 
-    @app = @h[:app][0][1][':app']
-    app_path = @h[:app][0][1][':app_path']
+    doc = self.to_doc.root
+
+    @app = app = doc.element('app/@app')
+    return unless app
+
+    app_path = doc.element('app_path/@app_path')
+
     Dir.chdir app_path if app_path
 
-    unless File.exists? @app then
+    unless File.exists? app then
 
-      command = 'rails new ' + @app
+      command = 'rails new ' + app
       puts ":: preparing to execute shell command: `#{command}`"
       puts 'Are you sure you want to build a new app? (Y/n)'
 
       shell command
     end
 
-    Dir.chdir @app
+    Dir.chdir app
 
     # select the :resource records
-    root = @h[:root][0][1][":root"]
+    root = doc.element('root/@root')
+
+    routes = File.join('config','routes.rb')
 
     if root then
 
       # check if the config/routes.rb file needs updated
-      routes = File.join('config','routes.rb')
+
       buffer = File.read routes
 
       regex = /  #( root 'welcome#index')/
@@ -66,31 +71,90 @@ class RailsBuilder
       end
     end
 
-    @h[:resource].each do |raw_resource|
+    resources = doc.element('resources/@resources')    
+
+    if resources then
+
+      buffer = File.read routes
+
+      if not buffer[/\n\s*resources :#{resources}/] then
+
+        puts ':: updating ' + routes
+        File.write routes, buffer.sub(/\n  resources :\w+/,'')\
+          .sub(/ #   resources :products/) \
+            {|x| x + "\n  resources :#{resources}"}
+      end
+    end
+
+    doc.xpath('resource').each do |node|
+
+      resource = node.attributes[:resource]
+
+      puts 'resource : ' + resource.inspect
+      next unless resource
+
+      controller = resource + '_controller.rb'
+      controller_file = File.join('app','controllers', controller)
 
-      resource_child = raw_resource[3][0]
-      resource = raw_resource[1][":resource"]
+      node.each do |child|
 
-      case resource_child[0]
+        case child.name.to_sym
 
-        when :model_class
-          puts "it's a model"
-        when :resource_cv
+          when :model
 
-          # fetch the action name
-          action = resource_child[3][0][1][:captures][0]
-          page = action + '.html.erb'
+            # does the controller exitst?
+
+            unless File.exists? controller_file then
+
+              command = "rails g controller %s" % resource
+              puts ":: preparing to execute shell command: `#{command}`"
+              puts 'Are you sure you want to generate a controller? (Y/n)'
+
+              shell command            
+            end
+
+          when :resource_cv
+
+            # fetch the action name
+            action = child.element 'resource_cv_av/@captures0'
+
+            if action then
+
+              page = action + '.html.erb'
+              view_file = File.join('app','views', resource, page)
+          
+              #   if the controller exists don't try to generate the view,
+              # instead add the entry to the controller file and
+              # create the view file
+
+
+              if File.exists? controller_file then
+
+                buffer = File.read controller_file
+
+                regex = /class \w+Controller < ApplicationController/
+                buffer.sub!(regex) {|x|  x + "\n\n  def new\n  end\n" }
+                File.write controller_file, buffer
+                puts ':: updated ' + controller
       
-          unless File.exists? File.join('app','views', resource, page) then
+                File.write view_file, ''
+                puts ':: created ' + page
 
-            command = "rails generate controller %s %s" % [resource, action]
-            puts ":: preparing to execute shell command: `#{command}`"
-            puts 'Are you sure you want to generate a controller action? (Y/n)'
+              else
 
-            shell command
-          end
+                unless File.exists? view_file then
 
-      end
+                  command = "rails generate controller %s %s" % [resource, action]
+                  puts ":: preparing to execute shell command: `#{command}`"
+                  puts 'Are you sure you want to generate a controller action? (Y/n)'
+
+                  shell command
+                end
+              end
+            end
+
+        end # /case when
+      end # / child iterator
     end
 
   end
@@ -99,6 +163,10 @@ class RailsBuilder
     File.write "#{@app}.cfg", @config
   end
 
+  def to_doc()
+    Rexle.new(@lp.to_xml)
+  end
+
   private
 
   def parse(patterns, s=nil)
@@ -125,8 +193,9 @@ EOF
     end
 
     @config = s
-    a = LineParser.new(patterns).parse s
-    a.group_by(&:first)
+    @lp = LineParser.new(patterns)
+    @lp.parse s
+
   end
 
   def shell(command)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   bNcCWso1cJhifoTCytPAyf9YVuyU4HjqC3eqx3p00NCg0VoELwMEkyhkpvYOGz2l
   NSkTRB6yCN+xzQ==
   -----END CERTIFICATE-----
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails