rails_apps_composer 2.2.26 → 2.2.27

data/templates/helpers.erb

@@ -94,8 +94,21 @@ def copy_from_repo(filename, opts = {})
 end
 
 def html_to_haml(source)
-  html = open(source) {|input| input.binmode.read }
-  Haml::HTML.new(html, :erb => true, :xhtml => true).render
+  begin
+    html = open(source) {|input| input.binmode.read }
+    Haml::HTML.new(html, :erb => true, :xhtml => true).render
+  rescue RubyParser::SyntaxError
+    say_wizard "Ignoring RubyParser::SyntaxError"
+    # special case to accommodate https://github.com/RailsApps/rails-composer/issues/55
+    html = open(source) {|input| input.binmode.read }
+    say_wizard "applying patch" if html.include? 'card_month'
+    say_wizard "applying patch" if html.include? 'card_year'
+    html = html.gsub(/, {add_month_numbers: true}, {name: nil, id: "card_month"}/, '')
+    html = html.gsub(/, {start_year: Date\.today\.year, end_year: Date\.today\.year\+10}, {name: nil, id: "card_year"}/, '')
+    result = Haml::HTML.new(html, :erb => true, :xhtml => true).render
+    result = result.gsub(/select_month nil/, "select_month nil, {add_month_numbers: true}, {name: nil, id: \"card_month\"}")
+    result = result.gsub(/select_year nil/, "select_year nil, {start_year: Date.today.year, end_year: Date.today.year+10}, {name: nil, id: \"card_year\"}")
+  end
 end
 
 def html_to_slim(source)

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.2.26"
+  VERSION = "2.2.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.2.26
+  version: 2.2.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -202,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2651757590416578582
+      hash: 4010866690309646770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2651757590416578582
+      hash: 4010866690309646770
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24