diff --git a/CHANGELOG.md b/CHANGELOG.md index c3b96fb7..3c722a20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -115,7 +115,7 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple- ### bug fix * Fix `merge_wrapper_options` to correctly merge options with duplicated keys. [@herminiotorres](https://github.com/herminiotorres) - Closes [#1278](https://github.com/plataformatec/simple_form/issues/1278). + Closes [#1278](https://github.com/heartcombo/simple_form/issues/1278). ## 3.2.1 @@ -177,11 +177,11 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple- * Add `boolean_label_class` config. * Add `:html` option to include additional attributes on custom wrappers [@remofritzsche](https://github.com/remofritzsche) and [@ulissesalmeida](https://github.com/ulissesalmeida) * Make possible to use the Wrappers API to define attributes for the components. - See https://github.com/plataformatec/simple_form/pull/997 for more information. + See https://github.com/heartcombo/simple_form/pull/997 for more information. * Put a whitespace before the `inline_label` options of boolean input if it is present. * Add support to configure the `label_text` proc at the wrapper level. [@NOX73](https://github.com/NOX73) * `label_text` proc now receive three arguments (label, request, and if the label was explicit). [@timscott](https://github.com/timscott) - * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/plataformatec/simple_form/pull/616) + * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/heartcombo/simple_form/pull/616) * Add support to define custom error messages for the attributes. * Add support to change the I18n scope to be used in Simple Form. [@nielsbuus](https://github.com/nielsbuus) * The default form class can now be overridden with `html: { :class }`. [@rmm5t](https://github.com/rmm5t) @@ -190,16 +190,16 @@ See http://blog.plataformatec.com.br/2019/09/incorrect-access-control-in-simple- * Fix `full_error` when the attribute is an association. [@mvdamme](https://github.com/jorge-d) * Fix suppport to `:namespace` and `:index` options for nested check boxes and radio buttons when the attribute is an association. * Collection input that uses automatic collection translation properly sets checked values. - Closes [#971](https://github.com/plataformatec/simple_form/issues/971) [@nashby](https://github.com/nashby) + Closes [#971](https://github.com/heartcombo/simple_form/issues/971) [@nashby](https://github.com/nashby) * Collection input generates `required` attribute if it has `prompt` option. [@nashby](https://github.com/nashby) * Grouped collection uses the first non-empty object to detect label and value methods. ## deprecation * Methods on custom inputs now accept a required argument with the wrapper options. - See https://github.com/plataformatec/simple_form/pull/997 for more information. + See https://github.com/heartcombo/simple_form/pull/997 for more information. * SimpleForm.form_class is deprecated in favor of SimpleForm.default_form_class. Future versions of Simple Form will not generate `simple_form` class for the form element. - See https://github.com/plataformatec/simple_form/pull/1109 for more information. + See https://github.com/heartcombo/simple_form/pull/1109 for more information. -Please check [v3.0](https://github.com/plataformatec/simple_form/blob/v3.0/CHANGELOG.md) for previous changes. +Please check [v3.0](https://github.com/heartcombo/simple_form/blob/v3.0/CHANGELOG.md) for previous changes. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 950e76df..350809b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,12 @@ ## Contributing 1. If you have any questions about Simple Form, search the -[Wiki](https://github.com/plataformatec/simple_form/wiki) or -use the [Mailing List](https://groups.google.com/group/plataformatec-simpleform) +[Wiki](https://github.com/heartcombo/simple_form/wiki) or [Stack Overflow](http://stackoverflow.com/questions/tagged/simple_form). Do not post questions here. 2. If you find a security bug, **DO NOT** submit an issue here. -Please send an e-mail to [opensource@plataformatec.com.br](mailto:opensource@plataformatec.com.br) +Please send an e-mail to [heartcombo@googlegroups.com](mailto:heartcombo@googlegroups.com) instead. 3. Do a small search on the issues tracker before submitting your issue to diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index b6c92fe9..6baa0c88 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ - Do not use the issues tracker for help or support, try Stack Overflow. - For bugs, do a quick search and make sure the bug has not yet been reported -- If you found a security bug, do not report it through GitHub. Please send an e-mail to opensource@plataformatec.com.br instead. +- If you found a security bug, do not report it through GitHub. Please send an e-mail to heartcombo@googlegroups.com instead. - Finally, be nice and have fun! ## Environment diff --git a/MIT-LICENSE b/MIT-LICENSE index e8ea2318..f02d8936 100644 --- a/MIT-LICENSE +++ b/MIT-LICENSE @@ -1,4 +1,5 @@ -Copyright (c) 2009-2019 Plataformatec http://plataformatec.com.br/ +Copyright (c) 2020 Rafael França, Carlos Antônio da Silva +Copyright (c) 2009-2019 Plataformatec Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index a18fc9ac..9a70e205 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -![Simple Form Logo](https://raw.github.com/plataformatec/simple_form/master/simple_form.png) - -By [Plataformatec](http://plataformatec.com.br/). +![Simple Form Logo](https://raw.github.com/heartcombo/simple_form/master/simple_form.png) Rails forms made easy. @@ -9,8 +7,7 @@ your forms. The basic goal of **Simple Form** is to not touch your way of defini you find the better design for your eyes. Most of the DSL was inherited from Formtastic, which we are thankful for and should make you feel right at home. -INFO: This README is [also available in a friendly navigable format](http://simple-form.plataformatec.com.br/) -and refers to **Simple Form** 3.1. For older releases, check the related branch for your version. +INFO: This README refers to **Simple Form** 3.1. For older releases, check the related branch for your version. ## Installation @@ -184,7 +181,7 @@ By default, **Simple Form** will look at the column type in the database and use appropriate input for the column. For example, a column created with type `:text` in the database will use a `textarea` input by default. See the section [Available input types and defaults for each column -type](https://github.com/plataformatec/simple_form#available-input-types-and-defaults-for-each-column-type) +type](https://github.com/heartcombo/simple_form#available-input-types-and-defaults-for-each-column-type) for a complete list of defaults. **Simple Form** also lets you overwrite the default input type it creates: @@ -288,7 +285,7 @@ end ``` -To view the actual RDocs for this, check them out here - http://rubydoc.info/github/plataformatec/simple_form/master/SimpleForm/FormBuilder:input_field +To view the actual RDocs for this, check them out here - http://rubydoc.info/github/heartcombo/simple_form/master/SimpleForm/FormBuilder:input_field ### Collections @@ -318,7 +315,7 @@ Collection inputs accept two other options beside collections: Those methods are useful to manipulate the given collection. Both of these options also accept lambda/procs in case you want to calculate the value or label in a special way eg. custom translation. You can also define a `to_label` method on your model as **Simple Form** will search for -and use `:to_label` as a `:label_method` first if it is found. +and use `:to_label` as a `:label_method` first if it is found. By default, **Simple Form** will use the first item from an array as the label and the second one as the value. If you want to change this behavior you must make it explicit, like this: @@ -992,7 +989,7 @@ when the content is present. ## Custom Components -When you use custom wrappers, you might also be looking for a way to add custom components to your +When you use custom wrappers, you might also be looking for a way to add custom components to your wrapper. The default components are: ```ruby @@ -1143,7 +1140,7 @@ by passing the html5 option: ### Using non Active Record objects -There are few ways to build forms with objects that don't inherit from Active Record, as +There are few ways to build forms with objects that don't inherit from Active Record, as follows: You can include the module `ActiveModel::Model`. @@ -1156,7 +1153,7 @@ class User end ``` -If you are using Presenters or Decorators that inherit from `SimpleDelegator` you can delegate +If you are using Presenters or Decorators that inherit from `SimpleDelegator` you can delegate it to the model. ```ruby @@ -1190,7 +1187,7 @@ class User end ``` -If your object doesn't implement those methods, you must make explicit it when you are +If your object doesn't implement those methods, you must make explicit it when you are building the form ```ruby @@ -1213,18 +1210,11 @@ end ## Information -### Google Group - -If you have any questions, comments, or concerns please use the Google Group instead of the GitHub -Issues tracker: - -http://groups.google.com/group/plataformatec-simpleform - ### RDocs You can view the **Simple Form** documentation in RDoc format here: -http://rubydoc.info/github/plataformatec/simple_form/master/frames +http://rubydoc.info/github/heartcombo/simple_form/master/frames ### Bug reports @@ -1232,25 +1222,24 @@ If you discover any bugs, feel free to create an issue on GitHub. Please add as possible to help us in fixing the potential bug. We also encourage you to help even more by forking and sending us a pull request. -https://github.com/plataformatec/simple_form/issues +https://github.com/heartcombo/simple_form/issues -If you have discovered a security related bug, please do NOT use the GitHub issue tracker. Send an e-mail to opensource@plataformatec.com.br. +If you have discovered a security related bug, please do NOT use the GitHub issue tracker. Send an e-mail to heartcombo@googlegroups.com. ## Maintainers -* José Valim (https://github.com/josevalim) * Carlos Antonio da Silva (https://github.com/carlosantoniodasilva) * Rafael Mendonça França (https://github.com/rafaelfranca) -* Vasiliy Ermolovich (https://github.com/nashby) +* Felipe Renan (https://github.com/feliperenan) [![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form) -[![Build Status](https://api.travis-ci.org/plataformatec/simple_form.svg?branch=master)](http://travis-ci.org/plataformatec/simple_form) -[![Code Climate](https://codeclimate.com/github/plataformatec/simple_form.png)](https://codeclimate.com/github/plataformatec/simple_form) -[![Inline docs](http://inch-ci.org/github/plataformatec/simple_form.png)](http://inch-ci.org/github/plataformatec/simple_form) +[![Build Status](https://api.travis-ci.org/heartcombo/simple_form.svg?branch=master)](http://travis-ci.org/heartcombo/simple_form) +[![Code Climate](https://codeclimate.com/github/heartcombo/simple_form.png)](https://codeclimate.com/github/heartcombo/simple_form) +[![Inline docs](http://inch-ci.org/github/heartcombo/simple_form.png)](http://inch-ci.org/github/heartcombo/simple_form) ## License -MIT License. Copyright 2009-2019 Plataformatec. http://plataformatec.com.br +MIT License. Copyright 2020 Rafael França, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec. + +The Simple Form logo is licensed under [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](https://creativecommons.org/licenses/by-nc-nd/4.0/). -You are not granted rights or licenses to the trademarks of the Plataformatec, including without -limitation the Simple Form name or logo. diff --git a/lib/generators/simple_form/templates/config/initializers/simple_form.rb b/lib/generators/simple_form/templates/config/initializers/simple_form.rb index 0dc88e8c..5f84a9e0 100644 --- a/lib/generators/simple_form/templates/config/initializers/simple_form.rb +++ b/lib/generators/simple_form/templates/config/initializers/simple_form.rb @@ -2,7 +2,7 @@ # # Uncomment this and change the path if necessary to include your own # components. -# See https://github.com/plataformatec/simple_form#custom-components to know +# See https://github.com/heartcombo/simple_form#custom-components to know # more about custom components. # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } # diff --git a/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb b/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb index 471a64d1..6e1f6a8e 100644 --- a/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb +++ b/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb @@ -4,11 +4,11 @@ # This generator is maintained by the community around simple_form-bootstrap: # https://github.com/rafaelfranca/simple_form-bootstrap # All future development, tests, and organization should happen there. -# Background history: https://github.com/plataformatec/simple_form/issues/1561 +# Background history: https://github.com/heartcombo/simple_form/issues/1561 # Uncomment this and change the path if necessary to include your own # components. -# See https://github.com/plataformatec/simple_form#custom-components +# See https://github.com/heartcombo/simple_form#custom-components # to know more about custom components. # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } diff --git a/lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb b/lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb index 34ec8a6a..c67d3c8e 100644 --- a/lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb +++ b/lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb @@ -2,7 +2,7 @@ # # Uncomment this and change the path if necessary to include your own # components. -# See https://github.com/plataformatec/simple_form#custom-components to know +# See https://github.com/heartcombo/simple_form#custom-components to know # more about custom components. # Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } # diff --git a/lib/simple_form.rb b/lib/simple_form.rb index 2f603e8a..a01872a8 100644 --- a/lib/simple_form.rb +++ b/lib/simple_form.rb @@ -35,7 +35,7 @@ to def %{name}(wrapper_options) -See https://github.com/plataformatec/simple_form/pull/997 for more information. +See https://github.com/heartcombo/simple_form/pull/997 for more information. WARN FILE_METHODS_DEPRECATION_WARN = <<-WARN diff --git a/lib/simple_form/inputs/collection_check_boxes_input.rb b/lib/simple_form/inputs/collection_check_boxes_input.rb index cc6fc7f4..0a70c0a2 100644 --- a/lib/simple_form/inputs/collection_check_boxes_input.rb +++ b/lib/simple_form/inputs/collection_check_boxes_input.rb @@ -5,7 +5,7 @@ module SimpleForm protected # Checkbox components do not use the required html tag. - # More info: https://github.com/plataformatec/simple_form/issues/340#issuecomment-2871956 + # More info: https://github.com/heartcombo/simple_form/issues/340#issuecomment-2871956 def has_required? false end diff --git a/simple_form.gemspec b/simple_form.gemspec index 93e2c708..be8fcdee 100644 --- a/simple_form.gemspec +++ b/simple_form.gemspec @@ -7,8 +7,8 @@ Gem::Specification.new do |s| s.version = SimpleForm::VERSION.dup s.platform = Gem::Platform::RUBY s.summary = "Forms made easy!" - s.email = "opensource@plataformatec.com.br" - s.homepage = "https://github.com/plataformatec/simple_form" + s.email = "heartcombo@googlegroups.com" + s.homepage = "https://github.com/heartcombo/simple_form" s.description = "Forms made easy!" s.authors = ['José Valim', 'Carlos Antônio', 'Rafael França'] s.license = "MIT" @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.test_files = Dir["test/**/*.rb"] s.test_files -= Dir["test/support/country_select/**/*"] s.require_paths = ["lib"] - + s.required_ruby_version = '>= 2.3.0' s.add_dependency('activemodel', '>= 5.0')