sinatra-bells 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d7abf3723618e62f1581222f4cc1cfc104b310
-  data.tar.gz: aae9d2fea9ccbc9a5d7e10a00920be9c20fe601d
+  metadata.gz: 53f2b23d0ae7f154e44a3e397757c6f7a2046db7
+  data.tar.gz: 61e1dc3ca04412604688581b82a14e9a81309db1
 SHA512:
-  metadata.gz: 0d07e09b9fea86fbd557a73bd5c8a05bcbcb7ab819fd92572695878342a57fb19c373f8d6d5a634e6f010e507566e2ffee99645dd14dfdcbd0b422afbd1e0006
-  data.tar.gz: ebf36cc4c4eae35d5a21fc2388c1c7cf4ffb7a52377b7214dbef14f68217094c0f885c286db9c26fd96a232e289d1a30cab4ab3190848ce741496a0f234d46d8
+  metadata.gz: 0f1c43831f29db9ebc8d591a1d375b79be25e1698be93fa127c47755eee98657b639d1ca90030b01fce0ec0b8b54fcd327f7006126ed04a8913b5480fab1b78c
+  data.tar.gz: f4e93040f59afa2e9fb4aa863db1d7f88e4ba24ed642844b3f18aa891f372a13ad76092be52fe4635a5b0ea27c478dde0171171e90557dd73a1013c98e260b22

data/ChangeLog

@@ -2,13 +2,20 @@
 
 = Revision history for sinatra-bells
 
+== 0.0.3 [2015-02-11]
+
+* Renamed Sinatra::Bells::Helpers::HTML to Sinatra::Bells::Helpers::View.
+* Extended Sinatra::Bells::Helpers::View#link_to to accept an anchor.
+* Added Sinatra::Bells::Helpers::View#format_label.
+* Added Sinatra::Bells.set_hash.
+
 == 0.0.2 [2014-12-19]
 
 * Sinatra::Bells::Helpers::Controller installs default error handlers.
 * Added Sinatra::Bells::Helpers::HTML#link_to_if.
 * Added Sinatra::Bells::Helpers::HTML#disabled?.
 * Added Sinatra::Bells::Helpers::HTML#active?.
-* Extended Sinatra::Bells#route to handle regexp paths.
+* Extended Sinatra::Bells.route to handle regexp paths.
 * Extended Sinatra::Bells::Helpers::HTML#link_to to accept query params.
 
 == 0.0.1 [2014-04-14]

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to sinatra-bells version 0.0.2
+This documentation refers to sinatra-bells version 0.0.3
 
 
 == DESCRIPTION
@@ -24,7 +24,7 @@ RubyGem::       https://rubygems.org/gems/sinatra-bells
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2014 Jens Wille
+Copyright (C) 2014-2015 Jens Wille
 
 sinatra-bells is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/lib/sinatra/bells/helpers/{html.rb → view.rb}

@@ -5,7 +5,7 @@
 #                                                                             #
 # sinatra-bells -- Sinatra with some more bells and whistles                  #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -32,7 +32,19 @@ class Sinatra::Bells
 
   module Helpers
 
-    module HTML
+    module View
+
+      LABEL_FORMAT_RE = %r{
+        \{
+          ( \w+ )               # field
+          (?: \( ( .*? ) \) )?  # separator
+          (?: : ( .*? ) )?      # format string
+        \}
+      }x.freeze
+
+      DEFAULT_FORMAT = '%s'.freeze
+
+      DEFAULT_SEPARATOR = '; '.freeze
 
       protected
 
@@ -50,6 +62,10 @@ class Sinatra::Bells
           }.join('&')
         end
 
+        if anchor = options.delete(:anchor)
+          href << '#' << CGI.escape(anchor.to_s)
+        end
+
         _a(text, options.merge(href: href))
       end
 
@@ -90,6 +106,18 @@ class Sinatra::Bells
         'disabled' unless condition
       end
 
+      def format_label(label, hash = nil, &block)
+        hash ||= block
+
+        label.gsub(LABEL_FORMAT_RE) {
+          field, separator, format =
+            $1, $2 || DEFAULT_SEPARATOR, $3 || DEFAULT_FORMAT
+
+          value = Array(hash[field]).map(&:to_s).delete_if(&:empty?)
+          format % [value.join(separator), field] unless value.empty?
+        }
+      end
+
     end
 
   end

data/lib/sinatra/bells/helpers.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # sinatra-bells -- Sinatra with some more bells and whistles                  #
 #                                                                             #
-# Copyright (C) 2014 Jens Wille                                               #
+# Copyright (C) 2014-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -27,7 +27,7 @@
 #++
 
 require_relative 'helpers/controller'
-require_relative 'helpers/html'
+require_relative 'helpers/view'
 
 class Sinatra::Bells
   helpers ERB::Util, *Helpers.constants.map { |mod| Helpers.const_get(mod) }

data/lib/sinatra/bells/version.rb

@@ -6,7 +6,7 @@ module Sinatra
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 2
+      TINY  = 3
 
       class << self
 

data/lib/sinatra/bells.rb

@@ -46,6 +46,12 @@ module Sinatra
         super(option, *args, &nil)
       end
 
+      def set_hash(opt, ary, suf = nil, &block)
+        (a, b = suf; ary.map! { |i| %W[#{i}#{a} #{i}#{b}] }) if suf
+        ary.map!(&block) if block
+        set(opt, Hash[ary])
+      end
+
       def set_root(file)
         set(:root, file.chomp(File.extname(file)))
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-bells
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -75,7 +75,7 @@ files:
 - lib/sinatra/bells.rb
 - lib/sinatra/bells/helpers.rb
 - lib/sinatra/bells/helpers/controller.rb
-- lib/sinatra/bells/helpers/html.rb
+- lib/sinatra/bells/helpers/view.rb
 - lib/sinatra/bells/version.rb
 homepage: http://github.com/blackwinter/sinatra-bells
 licenses:
@@ -83,18 +83,16 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  sinatra-bells-0.0.2 [2014-12-19]:
+  sinatra-bells-0.0.3 [2015-02-11]:
 
-  * Sinatra::Bells::Helpers::Controller installs default error handlers.
-  * Added Sinatra::Bells::Helpers::HTML#link_to_if.
-  * Added Sinatra::Bells::Helpers::HTML#disabled?.
-  * Added Sinatra::Bells::Helpers::HTML#active?.
-  * Extended Sinatra::Bells#route to handle regexp paths.
-  * Extended Sinatra::Bells::Helpers::HTML#link_to to accept query params.
+  * Renamed Sinatra::Bells::Helpers::HTML to Sinatra::Bells::Helpers::View.
+  * Extended Sinatra::Bells::Helpers::View#link_to to accept an anchor.
+  * Added Sinatra::Bells::Helpers::View#format_label.
+  * Added Sinatra::Bells.set_hash.
 
 rdoc_options:
 - "--title"
-- sinatra-bells Application documentation (v0.0.2)
+- sinatra-bells Application documentation (v0.0.3)
 - "--charset"
 - UTF-8
 - "--line-numbers"