Generators lib/generators/.DS_Store lib/generators/hao_de_generator.rb lib/generators/hao_de_nested_resource.rb lib/generators/hao_de_resource.rb lib/generators/templates/.DS_Store lib/generators/templates/nested_resource/app/controllers/%file_name%.rb lib/generators/templates/nested_resource/app/helpers/%file_name%.rb lib/generators/templates/nested_resource/app/models/%file_name%.rb lib/generators/templates/nested_resource/app/views/%file_name%/form.html.haml lib/generators/templates/nested_resource/app/views/%file_name%/index.html.haml lib/generators/templates/nested_resource/app/views/%file_name%/show.html.haml lib/generators/templates/nested_resource/spec/controllers/%file_name%_spec.rb lib/generators/templates/nested_resource/spec/models/%file_name%_spec.rb lib/generators/templates/nested_resource/spec/views/%file_name%/form.html.haml_spec.rb lib/generators/templates/nested_resource/spec/views/%file_name%/index.html.haml_spec.rb lib/generators/templates/nested_resource/spec/views/%file_name%/show.html.haml_spec.rb lib/generators/templates/resource/.DS_Store lib/generators/templates/resource/app/.DS_Store lib/generators/templates/resource/app/controllers/%file_name%.rb lib/generators/templates/resource/app/helpers/%file_name%.rb lib/generators/templates/resource/app/models/%file_name%.rb lib/generators/templates/resource/app/views/%file_name%/.DS_Store lib/generators/templates/resource/app/views/%file_name%/form.html.haml lib/generators/templates/resource/app/views/%file_name%/index.html.haml lib/generators/templates/resource/app/views/%file_name%/show.html.haml lib/generators/templates/resource/app/views/.DS_Store lib/generators/templates/resource/spec/.DS_Store lib/generators/templates/resource/spec/controllers/%file_name%_spec.rb lib/generators/templates/resource/spec/models/%file_name%_spec.rb lib/generators/templates/resource/spec/views/%file_name%/form.html.haml_spec.rb lib/generators/templates/resource/spec/views/%file_name%/index.html.haml_spec.rb lib/generators/templates/resource/spec/views/%file_name%/show.html.haml_spec.rb lib/generators/templates/resource/spec/views/.DS_Store public/javascripts/ui/i18n/.svn/all-wcprops public/javascripts/ui/i18n/.svn/entries public/javascripts/ui/i18n/.svn/format public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-ar.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-bg.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-ca.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-cs.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-da.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-de.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-es.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-fi.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-fr.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-he.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-hu.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-id.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-is.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-it.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-ja.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-ko.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-lt.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-lv.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-nl.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-no.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-pl.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-pt-BR.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-ro.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-ru.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-sk.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-sv.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-th.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-tr.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-zh-CN.js.svn-base public/javascripts/ui/i18n/.svn/prop-base/ui.datepicker-zh-TW.js.svn-base public/javascripts/ui/i18n/.svn/text-base/jquery.ui.i18n.all.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-ar.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-bg.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-ca.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-cs.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-da.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-de.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-eo.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-es.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-fi.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-fr.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-he.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-hr.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-hu.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-hy.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-id.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-is.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-it.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-ja.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-ko.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-lt.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-lv.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-nl.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-no.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-pl.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-pt-BR.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-ro.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-ru.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-sk.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-sl.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-sv.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-th.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-tr.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-uk.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-zh-CN.js.svn-base public/javascripts/ui/i18n/.svn/text-base/ui.datepicker-zh-TW.js.svn-base public/javascripts/ui/i18n/jquery.ui.i18n.all.js public/javascripts/ui/i18n/ui.datepicker-ar.js public/javascripts/ui/i18n/ui.datepicker-bg.js public/javascripts/ui/i18n/ui.datepicker-ca.js public/javascripts/ui/i18n/ui.datepicker-cs.js public/javascripts/ui/i18n/ui.datepicker-da.js public/javascripts/ui/i18n/ui.datepicker-de.js public/javascripts/ui/i18n/ui.datepicker-eo.js public/javascripts/ui/i18n/ui.datepicker-es.js public/javascripts/ui/i18n/ui.datepicker-fi.js public/javascripts/ui/i18n/ui.datepicker-fr.js public/javascripts/ui/i18n/ui.datepicker-he.js public/javascripts/ui/i18n/ui.datepicker-hr.js public/javascripts/ui/i18n/ui.datepicker-hu.js public/javascripts/ui/i18n/ui.datepicker-hy.js public/javascripts/ui/i18n/ui.datepicker-id.js public/javascripts/ui/i18n/ui.datepicker-is.js public/javascripts/ui/i18n/ui.datepicker-it.js public/javascripts/ui/i18n/ui.datepicker-ja.js public/javascripts/ui/i18n/ui.datepicker-ko.js public/javascripts/ui/i18n/ui.datepicker-lt.js public/javascripts/ui/i18n/ui.datepicker-lv.js public/javascripts/ui/i18n/ui.datepicker-nl.js public/javascripts/ui/i18n/ui.datepicker-no.js public/javascripts/ui/i18n/ui.datepicker-pl.js public/javascripts/ui/i18n/ui.datepicker-pt-BR.js public/javascripts/ui/i18n/ui.datepicker-ro.js public/javascripts/ui/i18n/ui.datepicker-ru.js public/javascripts/ui/i18n/ui.datepicker-sk.js public/javascripts/ui/i18n/ui.datepicker-sl.js public/javascripts/ui/i18n/ui.datepicker-sv.js public/javascripts/ui/i18n/ui.datepicker-th.js public/javascripts/ui/i18n/ui.datepicker-tr.js public/javascripts/ui/i18n/ui.datepicker-uk.js public/javascripts/ui/i18n/ui.datepicker-zh-CN.js public/javascripts/ui/i18n/ui.datepicker-zh-TW.js @@ -1,9 +1,9 @@ require 'rubygems' require 'rake/gempackagetask' -require 'rubygems/specification' -require 'date' -require 'merb-core/version' +require "rake/rdoctask" +require "extlib" require 'merb-core/tasks/merb_rake_helper' +require "spec/rake/spectask" NAME = "merb-simple-forms" GEM_VERSION = "0.0.1" @@ -11,9 +11,10 @@ AUTHOR = "Your Name" EMAIL = "Your Email" HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb plugin that provides ..." +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' spec = Gem::Specification.new do |s| - s.rubyforge_project = 'merb' + s.rubyforge_project = 'merb-simple-forms' s.name = NAME s.version = GEM_VERSION s.platform = Gem::Platform::RUBY @@ -24,33 +25,42 @@ spec = Gem::Specification.new do |s| s.author = AUTHOR s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency('merb', '>= 0.9.8') s.require_path = 'lib' - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") - + s.files = %w(LICENSE README Rakefile Generators TODO) + Dir.glob("{lib,spec,public/Library/Ruby/Gems/1.8/gems/templater-0.3.3/}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end -desc "install the plugin locally" -task :install => [:package] do - sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} +desc "Install the gem" +task :install do + Merb::RakeHelper.install(NAME, :version => GEM_VERSION) end -desc "create a gemspec file" -task :make_spec do - File.open("#{NAME}.gemspec", "w") do |file| +desc "Uninstall the gem" +task :uninstall do + Merb::RakeHelper.uninstall(NAME, :version => GEM_VERSION) +end + +desc "Create a gemspec file" +task :gemspec do + File.open("#{GEM_NAME}.gemspec", "w") do |file| file.puts spec.to_ruby end end -namespace :jruby do - - desc "Run :package and install the resulting .gem with jruby" - task :install => :package do - sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri} +desc "Run all examples (or a specific spec with TASK=xxxx)" +Spec::Rake::SpecTask.new('spec') do |t| + t.spec_opts = ["-cfs"] + t.spec_files = begin + if ENV["TASK"] + ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" } + else + FileList['spec/**/*_spec.rb'] + end end - end + +desc 'Default: run spec examples' +task :default => 'spec' \ No newline at end of file Rakefile @@ -41,6 +41,8 @@ module Merb text_area(options[:value], options) end + alias_method :control_textarea, :control_text_area + def control_password_field(options={}) password_field(options) end @@ -60,6 +62,25 @@ module Merb # Controls a computer size in bytes, KB, MB, GB and TB def control_size(options={}) + # Here is the javascript that does the conversion + javascript_lib = <<JS + <script type="text/javascript" charset="utf-8"> + function initialize_size_field(id) { + $("#"+id+"_converted").bind('change', function() { update_size_field_value(id) }); + $("#"+id+"_unit").bind('change', function() { update_size_field_value(id) }); + } + + function update_size_field_value(id) { + var converted_value = $("#"+id+"_converted").val(); + var unit = $("#"+id+"_unit").val(); + var hidden_field = $("#"+id); + if (unit=="B") { hidden_field.val(converted_value); } + if (unit=="KB") { hidden_field.val(converted_value * 1024); } + if (unit=="MB") { hidden_field.val(converted_value * 1024 * 1024); } + if (unit=="GB") { hidden_field.val(converted_value * 1024 * 1024 * 1024); } + if (unit=="TB") { hidden_field.val(converted_value * 1024 * 1024 * 1024 * 1024); } + </script> +JS html = "" if options[:value] != nil size = Kernel.Float(options[:value]) @@ -79,9 +100,64 @@ module Merb html << select(:id => options[:id]+"_unit", :name => options[:name]+"[unit]", :collection => [["B", "B"], ["KB", "KB"], ["MB", "MB"], ["GB", "GB"], ["TB", "TB"]], :selected => unit) html << hidden_field(options) # This javascript looks at the _converted text field and unit select and updates the real value in the hidden field - html << "<script type=\"text/javascript\" charset=\"utf-8\">$(document).ready(function(){initialize_size_field('#{options[:id]}');});</script>" + html << javascript_lib + html << document_ready("initialize_size_field('#{options[:id]}');") + html + end + + def control_date_picker(options={}) + # format the date for the date picker (dm does the conversion in the other way just fine) + options[:value] = options[:value].strftime("%m/%d/%Y") if options[:value].class == Time + + html = text_field(options) + html << document_ready("$('##{options[:id]}').datepicker();") html end + + alias_method :control_date, :control_date_picker + alias_method :control_date_selector, :control_date_picker + + def control_time_picker(options={}) + # format the time for the date picker (dm does the conversion in the other way just fine) + options[:value] = options[:value].strftime("%I:%M%p").downcase if options[:value].class == Time + + html = text_field(options) + html << document_ready("$('##{options[:id]}').timepicker();") + html + end + + alias_method :control_time, :control_time_picker + alias_method :control_time_selector, :control_time_picker + + def control_date_and_time(options={}) + date_picker = control_date_picker(options.merge(:id => options[:id]+"_date", :name => nil)) + time_picker = control_time_picker(options.merge(:id => options[:id]+"_time", :name => nil)) + hidden_field = hidden_field(options) + + javascript = <<JAVASCRIPT + function update_date_and_time(id) { + console.log("update date and time id: "+id); + console.log("date is "+$("#"+id+"_date").val()); + console.log("time is "+$("#"+id+"_time").val()); + $("#"+id).val($("#"+id+"_date").val() + " " + $("#"+id+"_time").val()); + } + + $("##{options[:id]}_date").bind('change', function() { update_date_and_time('#{options[:id]}') }); + $("##{options[:id]}_time").bind('change', function() { update_date_and_time('#{options[:id]}') }); + $("#h_#{options[:id]}_time").bind('change', function() { update_date_and_time('#{options[:id]}') }); + $("#m_#{options[:id]}_time").bind('change', function() { update_date_and_time('#{options[:id]}') }); + $("#p_#{options[:id]}_time").bind('change', function() { update_date_and_time('#{options[:id]}') }); +JAVASCRIPT + + date_picker + time_picker + hidden_field + document_ready(javascript) + end + + alias_method :control_date_and_time_picker, :control_date_and_time + alias_method :control_date_and_time_selector, :control_date_and_time + + def document_ready(script) + "<script type=\"text/javascript\" charset=\"utf-8\">$(document).ready(function(){ #{script} } );</script>" + end end end end lib/merb-simple-forms/controls.rb @@ -9,8 +9,12 @@ module Merb def render_form(object_symbol, form_definition={}) object = (object_symbol==nil) ? nil : self.instance_variable_get("@#{object_symbol.to_s}") - if ((form_definition=={}) and (object!=nil)) - form_definition = object.class.form_definition + if (form_definition=={}) + if (object!=nil) and object.class.respond_to?(:form_definition) + form_definition = object.class.form_definition + else + form_definition = self.send(object_symbol.to_s+"_form_definition") + end end form = "\n" lib/merb-simple-forms/simple-forms-helpers.rb public/javascripts/simple-forms.js c0bf52e0144940b74915837d8d3d101fc10f3e2e Maxime maxime@ekohe.com http://github.com/maxime/merb-simple-forms/commit/e61a76f120c8734da0e30d7821f605bc61863b9b e61a76f120c8734da0e30d7821f605bc61863b9b 2008-11-05T08:58:04-08:00 2008-11-05T08:58:04-08:00 A lot of new generators aa2b10f9ccbf0b600778ff61d613dad19e3640b3 Maxime maxime@ekohe.com