sequent-sinatra 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97c87c781855a940c9c66574a9f68342d159ea66
-  data.tar.gz: 287e0f1e73c596ef6a814df83831bf8f6ce13e8d
+SHA256:
+  metadata.gz: 4e8b3cbd50679e6f42d91f38e4f470d13a303c392dea54ce26cb5e8f3ad13450
+  data.tar.gz: 17ce0801d05b66d645dfeb3d187f7adad57b87e7f18cb27aaf2310d99c564fad
 SHA512:
-  metadata.gz: 00a7d067aeb7a22595443ffd3303f6ca8f57cb3d7d1941d2ff5289f064c3c8b44a09da57372274b9310c862291c04e86cda0d9d9a2bad5c7a10ce35f44da846c
-  data.tar.gz: 59a215973ffc08a03604ad3981ba4b430e4f416c662c7d1900e4ece04b58a0227ddf1b590fcae4c48ad13469e000d1d611d24c3d5144f2e82f93c5e3726e9aa3
+  metadata.gz: 20e726ce805af874678c436b2b03441eba03ec090312404acdd652e2fd2e50131d5efc8dd5f5366e45775dc3e0929d1a14d44843185bb54f724754da10d7c7f8
+  data.tar.gz: 541cd0f638019aaac3c0b0fae67d94d7257a1c2a005809a5fdb596ba71bfc2f32f0437007b310b3e6447c9833028ac8b8381ed5cbe7dd2ff3df7020792e7939b

data/lib/sequent-sinatra/tag_helper.rb

@@ -11,17 +11,20 @@ module Sequent
         # Parameters
         #   +field+ the name of the attribute within the current object.
         #   +options+ Hash with optional attributes.
-        #               :value - the default checked value if the current object has none
+        #               :default - the default checked value if the current object has none
         #               :class - the css class
         def raw_checkbox(field, options={})
-          id = calculate_id(field)
-          value = param_or_default(field, options[:value]) || id
+          id = options[:id] || calculate_id(field)
+          value = param_or_default(field, options.delete(:default), options) || id
           values = [value].compact
+          field_value = param_or_default(field, false)
+          checked = options.has_key?(:checked) ? options[:checked] : values.include?(field_value)
+          checked = checked ? "checked" : nil
           single_tag :input, options.merge(
                              :type => "checkbox",
                              :id => id,
                              :name => calculate_name(field),
-                             :value => value, checked: (values.include?(@values[field.to_s])) ? "checked" : nil
+                             :value => value, checked: checked
                            )
         end
 
@@ -31,19 +34,31 @@ module Sequent
         # Parameters
         #   +field+ the name of the attribute within the current object.
         #   +options+ Hash with optional attributes.
-        #               :value - the default value if the current object has none
+        #               :default - the default value if the current object has none
         #               :class - the css class
         def raw_input(field, options={})
           raw_field(field, "text", options)
         end
 
+        ##
+        # Creates a <input type=email>
+        #
+        # Parameters
+        #   +field+ the name of the attribute within the current object.
+        #   +options+ Hash with optional attributes.
+        #               :default - the default value if the current object has none
+        #               :class - the css class
+        def raw_email(field, options={})
+          raw_field(field, "email", options)
+        end
+
         ##
         # Creates a <input type=password>
         #
         # Parameters
         #   +field+ the name of the attribute within the current object.
         #   +options+ Hash with optional attributes.
-        #               :value - the default value if the current object has none
+        #               :default - the default value if the current object has none
         #               :class - the css class
         def raw_password(field, options={})
           raw_field(field, "password", options)
@@ -55,14 +70,14 @@ module Sequent
         # Parameters
         #   +field+ the name of the attribute within the current object.
         #   +options+ Hash with optional attributes.
-        #               :value - the default value if the current object has none
+        #               :default - the default value if the current object has none
         #               :class - the css class
         #               :rows - the number of rows of the textarea, default 3
         def raw_textarea(field, options={})
-          value = param_or_default(field, options[:value])
-
+          value = param_or_default(field, options.delete(:default), options)
+          id = options[:id] || calculate_id(field)
           with_closing_tag :textarea, value, {rows: "3"}.merge(options.merge(
-                                                                 :id => calculate_id(field),
+                                                                 :id => id,
                                                                  :name => calculate_name(field)
                                                                ))
         end
