RubyGems - sinatra-settings - Versions diffs - 0.1.0 → 0.1.2 - Mend

sinatra-settings 0.1.0 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

data/CHANGES +15 -0
data/README.rdoc +11 -4
data/Rakefile +1 -1
data/VERSION +1 -1
data/lib/sinatra/settings.rb +51 -9
data/sinatra-settings.gemspec +8 -7
data/spec/sinatra/settings_spec.rb +1 -1
metadata +18 -7

data/CHANGES ADDED

@@ -0,0 +1,15 @@
+rel 0.1.2 (2010-08-29)
+* Issue: #1 added 'classic' Sinatra app support
+* Some minor changes in the settings output.
+rel 0.1.1 (2010-03-01)
+* Bug fix: #1 added nl2br method
+* Added Extensions output, listing loaded extensions and version if available.
+rel 0.1.0 (2010-02-23)
+* intial release of gem / code

data/README.rdoc CHANGED

@@ -12,9 +12,6 @@ With a heavy dose of inspiration taken from Sinatra's Show Exception output page
 == Installation
-  #  Add Gemcutter to your RubyGems sources
-  $  gem sources -a http://gemcutter.com
   $  (sudo)? gem install sinatra-settings
 == Dependencies
@@ -23,7 +20,7 @@ This Gem depends upon the following:
 === Runtime:
-* sinatra ( >= 1.0.a )
+* sinatra ( >= 1.0 )
 === Development & Tests:
@@ -51,6 +48,16 @@ in your sub-classed Sinatra app:
   end
+In your "classic" Sinatra app, you just require the extension like this:
+  require 'rubygems'
+  require 'sinatra'
+  require 'sinatra/settings'
+  <snip...>
 Then at the bottom of your App's layout - <tt>layout.(erb|haml)</tt> add the following:

data/Rakefile CHANGED

@@ -10,7 +10,7 @@ begin
     gem.email = "kematzy@gmail.com"
     gem.homepage = "http://github.com/kematzy/sinatra-settings"
     gem.authors = ["kematzy"]
-    gem.add_dependency "sinatra", ">= 0.10.1"
+    gem.add_dependency "sinatra", ">= 1.0"
     gem.add_development_dependency "sinatra-tests", ">= 0.1.6"
     gem.add_development_dependency "rspec", ">= 1.3.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.1.0
1	+ 0.1.2

data/lib/sinatra/settings.rb CHANGED

@@ -1,7 +1,4 @@
-require 'sinatra/base'
 module Sinatra
   # :stopdoc:
@@ -46,7 +43,7 @@ module Sinatra
   #
   # === Runtime:
   #
-  # * sinatra ( >= 1.0.a )
+  # * sinatra ( >= 1.0 )
   #
   #
   # === Development & Tests:
@@ -73,6 +70,15 @@ module Sinatra
   #     <snip...>
   #   end
   #
+  # In your "classic" Sinatra app, you just require the extension like this:
+  #
+  #   require 'rubygems'
+  #   require 'sinatra'
+  #   require 'sinatra/settings'
+  #
+  #   <snip...>
+  #
+  #
   #
   # Then at the bottom of your App's layout - <tt>layout.(erb|haml)</tt> add the following:
   #
@@ -135,7 +141,7 @@ module Sinatra
   module Settings
-    VERSION = '0.1.0' unless const_defined?(:VERSION)
+    VERSION = '0.1.2' unless const_defined?(:VERSION)
     def self.version; "Sinatra::Settings v#{VERSION}"; end
@@ -147,6 +153,18 @@ module Sinatra
         alias_method :h, :escape_html
       end
+      unless respond_to?(:nl2br)
+        ##
+        # Convert new lines (\n) into +<br>+ tags in the given text
+        #
+        # ==== Examples
+        #
+        # @api public
+        def nl2br(txt)
+          txt.gsub("\n", '<br>')
+        end
+      end
       ##
       # Convenience helper method that returns a Hash, nicely
@@ -218,12 +236,12 @@ TEMPLATE = <<HTML
    /* table.req tr td.code { white-space: pre-wrap; word-wrap: break-word; } */
    table.req tr td.key { width: 200px; overflow:hidden; }
    table.req tr td.code div { width: 650px; overflow:hidden; }
+   .quiet { color: #aaa; }
 </style>
 <div id="debug">
-  <h2>PAGE DEBUG</h2>
+  <h2>APP INFORMATION</h2>
   <div id="get">
    <h3>GET</h3>
@@ -329,7 +347,7 @@ TEMPLATE = <<HTML
         <% r.each { |route| %>
           <tr>
             <td class="key"><%=h route.split(' ').first %></td>
-            <td class="code"><div><%= request.script_name %><%=h route.split(' ')[1] %></div></td>
+            <td class="code"><div><%= request.script_name %><a href="<%=h route.split(' ')[1].sub(/\\?$/,'') %>"><%=h route.split(' ')[1] %></a></div></td>
           </tr>
         <% } %>
       </table>
@@ -371,6 +389,29 @@ TEMPLATE = <<HTML
   <hr>
+  <div id="extensions">
+    <h3>EXTENSIONS (registered)</h3>
+    <table class="req">
+      <tr>
+        <th>Name</th>
+        <th>Version</th>
+      </tr>
+       <% self.class.extensions.each do |ext| %>
+       <tr>
+         <td class="key"><%=h ext %></td>
+         <% if ext.const_defined?(:VERSION) %>
+           <td class="code"><div><%= ext.const_get(:VERSION) %></div></td>
+          <% else %>
+          <td class="code"><div>Unknown <span class="quiet">(no constant :VERSION defined in extension)</span></div></td>
+          <% end %>
+       </tr>
+       <% end %>
+    </table>
+    <div class="clear"></div>
+  </div> <!-- /EXTENSIONS -->
+  <hr>
   <div id="rack">
     <h3 id="env-info">Rack ENV</h3>
     <table class="req">
@@ -424,5 +465,6 @@ HTML
   end #/module Settings
+  register(Sinatra::Settings)
 end #/module Sinatra

data/sinatra-settings.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{sinatra-settings}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-08-29}
   s.description = %q{Want an overview of all Sinatra settings (formerly options) in your app? This Sinatra Extension makes that dead simple.}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGES",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kematzy/sinatra-settings}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Sinatra Extension that shows your app's settings and other debug information}
   s.test_files = [
     "spec/sinatra/settings_spec.rb",
@@ -43,17 +44,17 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.10.1"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
       s.add_development_dependency(%q<sinatra-tests>, [">= 0.1.6"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0.10.1"])
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<sinatra-tests>, [">= 0.1.6"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0.10.1"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<sinatra-tests>, [">= 0.1.6"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end

data/spec/sinatra/settings_spec.rb CHANGED

@@ -179,7 +179,7 @@ describe "Sinatra" do
             erb_app "<%= show_settings_output? %>"
             # body.should have_tag(:debug)
             body.should have_tag('div#debug') do |div|
-              div.should have_tag('h2', 'PAGE DEBUG')
+              div.should have_tag('h2', 'APP INFORMATION')
               div.should have_tag('div#get > table.req')
               div.should have_tag('div#params > table.req')

metadata CHANGED

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-settings
 version: !ruby/object:Gem::Version
+  hash: 31
   prerelease: false
   segments:
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors:
 - kematzy
@@ -14,30 +15,33 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-02-23 00:00:00 +08:00
+date: 2010-08-29 00:00:00 +08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 15
         segments:
-        - 0
-        - 10
         - 1
-        version: 0.10.1
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
   name: sinatra-tests
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 23
         segments:
         - 0
         - 1
@@ -49,9 +53,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 27
         segments:
         - 1
         - 3
@@ -71,6 +77,7 @@ extra_rdoc_files:
 files:
 - .document
 - .gitignore
+- CHANGES
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -90,23 +97,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: A Sinatra Extension that shows your app's settings and other debug information