visionmedia-dm-forms 0.0.2 → 0.0.3

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
 
+require 'rubygems'
 require 'dm-forms'
 require 'rspec_hpricot_matchers'
-include RspecHpricotMatchers
-  
-class String
-  def deindent spaces = 6
-    gsub /^ {0,#{spaces}}/, ''
-  end
-end
+
+Spec::Runner.configure do |config|
+  config.include RspecHpricotMatchers
+end

data/tasks/spec.rake

@@ -22,4 +22,9 @@ namespace :spec do
     t.spec_opts = ["--color", "--format", "specdoc", "--require", "spec/spec_helper.rb"]
   end
   
+  desc 'Bind specs'
+  task :bind do
+    sh %(rbind to spec/**/*.rb lib/**/*.rb -i 1 -e 'system "clear && rake spec"')
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-dm-forms
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,11 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-15 00:00:00 -08:00
+date: 2009-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: visionmedia-rext
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -37,45 +49,53 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
-- lib/dm-forms.rb
+- lib/dm-forms/base.rb
 - lib/dm-forms/core_ext.rb
-- lib/dm-forms/elements.rb
-- lib/dm-forms/model_elements.rb
+- lib/dm-forms/helpers.rb
+- lib/dm-forms/mixins/descriptions.rb
+- lib/dm-forms/mixins/errors.rb
+- lib/dm-forms/mixins/labels.rb
+- lib/dm-forms/mixins/wrappers.rb
+- lib/dm-forms/mixins.rb
 - lib/dm-forms/tag.rb
 - lib/dm-forms/version.rb
+- lib/dm-forms.rb
+- README.rdoc
 - tasks/benchmarks.rake
 - tasks/docs.rake
 - tasks/gemspec.rake
 - tasks/spec.rake
 files: 
-- History.rdoc
-- Manifest
-- README.rdoc
-- Rakefile
-- Todo.rdoc
+- dm-forms.gemspec
 - examples/benchmarks.rb
-- examples/datamapper.rb
-- examples/elements.rb
-- examples/haml.rb
-- examples/login.haml
-- lib/dm-forms.rb
+- examples/login.rb
+- History.rdoc
+- lib/dm-forms/base.rb
 - lib/dm-forms/core_ext.rb
-- lib/dm-forms/elements.rb
-- lib/dm-forms/model_elements.rb
+- lib/dm-forms/helpers.rb
+- lib/dm-forms/mixins/descriptions.rb
+- lib/dm-forms/mixins/errors.rb
+- lib/dm-forms/mixins/labels.rb
+- lib/dm-forms/mixins/wrappers.rb
+- lib/dm-forms/mixins.rb
 - lib/dm-forms/tag.rb
 - lib/dm-forms/version.rb
-- spec/functional/core_ext_spec.rb
-- spec/functional/elements_spec.rb
+- lib/dm-forms.rb
+- Manifest
+- Rakefile
+- README.rdoc
+- spec/functional/helpers_spec.rb
+- spec/functional/mixins/descriptions_spec.rb
+- spec/functional/mixins/labels_spec.rb
+- spec/functional/mixins/wrappers_spec.rb
 - spec/functional/tag_spec.rb
 - spec/integration/datamapper_spec.rb
-- spec/integration/haml_spec.rb
 - spec/spec_helper.rb
 - tasks/benchmarks.rake
 - tasks/docs.rake
 - tasks/gemspec.rake
 - tasks/spec.rake
-- dm-forms.gemspec
+- Todo.rdoc
 has_rdoc: true
 homepage: http://github.com/visionmedia/dm-forms
 post_install_message: 

data/examples/datamapper.rb

@@ -1,37 +0,0 @@
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'dm-forms'
-require 'dm-core'
-require 'dm-validations'
-
-include DataMapper::Form::ModelElements
-DataMapper.setup :default, 'sqlite3::memory:'
-
-class User
-  include DataMapper::Resource
-  property :id,    Serial
-  property :name,  String, :format => /^[\w]+$/
-  property :email, String, :format => :email_address
-end
-
-DataMapper.auto_migrate!
-user = User.new :name => 'tj', :email => 'invalid email@lame.com'
-
-s = errors_for(user)
-s << form_for(user, :action => '/user') do |f|
-  f.textarea :name
-  f.textarea :email
-  f.submit :op, :value => 'Add'
-end
-puts s
-
-user.email = 'tj@vision-media.ca'
-user.save
-
-s = errors_for(user)
-s << form_for(user, :action => '/user') do |f|
-  f.textarea :name, :label => 'Name'
-  f.textarea :email, :label => 'Email'
-  f.submit :op, :value => 'Update'
-end
-puts s

data/examples/elements.rb

@@ -1,31 +0,0 @@
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'dm-forms'
-
-include DataMapper::Form::Elements
-
-def example before, &block
-  puts before << "\n\n"
-  puts yield.gsub!(/^/, '    ')
-  puts
-end
-
-example %(textarea :comments) do
-  textarea :comments
-end
-
-example %(textarea :comments, :label => 'Comments', :description => 'Tell us what you think') do
-  textarea :comments, :label => 'Comments', :description => 'Tell us what you think'
-end
-
-example %(textfield :email, :label => 'Email', :required => true) do
-  textfield :email, :label => 'Email', :required => true
-end
-
-example 'Login' do
-  form :login do |f|
-    f.textfield :name, :label => 'Username'
-    f.textfield :pass, :label => 'Password'
-    f.submit :op, :value => 'Login'
-  end
-end

data/examples/haml.rb

@@ -1,21 +0,0 @@
-
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'rubygems'
-require 'haml'
-require 'dm-forms'
-
-include DataMapper::Form::ModelElements
-
-# Haml does not play very nice with nested Ruby, but then again
-# there is relatively nothing that cannot be altered via styling
-# so placing forms directly within a Haml view is not entirely
-# necessary.
-def login_form
-  form :login, :action => '/user' do |f|
-	  f.textarea :name, :label => 'Name'
-	  f.textarea :email, :label => 'Email'
-	  f.submit :op, :value => 'Login'
-	end
-end
-
-puts Haml::Engine.new(File.read(File.dirname(__FILE__) + '/login.haml')).render

data/examples/login.haml

@@ -1,4 +0,0 @@
-#primary
-  .content
-    %h1 Login
-    = login_form

data/lib/dm-forms/elements.rb

@@ -1,210 +0,0 @@
-
-module DataMapper
-  module Form
-    module Elements
-      
-      ##
-      # Proxy object for capturing elements. See Elements#capture_elements.
-      
-      class Proxy
-        def initialize model = nil
-          @model = model 
-        end
-        
-        def method_missing meth, *args, &block
-          add_error_class_to args if has_a_model_with_errors_on? args.first
-          (@elements ||= []) << Elements.send(meth, *args, &block)
-        end
-        
-        def add_error_class_to args
-          ((args[1] ||= {})[:class] ||= '') << ' error'
-        end
-        
-        def has_a_model_with_errors_on? meth
-          @model and !@model.valid? and @model.errors.on meth
-        end
-      end
-      
-      module_function
-      
-      ##
-      # Generates a generic HTML +name+ tag. Although this method is 
-      # generally used internally by dm-forms, you may utilize it directly
-      # passing any of the following +options+.
-      #
-      # === Options:
-      #
-      #   :self_closing   Wither or not the element should self-close (<br />)
-      #   :attributes     Hash of attributes such as :type => :textfield
-      #
-      
-      def tag name, options = {}, &block
-        Tag.new(name, options, &block).render
-      end
-      
-      ##
-      # Generates a label.
-      
-      def label value, options = {}
-        value << ':'
-        value << '<em>*</em>' if options.delete :required
-        %(<label for="#{options[:for]}">#{value}</label>\n)
-      end
-      
-      ##
-      # Generates a legend.
-      
-      def legend value
-        %(<legend>#{value}</legend>)
-      end
-      
-      ##
-      # Generates a description.
-      
-      def desc text
-        %(\n<p class="description">#{text}</p>) unless text.blank?
-      end
-           
-      ##
-      # Generates an option.
-      
-      def option value, title
-        %(<option value="#{value}">#{title}</option>\n)
-      end
-      
-      ##
-      # Generates a form.
-      
-      def form name, options = {}, &block
-        options = { :method => :post, :id => "form-#{name}" }.merge options
-        unless valid_http_verb? options
-          old_value = options[:value] || ''
-          options[:value] = hidden_method(options[:method]) << old_value
-          options[:method] = :post
-        end
-        tag :form, :attributes => options, &block
-      end
-      
-      ##
-      # Generates a fieldset.
-      
-      def fieldset name, options = {}, &block
-        legend_value = options.has_key?(:legend) ? options.delete(:legend) : name.humanize.capitalize
-        options = { :class => "fieldset-#{name}" }.merge options
-        options[:value] = "\n" << legend(legend_value) << (options.delete(:value) || '')
-        tag :fieldset, :attributes => options, &block
-      end
-              
-      ##
-      # Generates a textfield.
-      
-      def textfield name, options = {}
-        options = { :type => :textfield, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options
-      end
-      
-      ##
-      # Generates a password field.
-      
-      def password name, options = {}
-        options = { :type => :password, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options
-      end
-      
-      ##
-      # Generates a checkbox.
-      
-      def checkbox name, options = {}
-        options = { :type => :checkbox, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options        
-      end
-      
-      ##
-      # Generates a hidden field.
-      
-      def hidden name, options = {}
-        options = { :type => :hidden, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options        
-      end
-      
-      ##
-      # Creates hidden _method, with value of +method+.
-      
-      def hidden_method method
-        hidden :_method, :value => method
-      end
-            
-      ##
-      # Generates a radio button.
-      
-      def radio name, options = {}
-        options = { :type => :radio, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options        
-      end
-      
-      ##
-      # Generates a file field.
-      
-      def file name, options = {}
-        options = { :type => :file, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options        
-      end
-      
-      ##
-      # Generates a select field.
-      
-      def select name, options = {}, &block
-        options = { :name => name, :value => "\n" }.merge options
-        options[:value] << capture_elements(&block) if block_given?
-        options[:value] << select_options(options) if options.include? :options
-        tag :select, :attributes => options
-      end
-      
-      ##
-      # Generates a textarea.
-      
-      def textarea name, options = {}, &block
-        options = { :name => name }.merge options
-        tag :textarea, :attributes => options, &block
-      end
-            
-      ##
-      # Generates a submit button.
-      
-      def submit name, options = {}
-        options = { :type => :submit, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options
-      end
-      
-      ##
-      # Generates a button.
-      
-      def button name, options = {}
-        type = options.has_key?(:src) ? :image : :button
-        options = { :type => type, :name => name }.merge options
-        tag :input, :self_closing => true, :attributes => options
-      end
-      
-      ##
-      # Capture results of elements called within +block+. Optionally
-      # a DataMapper model may be passed, at which point error classes
-      # will be applied to invalid elements.
-      
-      def capture_elements model = nil, &block
-        elements = yield Proxy.new(model)
-        elements.join
-      end
-      
-      private
-      
-      def select_options options #:nodoc:
-        options.delete(:options).collect { |value, title| option(value, title) }.join
-      end
-      
-      def valid_http_verb? options #:nodoc:
-        [:get, :post].include? options[:method]
-      end
-      
-    end
-  end
-end