incline 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842e7eff9a44004c8cb445ff80b538f2c08726c7
-  data.tar.gz: cb560523652fc10d1c0621bca9e8bacc18e0417e
+  metadata.gz: 404eac95dd5245f93a10413012dd3757d817232a
+  data.tar.gz: 86a88d8d878eb8b2d3922589431483d3d5f1815f
 SHA512:
-  metadata.gz: 4f4f49b159ef9ce55da131be8cc0fd7974ff7aa4466a4396ef38a5db82cdb16a3e7cbd9ebcccdfd4e608f553df4aae1c1d567857f92ab5bb73e3eff65d9d2214
-  data.tar.gz: 816525fa0e434fcff3d045b3d3ce66c3ae7bb5f5c36b0ba5c9c3446000f0b68895e860da43064eb561eb8c436da3f631490dc65042bc293ddbdcac7740d82bee
+  metadata.gz: 31f8747e60f9fc1888642b776f6a940e0891cc4d451c18d33454cb84a8b50115e52155ab076c46656e1a3df9f3aab17cc9d85432ceb3d671445b9f4f382983bf
+  data.tar.gz: 8839b5f95bbb89da70023da2e7a21c612adb99b904542760359964a963b67c45074370bd2237570ab2b6bb34202309faca9aba70c7fcddc7ce254305667aaa06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.3.7)
+    incline (0.3.8)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass

data/lib/incline/cli/prepare.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'json'
 require 'shells'
 require 'io/console'
 require 'ansi/code'

data/lib/incline/extensions/form_builder.rb

@@ -178,13 +178,12 @@ module Incline::Extensions
       # We want each field to have a width specified.
       remaining_width = 100.0
       remaining_fields = fields.count
-      width_match_1 = /^width:([^;]);/
-      width_match_2 = /;\s*width:([^;]);/
+      width_match = /(?:^|;)\s*width:\s*([^;]+);/
 
       # pass 1, compute remaining width.
       fields.each do |meth, attr|
-        width = width_match_1.match(attr[:style]) || width_match_2.match(attr[:style])
-        if width
+        if attr[:style] =~ width_match
+          width = $1
           if width[-1] == '%'
             width = width[0...-1].strip.to_f
             if width > remaining_width
@@ -205,8 +204,7 @@ module Incline::Extensions
 
       # pass 2, fill in missing widths.
       fields.each do |meth, attr|
-        width = width_match_1.match(attr[:style]) || width_match_2.match(attr[:style])
-        unless width
+        unless attr[:style] =~ width_match
           width =
             if remaining_fields > 1
               (remaining_width / remaining_fields).to_i

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/test/extensions/action_view_base_extensions_test.rb

@@ -243,7 +243,7 @@ class ActionViewBaseExtensionsTest < ActiveSupport::TestCase
         "<li class=\"alert_52444\" style=\"display: none;\">This is error #9.</li>" +
         "<li class=\"alert_52444\" style=\"display: none;\">This is error #10.</li>" +
         "</ul></div>" +
-        "<script type=\"text/javascript\">\n<![CDATA[\nfunction show_alert_52444() { $('.alert_52444_show').hide(); $('.alert_52444').show(); }\n\n]]>\n</script>\n" +
+        "<script type=\"text/javascript\">\n//<![CDATA[\nfunction show_alert_52444() { $('.alert_52444_show').hide(); $('.alert_52444').show(); }\n\n//]]>\n</script>\n" +
         "</div></div>"
 
     val = @view.error_summary(TestModel.new)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Beau Barker