casein 5.1.1.1 → 5.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6514148c76a42536b8a8aba0f69830b32dc76114
-  data.tar.gz: 204d0fcd3375a8ea9c4862a4414f7f7e68f680b0
+  metadata.gz: 7354f9f7e65cbd596a76c098c53dacfc571a4b36
+  data.tar.gz: 9becab574370ce29dd7954ec25d642d3b1c148cb
 SHA512:
-  metadata.gz: b06121f648b21e6ad5ec04545826294bbf59adbef0d7fceded43045eb16f25d70acf211d10759d2a7808a673e70f363b308b800f03938945d86c99ea34094a23
-  data.tar.gz: e71c8365457b090787d4cdb7a93c1d7bde66661327a86a40aebe931817bf489ef4bd388402ba1802983569cee063d6e79f17e86f8d389c159d33f8e37b99c762
+  metadata.gz: 368154bd219b3504def38ef38312bb394b576e340145e9c2dd3c6538ce1d613f70283d45eef0b0ce80a0810fe82f3fa07ae49d5db3de364fef2066d5e16be410
+  data.tar.gz: 60a13f4858a138462c413b3dbcc532751a2458dbc3dd512f42942c295b6dd91903e71c7b9ccbec01d036e44bef3c6f9a51440be435576fc753268ade8a163c19

data/README.rdoc

@@ -220,20 +220,24 @@ All of the standard Rails form helpers are available, but the Casein versions ar
   casein_datetime_select form, obj, attribute, options = {}
   casein_file_field form, obj, object_name, attribute, options = {}
   casein_hidden_field form, obj, attribute, options = {}
+  casein_color_field form, obj, attribute, options = {}
+  casein_search_field form, obj, attribute, options = {}
+  casein_telephone_field form, obj, attribute, options = {}
+  casein_url_field form, obj, attribute, options = {}
+  casein_email_field form, obj, attribute, options = {}
+  casein_date_field form, obj, attribute, options = {}
+  casein_datetime_field form, obj, attribute, options = {}
+  casein_datetime_local_field form, obj, attribute, options = {}
+  casein_month_field form, obj, attribute, options = {}
+  casein_week_field form, obj, attribute, options = {}
+  casein_time_field form, obj, attribute, options = {}
+  casein_number_field form, obj, attribute, options = {}
+  casein_range_field form, obj, attribute, options = {}
+
+
+You can also add custom contents:
+
   casein_custom_field form, obj, attribute, custom_contents, options = {}
-  casein_color_field form, obj, attribute, options = nil
-  casein_search_field form, obj, attribute, options = nil
-  casein_telephone_field form, obj, attribute, options = nil
-  casein_url_field form, obj, attribute, options = nil
-  casein_email_field form, obj, attribute, options = nil
-  casein_date_field form, obj, attribute, options = nil
-  casein_datetime_field form, obj, attribute, options = nil
-  casein_datetime_local_field form, obj, attribute, options = nil
-  casein_month_field form, obj, attribute, options = nil
-  casein_week_field form, obj, attribute, options = nil
-  casein_time_field form, obj, attribute, options = nil
-  casein_number_field form, obj, attribute, range, step, options = nil
-  casein_range_field form, obj, attribute, range, options = nil
 
 
 For more information on each function, check the app/helpers/casein/casein_helper.rb file within the project. The method parameters are typically the same as the Rails form tag helpers. There are some extra Casein options that can be passed through as part of the options hash:

data/app/helpers/casein/casein_helper.rb

@@ -3,9 +3,9 @@ module Casein
 
     def casein_get_footer_string include_version = false
       if include_version
-        "Running on #{link_to 'Casein', 'http://www.github.com/russellquinn/casein'} #{casein_get_full_version_string}, an open-source project.".html_safe
+        "Running on #{link_to 'Casein', 'http://www.caseincms.com'} #{casein_get_full_version_string}, an open-source project.".html_safe
       else
-        "Running on #{link_to 'Casein', 'http://www.github.com/russellquinn/casein'}, an open-source project.".html_safe
+        "Running on #{link_to 'Casein', 'http://www.caseincms.com'}, an open-source project.".html_safe
       end
     end
 
@@ -212,88 +212,66 @@ module Casein
   	  form.hidden_field(attribute, strip_casein_options(options)).html_safe
   	end
 
-    def casein_custom_field form, obj, attribute, custom_contents, options = {}
-      casein_form_tag_wrapper(custom_contents, form, obj, attribute, options).html_safe
+    def casein_color_field form, obj, attribute, options = {}
+        casein_form_tag_wrapper(form.color_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_color_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :color_field, form, obj, attribute, options
+    def casein_search_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.search_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_search_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :search_field, form, obj, attribute, options
+    def casein_telephone_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.telephone_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_telephone_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :telephone_field, form, obj, attribute, options
+    def casein_url_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.url_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_url_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :url_field, form, obj, attribute, options
+    def casein_email_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.email_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_email_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :email_field, form, obj, attribute, options
+    def casein_date_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.date_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_date_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :date_field, form, obj, attribute, options
+    def casein_datetime_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.datetime_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_datetime_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :datetime_field, form, obj, attribute, options
+    def casein_datetime_local_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.datetime_local_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_datetime_local_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :datetime_local_field, form, obj, attribute, options
+    def casein_month_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.month_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_month_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :month_field, form, obj, attribute, options
+    def casein_week_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.week_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_week_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :week_field, form, obj, attribute, options
+    def casein_time_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.time_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_time_field form, obj, attribute, options = nil
-      options ||= {}
-      casein_wrapped_field :time_field, form, obj, attribute, options
+    def casein_number_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.number_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_number_field form, obj, attribute, range, step, options = nil
-      options ||= {}
-      casein_wrapped_field :number_field, form, obj, attribute, {in: range, step: step}.merge(options)
+    def casein_range_field form, obj, attribute, options = {}
+      casein_form_tag_wrapper(form.range_field(attribute, strip_casein_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def casein_range_field form, obj, attribute, range, options = nil
-      options ||= {}
-      casein_wrapped_field :range_field, form, obj, attribute, {in: range}.merge(options)
+    def casein_custom_field form, obj, attribute, custom_contents, options = {}
+      casein_form_tag_wrapper(custom_contents, form, obj, attribute, options).html_safe
     end
 
-
     protected
 
-    def casein_wrapped_field field_helper_method, form, obj, attribute, options
-      clz = "casein-" + field_helper_method.to_s.gsub(/_field$/,'').gsub('_', '-')
-      contents = content_tag 'div', class: clz do
-        form.send(field_helper_method, attribute, strip_casein_options(options))
-      end
-      casein_form_tag_wrapper(contents.html_safe, form, obj, attribute, options).html_safe
-    end
-
     def strip_casein_options options
-      (options || {}).reject {|key, value| key.to_s.include? "casein_" }
+      options.reject {|key, value| key.to_s.include? "casein_" }
     end
 
     def merged_class_hash options, new_class
@@ -312,8 +290,7 @@ module Casein
       options
     end
 
-    def casein_form_tag_wrapper form_tag, form, obj, attribute, options = nil
-      options ||= {}
+    def casein_form_tag_wrapper form_tag, form, obj, attribute, options = {}
       unless options.key? :casein_label
     		human_attribute_name = attribute.to_s.humanize
       else

data/lib/casein/version.rb

@@ -1,4 +1,4 @@
 module Casein
-  VERSION_HASH = { major: 5, minor: 1, patch: 1, build: 1 }
+  VERSION_HASH = { major: 5, minor: 1, patch: 1, build: 2 }
   VERSION = VERSION_HASH.values.join(".")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casein
 version: !ruby/object:Gem::Version
-  version: 5.1.1.1
+  version: 5.1.1.2
 platform: ruby
 authors:
 - Russell Quinn
@@ -101,7 +101,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,7 +115,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -129,7 +129,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: