ext_form 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d9b38b51986b38cd25a32a681edd6d8d842484
-  data.tar.gz: 2ce42445ab5b7384ee2cfea04ba27348036c79e4
+  metadata.gz: 9cc7043309c0ab9382ef4584368c7487f99b3473
+  data.tar.gz: b12ececbbc208b222e955bb52b6bc9e342235bd8
 SHA512:
-  metadata.gz: 7888e8974d5347d5bfde50f9a81ffdbc03c85e3b087a47a106754eef9aa173feffba60b49f6ebc77a61bdcdda484c5de2e26a51deb3e2f9e491aba280101304d
-  data.tar.gz: a375fc0ad2d975b355cc07a4bf12924fa94625f27da1b22d8f9ac1064c29f9bce502e9e3c5f0b793fb830851d46f3a95e2ec7a4adaebe138aa639f98c9f1b0a9
+  metadata.gz: 1d8267bf63deea060237c508139183cc1aa89b6dde832febf84ea7df3006df55ebae530529f1f6f024915ca005e387a5066cfb158e0c87a6f74476a6cdacd52e
+  data.tar.gz: 68cdc971dc092c4910ad160c55bfeaf84faf6d2fc16253714c68fa297c6334b0e17b0ab30bf0238acd08415c30ac8b17bd7d9008e1e92a83b79ff22cda538f9d

data/lib/ext_form.rb

@@ -38,7 +38,7 @@ module ExtForm
   @@form_class = 'form-horizontal'
 
   mattr_accessor :locale
-  @@locale = 'pt-BR'
+  @@locale = 'en'
   # Default way to setup SimpleForm. Run rails generate simple_form:install
   # to create a fresh initializer with all configuration values.
   def self.setup

data/lib/ext_form/helpers/tags/dt_picker.rb

@@ -7,7 +7,15 @@ module ExtForm
           if value_before_type_cast(object).present?
             @options[:value] = value_before_type_cast(object).match(/\d{4}-\d{1,2}-\d{1,2}(\s\d{1,2}:\d{1,2}:\d{1,2})?/)
           end
-          output = super
+
+          output = @template_object.content_tag(:div, nil, class: 'input-append') do
+            [super,
+             @template_object.content_tag(:span, nil, class: 'add-on') do
+               @template_object.content_tag(:i, nil, data: {:'time-icon' => 'icon-time',
+                                           :'date-icon' => 'icon-calendar'})
+             end
+            ].join.html_safe
+          end
 
           html_options = {}
           add_default_name_and_id(html_options)

data/lib/ext_form/inputs/dt_picker.rb

@@ -1,15 +1,6 @@
 module ExtForm
   module Inputs
     class DtPicker < SimpleForm::Inputs::StringInput
-      enable :input_addon
-
-      attr_accessor :addon_options
-
-      def initialize(builder, attribute_name, column, input_type, options = {})
-        self.addon_options = options.delete(:input_addon) || {}
-        self.addon_options.merge!({datetimepicker: true})
-        super
-      end
 
       def input
         @builder.send(input_type, attribute_name, input_html_options)

data/lib/ext_form/version.rb

@@ -1,3 +1,3 @@
 module ExtForm
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/generators/ext_form/templates/config/initializers/z_ext_form_bootstrap.rb

@@ -41,9 +41,6 @@ SimpleForm.setup do |config|
                            /_time$/ => :dt_picker,
                            /_at$/ => :dt_picker}
 
-  config.wrapper_mappings = { dt_picker: :ext_datetimepicker,
-                              date_picker: :ext_datetimepicker,
-                              time_picker: :ext_datetimepicker }
 end
 
 ExtForm.setup do |e|
@@ -55,5 +52,4 @@ ExtForm.setup do |e|
       label_width: '2',
       max_width: '12'
   }
-  e.locale = 'zh-CN'
 end

data/spec/dummy/config/initializers/z_ext_form_bootstrap.rb

@@ -41,9 +41,6 @@ SimpleForm.setup do |config|
                            /_time$/ => :dt_picker,
                            /_at$/ => :dt_picker}
 
-  config.wrapper_mappings = { dt_picker: :ext_datetimepicker,
-                              date_picker: :ext_datetimepicker,
-                              time_picker: :ext_datetimepicker }
 end
 
 ExtForm.setup do |e|
@@ -55,5 +52,4 @@ ExtForm.setup do |e|
       label_width: '2',
       max_width: '12'
   }
-  e.locale = 'zh-CN'
 end

data/spec/dummy/log/development.log

@@ -30849,3 +30849,252 @@ Started GET "/assets/order_lines.js?body=1" for 127.0.0.1 at 2013-09-17 12:18:04
    (117.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130913082503')
    (101.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130914101232')
    (127.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130913025429')
+
+
+Started GET "/" for 127.0.0.1 at 2013-09-22 14:52:02 +0800
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by Rails::WelcomeController#index as HTML
+  Rendered /home/bigxiang/.rvm/gems/ruby-2.0.0-p0@rails4/gems/railties-4.0.0/lib/rails/templates/rails/welcome/index.html.erb (2.9ms)
+Completed 200 OK in 27ms (Views: 26.5ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/order_headers/1/edit" for 127.0.0.1 at 2013-09-22 14:52:06 +0800
+Processing by OrderHeadersController#edit as HTML
+  Parameters: {"id"=>"1"}
+  OrderHeader Load (0.4ms)  SELECT "order_headers".* FROM "order_headers" WHERE "order_headers"."id" = ? LIMIT 1  [["id", "1"]]
+  Rendered order_headers/_form.html.erb (302.7ms)
+  Rendered order_headers/edit.html.erb within layouts/application (344.0ms)
+Completed 500 Internal Server Error in 603ms
+
+ActionView::Template::Error (undefined method `output_buffer=' for #<ExtForm::Helpers::Tags::DtPicker:0xb4f35e8>):
+    30:                       } %>
+    31:       <% end %>
+    32: 
+    33:       <%= f.inputs(:order_date, :bill_to_address, :bill_to_contact, :order_type) %>
+    34: 
+    35:       <%= f.ext_fields_for :order_lines, l: {layout: '1:1:1'} do |l| %>
+    36:           <%= l.before_row_end do %>
+  app/views/order_headers/_form.html.erb:33:in `block in _app_views_order_headers__form_html_erb__178123894_90603370'
+  app/views/order_headers/_form.html.erb:2:in `_app_views_order_headers__form_html_erb__178123894_90603370'
+  app/views/order_headers/edit.html.erb:3:in `_app_views_order_headers_edit_html_erb__239552735_89693750'
+
+
+  Rendered /home/bigxiang/.rvm/gems/ruby-2.0.0-p0@rails4/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/_trace.erb (3.1ms)
+  Rendered /home/bigxiang/.rvm/gems/ruby-2.0.0-p0@rails4/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (25.3ms)
+  Rendered /home/bigxiang/.rvm/gems/ruby-2.0.0-p0@rails4/gems/actionpack-4.0.0/lib/action_dispatch/middleware/templates/rescues/template_error.erb within rescues/layout (43.9ms)
+
+
+Started GET "/order_headers/1/edit" for 127.0.0.1 at 2013-09-22 14:54:05 +0800
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by OrderHeadersController#edit as HTML
+  Parameters: {"id"=>"1"}
+  OrderHeader Load (0.2ms)  SELECT "order_headers".* FROM "order_headers" WHERE "order_headers"."id" = ? LIMIT 1  [["id", "1"]]
+  OrderType Load (0.1ms)  SELECT "order_types".* FROM "order_types"
+  OrderLine Load (15.7ms)  SELECT "order_lines".* FROM "order_lines" WHERE "order_lines"."order_header_id" = ?  [["order_header_id", 1]]
+  Rendered order_headers/_form.html.erb (299.9ms)
+  Rendered order_headers/edit.html.erb within layouts/application (306.3ms)
+Completed 200 OK in 974ms (Views: 906.9ms | ActiveRecord: 17.6ms)
+
+
+Started GET "/assets/ext_form/application_bootstrap.css?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-button.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-carousel.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-collapse.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-transition.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/order_headers.css?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/shipments.css?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-affix.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/scaffold.css?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/order_lines.css?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-scrollspy.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-alert.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-dropdown.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-modal.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-tab.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-typeahead.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/typeahead.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-tooltip.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/select2.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:07 +0800
+
+
+Started GET "/assets/bootstrap-popover.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/bootstrap.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/bootstrap-datetimepicker.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/jquery_nested_form.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/select2_locale_zh-CN.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/locales/bootstrap-datetimepicker.zh-CN.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/order_headers.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/shipments.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/order_lines.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/ext_form/application.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/glyphicons-halflings.png" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/assets/select2.png" for 127.0.0.1 at 2013-09-22 14:54:08 +0800
+
+
+Started GET "/order_headers/1/edit" for 127.0.0.1 at 2013-09-22 14:56:20 +0800
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by OrderHeadersController#edit as HTML
+  Parameters: {"id"=>"1"}
+  OrderHeader Load (0.3ms)  SELECT "order_headers".* FROM "order_headers" WHERE "order_headers"."id" = ? LIMIT 1  [["id", "1"]]
+  OrderType Load (0.1ms)  SELECT "order_types".* FROM "order_types"
+  OrderLine Load (2.4ms)  SELECT "order_lines".* FROM "order_lines" WHERE "order_lines"."order_header_id" = ?  [["order_header_id", 1]]
+  Rendered order_headers/_form.html.erb (222.3ms)
+  Rendered order_headers/edit.html.erb within layouts/application (226.5ms)
+Completed 200 OK in 603ms (Views: 557.3ms | ActiveRecord: 4.1ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/order_lines.css?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/scaffold.css?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/ext_form/application_bootstrap.css?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/shipments.css?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/order_headers.css?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-transition.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-affix.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-alert.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-button.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-carousel.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-collapse.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-dropdown.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-modal.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-scrollspy.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-tab.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-tooltip.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-popover.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/jquery_nested_form.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-typeahead.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/bootstrap-datetimepicker.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/typeahead.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/select2.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/locales/bootstrap-datetimepicker.zh-CN.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/ext_form/application.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/select2_locale_zh-CN.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/order_headers.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/order_lines.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800
+
+
+Started GET "/assets/shipments.js?body=1" for 127.0.0.1 at 2013-09-22 14:56:21 +0800