sequent-sinatra 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff3009b374b8b75cad6de45571b76487c92a691d
-  data.tar.gz: 8fa9e461c0c80a3f7b2610c8af6eeb915287165e
+  metadata.gz: 97c87c781855a940c9c66574a9f68342d159ea66
+  data.tar.gz: 287e0f1e73c596ef6a814df83831bf8f6ce13e8d
 SHA512:
-  metadata.gz: eecf5a4b6e328bad1282f225248d01b1a7c239cae5b55e6b917ae4feb824845b234283af491765cfec2bece2b85c63eca2d7611f61cb9cc0a875dcff05eae175
-  data.tar.gz: 4ce04e459bde7fe61d229495795e2595b135b67821dfda16a426fa0c4c50f71b57796419679f2faee1a03c226380103351002a28bd9f73fad4ade20fa6fc2951
+  metadata.gz: 00a7d067aeb7a22595443ffd3303f6ca8f57cb3d7d1941d2ff5289f064c3c8b44a09da57372274b9310c862291c04e86cda0d9d9a2bad5c7a10ce35f44da846c
+  data.tar.gz: 59a215973ffc08a03604ad3981ba4b430e4f416c662c7d1900e4ece04b58a0227ddf1b590fcae4c48ad13469e000d1d611d24c3d5144f2e82f93c5e3726e9aa3

data/lib/sequent-sinatra/fieldset.rb

@@ -13,6 +13,10 @@ module Sequent
           nil
         end
 
+        def postfix_for_id
+          nil
+        end
+
         def initialize(parent, path, params, errors, options = {})
           raise "params are empty while creating new fieldset path #{path}" unless params
           @values = params[path] || {}
@@ -22,9 +26,10 @@ module Sequent
           @options = options
         end
 
-        def nested_array(name)
-          (@values[name] || [{}]).each do |value|
-            yield FieldsetInArray.new(self, name, { name => value }, @errors, @options)
+        def nested_array(name, default_if_empty = {})
+          values = @values[name].present? ? @values[name] : [default_if_empty].compact
+          values.each_with_index do |value, index|
+            yield FieldsetInArray.new(self, name, { name => value }, @errors, @options.merge(index_in_array: index))
           end
         end
 
@@ -36,15 +41,16 @@ module Sequent
           @parent.send(method, *args)
         end
 
-        def path_for(field_name)
-          css_id @path, field_name
-        end
       end
 
       class FieldsetInArray < Fieldset
         def postfix
           "[]"
         end
+
+        def postfix_for_id
+          @options[:index_in_array].to_s
+        end
       end
     end
   end

data/lib/sequent-sinatra/form.rb

@@ -17,10 +17,6 @@ module Sequent
           @options = options
         end
 
-        def path_for(field_name)
-          css_id field_name
-        end
-
         def method_missing(method, *args, &block)
           @context.send(method, *args)
         end

data/lib/sequent-sinatra/tag_helper.rb

@@ -14,11 +14,12 @@ module Sequent
         #               :value - the default checked value if the current object has none
         #               :class - the css class
         def raw_checkbox(field, options={})
-          id = css_id(@path, field)
+          id = calculate_id(field)
           value = param_or_default(field, options[:value]) || id
           values = [value].compact
           single_tag :input, options.merge(
-                             :type => "checkbox", :id => id,
+                             :type => "checkbox",
+                             :id => id,
                              :name => calculate_name(field),
                              :value => value, checked: (values.include?(@values[field.to_s])) ? "checked" : nil
                            )
@@ -56,12 +57,12 @@ module Sequent
         #   +options+ Hash with optional attributes.
         #               :value - the default value if the current object has none
         #               :class - the css class
-        #               :rows - the number of rows of the textarea
+        #               :rows - the number of rows of the textarea, default 3
         def raw_textarea(field, options={})
           value = param_or_default(field, options[:value])
 
           with_closing_tag :textarea, value, {rows: "3"}.merge(options.merge(
-                                                                 :id => css_id(@path, field),
+                                                                 :id => calculate_id(field),
                                                                  :name => calculate_name(field)
                                                                ))
         end
@@ -97,39 +98,44 @@ 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 => css_id(@path, field), :name => calculate_name(field))
+          tag :select, content, options.merge(id: calculate_id(field), name: calculate_name(field))
         end
 
+        def full_path(field)
+          tree_in_names(field, :postfix_for_id).join('_')
+        end
+
+        alias_method :calculate_id, :full_path
+
         def calculate_name(field)