@@ -73,7 +88,7 @@ module Sequent
         # Parameters
         #   +field+ the name of the attribute within the current object.
         #   +options+ Hash with optional attributes.
-        #               :value - the default value if the current object has none
+        #               :default - the default value if the current object has none
         #               :class - the css class
         def raw_hidden(field, options={})
           raw_field(field, "hidden", options)
@@ -86,11 +101,12 @@ module Sequent
         #   +field+ the name of the attribute within the current object.
         #   +values+ an array of pairs (arrays) of [value, text_to_display]
         #   +options+ Hash with optional attributes.
-        #               :value - the default value if the current object has none
+        #               :default - the default value if the current object has none
         #               :class - the css class
         def raw_select(field, values, options={})
-          value = param_or_default(field, options[:value])
+          value = param_or_default(field, options.delete(:default), options)
           content = ""
+          css_id = options[:id] || calculate_id(field)
           Array(values).each do |val|
             id, text = id_and_text_from_value(val)
             option_values = {value: id}
@@ -98,7 +114,32 @@ module Sequent
             option_values.merge!(disabled: "disabled") if options[:disable].try(:include?, id)
             content << tag(:option, text, option_values)
           end
-          tag :select, content, options.merge(id: calculate_id(field), name: calculate_name(field))
+          tag :select, content, options.merge(id: css_id, name: calculate_name(field))
+        end
+
+        ##
+        # creates a <input type=radio>
+        #
+        # By default it will check the radio button who's value is present in the backing object
+        #
+        # Parameters
+        #   +field+ the name of the attribute within the current object.
+        #   +options+ Hash with optional attributes.
+        #               :default - the value of the radio option
+        #               :checked - does this radio need to be checked
+        #               :class - the css class
+        def raw_radio(field, options = {})
+          raise "radio buttons need a value" unless options[:value]
+          id = options[:id] || calculate_id(field)
+          value = options.delete(:value)
+          checked = (value == @values[field.to_s] || options.include?(:checked))
+          single_tag :input, options.merge(
+                             :type => "radio",
+                             :id => id,
+                             :name => calculate_name(field),
+                             :value => value,
+                             checked: checked ? "checked" : nil
+                           )
         end
 
         def full_path(field)
@@ -112,7 +153,8 @@ module Sequent
           "#{reverse_names.first}#{reverse_names[1..-1].map { |n| n == '[]' ? n : "[#{n}]" }.join}"
         end
 
-        def param_or_default(field, default)
+        def param_or_default(field, default, options = {})
+          return options[:value] if options.has_key?(:value)
           @values.nil? ? default : @values.has_key?(field.to_s) ? @values[field.to_s] || default : default
         end
 
@@ -160,21 +202,30 @@ module Sequent
           html_attrs.chop
         end
 
-
         def raw_field(field, field_type, options)
-          value = param_or_default(field, options[:value])
+          value = param_or_default(field, options.delete(:default), options)
           if options[:formatter]
             value = self.send(options[:formatter], value)
             options.delete(:formatter)
           end
           #TODO use calculate_id
           id = options[:id] || calculate_id(field)
+          options.merge!(data_attributes(options.delete(:data)))
           single_tag :input, options.merge(
-                             :type => field_type,
-                             :id => id,
-                             :name => calculate_name(field),
-                             :value => value
-                           )
+            :type => field_type,
+            :id => id,
+            :name => calculate_name(field),
+            :value => value,
+          )
+        end
+
+        def data_attributes(data, prefix = 'data')
+          case data
+          when Hash
+            data.reduce({}) { |memo, (key, value)| memo.merge(data_attributes(value, "#{prefix}-#{key}")) }
+          else
+            { prefix.gsub('_', '-').to_sym => data }
+          end
         end
 
         def tree_in_names(field, postfix_method_name)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SequentSinatra
-  VERSION='0.1.5'
+  VERSION='0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequent-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Lars Vonk
@@ -12,34 +12,54 @@ bindir: bin
 cert_chain: []
 date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: sequent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Event sourcing framework for Ruby - Sinatra adapter