dry_crud 1.2.6 → 1.2.7

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

data/lib/generators/dry_crud/templates/app/helpers/standard_form_builder.rb

@@ -72,7 +72,7 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   
   # Render a standard number field.
   def number_field(attr, html_options = {})
-    text_field(attr, {:size => 15}.merge(html_options))
+    super(attr, {:size => 15}.merge(html_options))
   end
   
   # Render an integer field.
@@ -115,7 +115,7 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   
   # Renders a marker if the given attr has to be present.
   def required_mark(attr)
-    REQUIRED_MARK if required?(attr)
+    required?(attr) ? REQUIRED_MARK : ''
   end
   
   # Render a label for the given attribute with the passed field html section.

data/lib/generators/dry_crud/templates/public/stylesheets/crud.css

@@ -145,6 +145,7 @@ a.action img {
 .required {
 	font-size: 80%;
 	vertical-align: top;
+	margin-left: 1pt;
 }
 
 #flash_notice, #flash_alert {

data/lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb

@@ -82,9 +82,9 @@ class CrudHelperTest < ActionView::TestCase
     assert_match /form .*?action="\/crud_test_models\/#{@entry.id}"/, f
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text"/, f
     assert_match /input .*?name="crud_test_model\[whatever\]" .*?type="text"/, f
-    assert_match /input .*?name="crud_test_model\[children\]" .*?type="text"/, f
-    assert_match /input .*?name="crud_test_model\[rating\]" .*?type="text"/, f
-    assert_match /input .*?name="crud_test_model\[income\]" .*?type="text"/, f
+    assert_match /input .*?name="crud_test_model\[children\]" .*?type="number"/, f
+    assert_match /input .*?name="crud_test_model\[rating\]" .*?type="number"/, f
+    assert_match /input .*?name="crud_test_model\[income\]" .*?type="number"/, f
     assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
     assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
     assert_match /select .*?name="crud_test_model\[companion_id\]"/, f

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_form_builder_test.rb

@@ -61,6 +61,13 @@ class StandardFormBuilderTest < ActionView::TestCase
   	assert result.include?(form.input_field(:children))
   end
   
+  test "labeld_input_field adds required mark" do
+  	result = form.labeled_input_field(:name)
+  	assert result.include?(StandardFormBuilder::REQUIRED_MARK)
+  	result = form.labeled_input_field(:remarks)
+  	assert !result.include?(StandardFormBuilder::REQUIRED_MARK)
+  end
+  
   test "belongs_to_field has all options by default" do
     f = form.belongs_to_field(:companion_id)
     assert_equal 7, f.scan('</option>').size
@@ -113,8 +120,8 @@ class StandardFormBuilderTest < ActionView::TestCase
   
   test "required mark is shown" do
     assert_equal StandardFormBuilder::REQUIRED_MARK, form.required_mark(:name)
-    assert_nil form.required_mark(:rating)
-    assert_nil form.required_mark(:anything)
+    assert_equal "", form.required_mark(:rating)
+    assert_equal "", form.required_mark(:anything)
   end
   
   test "method missing still works" do

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_helper_test.rb

@@ -175,7 +175,7 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /option selected="selected" value="1910">1910<\/option>/, f 
     assert_match /option selected="selected" value="1">January<\/option>/, f
     assert_match /option selected="selected" value="1">1<\/option>/, f
-    assert_match /input .*?name="crud_test_model\[children\]" .*?type="text" .*?value=\"9\"/, f
+    assert_match /input .*?name="crud_test_model\[children\]" .*?type="number" .*?value=\"9\"/, f
     assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
     assert_match /input .*?type="submit" .*?value="Save"/, f
   end
@@ -190,7 +190,7 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /input .*?name="crud_test_model\[name\]" .*?type="text"/, f
     assert_no_match /input .*?name="crud_test_model\[name\]" .*?type="text" .*?value=/, f
     assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
-    assert_match /input .*?name="crud_test_model\[children\]" .*?type="text"/, f
+    assert_match /input .*?name="crud_test_model\[children\]" .*?type="number"/, f
     assert_no_match /input .*?name="crud_test_model\[children\]" .*?type="text" .*?value=/, f
     assert_match /input .*?type="submit" .*?value="Save"/, f
   end
@@ -212,7 +212,7 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /option selected="selected" value="1910">1910<\/option>/, f
     assert_match /option selected="selected" value="1">January<\/option>/, f
     assert_match /option selected="selected" value="1">1<\/option>/, f
-    assert_match /input .*?name="crud_test_model\[children\]" .*?type="text" .*?value=\"9\"/, f
+    assert_match /input .*?name="crud_test_model\[children\]" .*?type="number" .*?value=\"9\"/, f
     assert_match /input .*?name="crud_test_model\[human\]" .*?type="checkbox"/, f
     assert_match /input .*?type="submit" .*?value="Save"/, f
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_crud
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency