railsbuilder 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24c03e8ac1c406a08b8c3591a3e49419df5d612
-  data.tar.gz: bc1b3623facea7eed81231ee0a2b474d9896f53e
+  metadata.gz: eab75b065f3c45da2a5ebe2e2476b020e46bb74a
+  data.tar.gz: b2b3dddce7b57069353ff2de1783c567e89afaf6
 SHA512:
-  metadata.gz: 2eedbcc52213f89f9c5103ae388cceadfc65115d0a27a447b5ac9547ffdd234dd729ed927e7af6008117956e85fba814d969d5ed05f8eaf95f169381aa88f6de
-  data.tar.gz: 169e888e78d54ef0bdb825dc5ebda64891595fb1864c84e146489410a0103fc7fea104c47054a3d6ba13bfb42df4cb0ff6eddf65fc3141c408dd6ac053c5763f
+  metadata.gz: 86b59e46c6a549506414a07ec464bc5ca3bb7f7b37b9d7229c3471962f62e689b0a10b1e803a4207306fc64f8adadf61a0e75edca513b2a69882ae4ba40be761
+  data.tar.gz: a2e211fb9e9a462945dc83de06fb2966d1ed6c12d25f4d6a9f8a255d8dab3eefdc535baef1a72a39ac158918c95222cf8a60cd4349013f18bd4ad07d7752a0dc

data/lib/railsbuilder.rb

@@ -15,10 +15,10 @@ require 'activity-logger'
 class RailsBuilder
   
 
-  def initialize(filepath=nil, journal: false)
+  def initialize(s=nil, journal: false)
 
-    @config = RXFHelper.read(filepath)[0].gsub(/^(\s{,5})#/,'\1;') if filepath
-    @tmp_path = @journal = journal == true ? Dir.tmpdir : journal if journal
+    @config = RXFHelper.read(s)[0].gsub(/^(\s{,5})#/,'\1;') if s
+    @tmp_path = @journal = journal == true ? Dir.tmpdir : journal  if journal
 
     patterns = [
       [:root, 'app_path: :app_path', :app_path],
@@ -29,7 +29,7 @@ class RailsBuilder
         [:resource, 'model', :model],
           [:model, ':class_name', :model_class],
             [:model_class, /(\w+):\s*(string|text)/, :class_attribute],
-        [:resource, /controller \+ views/, :resource_cv],
+        [:resource, /(?:controller \+ views|actionpack:)/, :resource_cv],
           [:resource_cv, /(\w+)(?:\s+([av]{1,2}))?/, :resource_cv_av],
             [:resource_cv_av, /(markdown):\s*(.*)/, :renderer],
               [:renderer, /.*/, :render_block],
@@ -124,18 +124,16 @@ class RailsBuilder
       
       resource = node.attributes[:resource]
 
-
       next unless resource
 
       controller = resource + '_controller.rb'
       controller_file = File.join('app','controllers', controller)
 
-      node.each do |child|
+      node.elements.each do |child|
 
         case child.name.to_sym
 
           when :model
-            puts 'inside :model'
 
             # does the controller exitst?
 
@@ -155,16 +153,13 @@ class RailsBuilder
             # if the model fields are defined let's generate the model
             model = child.element('model_class')
             next unless model
-            puts 'we have a model'
 
             class_name = model.attributes[:class_name]
             next unless class_name
-            puts 'we have a class name'
 
             attributes = model.xpath('.').map {|x| x.attributes.values}
-            puts 'attributes : ' + attributes.inspect
+
             next if attributes.empty?
-            puts 'we have attributes'
 
             s = class_name + ' ' + attributes.map{|x| x.join ':'}.join(' ')
 
@@ -431,4 +426,4 @@ rb = RailsBuilder.new
 r = rb.build
 rb.save
 
-=end
+=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - James Robertson
@@ -31,78 +31,108 @@ cert_chain:
   bNcCWso1cJhifoTCytPAyf9YVuyU4HjqC3eqx3p00NCg0VoELwMEkyhkpvYOGz2l
   NSkTRB6yCN+xzQ==
   -----END CERTIFICATE-----
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: lineparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7.1
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: activity-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.15
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -122,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Builds a Rails app from a configuration file.