railsbuilder 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 532ee816c29027e4a271eb61fff21d0c1233a064
-  data.tar.gz: b6464756d6d3c266a40c700110459144d2f3c69a
+  metadata.gz: c78cc57d3f08d6b09f920163e8aa5a11acd34f46
+  data.tar.gz: bd728be7d7f5af4cfd78fd76087cdef86a38ac49
 SHA512:
-  metadata.gz: b7ec7528656b1cc34c6b77d97bdff9fa2ae434c94c079c32c83a2c8928a688071a24a8446dc742888accc6e47d9a2f4aeb9b3002a516f33d0ece94647323a704
-  data.tar.gz: 7b3d978f7c827255e5e52cf68408be88d263000bef3ba70b0bc1a7ce94b9770d168a550f1127728e0999de2f8a5be4bb3137759a094481a4e26b6b7943cc3d89
+  metadata.gz: 7e9ff7a40a74a4f89771776b3376a9eb9694b8551ae31359094f55b0f42a5623dbc78256273d8f44f6558c7bc2f1978087fad794f1828862021f248910037364
+  data.tar.gz: 4d9b022ba547927708552f1fb776f6e9be603c9e4e42ce4a0619e7b87b9dfe08e820ff686b4fa613fda71728b868f353d767e2820eb9339b1ee41789103c8962

data/lib/railsbuilder.rb

@@ -19,6 +19,8 @@ class RailsBuilder
 
     @config = RXFHelper.read(s)[0].gsub(/^(\s{,5})#/,'\1;') if s
     @tmp_path = @journal = journal == true ? Dir.tmpdir : journal  if journal
+    
+            #[:model_class, /(\w+):\s*(string|text|decimal)\s*,?(?<options>.*)/, :class_attribute],    
 
     patterns = [
       [:root, 'app_path: :app_path', :app_path],
@@ -28,7 +30,7 @@ class RailsBuilder
       [:root, ':resource', :resource],
         [:resource, 'model', :model],
           [:model, ':class_name', :model_class],
-            [:model_class, /(\w+):\s*(string|text)/, :class_attribute],
+            [:model_class, /^(?<name>\w+):\s*(?<type>string|text|decimal)\s*,?(?<options>.*)/, :class_attribute],
         [:resource, /(?:controller \+ views|actionpack:)/, :resource_cv],
           [:resource_cv, /(\w+)(?:\s+([av]{1,2}))?/, :resource_cv_av],
             [:resource_cv_av, /(markdown):\s*(.*)/, :renderer],
@@ -72,7 +74,7 @@ class RailsBuilder
     @app_path = app_path = doc.element('app_path/@app_path') || 
                                            File.join(@parent_path, app)
 
-    puts 'changing director to ' + app_path.inspect
+    puts 'changing directory to ' + app_path.inspect
     Dir.chdir app_path
 
     # select the :resource records
@@ -159,11 +161,13 @@ class RailsBuilder
               class_name = model.attributes[:class_name]
               next unless class_name
 
-              attributes = model.xpath('.').map {|x| x.attributes.values}
+              #attributes = model.xpath('.').map {|x| x.attributes.values}
+              attributes = model.xpath('.').map {|x| field_attributes x}
 
               next if attributes.empty?
 
-              s = class_name + ' ' + attributes.map{|x| x.join ':'}.join(' ')
+              s = class_name + ' ' + attributes\
+                            .map{|h| "%s: %s" % [h[:name], h[:type]]}.join(' ')
 
               command = "rails generate model %s" % s
               puts ":: preparing to execute shell command: `#{command}`"
@@ -185,11 +189,12 @@ class RailsBuilder
               class_name = model.attributes[:class_name]
               next unless class_name
 
-              attributes = model.xpath('.').map {|x| x.attributes.values}
+              attributes = model.xpath('.').map {|x| field_attributes x}
 
               next if attributes.empty?
 
-              s = class_name + ' ' + attributes.map{|x| x.join ':'}.join(' ')                            
+              s = class_name + ' ' + attributes\
+                            .map{|h| "%s: %s" % [h[:name], h[:type]]}.join(' ')
 
               command = "rails generate scaffold %s" % s
               puts ":: preparing to execute shell command: `#{command}`"
@@ -391,6 +396,20 @@ class RailsBuilder
 
   private
 
+  def field_attributes(e)
+
+    h = {
+      name: e.attributes[:name],
+      type: e.attributes[:type],
+    }
+    raw_opt = e.attributes[:options]
+    if raw_opt.length > 0 then
+      h[:options] = raw_opt.split(/\s*,?\s*\b(?=\w+:)/)[1..-1]\
+          .map {|x| x.split(':',2).map(&:lstrip)}
+    end
+    h  
+  end  
+  
   def parse(patterns, s=nil)
 
     if s.nil? then

metadata

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