formidable 0.1 → 0.1.1

data/Gemfile

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+source :rubygems
+
 # gem "nokogiri"
 
 gem "nake"

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    code-cleaner (0.8.2)
+    diff-lcs (1.1.2)
+    nake (0.0.8)
+      term-ansicolor
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  code-cleaner
+  nake
+  rspec

data/formidable.pre.gemspec

@@ -3,6 +3,6 @@
 
 # You might think this is a terrible mess and guess what, you're
 # right mate! However say thanks to authors of RubyGems, not me.
-eval(File.read("form.gemspec")).tap do |specification|
+eval(File.read("formidable.gemspec")).tap do |specification|
   specification.version = "#{specification.version}.pre"
 end

data/lib/formidable/elements.rb

@@ -121,7 +121,8 @@ module Formidable
       renderer Renderers::Form
 
       # TODO: prefix should be in the form definition (name or namespace)
-      def initialize(action, method = "POST", prefix = nil, attributes = Hash.new, raw_data = nil)
+      def initialize(action, method = "POST", prefix = nil, attributes = Hash.new, raw_data = Hash.new)
+        @raw_data = raw_data
         self.setup
         super(:form, nil, attributes.merge!(action: action, method: method), raw_data)
         set_prefix(prefix) if prefix

data/lib/formidable/renderers/string.rb

@@ -4,9 +4,9 @@
 module Formidable
   module Renderers
     class Renderer
-      attr_reader :element
-      def initialize(element)
-        @element = element
+      attr_reader :element, :rendering_block
+      def initialize(element, &rendering_block)
+        @element, @rendering_block = element, rendering_block
       end
 
       def tag(name, attributes = nil, &block)
@@ -53,7 +53,8 @@ module Formidable
       end
     end
 
-    class LabeledInputRenderer < SimpleInputRenderer
+    # Point of this mixin is that we want to have two classes with the same functionality, but different superclass (so super call will render input or tag, depending on what we want).
+    module LabeledElementMixin
       def render
         id = element.attributes[:id] || (element.attributes[:id] = "random-#{element.object_id}")
         buffer = tag(:label, for: id) { element.attributes[:title] || element.attributes[:placeholder] } + "\n"
@@ -61,6 +62,14 @@ module Formidable
       end
     end
 
+    class LabeledInputRenderer < SimpleInputRenderer
+      include LabeledElementMixin
+    end
+
+    class LabeledTagRenderer < SimpleTagRenderer
+      include LabeledElementMixin
+    end
+
     class Fieldset < SimpleInputRenderer
       def render
         tag(:fieldset) do
@@ -94,6 +103,14 @@ module Formidable
           set_method(method)
         end
 
+        if self.rendering_block
+          block ||= Proc.new do
+            element.elements.map do |element|
+              self.instance_exec(element, &rendering_block)
+            end.join("\n")
+          end
+        end
+
         block ||= begin
           Proc.new do
             element.elements.map do |element|

data/lib/formidable/rendering.rb

@@ -8,7 +8,7 @@ module Formidable
       klass.extend(ClassMethods)
       klass.extend Module.new {
         def inherited(subclass)
-          subclass.renderer(default_renderer)
+          subclass.renderer(default_renderer, &rendering_block)
         end
       }
     end
@@ -17,7 +17,8 @@ module Formidable
     def renderer
       @renderer ||= begin
         renderer = self.class.default_renderer
-        renderer.new(self) unless renderer.nil?
+        rendering_block = self.class.rendering_block
+        renderer.new(self, &rendering_block) unless renderer.nil?
       end
     end
 
@@ -32,10 +33,11 @@ module Formidable
     end
 
     module ClassMethods
-      attr_reader :default_renderer
+      attr_reader :default_renderer, :rendering_block
 
-      def renderer(default_renderer)
+      def renderer(default_renderer, &rendering_block)
         @default_renderer = default_renderer
+        @rendering_block  = rendering_block
       end
     end
   end

data/lib/formidable/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Formidable
-  VERSION = "0.1"
+  VERSION ||= "0.1.1"
 end

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: formidable
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jakub Stastny aka Botanicus
@@ -13,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-11-03 00:00:00 +01:00
+date: 2011-07-18 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +26,7 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.textile
 - TODO.txt
@@ -70,7 +68,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks.rb
-- vendor/cache/validatable-1.6.7.gem
 has_rdoc: true
 homepage: http://github.com/botanicus/formidable
 licenses: []
@@ -85,22 +82,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
       version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: formidable
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ""