sinatra-partial 0.3.1 → 0.3.2

data/.gitignore

@@ -16,3 +16,4 @@ vendor/
 bin/
 docs/
 coverage/
+.rbx/

data/.travis.yml

@@ -4,5 +4,13 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
+  - jruby-19mode
+  - rbx
 bundler_args: --binstubs --path vendor 
 script: bundle exec rspec spec
+
+# whitelist
+branches:
+  only:
+    - master
+    - develop

data/CHANGES.markdown

@@ -1,3 +1,18 @@
+## v0.3.2 ##
+
+23rd of August 2012
+
+* Updated the examples to use a setting instead of a constant (because JRuby didn't like it, and because it is a bit weird).
+* Ran specs against Rubinius and JRuby(1.9 API) and they passed, so they've been added to the Travis CI as well.
+* Updated the README to make the build status a bit clearer.
+
+7th of June 2012
+
+* Fixes to README.
+
+----
+
+
 ## v0.3.1 ##
 
 28th of May 2012
@@ -5,6 +20,9 @@
 * 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 
@@ -17,6 +35,8 @@
 * Better organised development (at last!)
 * A Rake file has arrived!
 
+----
+
 
 ## v0.2.1 ##
 
@@ -30,6 +50,8 @@ Sam Elliott provided a lot of helpful code to add in features that were lost fro
 * Examples have been added to the examples directory 
 * The code docs are much more extensive.
 
+----
+
 
 ## v0.1.1 ##
 
@@ -37,6 +59,8 @@ Sam Elliott provided a lot of helpful code to add in features that were lost fro
 
 * Improved the examples in the Readme file. A lot.
 
+----
+
 
 ## v0.1.0 ##
 

data/README.markdown

@@ -1,9 +1,15 @@
-[![Build Status for development branch](https://secure.travis-ci.org/yb66/Sinatra-Partial.png?branch=develop)](http://travis-ci.org/yb66/Sinatra-Partial)
-
 ## Sinatra Partial ##
 
 Partials for Sinatra!
 
+### Build status ###
+
+Master branch:
+[![Build Status](https://secure.travis-ci.org/yb66/Sinatra-Partial.png?branch=master)](http://travis-ci.org/yb66/Sinatra-Partial)
+
+Develop branch:
+[![Build Status for development branch](https://secure.travis-ci.org/yb66/Sinatra-Partial.png?branch=develop)](http://travis-ci.org/yb66/Sinatra-Partial)
+
 ### Quick note ###
 
 If you do decide to use this gem, please let me know if it isn't working for you - make a contribution! Github makes it so simple..! See the Contribution section for more.
@@ -26,6 +32,18 @@ So here it is, partials, and that's it.
 
     gem install sinatra-partial
 
+### Getting started ###
+
+At the top of your app.rb:
+
+    require 'sinatra/partial'
+
+For a classic app, that's all you need to do. For a modular app you should register it too:
+
+    class Blah < Sinatra::Base
+      register Sinatra::Partial
+
+
 ### Configuration options ###
 
 The default templating engine is haml. If you wish to use something else, you can set in the config options:
@@ -42,17 +60,6 @@ If you like the Rails convention of adding an underscore to the beginning of a p
 
 Otherwise, the default is for no underscore (if you like Rails you know where to get it;)
 
-### Getting started ###
-
-At the top of your app.rb:
-
-    require 'sinatra/partial'
-
-For a classic app, that's all you need to do. For a modular app you should register it too:
-
-    class Blah < Sinatra::Base
-      register Sinatra::Partial
-
 
 ### Some examples ###
 
@@ -85,6 +92,7 @@ or use yard/rdoc to generate them.
     %p
       Is it worse to be at the bottom or the foot?
 
+
 #### Local variables ####
 
     get "/" do
@@ -112,10 +120,10 @@ Remember that since this is a helper method it can be called inside routes and v
       Welcome back #{username}
       
     -# content.haml
-      Blah Blah Blah
+    Blah Blah Blah
       
     -# footer.haml
-      You've reached the bottom of the page!
+    You've reached the bottom of the page!
     
     -# layout.haml
     %html
@@ -184,6 +192,7 @@ Look in the examples directory for some very simple examples.
 
 Thanks to Chris Schneider and Sam Elliott for sharing their code, and for sharing further updates.
 
+
 ### Contributing ###
 
 Most of all, remember that **any** contribution you can make will be valuable, whether that is putting in a ticket for a feature request (or a bug, but they don't happen here;), cleaning up some grammar, writing some documentation (or even a blog post, let me know!) or a full blooded piece of code - it's **all** welcome and encouraged.
@@ -200,9 +209,9 @@ To contribute some code:
     - `git checkout -b kitchen_sink`
 * Install Bundler.
     - `gem install bundler -r --no-ri --no-rdoc`
-    - Any further updates needed, just run `bundle install`, it'll remember the rest.
 * Install gems from Gemfile.
     - `bundle install --binstubs --path vendor`
+    - Any further updates needed, just run `bundle install`, it'll remember the rest.
 * Write some specs.
 * Write some code. (Yes, I believe that is the correct order, and you'll never find me doing any different;)
 * Write some documentation using Yard comments - see http://rubydoc.info/docs/yard/file/docs/GettingStarted.md

data/examples/app_no_underscores/app.rb

@@ -9,7 +9,9 @@ module AppNoUnderscores
     register Sinatra::Partial
     use WhiteSpaceRemove
     
-    News = ["This", "is", "all", "new"]
+    configure do 
+      set :news, ["This", "is", "all", "new"]
+    end
     
     
     get "/" do  

data/examples/app_no_underscores/views/layout.haml

@@ -4,7 +4,7 @@
     = partial :meta
     
     %ul
-      = partial :news, :collection => News, :locals => {:klass => {:class => "klassic"}}
+      = partial :news, :collection => settings.news, :locals => {:klass => {:class => "klassic"}}
       
     = partial :locality, :locals => Hash[%w{a b c d}.zip(%w{A B C D})]
     

data/examples/app_with_underscores/app.rb

@@ -9,7 +9,9 @@ module AppWithUnderscores
     register Sinatra::Partial
     use WhiteSpaceRemove
     
-    News = ["This", "is", "all", "new"]
+    configure do 
+      set :news, ["This", "is", "all", "new"]
+    end
     
     set :partial_underscores, true
     

data/examples/app_with_underscores/views/layout.haml

@@ -4,7 +4,7 @@
     = partial :meta
     
     %ul
-      = partial :news, :collection => News, :locals => {:klass => {:class => "klassic"}}
+      = partial :news, :collection => settings.news, :locals => {:klass => {:class => "klassic"}}
       
     = partial :locality, :locals => Hash[%w{a b c d}.zip(%w{A B C D})]
     

data/examples/app_with_underscores_and_erb/app.rb

@@ -8,8 +8,10 @@ module AppWithUnderscoresAndErb
   class App < Sinatra::Base
     register Sinatra::Partial
     use WhiteSpaceRemove
-  
-    News = ["This", "is", "all", "new"]
+    
+    configure do 
+      set :news, ["This", "is", "all", "new"]
+    end
     
     enable :partial_underscores
     set :partial_template_engine, :erb

data/examples/app_with_underscores_and_erb/views/layout.erb

@@ -4,7 +4,7 @@
     <%= partial :meta %>
     
     <ul>
-      <%= partial :news, :collection => News, :locals => {:klass => {:class => "klassic"}} %>
+      <%= partial :news, :collection => settings.news, :locals => {:klass => {:class => "klassic"}} %>
     </ul>
       
     <%= partial( :locality, :locals => Hash[%w{a b c d}.zip(%w{A B C D})]) %>

data/examples/app_with_underscores_and_erb_and_subdirs/app.rb

@@ -9,7 +9,9 @@ module AppWithUnderscoresAndErbAndSubdirs
     register Sinatra::Partial
     use WhiteSpaceRemove
     
-    News = ["This", "is", "all", "new"]
+    configure do 
+      set :news, ["This", "is", "all", "new"]
+    end
     
     enable :partial_underscores
     set :partial_template_engine, :erb

data/examples/app_with_underscores_and_erb_and_subdirs/views/layout.erb

@@ -4,7 +4,7 @@
     <%= partial :"partials/meta" %>
     
     <ul>
-      <%= partial :"partials/news", :collection => News, :locals => {:klass => {:class => "klassic"}} %>
+      <%= partial :"partials/news", :collection => settings.news, :locals => {:klass => {:class => "klassic"}} %>
     </ul>
       
     <%= partial( :"partials/locality", :locals => Hash[%w{a b c d}.zip(%w{A B C D})]) %>

data/lib/sinatra/partial/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-partial
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -118,3 +118,4 @@ test_files:
 - spec/sinatra_partial_helpers_spec.rb
 - spec/sinatra_partial_private_spec.rb
 - spec/spec_helper.rb
+has_rdoc: