sinatra-partial 0.3.0 → 0.3.1

data/CHANGES.markdown

@@ -1,3 +1,10 @@
+## v0.3.1 ##
+
+28th of May 2012
+
+* Fixed a bug where partials called within a route would not have layout set to false by default. To be honest, I think it's a change in the Sinatra codebase, but it was easily fixed by setting layout to false with the partial method. This does, however, mean that partial can't be called to run a layout, but if you're using it that way then you're using it wrong! Try just calling `haml` or `erb`.
+* Improved the examples by adding a config.rb and config.ru. Not only does it mean the examples can be run from the command line easier, but I think it's a good way to set up an app to help with testing.
+
 ## v0.3.0 ##
 
 23rd of April 2012 

data/examples/app_no_underscores/app.rb

@@ -4,14 +4,17 @@ require File.expand_path( File.join File.dirname(__FILE__), "../ext/kernel.rb")
 require_relative "../../lib/sinatra/partial.rb"
 require_relative "../whitespace_remove.rb"
 
-
-class AppNoUnderscores < Sinatra::Base
-  register Sinatra::Partial
-  use WhiteSpaceRemove
-  
-  News = ["This", "is", "all", "new"]
-  
-  get "/" do
-    haml :home
+module AppNoUnderscores
+  class App < Sinatra::Base
+    register Sinatra::Partial
+    use WhiteSpaceRemove
+    
+    News = ["This", "is", "all", "new"]
+    
+    
+    get "/" do  
+      magic = partial :magic
+      haml :home, :locals => { :show_me_magic => magic }
+    end
   end
-end
+end

data/examples/app_no_underscores/config.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+module AppNoUnderscores
+
+  require_relative "./app.rb"
+  
+  def self.app
+    Rack::Builder.app do
+      run App
+    end
+  end # self.app
+
+end

data/examples/app_no_underscores/config.ru

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+root = File.expand_path File.dirname(__FILE__)
+require File.join( root , "./config.rb" )
+
+# everything else separate module/file (config.rb) to make it easier to set up tests
+
+map "/" do
+  run AppNoUnderscores.app
+end

data/examples/app_no_underscores/views/home.haml

@@ -1,2 +1,4 @@
 %p
   Hello, World
+
+#{show_me_magic}

data/examples/app_no_underscores/views/magic.haml

@@ -0,0 +1,2 @@
+%p
+  Show me magic!

data/examples/app_with_underscores/app.rb

@@ -4,16 +4,19 @@ require File.expand_path( File.join File.dirname(__FILE__), "../ext/kernel.rb")
 require_relative "../../lib/sinatra/partial.rb"
 require_relative "../whitespace_remove.rb"
 
-class AppWithUnderscores < Sinatra::Base
-  register Sinatra::Partial
-  use WhiteSpaceRemove
-  
-  News = ["This", "is", "all", "new"]
-  
-  set :partial_underscores, true
-  
-  
-  get "/" do
-    haml :home
+module AppWithUnderscores
+  class App < Sinatra::Base
+    register Sinatra::Partial
+    use WhiteSpaceRemove
+    
+    News = ["This", "is", "all", "new"]
+    
+    set :partial_underscores, true
+    
+    
+    get "/" do  
+      magic = partial :magic
+      haml :home, :locals => { :show_me_magic => magic }
+    end
   end
-end
+end

data/examples/app_with_underscores/config.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+module AppWithUnderscores
+
+  require_relative "./app.rb"
+  
+  def self.app
+    Rack::Builder.app do
+      run App
+    end
+  end # self.app
+
+end

data/examples/app_with_underscores/config.ru

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+root = File.expand_path File.dirname(__FILE__)
+require File.join( root , "./config.rb" )
+
+# everything else separate module/file (config.rb) to make it easier to set up tests
+
+map "/" do
+  run AppWithUnderscores.app
+end

data/examples/app_with_underscores/views/_magic.haml

@@ -0,0 +1,2 @@
+%p
+  Show me magic!

data/examples/app_with_underscores/views/home.haml

@@ -1,2 +1,3 @@
 %p
   Hello, World
+#{show_me_magic}

data/examples/app_with_underscores_and_erb/app.rb

@@ -4,16 +4,19 @@ require File.expand_path( File.join File.dirname(__FILE__), "../ext/kernel.rb")
 require_relative "../../lib/sinatra/partial.rb"
 require_relative "../whitespace_remove.rb"
 
-class AppWithUnderscoresAndErb < Sinatra::Base
-  register Sinatra::Partial
-  use WhiteSpaceRemove
-
-  News = ["This", "is", "all", "new"]
-  
-  set :partial_underscores, true
-  set :partial_template_engine, :erb
+module AppWithUnderscoresAndErb
+  class App < Sinatra::Base
+    register Sinatra::Partial
+    use WhiteSpaceRemove
   
-  get "/" do
-    erb :home
+    News = ["This", "is", "all", "new"]
+    
+    enable :partial_underscores
+    set :partial_template_engine, :erb
+    
+    get "/" do
+      magic = partial :magic
+      erb :home, :locals => { :show_me_magic => magic }
+    end
   end
 end

data/examples/app_with_underscores_and_erb/config.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+module AppWithUnderscoresAndErb
+
+  require_relative "./app.rb"
+  
+  def self.app
+    Rack::Builder.app do
+      run App
+    end
+  end # self.app
+
+end

data/examples/app_with_underscores_and_erb/config.ru

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+root = File.expand_path File.dirname(__FILE__)
+require File.join( root , "./config.rb" )
+
+# everything else separate module/file (config.rb) to make it easier to set up tests
+
+map "/" do
+  run AppWithUnderscoresAndErb.app
+end

data/examples/app_with_underscores_and_erb/views/_magic.erb

@@ -0,0 +1 @@
+<p>Show me magic!</p>

data/examples/app_with_underscores_and_erb/views/home.erb

@@ -1,3 +1,4 @@
 <p>
   Hello, World
-</p>
+</p>
+<%= show_me_magic %>

data/examples/app_with_underscores_and_erb_and_subdirs/app.rb

@@ -4,18 +4,20 @@ require File.expand_path( File.join File.dirname(__FILE__), "../ext/kernel.rb")
 require_relative "../../lib/sinatra/partial.rb"
 require_relative "../whitespace_remove.rb"
 
-class AppWithUnderscoresAndErbAndSubdirs < Sinatra::Base
-  register Sinatra::Partial
-  use WhiteSpaceRemove
-  
-  News = ["This", "is", "all", "new"]
-  
-  set :partial_underscores, true
-  set :partial_template_engine, :erb
-  
-  
-  get "/" do
-    erb :home
+module AppWithUnderscoresAndErbAndSubdirs
+  class App < Sinatra::Base
+    register Sinatra::Partial
+    use WhiteSpaceRemove
+    
+    News = ["This", "is", "all", "new"]
+    
+    enable :partial_underscores
+    set :partial_template_engine, :erb
+    
+    
+    get "/" do
+      magic = partial :"partials/magic"
+      erb :home, :locals => { :show_me_magic => magic }
+    end
   end
-end
-
+end

data/examples/app_with_underscores_and_erb_and_subdirs/config.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+module AppWithUnderscoresAndErbAndSubdirs
+
+  require_relative "./app.rb"
+  
+  def self.app
+    Rack::Builder.app do
+      run App
+    end
+  end # self.app
+
+end

data/examples/app_with_underscores_and_erb_and_subdirs/config.ru

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+root = File.expand_path File.dirname(__FILE__)
+require File.join( root , "./config.rb" )
+
+# everything else separate module/file (config.rb) to make it easier to set up tests
+
+map "/" do
+  run AppWithUnderscoresAndErbAndSubdirs.app
+end

data/examples/app_with_underscores_and_erb_and_subdirs/views/home.erb

@@ -1,3 +1,4 @@
 <p>
   Hello, World
-</p>
+</p>
+<%= show_me_magic %>

data/examples/app_with_underscores_and_erb_and_subdirs/views/partials/_magic.erb

@@ -0,0 +1 @@
+<p>Show me magic!</p>

data/lib/sinatra/partial.rb

@@ -54,6 +54,7 @@ module Sinatra
       #     # => renders views/meta/_news.haml once per item in :collection,
       #           with the local variable `news` being the current item in the iteration
       def partial(partial_name, options={})
+        options.merge! :layout => false
         partial_location = partial_name.to_s
         engine = options.fetch(:template_engine, settings.partial_template_engine)
         underscores = options.fetch(:underscores, settings.partial_underscores)

data/lib/sinatra/partial/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Partial
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/examples_spec.rb

@@ -4,13 +4,13 @@ require "spec_helper"
 
 require_relative "../lib/sinatra/partial.rb"
 
-require_relative "../examples/app_no_underscores/app.rb"
-require_relative "../examples/app_with_underscores/app.rb"
-require_relative "../examples/app_with_underscores_and_erb/app.rb"
-require_relative "../examples/app_with_underscores_and_erb_and_subdirs/app.rb"
+require_relative "../examples/app_no_underscores/config.rb"
+require_relative "../examples/app_with_underscores/config.rb"
+require_relative "../examples/app_with_underscores_and_erb/config.rb"
+require_relative "../examples/app_with_underscores_and_erb_and_subdirs/config.rb"
 
 shared_examples_for "all in examples dir" do
-  let(:expected) { "<html><head></head><body><p>Time is #{Time.now}</p><ul><li class='klassic'>This</li><li class='klassic'>is</li><li class='klassic'>all</li><li class='klassic'>new</li></ul><p>A is A</p><p>B is B</p><p>C is C</p><p>D is D</p><p>Hello, World</p></body></html>" }
+  let(:expected) { "<html><head></head><body><p>Time is #{Time.now}</p><ul><li class='klassic'>This</li><li class='klassic'>is</li><li class='klassic'>all</li><li class='klassic'>new</li></ul><p>A is A</p><p>B is B</p><p>C is C</p><p>D is D</p><p>Hello, World</p><p>Show me magic!</p></body></html>" }
   subject { browser.last_response }
   it { should be_ok }
   it { subject.body.should == expected }
@@ -24,7 +24,7 @@ Apps = [AppNoUnderscores, AppWithUnderscores, AppWithUnderscoresAndErb, AppWithU
 
 Apps.each do |app|
   describe app.to_s do
-    let(:browser){  new_session( app ) }
+    let(:browser){  new_session( app.app ) }
     before{ browser.get '/' }
     it_should_behave_like "all in examples dir"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-partial
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -44,27 +44,39 @@ files:
 - README.markdown
 - Rakefile
 - examples/app_no_underscores/app.rb
+- examples/app_no_underscores/config.rb
+- examples/app_no_underscores/config.ru
 - examples/app_no_underscores/views/home.haml
 - examples/app_no_underscores/views/layout.haml
 - examples/app_no_underscores/views/locality.haml
+- examples/app_no_underscores/views/magic.haml
 - examples/app_no_underscores/views/meta.haml
 - examples/app_no_underscores/views/news.haml
 - examples/app_with_underscores/app.rb
+- examples/app_with_underscores/config.rb
+- examples/app_with_underscores/config.ru
 - examples/app_with_underscores/views/_locality.haml
+- examples/app_with_underscores/views/_magic.haml
 - examples/app_with_underscores/views/_meta.haml
 - examples/app_with_underscores/views/_news.haml
 - examples/app_with_underscores/views/home.haml
 - examples/app_with_underscores/views/layout.haml
 - examples/app_with_underscores_and_erb/app.rb
+- examples/app_with_underscores_and_erb/config.rb
+- examples/app_with_underscores_and_erb/config.ru
 - examples/app_with_underscores_and_erb/views/_locality.erb
+- examples/app_with_underscores_and_erb/views/_magic.erb
 - examples/app_with_underscores_and_erb/views/_meta.erb
 - examples/app_with_underscores_and_erb/views/_news.erb
 - examples/app_with_underscores_and_erb/views/home.erb
 - examples/app_with_underscores_and_erb/views/layout.erb
 - examples/app_with_underscores_and_erb_and_subdirs/app.rb
+- examples/app_with_underscores_and_erb_and_subdirs/config.rb
+- examples/app_with_underscores_and_erb_and_subdirs/config.ru
 - examples/app_with_underscores_and_erb_and_subdirs/views/home.erb
 - examples/app_with_underscores_and_erb_and_subdirs/views/layout.erb
 - examples/app_with_underscores_and_erb_and_subdirs/views/partials/_locality.erb
+- examples/app_with_underscores_and_erb_and_subdirs/views/partials/_magic.erb
 - examples/app_with_underscores_and_erb_and_subdirs/views/partials/_meta.erb
 - examples/app_with_underscores_and_erb_and_subdirs/views/partials/_news.erb
 - examples/ext/kernel.rb
@@ -97,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A sinatra extension for render partials.