sinatra-sugar 0.4.0.a → 0.4.0.b

data/README.md

@@ -12,6 +12,11 @@ BigBand
 Sinatra::Sugar is part of the [BigBand](http://github.com/rkh/big_band) stack.
 Check it out if you are looking for other fancy Sinatra extensions.
 
+Installation
+------------
+
+    gem install sinatra-sugar --prerelease
+
 More advanced set
 -----------------
 
@@ -22,16 +27,14 @@ More advanced set
         set :haml, :excape_html => false
         haml # => { :format => :html5, :escape_html => false }
     
-- Allowes passing a block:
+- Allows passing a block in Sinatra 0.9, too:
 
         set(:foo) { Time.now }
-    
-- Defines a helper to access #{key} and #{key}? unless a helper/method with that name already exists.
 
 More advanced register
 ----------------------
 
-If an exntesion is registered twice, the registered hook will only be called once.
+If an extension is registered twice, the registered hook will only be called once.
 
 Ability to extend command line options
 --------------------------------------

data/lib/sinatra/sugar.rb

@@ -34,12 +34,11 @@ module Sinatra
       #     set :haml, :format => :html5, :escape_html => true
       #     set :haml, :excape_html => false
       #     haml # => { :format => :html5, :escape_html => false }
-      # - Allowes passing a block:
+      # - Allowes passing a block (for Sinatra 0.9.x):
       #     set(:foo) { Time.now }
-      # - Defines a helper to access #{key} and #{key}? unless a helper/method with that name already exists.
       def set(key, value = self, &block)
         # FIXME: refactor, refactor, refactor
-        if block_given?
+        if block_given? and Sinatra::VERSION < "1.0"
           raise ArgumentError, "both a value and a block given" if value != self
           value = block
         end
@@ -47,11 +46,6 @@ module Sinatra
         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)
-        if symbolized
-          method_names = instance_methods.map { |m| m.to_s }
-          define_method(key)       { self.class.send(key)       } unless method_names.include? key.to_s
-          define_method("#{key}?") { self.class.send("#{key}?") } unless method_names.include? "#{key}?"
-        end
         # 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.
@@ -85,7 +79,7 @@ module Sinatra
       #     root_glob("app", "{models,views,controllers}", "*.rb") { |file| load file }
       #   end
       def root_glob(*args, &block)
-        Dir.glob(root_path(*args), &block)
+        Dir.glob(root_path(*args)).each(&block)
       end
 
       # Whether or not to start a webserver.
@@ -168,12 +162,8 @@ module Sinatra
     end
 
     def self.registered(klass)
-      klass.set :app_file, klass.caller_files.first.expand_path unless klass.app_file?
       klass.extend ClassMethods
       klass.send :include, InstanceMethods
-      klass.set :haml, :format => :html5, :escape_html => true
-      klass.use Rack::Session::Cookie
-      klass.enable :sessions
     end
 
     def self.set_app_file(klass)

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
 require "sinatra/rspec"
 require "sinatra/sugar"
-Sinatra::Base.set :environment, :test

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sugar
-version: &id001 !ruby/object:Gem::Version 
-  version: 0.4.0.a
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 0
+  - 4
+  - 0
+  - b
+  version: 0.4.0.b
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -9,47 +15,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +01:00
+date: 2010-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: monkey-lib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
-      - *id001
-    version: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        - b
+        version: 0.4.0.b
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra-test-helper
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
-      - *id001
-    version: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        - b
+        version: 0.4.0.b
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Some extensions to the sinatra default behavior (usefull for other Sintatra extensions, part of BigBand).
 email: konstantin.mailinglists@googlemail.com
 executables: []
@@ -76,18 +102,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Some extensions to the sinatra default behavior (usefull for other Sintatra extensions, part of BigBand).