sinatra-tag-helpers 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWZmNGE0MWU1ZDc2MjBlNTVhZGVmMzI3MjI2MDkwYTQxNWIyNzdkYQ==
+    NzI1YTcwY2ExN2RmMTRlN2E5NTlkOWZkNDkwYzA4M2FkMmEyMTRhZA==
   data.tar.gz: !binary |-
-    MzE0OTY3Mzc3ZDUyMTlmMDg2ZTVjN2QzODQ5YzgzNzA3MDkzMjI0OQ==
+    NmNlMzQwYjY1MzMxNWI1NDcxMGM4MDg3Yjc3NGE0YThiNmNhNTVlZg==
 SHA512:
   metadata.gz: !binary |-
-    ZWJhYThlNTZiODQ3NGNhOTlmM2JhMGZkMGEwZWJmMzhmMzRlNDhkN2EzNzc5
-    YjlhYjlmZWE5NzY4ZjU0ZTJhNjM3ZDkwNGUyZjc2MTk2ZDY3YTA2MjVlNWI3
-    ZjM2OGUzNTI2NGM2MGNiYjYwYTNjZjhmYjE2ZDc4OTcxMTQyYzQ=
+    NmU4NzUxNzhkY2M1ZTIxNzM3NWU1MjgyOGQwMjRjNWYzYmUwYjRhYzExMWFi
+    OTgyNjIyZTYxYmQ2NDkyNWY1NTYxY2I3ODc2ZTczNTZjNTA0YjIyY2UzMWY5
+    ZmE3MDQ3MGIwYTBmOWFjNzhhOWM0YzZlMTU5NzhlNGFhOGQ2YTQ=
   data.tar.gz: !binary |-
-    ZDhiNTJlMDU5OTFmZmNjYzA4NDVhNWY4MDViMzllZTE2YjZlNTI2ZTlmYmU0
-    NTg0ZmFhZGIyOWI3YzJiYmY2YzUzYmRjNjRmMzcyNDU4NmMwODg1NDUxMjdm
-    ZWI2ZjQzNWUyNDEwZGY5MWRkMzU2MmM5YmNkMTY0MTNhMTk4YWY=
+    ZjFmZjZmOWMwYTAyMWMwYmFjNGY1ZWQ3NDYwZDlkYmI4ZjVjNTJlOTRkMzYz
+    ZGZkMzFjYTVjZTIzNzYxZjU2MGVhNGRjZjFmY2Y4ZDZmMWFhOGY1YjdjY2Yw
+    OWM5ZmM1MjNiZjg2ODM0NjJmNWMxMzZiMWZlZTgzNjM2ODI2Mjg=

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 Classic style apps should be good to go and modular apps can do the old:
 
-    helpers Sinatra::TagHelpers
+    register Sinatra::TagHelpers
 
 ## Contributing
 

data/lib/sinatra/tag-helpers.rb

@@ -1,217 +1,243 @@
 require 'sinatra/base'
 require 'sinatra/tag-helpers/version'
+require 'escape_utils'
 
 module Sinatra
   module TagHelpers
-    # don't even try it
-    def html_escape(text = '')
-      EscapeUtils.escape_html(text || '')
-    end
-    alias_method :h, :html_escape
-
-    # converts a hash into HTML style attributes
-    def to_attributes(hash)
-      hash.collect do |key, value|
-        # for things like data: { stuff: 'hey' }
-        if value.is_a? Hash
-          value.collect do |k, v|
-            "#{key}-#{k}=\"#{v}\""
+    module HelperMethods
+      # don't even try it
+      def html_escape(text = '')
+        EscapeUtils.escape_html(text || '')
+      end
+      alias_method :h, :html_escape
+
+      # converts a hash into HTML style attributes
+      def to_attributes(hash)
+        hash.collect do |key, value|
+          # for things like data: { stuff: 'hey' }
+          if value.is_a? Hash
+            value.collect do |k, v|
+              "#{key}-#{k}=\"#{v}\""
+            end
+          else
+            value.is_a?(TrueClass) ? key.to_s : "#{key}=\"#{value}\""
           end
-        else
-          value.is_a?(TrueClass) ? key.to_s : "#{key}=\"#{value}\""
-        end
-      end.join(' ').chomp
-    end
-
-    # mostly so we can override this if we need to look anywhere besides the params
-    # * cough * session * cough *
-    def param_value(param_name)
-      html_escape(params[param_name.to_sym] || '')
-    end
-
-    # link helper
-    # examples:
-    #
-    #   link_to 'Overview', '/account/overview' # => <a href='/account/overview'>Overview</a>
-    #
-    # when on /account/overview
-    #
-    #   <a href='/account/overview' class='current'>Overview</a>
-    #
-    def link_to(text, link, attributes = {})
-      if URI.parse(link).path == request.path_info
-        attributes[:class] = "#{ attributes[:class] } current"
+        end.join(' ').chomp
       end
 
-      attributes.merge!({ :href => to(link) })
+      # mostly so we can override this if we need to look anywhere besides the params
+      # * cough * session * cough *
+      def param_value(param_name)
+        html_escape(params[param_name.to_sym] || '')
+      end
 
-      "<a #{ to_attributes(attributes) }>#{ text }</a>"
-    end
+      # link helper
+      # examples:
+      #
+      #   link_to 'Overview', '/account/overview' # => <a href='/account/overview'>Overview</a>
+      #
+      # when on /account/overview
+      #
+      #   <a href='/account/overview' class='current'>Overview</a>
+      #
+      def link_to(text, link, attributes = {})
+        if URI.parse(link).path == request.path_info
+          attributes[:class] = [attributes[:class], settings.link_to_current_class].join(' ')
+        end
 
-    # input_for creates an <input> tag with a number of configurable options
-    #   if `param` is set in the `params` hash, the values from the `params` hash will be populated in the tag.
-    #
-    #   <%= input_for 'something_hidden', type: 'hidden', value: 'Shhhhhh' %>
-    #
-    # Yields:
-    #
-    #   <input type='hidden' name='something_hidden' id='something_hidden' value='Shhhhhh'>
-    #
-    def input_for(param, attributes = {})
-      attributes = {
-        :type  => 'text',
-        :value => param_value(param),
-        :name  => param,
-        :id    => param
-      }.merge(attributes)
-
-      "<input #{ to_attributes(attributes) }>"
-    end
+        attributes.merge!({ :href => to(link) })
 
-    # radio_for creates an input tag of type radio and marks it `checked` if the param argument is set to the same value in the `params` hash
-    def radio_for(param, attributes = {})
-      attributes = {
-        :type => 'radio'
-      }.merge(attributes)
+        "<a #{ to_attributes(attributes) }>#{ text }</a>"
+      end
 
-      if param_value(param) == attributes[:value].to_s
-        attributes.merge!({ :checked => true })
+      # input_for creates an <input> tag with a number of configurable options
+      #   if `param` is set in the `params` hash, the values from the `params` hash will be populated in the tag.
+      #
+      #   <%= input_for 'something_hidden', type: 'hidden', value: 'Shhhhhh' %>
+      #
+      # Yields:
+      #
+      #   <input type='hidden' name='something_hidden' id='something_hidden' value='Shhhhhh'>
+      #
+      def input_for(param, attributes = {})
+        attributes = {
+          :type  => 'text',
+          :value => param_value(param),
+          :name  => param,
+          :id    => param
+        }.merge(attributes)
+
+        "<input #{ to_attributes(attributes) }>"
       end
 
-      input_for param, attributes
-    end
+      # radio_for creates an input tag of type radio and marks it `checked` if the param argument is set to the same value in the `params` hash
+      def radio_for(param, attributes = {})
+        attributes = {
+          :type => 'radio'
+        }.merge(attributes)
+
+        if param_value(param) == attributes[:value].to_s
+          attributes.merge!({ :checked => true })
+        end
 
-    # checkbox_for creates an input of type checkbox with a `checked_if` argument to determine if it should be checked
-    #
-    #   <%= checkbox_for 'is_cool', User.is_cool? %>
-    #
-    # Yields:
-    #
-    #   <input type='checkbox' name='is_cool' id='is_cool' value='true'>
-    #
-    # Which will be marked with `checked` if `User.is_cool?` evaluates to true
-    #
-    def checkbox_for(param, checked_if = false, attributes = {})
-      attributes = {
-        :type  => 'checkbox',
-        :value => 'true'
-      }.merge(attributes)
-
-      if checked_if || param_value(param) == attributes[:value].to_s
-        attributes.merge!({ checked: true })
+        input_for param, attributes
       end
 
-      input_for param, attributes
-    end
+      # checkbox_for creates an input of type checkbox with a `checked_if` argument to determine if it should be checked
+      #
+      #   <%= checkbox_for 'is_cool', User.is_cool? %>
+      #
+      # Yields:
+      #
+      #   <input type='checkbox' name='is_cool' id='is_cool' value='true'>
+      #
+      # Which will be marked with `checked` if `User.is_cool?` evaluates to true
+      #
+      def checkbox_for(param, checked_if = false, attributes = {})
+        attributes = {
+          :type  => 'checkbox',
+          :value => 'true'
+        }.merge(attributes)
+
+        if checked_if || param_value(param) == attributes[:value].to_s
+          attributes.merge!({ checked: true })
+        end
 
-    # creates a simple <textarea> tag
-    def textarea_for(param, attributes = {})
-      attributes = {
-        :name => param,
-        :id   => param
-      }.merge(attributes)
+        input_for param, attributes
+      end
 
-      "<textarea #{ to_attributes(attributes) }>#{ param_value(param) }</textarea>"
-    end
+      # creates a simple <textarea> tag
+      def textarea_for(param, attributes = {})
+        attributes = {
+          :name => param,
+          :id   => param
+        }.merge(attributes)
 
-    # option_for creates an <option> element with the specified attributes
-    #   if the param specified is set to the value of this option tag then it is marked as 'selected'
-    #   designed to be used within a <select> element
-    #
-    #   <%= option_for 'turtles', key: 'I love them', value: 'love' %>
-    #
-    # Yields:
-    #
-    #   <option value='love'>I love them</option>
-    #
-    # If params[:turtle] is set to 'love' this yields:
-    #
-    #   <option value='love' selected>I love them</option>
-    #
-    def option_for(param, attributes = {})
-      default = attributes.delete(:default).to_s
-
-      if !params[param.to_sym].nil? && !params[param.to_sym].empty?
-        default = param_value(param)
+        "<textarea #{ to_attributes(attributes) }>#{ param_value(param) }</textarea>"
       end
 
-      attributes.merge!({ :selected => true }) if default == attributes[:value].to_s
-      key = attributes.delete(:key)
+      # option_for creates an <option> element with the specified attributes
+      #   if the param specified is set to the value of this option tag then it is marked as 'selected'
+      #   designed to be used within a <select> element
+      #
+      #   <%= option_for 'turtles', key: 'I love them', value: 'love' %>
+      #
+      # Yields:
+      #
+      #   <option value='love'>I love them</option>
+      #
+      # If params[:turtle] is set to 'love' this yields:
+      #
+      #   <option value='love' selected>I love them</option>
+      #
+      def option_for(param, attributes = {})
+        default = attributes.delete(:default).to_s
+
+        if !params[param.to_sym].nil? && !params[param.to_sym].empty?
+          default = param_value(param)
+        end
 
-      "<option #{ to_attributes(attributes) }>#{ key }</option>"
-    end
+        attributes.merge!({ :selected => true }) if default == attributes[:value].to_s
+        key = attributes.delete(:key)
 
-    # select_for creates a <select> element with the specified attributes
-    #   options are the available <option> tags within the <select> box
-    #
-    #   <%= select_for 'days', { monday: 'Monday', myday: 'MY DAY!' } %>
-    #
-    # Yields:
-    #
-    #   <select name='days' id='days' size='1'>
-    #     <option value='monday'>Monday</option>
-    #     <option value='myday'>MY DAY!</option>
-    #   </select>
-    #
-    def select_for(param, options, attributes = {})
-      attributes = {
-        :name => param,
-        :id   => param
-      }.merge(attributes)
-
-      select = ["<select #{ to_attributes(attributes) }>"]
-
-      options.collect do |key, val|
-        # groups...
-        if val.is_a?(Hash)
-          select.push "<optgroup label='#{ key }'>"
-
-          val.each do |group_key, group_val|
-            select.push option_for(param, :key => group_key, :value => group_val, :default => attributes[:default] || param_value(param))
-          end
+        "<option #{ to_attributes(attributes) }>#{ key }</option>"
+      end
 
