unirer-bootstrap 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85a7458765d13a7a18f26fca404886e0bbb9a162
-  data.tar.gz: 4113b9046bbb58de8a6e48ae56f9b0d6e8a154e5
+  metadata.gz: 36f6418daa098ae465f381f81bf9061ebe41d660
+  data.tar.gz: cf2ed59e2d63d933d63c0ec817cf9d0618f0dacc
 SHA512:
-  metadata.gz: 73868f62cc918b995b59d5421198134c900642b9e083de58288ed7473de04926ad7a8862a911740b79c3473185a12e0eae2f4e360610ddd41a6b6a8d642e0317
-  data.tar.gz: 8564970a1ead7da3579d5f7a7618035842ee70a090a96106f2228c82cd0326376a4a2b872ccd04fcec7b83da97fe3b7798ba0ac865a3c23f0d16dac9cb300269
+  metadata.gz: eb46ff94979670eab77a38d3e4e5cf252a4732d4a55e8206e3936cba83ae8ed6d9594df9c703206cb3018b3759e64d5e1d5f85cedb29f05d144d84b1a234f6af
+  data.tar.gz: 94b133fc0091f8d61fa212493d5651beb4fd5454ffd9375cae4e1aa2f925d7222cceb28217b215c775dd64318216cde8ff39bef4f7d93e2bb01c7166753f2509

data/README.md

@@ -11,6 +11,15 @@ Unirer (统一资源表现)是一系列的资源表现引擎。Bootstrap 资源
 gem 'unirer-bootstrap'
 ```
 
+
+
+## Include the Helper in your Application Controller before Render the Style or Script
+```ruby
+helper ::Unirer::Bootstrap::ApplicationHelper
+```
+
+
+
 ## Render the Pre-defined Partials
 ```erb
 <%= render partial: 'unirer/bootstrap/meta'   %>
@@ -19,6 +28,8 @@ gem 'unirer-bootstrap'
 <%= render partial: 'unirer/bootstrap/form_field', locals: { options: { model: model, form: f, name: :phone_number, type: :telephone_field } } %>
 ```
 
+
+
 ### Render the Meta
 The Meta partial includes the HTML meta tags for Bootstrap.
 ```erb
@@ -35,6 +46,8 @@ The source codes of the Meta partial:
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 ```
 
+
+
 ### Render the Script
 The Script partial includes the HTML script tags for jQuery, Bootstrap, and React. All the CDN servers of the JavaScript libraries are optimized for China only. The following code snippet does not load React JS.
 ```erb
@@ -48,22 +61,30 @@ The following code snippet loads the latest React JS.
 
 The following code snippet loads the React JS with the given version.
 ```erb
-<%= render partial: 'unirer/bootstrap/script', locals: { options: { react: { version: '0.14.6' } } } %>
+<%= render partial: 'unirer/bootstrap/script', locals: { options: { :jquery => { version: '2.2.0' }, :'moment-with-locales' => true, :'bootstrap-datetimepicker' => true, :react => { version: '0.14.6' } } } %>
 ```
+The following JavaScript libraries are always enabled, only the version can be configurable:
+- :jquery
+- :bootstrap
+The following JavaScript libraries are switchable, and the version can be configurable:
+- :'moment-with-locales'
+- :'bootstrap-datetimepicker'
+- :react
+
+
 
 ### Render the Style
 The Style partial includes the HTML style tags for Bootstrap and Font Awesome. All the CDN servers of the CSS libraries are optimized for China only.
 ```erb
-<%= render partial: 'unirer/bootstrap/style' %>
+<%= render partial: 'unirer/bootstrap/style', locals: { options: { :'font-awesome' => { version: '4.4.0' }, :'bootstrap-datetimepicker' => true } } %>
 ```
+The following CSS libraries are always enabled, only the version can be configurable:
+- :bootstrap
+The following JavaScript libraries are switchable, and the version can be configurable:
+- :'font-awesome'
+- :'bootstrap-datetimepicker'
 
-The source codes of the Style partial:
-```html
-<%= stylesheet_link_tag '//cdn.bootcss.com/bootstrap/3.3.6/css/bootstrap.min.css',       media: 'all' %>
-<%= stylesheet_link_tag '//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css', media: 'all' %>
 
-<%= stylesheet_link_tag '//cdn.bootcss.com/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css', media: 'all' %>
-```
 
 ### Render the Form Field
 The Form Field partial includes the HTML form field tags for Rails Form Builder and Bootstrap.
@@ -74,8 +95,10 @@ The Form Field partial includes the HTML form field tags for Rails Form Builder
 The 4 options are required: model, form, name, and type.
 Here are more options:
 - label: the customized label text.
-- label_class: the CSS class for the label tag.
-- field_class: the CSS class for the wrapper of the form control.
-- error_class: the CSS class for the validation error block of this field.
+- group_class: The CSS class for the form group wrapper. The .form-group class is mandatory, and can not be removed.
+- label_class: the CSS class for the label tag. The .control-label class is mandatory, and can not be removed.
+- field_class: the CSS class for the wrapper of the form control. The .input-group class is mandatory, and can not be removed.
+- error_class: the CSS class for the validation error block of this field. The .text-danger class is mandatory, and can not be removed.
+- error_hidden: Determines whether the error message block should be shown if the field has any error.
 - prefix: the HTML source codes of input group addon before the form control.
 - suffix: the HTML source codes of input group addon after the form control.

data/app/helpers/unirer/bootstrap/application_helper.rb

@@ -1,2 +1,11 @@
 module Unirer::Bootstrap::ApplicationHelper
+
+  def library_enabled?(name, options)
+    defined?(options) && options.try(:[], name).present?
+  end
+
+  def library_version(name, default_version, options)
+    defined?(options) ? options.try(:[], name).try(:[], :version)||default_version : default_version
+  end
+
 end

data/app/views/unirer/bootstrap/_form_field.html.erb

@@ -27,6 +27,8 @@
       maxlength:   options[:maxlength],
       required:    options[:required]
     }
+
+  error_hidden = options[:error_hidden]
 %>
 
 <div class='<%= group_class %>'>
@@ -49,7 +51,7 @@
     <% end %>
   </div>
 
-  <% if model.errors[name].present? %>
+  <% if model.errors[name].present? && !error_hidden %>
     <p class='<%= error_class %>'><%= model.errors[name].first %></p>
   <% end %>
 

data/app/views/unirer/bootstrap/_script.html.erb

@@ -1,16 +1,11 @@
-<%= javascript_include_tag '//cdn.bootcss.com/jquery/2.2.1/jquery.min.js'          %>
-<%= javascript_include_tag '//cdn.bootcss.com/bootstrap/3.3.6/js/bootstrap.min.js' %>
+<% options = defined?(options) ? options : nil %>
+<%= javascript_include_tag "//cdn.bootcss.com/jquery/#{library_version(:jquery, '2.2.1', options)}/jquery.min.js"             %>
+<%= javascript_include_tag "//cdn.bootcss.com/bootstrap/#{library_version(:bootstrap, '3.3.6', options)}/js/bootstrap.min.js" %>
 
-<%= javascript_include_tag '//cdn.bootcss.com/moment.js/2.11.1/moment-with-locales.min.js'                         %>
-<%= javascript_include_tag '//cdn.bootcss.com/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js' %>
+<%= javascript_include_tag "//cdn.bootcss.com/moment.js/#{library_version(:'moment-with-locales', '2.11.1', options)}/moment-with-locales.min.js" if library_enabled?(:'moment-with-locales', options) %>
+<%= javascript_include_tag "//cdn.bootcss.com/bootstrap-datetimepicker/#{library_version(:'bootstrap-datetimepicker', '4.17.37', options)}/js/bootstrap-datetimepicker.min.js" if library_enabled?(:'bootstrap-datetimepicker', options) %>
 
-<% if defined?(options) && options.try(:[], :react).present? %>
-  <% react_version = options[:react].try(:[], :version) %>
-  <% if react_version.present? %>
-    <%= javascript_include_tag "//cdn.bootcss.com/react/#{react_version}/react.min.js"     %>
-    <%= javascript_include_tag "//cdn.bootcss.com/react/#{react_version}/react-dom.min.js" %>
-  <% else %>
-    <%= javascript_include_tag '//cdn.bootcss.com/react/0.14.7/react.min.js'     %>
-    <%= javascript_include_tag '//cdn.bootcss.com/react/0.14.7/react-dom.min.js' %>
-  <% end %>
+<% if library_enabled?(:react, options) %>
+  <%= javascript_include_tag "//cdn.bootcss.com/react/#{library_version(:react, '0.14.7', options)}/react.min.js"     %>
+  <%= javascript_include_tag "//cdn.bootcss.com/react/#{library_version(:react, '0.14.7', options)}/react-dom.min.js" %>
 <% end %>

data/app/views/unirer/bootstrap/_style.html.erb

@@ -1,4 +1,5 @@
-<%= stylesheet_link_tag '//cdn.bootcss.com/bootstrap/3.3.6/css/bootstrap.min.css',       media: 'all' %>
-<%= stylesheet_link_tag '//cdn.bootcss.com/font-awesome/4.5.0/css/font-awesome.min.css', media: 'all' %>
+<% options = defined?(options) ? options : nil %>
+<%= stylesheet_link_tag "//cdn.bootcss.com/bootstrap/#{library_version :bootstrap, '3.3.6', options}/css/bootstrap.min.css", media: 'all' %>
+<%= stylesheet_link_tag "//cdn.bootcss.com/font-awesome/#{library_version(:'font-awesome', '4.5.0', options)}/css/font-awesome.min.css", media: 'all' if library_enabled?(:'font-awesome', options) %>
 
-<%= stylesheet_link_tag '//cdn.bootcss.com/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.min.css', media: 'all' %>
+<%= stylesheet_link_tag "//cdn.bootcss.com/bootstrap-datetimepicker/#{library_version(:'bootstrap-datetimepicker', '4.17.37', options)}/css/bootstrap-datetimepicker.min.css", media: 'all' if library_enabled?(:'bootstrap-datetimepicker', options) %>

data/lib/unirer/bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Unirer
   module Bootstrap
-    VERSION = '0.5'.freeze
+    VERSION = '0.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unirer-bootstrap
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails