sinatra-bells 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6214bebfaad377d0320032568aec9fd2b53d6ff
-  data.tar.gz: c7d10f33f00a5b6e69c45aefc6f5bb6a907003cb
+  metadata.gz: 98d7abf3723618e62f1581222f4cc1cfc104b310
+  data.tar.gz: aae9d2fea9ccbc9a5d7e10a00920be9c20fe601d
 SHA512:
-  metadata.gz: 9812d79432110a6617fe07e35a06d71d40e7e5523bdeb378d5866cdaea4356d2cc9de4e86679eb097b82d451deab3f859704ac266cb40dae943869307f68f179
-  data.tar.gz: 4b971fa58f45e4821697ff43b7cb6b2180099e67ff2c2d8b3f74faf1c60c912d192be21a7c62e83386b055253297379a0f8e49fcc124eeb300f7e67ec997acf9
+  metadata.gz: 0d07e09b9fea86fbd557a73bd5c8a05bcbcb7ab819fd92572695878342a57fb19c373f8d6d5a634e6f010e507566e2ffee99645dd14dfdcbd0b422afbd1e0006
+  data.tar.gz: ebf36cc4c4eae35d5a21fc2388c1c7cf4ffb7a52377b7214dbef14f68217094c0f885c286db9c26fd96a232e289d1a30cab4ab3190848ce741496a0f234d46d8

data/ChangeLog

@@ -2,6 +2,15 @@
 
 = Revision history for sinatra-bells
 
+== 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::Helpers::HTML#link_to to accept query params.
+
 == 0.0.1 [2014-04-14]
 
 * First release.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to sinatra-bells version 0.0.1
+This documentation refers to sinatra-bells version 0.0.2
 
 
 == DESCRIPTION
@@ -12,7 +12,7 @@ Extends Sinatra[http://sinatrarb.com/] with some convenience shortcuts.
 
 == LINKS
 
-Documentation:: https://blackwinter.github.io/sinatra-bells/
+Documentation:: https://blackwinter.github.com/sinatra-bells
 Source code::   https://github.com/blackwinter/sinatra-bells
 RubyGem::       https://rubygems.org/gems/sinatra-bells
 

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/sinatra/bells/version}, __FILE__)
+require_relative 'lib/sinatra/bells/version'
 
 begin
   require 'hen'
@@ -13,7 +13,7 @@ begin
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: %w[sinatra],
+      dependencies: { sinatra: '~> 1.4' },
 
       required_ruby_version: '>= 1.9.3'
     }

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

@@ -34,8 +34,30 @@ class Sinatra::Bells
 
     module Controller
 
+      def self.included(base)
+        error_code = Rack::Utils::HTTP_STATUS_CODES
+
+        base.class_eval {
+          [400, 401, 403, 404, 500].each { |code|
+            error(code) {
+              @code, @error = code, error_code[code]
+              render_error
+            }
+          }
+
+          [400, 401, 403].each { |code|
+            name = error_code[code].downcase.tr(' ', '_')
+            define_method(name) { |body = nil| error(code, body) }
+          }
+        }
+      end
+
       protected
 
+      def render_error
+        erb ''
+      end
+
       def send_file(file, options = {})
         options.is_a?(Hash) ? super :
           File.readable?(file) ? super(file, type: options) : not_found

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

@@ -26,6 +26,8 @@
 ###############################################################################
 #++
 
+require 'cgi'
+
 class Sinatra::Bells
 
   module Helpers
@@ -36,7 +38,23 @@ class Sinatra::Bells
 
       def link_to(text, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        _a(text, options.merge(href: uri(args.join('/'))))
+
+        href = uri(args.join('/'))
+
+        if params = options.delete(:params)
+          href << '?' << Array(params).flat_map { |key, value|
+            key = CGI.escape(key.to_s)
+
+            value.nil? ? key : Array(value)
+              .map { |val| "#{key}=#{CGI.escape(val.to_s)}" }
+          }.join('&')
+        end
+
+        _a(text, options.merge(href: href))
+      end
+
+      def link_to_if(condition, text, *args)
+        condition ? link_to(text, *args) : block_given? ? yield(text, *args) : text
       end
 
       def _tag(name, *args)
@@ -64,6 +82,14 @@ class Sinatra::Bells
         _tag(:ul, *args) { |tag| list.each { |*item| tag << yield(*item) } }
       end
 
+      def active?(path)
+        'active' if request.path_info =~ /\A#{Regexp.escape(path)}(?:\/|\?|\z)/
+      end
+
+      def disabled?(condition)
+        'disabled' unless condition
+      end
+
     end
 
   end

data/lib/sinatra/bells/version.rb

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

data/lib/sinatra/bells.rb

@@ -61,12 +61,10 @@ module Sinatra
           template, render = render, settings.default_render
         end
 
-        dot = '.' unless path.end_with?('/')
-
         blocks = {}
 
-        render.each { |type, method|
-          super(verb, "#{path}#{dot}#{type}", options, &blocks[type] = lambda {
+        type_paths(render, path) { |type_path, type, method|
+          super(verb, type_path, options, &blocks[type] = lambda {
             content_type(type)
             instance_eval(&block)
             instance_eval(&method)
@@ -78,8 +76,21 @@ module Sinatra
           send(settings.default_renderer, template)
         }
 
+        blocks.each { |type, type_block|
+          super(verb, path, options.merge(provides: type), &type_block)
+        }
+      end
+
+      def type_paths(render, path)
+        path, re = path.source, path if path.is_a?(Regexp)
+        anchor = $& if re && path.sub!(/\\z|\$/i, '')
+
+        dot = '.' unless path.end_with?('/')
+        dot = Regexp.escape(dot) if dot && re
+
         render.each { |type, method|
-          super(verb, path, options.merge(provides: type), &blocks[type])
+          type_path = "#{path}#{dot}#{type}#{anchor}"
+          yield re ? Regexp.new(type_path, re.options) : type_path, type, method
         }
       end
 

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-bells
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,13 +83,18 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  sinatra-bells-0.0.1 [2014-04-14]:
+  sinatra-bells-0.0.2 [2014-12-19]:
 
-  * First release.
+  * 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.
 
 rdoc_options:
 - "--title"
-- sinatra-bells Application documentation (v0.0.1)
+- sinatra-bells Application documentation (v0.0.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -104,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sinatra with some more bells and whistles.