-          select.push "</optgroup>"
-        else
-          select.push option_for(param, :key => key, :value => val, :default => attributes[:default] || param_value(param))
+      # select_for creates a <select> element with the specified attributes
+      #   options are the available <option> tags within the <select> box
+      #
+      #   <%= select_for 'days', { monday: 'Monday', myday: 'MY DAY!' } %>
+      #
+      # Yields:
+      #
+      #   <select name='days' id='days' size='1'>
+      #     <option value='monday'>Monday</option>
+      #     <option value='myday'>MY DAY!</option>
+      #   </select>
+      #
+      def select_for(param, options, attributes = {})
+        attributes = {
+          :name => param,
+          :id   => param
+        }.merge(attributes)
+
+        select = ["<select #{ to_attributes(attributes) }>"]
+
+        options.collect do |key, val|
+          # groups...
+          if val.is_a?(Hash)
+            select.push "<optgroup label='#{ key }'>"
+
+            val.each do |group_key, group_val|
+              select.push option_for(param, :key => group_key, :value => group_val, :default => attributes[:default] || param_value(param))
+            end
+
+            select.push "</optgroup>"
+          else
+            select.push option_for(param, :key => key, :value => val, :default => attributes[:default] || param_value(param))
+          end
         end
-      end
 
-      select.push('</select>').join(' ').chomp
-    end
+        select.push('</select>').join(' ').chomp
+      end
 
-    # shortcut to generate a month list
-    def months_for(param, attributes = {})
-      select_for(param, { 'Month' => '', '1 - January' => '01', '2 - February' => '02', '3 - March' => '03', '4 - April' => '04', '5 - May' => '05', '6 - June' => '06', '7 - July' => '07', '8 - August' => '08', '9 - September' => '09', '10 - October' => '10', '11 - November' => '11', '12 - December' => '12' }, attributes)
-    end
+      # shortcut to generate a month list
+      def months_for(param, attributes = {})
+        select_for(param, settings.months_hash, attributes)
+      end
 
-    def years_for(param, range = 1940..Date.today.year, attributes = {})
-      options = { 'Year' => '' }
+      def years_for(param, range = settings.years_range, attributes = {})
+        options = { 'Year' => '' }
 
-      if range.last > range.first
-        # top down
-        range.last.downto(range.first) do |element|
-          options[element] = element
-        end
-      else
-        # bottom up
-        range.last.upto(range.first) do |element|
-          options[element] = element
+        if range.last > range.first
+          # top down
+          range.last.downto(range.first) do |element|
+            options[element] = element
+          end
+        else
+          # bottom up
+          range.last.upto(range.first) do |element|
+            options[element] = element
+          end
         end
+
+        select_for(param, options, attributes)
       end
 
-      select_for(param, options, attributes)
-    end
+      def days_for(param, attributes = {})
+        options = { 'Day' => '' }
 
-    def days_for(param, attributes = {})
-      options = { 'Day' => '' }
+        (1..31).each do |day|
+          options[day] = day
+        end
 
-      (1..31).each do |day|
-        options[day] = day
+        select_for(param, options, attributes)
       end
+    end
 
-      select_for(param, options, attributes)
+    # settings and such
+    def self.registered(app)
+      app.helpers TagHelpers::HelperMethods
+
+      app.set :link_to_current_class, 'current'
+      app.set :years_range, 1940..Date.today.year
+      app.set :months_hash, {
+        'Month' => '',
+        '1 - January'   => '01',
+        '2 - February'  => '02',
+        '3 - March'     => '03',
+        '4 - April'     => '04',
+        '5 - May'       => '05',
+        '6 - June'      => '06',
+        '7 - July'      => '07',
+        '8 - August'    => '08',
+        '9 - September' => '09',
+        '10 - October'  => '10',
+        '11 - November' => '11',
+        '12 - December' => '12'
+      }
     end
   end
 
-  helpers TagHelpers
+  register TagHelpers
 end

data/lib/sinatra/tag-helpers/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module TagHelpers
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/sinatra-tag-helpers.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.license       = 'MIT'
 
-  spec.add_dependency 'sinatra', '~> 1.4.0'
+  spec.add_dependency 'sinatra', '>= 1.4.0'
   spec.add_dependency 'escape_utils', '>= 0.3.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-tag-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Evan Lecklider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement