formtastic_extensions 0.0.6 → 0.0.7

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/krasivotokak/formtastic_extensions"
     gem.authors = ["Alexander Semyonov"]
     gem.add_development_dependency "thoughtbot-shoulda"
-    gem.add_dependency('formtastic', '0.2.5')
+    gem.add_dependency('formtastic', '>= 0.9.1')
     gem.add_dependency('validation_reflection', '0.3.5')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/formtastic_extensions.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic_extensions}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
-  s.date = %q{2009-10-17}
+  s.date = %q{2009-11-06}
   s.description = %q{extension for formtastic, adding tag_list and others}
   s.email = %q{rotuka@tokak.ru}
   s.extra_rdoc_files = [
@@ -51,16 +51,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<formtastic>, ["= 0.2.5"])
+      s.add_runtime_dependency(%q<formtastic>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<validation_reflection>, ["= 0.3.5"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<formtastic>, ["= 0.2.5"])
+      s.add_dependency(%q<formtastic>, [">= 0.9.1"])
       s.add_dependency(%q<validation_reflection>, ["= 0.3.5"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<formtastic>, ["= 0.2.5"])
+    s.add_dependency(%q<formtastic>, [">= 0.9.1"])
     s.add_dependency(%q<validation_reflection>, ["= 0.3.5"])
   end
 end
+

data/lib/formtastic_extensions.rb

@@ -1,9 +1,16 @@
-require 'validation_reflection'
-require 'formtastic'
-require 'formtastic_extensions/semantic_form_builder'
-
 module FormtasticExtensions
   def self.locale_files
-    Dir[File.join(File.dirname(__FILE__), 'milk', 'locales', '*')]
+    Dir[File.join(File.dirname(__FILE__), 'formtastic_extensions', 'locales', '*')]
+  end
+
+  def self.override_formtastic!
+    Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
+    Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+    Formtastic::SemanticFormHelper.builder = FormtasticExtensions::SemanticFormBuilder
   end
 end
+
+
+if defined?(:Rails)
+  I18n.load_path.unshift(*FormtasticExtensions.locale_files)
+end

data/lib/formtastic_extensions/locales/en.yml

@@ -5,5 +5,5 @@ en:
     required: 'Required'
     buttons:
       create: 'Create'
-      save: 'Save'
+      update: 'Save'
       submit: 'Submit'

data/lib/formtastic_extensions/locales/ru.yml

@@ -5,5 +5,5 @@ ru:
     required: 'Обязательно'
     buttons:
       create: 'Добавить'
-      save: 'Сохранить'
+      update: 'Сохранить'
       submit: 'Отправить'

data/lib/formtastic_extensions/semantic_form_builder.rb

@@ -1,11 +1,14 @@
+require 'formtastic'
+
 module FormtasticExtensions
-  class SemanticFormBuilder < ::Formtastic::SemanticFormBuilder
-    @@all_fields_required_by_default = false
-    @@i18n_lookups_by_default = true
+  class SemanticFormBuilder < Formtastic::SemanticFormBuilder
+    cattr_accessor :input_class, :inputs_class, :butons_class
+
+    self.all_fields_required_by_default = false
+    self.i18n_lookups_by_default = true
     @@input_class = 'b_field'
     @@inputs_class = 'b_fields_set'
     @@buttons_class = 'b_buttons_set'
-    cattr_accessor :input_class, :inputs_class, :butons_class
 
     def input(method, options = {})
       options[:required] = method_required?(method) unless options.key?(:required)
@@ -13,14 +16,11 @@ module FormtasticExtensions
 
       html_class = [ options[:as], (options[:required] ? :required : :optional) ]
       html_class << 'error' if @object && @object.respond_to?(:errors) && !@object.errors[method.to_sym].blank?
+      html_class << method.to_s
 
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:id]  ||= generate_html_id(method)
-      wrapper_html[:class] = "#{@@input_class} #{(html_class << wrapper_html[:class]).flatten.compact.map{ |klass| "#{@@input_class}-#{klass}" }.join(' ')}"
-
-      if [:boolean_select, :boolean_radio].include?(options[:as])
-        ::ActiveSupport::Deprecation.warn(":as => :#{options[:as]} is deprecated, use :as => :#{options[:as].to_s[8..-1]} instead", caller[3..-1])
-      end
+      wrapper_html[:class] = class_with_modifiers(@@input_class, html_class << wrapper_html[:class])
 
       if options[:input_html] && options[:input_html][:id]
         options[:label_html] ||= {}
@@ -49,7 +49,7 @@ module FormtasticExtensions
         if @object && args.empty?
           args  = @object.class.reflections.map { |n,_| n if _.macro == :belongs_to }
           args += @object.class.content_columns.map(&:name)
-          args -= %w[created_at updated_at created_on updated_on lock_version]
+          args -= %w[created_at updated_at created_on updated_on lock_version version]
           args.compact!
         end
         contents = args.map { |method| input(method.to_sym) }
@@ -71,21 +71,22 @@ module FormtasticExtensions
       end
     end
 
-    def save_or_create_button_text(prefix = 'Submit')
-      if @object
-        prefix = @object.new_record? ? 'Create' : 'Save'
-        object_name = @object.class.name.underscore
-      else
-        object_name = @object_name.to_s.underscore
-      end
-      i18n_prefix = prefix.downcase
+    def wysiwyg_input(method, options = {})
+      html_options = options.delete(:input_html) || {}
+      html_options[:class] ||= ''
+      html_options[:class] << ' mceEditor'
 
-      i18n_prefix = prefix.downcase
-      I18n.t("formtastic.buttons.#{object_name}.#{i18n_prefix}",
-             :default => [
-               :"formtastic.buttons.#{i18n_prefix}",
-               prefix])
+      self.label(method, options_for_label(options)) +
+      self.text_area(method, html_options)
+    end
+
+  protected
+    def class_with_modifiers(main_klass, modifiers)
+      result = "#{main_klass} "
+      result << modifiers.flatten.compact.map do |klass|
+        "#{main_klass}-#{klass}"
+      end.join(' ')
+      result
     end
   end
 end
-

data/rails/init.rb

@@ -1,6 +1 @@
-require 'formtastic'
 require 'formtastic_extensions'
-
-ActionView::Base.send :include, Formtastic::SemanticFormHelper
-Formtastic::SemanticFormHelper.builder = FormtasticExtensions::SemanticFormBuilder
-I18n.load_path.unshift(*FormtasticExtensions.locale_files)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic_extensions
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 +04:00
+date: 2009-11-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.5
+        version: 0.9.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: validation_reflection