sinatra-bells 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d8d747f1dbcd4fe39bd55d5cf787e5bf537e4f
-  data.tar.gz: a44048ea6c7d6081f13acd8d6d1313f6c2519753
+  metadata.gz: 8c06a119e890338c06263a4ff633d48408783cb3
+  data.tar.gz: 0caaea6341e20b1525125caaafa6562613a2aa54
 SHA512:
-  metadata.gz: 074d45d14568d8a136182dcfc2fd7e437a94a5611d3e9aaba8ac7d2d12d9ef419e9cfd7e4289c466f534590236c689638322175a24add8e2a57c29d3d468a76b
-  data.tar.gz: 550a3e97a9b0b8de15e48b8adaa643eb17d73225fee004270099f108f66bbaa89b44210c26870561ae817456ef3b76ff290a5ea73685d61e1647f16354abaa66
+  metadata.gz: f8582be5383ef42c876b695810905a058df03bfefb82b03e57841c67fefd9028707712f7876663c68bdb1bc3f1d611dace8773b075de8e0d5fce6856456351b2
+  data.tar.gz: a0e5f7574fd1c043bc8d67ed4141b0f2a2feb52933bad982756f5b422a64503b1c7cc5742725ee82457a1d6a8c8111e347e903a3a96c726c492ae7120e00db84

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for sinatra-bells
 
+== 0.4.0 [2016-06-06]
+
+* Prevent Sinatra's hash merge behaviour in Sinatra::Bells.set.
+* Added Sinatra::Bells::Helpers::View#tag__ and HTML element helpers.
+
 == 0.3.0 [2016-01-28]
 
 * Added Sinatra::Bells::Helpers::View#partial.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to sinatra-bells version 0.3.0
+This documentation refers to sinatra-bells version 0.4.0
 
 
 == DESCRIPTION

data/lib/sinatra/bells.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # sinatra-bells -- Sinatra with some more bells and whistles                  #
 #                                                                             #
-# Copyright (C) 2014-2015 Jens Wille                                          #
+# Copyright (C) 2014-2016 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -35,9 +35,9 @@ module Sinatra
     class << self
 
       def set(option, *args, &block)
-        block ? !args.empty? ?
+        block ? args.empty? ? set_defer(option, &block) :
           raise(ArgumentError, 'both block and arguments given') :
-          set_defer(option, &block) : super(option, *args, &nil)
+            (set(option, nil) if args.first.is_a?(Hash); super(option, *args))
       end
 
       def set_defer(option, &block)

data/lib/sinatra/bells/helpers/view.rb

@@ -68,6 +68,10 @@ class Sinatra::Bells
               def #{name}_(*args, &block)
                 tag_(#{name.inspect}, *args, &block)
               end
+
+              def #{name}__(*args)
+                tag__(#{name.inspect}, *args)
+              end
             EOT
           }
         end
@@ -86,6 +90,10 @@ class Sinatra::Bells
 
                 tag_(#{name.inspect}, *args, &block)
               end
+
+              def #{name}__(*args)
+                tag__(#{name.inspect}, *args)
+              end
             EOT
           }
         end
@@ -120,6 +128,12 @@ class Sinatra::Bells
       end
 
       def tag_(name, *args)
+        tag__(name, *args)
+        yield args if block_given?
+        args.push('</', name, '>').join
+      end
+
+      def tag__(name, *args)
         args.unshift('<', name, '>')
 
         if args.last.is_a?(Hash)
@@ -127,9 +141,7 @@ class Sinatra::Bells
           args.insert(2, ' ', attr.join(' ')) unless attr.empty?
         end
 
-        yield args if block_given?
-
-        args.push('</', name, '>').join
+        args.join
       end
 
       define_html_tag_method(*HTML_ELEMENTS)

data/lib/sinatra/bells/version.rb

@@ -5,7 +5,7 @@ module Sinatra
     module Version
 
       MAJOR = 0
-      MINOR = 3
+      MINOR = 4
       TINY  = 0
 
       class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-bells
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -33,7 +33,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -83,13 +83,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  sinatra-bells-0.3.0 [2016-01-28]:
+  sinatra-bells-0.4.0 [2016-06-06]:
 
-  * Added Sinatra::Bells::Helpers::View#partial.
+  * Prevent Sinatra's hash merge behaviour in Sinatra::Bells.set.
+  * Added Sinatra::Bells::Helpers::View#tag__ and HTML element helpers.
 
 rdoc_options:
 - "--title"
-- sinatra-bells Application documentation (v0.3.0)
+- sinatra-bells Application documentation (v0.4.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Sinatra with some more bells and whistles.