-          reverse_names = tree_in_names(field)
+          reverse_names = tree_in_names(field, :postfix)
           "#{reverse_names.first}#{reverse_names[1..-1].map { |n| n == '[]' ? n : "[#{n}]" }.join}"
         end
 
-        def full_path(field)
-          tree_in_names(field).join('_')
+        def param_or_default(field, default)
+          @values.nil? ? default : @values.has_key?(field.to_s) ? @values[field.to_s] || default : default
         end
 
-        alias_method :calculate_id, :full_path
+        def merge_and_append_class_attributes(to_append, options = {})
+          to_append.merge(options) do |key, oldval, newval|
+            key == :class ? "#{oldval} #{newval}" : newval
+          end
+        end
 
-        def tree_in_names(field)
-          if respond_to? :path
-            names = [field, postfix, path].compact
-            parent = @parent
-            while parent.is_a? Fieldset
-              names << parent.postfix if parent.postfix
-              names << parent.path
-              parent = parent.parent
-            end
-            names.reverse
+        def i18n_name(field)
+          if @path
+            "#{@path}.#{field}"
           else
-            [field]
+            field.to_s
           end
         end
 
-        def param_or_default(field, default)
-          @values.nil? ? default : @values.has_key?(field.to_s) ? @values[field.to_s] || default : default
+        def has_form_error?(name)
+          @errors.try(:has_key?, name.to_sym)
         end
 
+        private
+
         def id_and_text_from_value(val)
           if val.is_a? Array
             [val[0], val[1]]
@@ -138,24 +144,12 @@ module Sequent
           end
         end
 
-        def css_id(*things)
-          things.compact.map { |t| t.to_s }.join('_').downcase.gsub(/\W/, '_')
-        end
-
         def tag(name, content, options={})
           "<#{name.to_s}" +
             (options.length > 0 ? " #{hash_to_html_attrs(options)}" : '') +
             (content.nil? ? '>' : ">#{content}</#{name}>")
         end
 
-        def single_tag(name, options={})
-          "<#{name.to_s} #{hash_to_html_attrs(options)} />"
-        end
-
-        def with_closing_tag(name, value, options={})
-          %Q{<#{name.to_s} #{hash_to_html_attrs(options)} >#{h value}</#{name.to_s}>}
-        end
-
         def hash_to_html_attrs(options={})
           raise %Q{Keys used in options must be a Symbol. Don't use {"class" => "col-md-4"} but use {class: "col-md-4"}} if options.keys.find { |k| not k.kind_of? Symbol }
           html_attrs = ""
@@ -166,32 +160,15 @@ module Sequent
           html_attrs.chop
         end
 
-        def merge_and_append_class_attributes(to_append, options = {})
-          to_append.merge(options) do |key, oldval, newval|
-            key == :class ? "#{oldval} #{newval}" : newval
-          end
-        end
-
-        def i18n_name(field)
-          if @path
-            "#{@path}.#{field}"
-          else
-            field.to_s
-          end
-        end
-
-        def has_form_error?(name)
-          @errors.try(:has_key?, name.to_sym)
-        end
 
-        private
         def raw_field(field, field_type, options)
           value = param_or_default(field, options[:value])
           if options[:formatter]
             value = self.send(options[:formatter], value)
             options.delete(:formatter)
           end
-          id = options[:id] || css_id(@path, field)
+          #TODO use calculate_id
+          id = options[:id] || calculate_id(field)
           single_tag :input, options.merge(
                              :type => field_type,
                              :id => id,
@@ -200,6 +177,28 @@ module Sequent
                            )
         end
 
+        def tree_in_names(field, postfix_method_name)
+          if respond_to? :path
+            names = [field, send(postfix_method_name), path].compact
+            parent = @parent
+            while parent.is_a? Fieldset
+              names << parent.postfix if parent.send(postfix_method_name)
+              names << parent.path
+              parent = parent.parent
+            end
+            names.reverse
+          else
+            [field]
+          end
+        end
+
+        def single_tag(name, options={})
+          "<#{name.to_s} #{hash_to_html_attrs(options)} />"
+        end
+
+        def with_closing_tag(name, value, options={})
+          %Q{<#{name.to_s} #{hash_to_html_attrs(options)} >#{h value}</#{name.to_s}>}
+        end
 
       end
     end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequent-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Lars Vonk