sinatra-sugar 0.4.1 → 0.5.0

data/LICENSE

@@ -0,0 +1,27 @@
+copyright (c) 2010 Konstantin Haase.  All rights reserved.
+
+Developed by: Konstantin Haase
+              http://github.com/rkh/big_band
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal with the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimers.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimers in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of Konstantin Haase, nor the names of other contributors
+     may be used to endorse or promote products derived from this Software without
+     specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+WITH THE SOFTWARE.

data/README.md

@@ -26,10 +26,6 @@ More advanced set
         set :haml, :format => :html5, :escape_html => true
         set :haml, :excape_html => false
         haml # => { :format => :html5, :escape_html => false }
-    
-- Allows passing a block in Sinatra 0.9, too:
-
-        set(:foo) { Time.now }
 
 More advanced register
 ----------------------

data/lib/sinatra/sugar.rb

@@ -1,5 +1,5 @@
 require "sinatra/base"
-require "monkey"
+require "monkey-lib"
 
 module Sinatra
   module Sugar
@@ -37,15 +37,10 @@ module Sinatra
       # - Allowes passing a block (for Sinatra 0.9.x):
       #     set(:foo) { Time.now }
       def set(key, value = self, &block)
-        # FIXME: refactor, refactor, refactor
-        if block_given? and Sinatra::VERSION < "1.0"
-          raise ArgumentError, "both a value and a block given" if value != self
-          value = block
-        end
         symbolized = (key.to_sym if key.respond_to? :to_sym)
         old_value = (send(symbolized) if symbolized and respond_to? symbolized)
         value = old_value.merge value if value.is_a? Hash and old_value.is_a? Hash
-        super(key, value)
+        super
         # HACK: Sinatra::Base.set uses recursion and in the final step value always
         # is a Proc. Also, if value is a Proc no step ever follows. I abuse this to
         # invoke the hooks only once per set.

data/spec/sinatra/sugar_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(__FILE__ + "/../../spec_helper.rb")
 
 describe Sinatra::Sugar do
-
   before { app :Sugar }
+  it_should_behave_like 'sinatra'
 
   describe "set" do
 

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require "sinatra/rspec"
+require "sinatra/rspec/shared"
 require "sinatra/sugar"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sugar
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -14,58 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: monkey-lib
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra-test-helper
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -86,6 +94,7 @@ files:
 - spec/sinatra/sugar_spec.rb
 - spec/spec_helper.rb
 - README.md
+- LICENSE
 has_rdoc: yard
 homepage: http://github.com/rkh/sinatra-sugar
 licenses: []
@@ -96,23 +105,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Some extensions to the sinatra default behavior (usefull for other Sintatra extensions, part of BigBand).