sinatra-cache 0.3.0 → 0.3.1

data/README.rdoc

@@ -17,11 +17,11 @@ With that said, on to the real stuff.
 
 
 == Installation
-
+  
   #  Add RubyGems.org (former Gemcutter) to your RubyGems sources 
   $  gem sources -a http://rubygems.org
 
-  $  (sudo)? gem install sinatra-cache
+  $  (sudo)? gem install sinatra-cache 
 
 == Dependencies
 
@@ -30,14 +30,18 @@ This Gem depends upon the following:
 === Runtime:
 
 * sinatra ( >= 1.0.a )
+* sinatra-outputbuffer[http://github.com/kematzy/sinatra-outputbuffer] (>= 0.1.0)
+
+Optionals:
 
+* sinatra-settings[http://github.com/kematzy/sinatra-settings] (>= 0.1.1) # to view default settings in a browser display.
 
 === Development & Tests:
 
+* sinatra-tests (>= 0.1.6)
 * rspec (>= 1.3.0 )
 * rack-test (>= 0.5.3)
 * rspec_hpricot_matchers (>= 0.1.0)
-* sinatra-tests (>= 0.1.6)
 * fileutils
 * sass
 * ostruct
@@ -376,14 +380,6 @@ See LICENSE for details.
 
 === Credits
 
-Included in this gem is code from <tt>SinatraMore::OutputHelpers</tt>, taken from the
-<tt>sinatra_more</tt> gem [ http://github.com/nesquena/sinatra_more/ ] by Nathan Esquenazi.
-
-The code was renamed to Sinatra::Output to prevent any extension clashes. 
-
-Copyright (c) 2009 Nathan Esquenazi.  Released under the MIT License.
-
-
 A big <b>Thank You!</b> goes to rtomayko[http://github/rtomayko], blakemizerany[http://github.com/blakemizerany/] 
 and others working on the Sinatra framework.
 

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/kematzy/sinatra-cache"
     gem.authors = ["kematzy"]
     gem.add_dependency('sinatra', '>=1.0.a')
-    # gem.add_dependency('dependency', '>=x.x.x')
+    gem.add_dependency('sinatra-outputbuffer', '>=0.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
@@ -36,10 +36,10 @@ end
 
 namespace :spec do
   
-  desc "Run all specifications verbosely"
-  Spec::Rake::SpecTask.new(:verbose) do |t|
+  desc "Run all specifications quietly"
+  Spec::Rake::SpecTask.new(:quiet) do |t|
     t.libs << "lib"
-    t.spec_opts = ["--color", "--format", "specdoc", "--require", "spec/spec_helper.rb"]
+    t.spec_opts = ["--color", "--require", "spec/spec_helper.rb"]
   end
   
   desc "Run specific spec verbosely (SPEC=/path/2/file)"

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/sinatra/cache.rb

@@ -1,13 +1,14 @@
 
 require 'sinatra/base'
+require 'sinatra/outputbuffer'
 
 module Sinatra
   module Cache
-    VERSION = '0.3.0' unless const_defined?(:VERSION)
+    VERSION = '0.3.1' unless const_defined?(:VERSION)
     def self.version; "Sinatra::Cache v#{VERSION}"; end
   end #/ Cache
 end #/ Sinatra
 
-%w(templates output cache/helpers).each do |lib| 
+%w(templates cache/helpers).each do |lib| 
   require "sinatra/#{lib}" 
 end

data/lib/sinatra/cache/helpers.rb

@@ -19,7 +19,11 @@ module Sinatra
   # === Runtime:
   # 
   # * sinatra ( >= 1.0.a )
+  # * sinatra-outputbuffer[http://github.com/kematzy/sinatra-outputbuffer] (>= 0.1.0)
   # 
+  # Optionals:
+  # 
+  # * sinatra-settings[http://github.com/kematzy/sinatra-settings] (>= 0.1.1) # to view default settings in a browser display.
   # 
   # === Development & Tests:
   # 
@@ -629,7 +633,7 @@ module Sinatra
     # 
     # 
     def self.registered(app)
-      app.helpers Sinatra::Output::Helpers
+      app.register(Sinatra::OutputBuffer)
       app.helpers Cache::Helpers
       
       ## CONFIGURATIONS::

data/sinatra-cache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-cache}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-03-02}
   s.description = %q{A Sinatra Extension that makes Page and Fragment Caching easy.}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/sinatra/cache.rb",
      "lib/sinatra/cache/helpers.rb",
-     "lib/sinatra/output.rb",
      "lib/sinatra/templates.rb",
      "sinatra-cache.gemspec",
      "spec/fixtures/apps/base/views/css.sass",
@@ -52,15 +51,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0.a"])
+      s.add_runtime_dependency(%q<sinatra-outputbuffer>, [">= 0.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>, [">= 1.0.a"])
+      s.add_dependency(%q<sinatra-outputbuffer>, [">= 0.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>, [">= 1.0.a"])
+    s.add_dependency(%q<sinatra-outputbuffer>, [">= 0.1.0"])
     s.add_dependency(%q<sinatra-tests>, [">= 0.1.6"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
   end

data/spec/sinatra/cache_spec.rb

@@ -70,7 +70,8 @@ describe "Sinatra" do
       
     end
     
-    
+    # convenience shared spec that sets up MyTestApp and tests it's OK,
+    # without it you will get "stack level too deep" errors
     it_should_behave_like "MyTestApp"
     
     # it_should_behave_like "debug => app.methods"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - kematzy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +08:00
+date: 2010-03-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra-tests
+  name: sinatra-outputbuffer
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sinatra-tests
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,11 +58,11 @@ dependencies:
         - 6
         version: 0.1.6
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,7 +72,7 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: A Sinatra Extension that makes Page and Fragment Caching easy.
 email: kematzy@gmail.com
 executables: []
@@ -76,7 +90,6 @@ files:
 - VERSION
 - lib/sinatra/cache.rb
 - lib/sinatra/cache/helpers.rb
-- lib/sinatra/output.rb
 - lib/sinatra/templates.rb
 - sinatra-cache.gemspec
 - spec/fixtures/apps/base/views/css.sass

data/lib/sinatra/output.rb

@@ -1,147 +0,0 @@
-
-# :stopdoc:
-unless Object.new.respond_to?(:blank?)
-  
-  class Object
-    def blank?
-      respond_to?(:empty?) ? empty? : !self
-    end
-    def present?
-      !blank?
-    end
-  end
-end
-# :startdoc:
-
-
-module Sinatra
-  
-  # Sinatra::Output Extension
-  # 
-  # Provides support for the :cache_fragment() functionality.
-  # 
-  # Thank You very much Nathan. Much appreciated!
-  # 
-  # 
-  # The code within this extension is almost in its interity copied from:
-  # 
-  #   sinatra_more gem [ http://github.com/nesquena/sinatra_more/ ] by Nathan Esquenazi.
-  # 
-  # 
-  # Copyright (c) 2009 Nathan Esquenazi
-  # 
-  # Permission is hereby granted, free of charge, to any person obtaining
-  # a copy of this software and associated documentation files (the
-  # "Software"), to deal in 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:
-  # 
-  # The above copyright notice and this permission notice shall be
-  # included in all copies or substantial portions of the Software.
-  # 
-  # 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 AUTHORS 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 IN THE SOFTWARE.
-  # 
-  # 
-  module Output
-    
-    VERSION = Sinatra::Cache::VERSION
-    ##
-    # Returns the version string for this extension
-    # 
-    # ==== Examples
-    # 
-    #   Sinatra::Output.version  => 'Sinatra::Output v0.9.9'
-    # 
-    def self.version; "Sinatra::Output v#{VERSION}"; end
-    
-    
-    module Helpers
-      
-      # Captures the html from a block of template code for erb or haml
-      # capture_html(&block) => "...html..."
-      def capture_html(*args, &block)
-        if self.respond_to?(:is_haml?) && is_haml?
-           block_is_haml?(block) ? capture_haml(*args, &block) : block.call
-        elsif has_erb_buffer?
-          result_text = capture_erb(*args, &block)
-          result_text.present? ? result_text : (block_given? && block.call(*args))
-        else # theres no template to capture, invoke the block directly
-          block.call(*args)
-        end
-      end
-      
-      # Outputs the given text to the templates buffer directly
-      # concat_content("This will be output to the template buffer in erb or haml")
-      def concat_content(text="") 
-        if self.respond_to?(:is_haml?) && is_haml?
-          haml_concat(text)
-        elsif has_erb_buffer?
-          erb_concat(text)
-        else # theres no template to concat, return the text directly
-          text
-        end
-      end
-      
-      # Returns true if the block is from an ERB or HAML template; false otherwise.
-      # Used to determine if html should be returned or concatted to view
-      # block_is_template?(block)
-      def block_is_template?(block) 
-         block && (block_is_erb?(block) || (self.respond_to?(:block_is_haml?) && block_is_haml?(block)))
-      end
-      
-      
-      protected
-        
-        # Used to capture the html from a block of erb code
-        # capture_erb(&block) => '...html...'
-        def capture_erb(*args, &block) 
-          erb_with_output_buffer { block_given? && block.call(*args) }
-        end
-        
-        # Concats directly to an erb template
-        # erb_concat("Direct to buffer")
-        def erb_concat(text) 
-          @_out_buf << text if has_erb_buffer?
-        end
-        
-        # Returns true if an erb buffer is detected
-        # has_erb_buffer? => true
-        def has_erb_buffer? 
-          !@_out_buf.nil?
-        end
-        
-        # Used to determine if a block is called from ERB.
-        # NOTE: This doesn't actually work yet because the variable __in_erb_template 
-        # hasn't been defined in ERB. We need to find a way to fix this.
-        def block_is_erb?(block) 
-          has_erb_buffer? || block && eval('defined? __in_erb_template', block)
-        end
-        
-        # Used to direct the buffer for the erb capture
-        def erb_with_output_buffer(buf = '') #:nodoc: 
-          @_out_buf, old_buffer = buf, @_out_buf
-          yield
-          @_out_buf
-        ensure
-          @_out_buf = old_buffer
-        end
-        
-    end #/ Helpers
-    
-    # def self.registered(app)
-    #   app.helpers Sinatra::Output::Helpers
-    # end #/ self.registered
-    
-  end #/ Output
-  
-  helpers Sinatra::Output::Helpers
-  
-end #/ Sinatra