RubyGems - wbzyl-sinatra-static-assets - Versions diffs - 0.1.2 → 0.1.4 - Mend

wbzyl-sinatra-static-assets 0.1.2 → 0.1.4

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 (11) hide show

data/README.markdown +27 -11
data/VERSION.yml +1 -1
data/examples/rconfig.ru +5 -2
data/examples/summer/views/index.erb +1 -1
data/examples/winter/config.ru +1 -4
data/examples/winter/public/javascripts/{app2.js → app.js} +0 -0
data/examples/winter/public/stylesheets/{app2.css → app.css} +0 -0
data/examples/winter/views/index.erb +2 -0
data/examples/winter/views/layout.erb +2 -2
data/examples/winter/{app2.rb → winter.rb} +0 -0
metadata +5 -5

data/README.markdown CHANGED Viewed

@@ -134,16 +134,19 @@ Or, if subclassing `Sinatra::Base`, include helpers manually:
 With the latest version of Sinatra it is possible to build
 reusable Sinatra applications. This means that multiple Sinatra applications
-can now be run in isolation and co-exist peacefully with other Rack
+can be run in isolation and co-exist peacefully with other Rack
 based applications. Subclassing `Sinatra::Base` creates such a
 reusable application.
 The `example` directory contains two reusable Sinatra applications:
 *rsummer*, *rwinter* and a rackup file `rconfig.ru` which
-dispatches these applications to `/summer` and `/rsummer` sub URI.
+dispatches these applications to `/summer` and `/rsummer` sub URI:
-    require 'rsummer/summer'
-    require 'rwinter/winter'
+    $LOAD_PATH.unshift('rsummer')
+    require 'summer'
+    $LOAD_PATH.unshift('rwinter')
+    require 'winter'
     map '/summer' do
       run Sinatra::Summer.new
@@ -153,23 +156,36 @@ dispatches these applications to `/summer` and `/rsummer` sub URI.
       run Sinatra::Winter.new
     end
-This rackup file could be used to deploy to virtual host's root.
+Run `rconfig.ru` file with:
+    rackup -p 3000 rconfig.ru
+This file could **also** be used to deploy to virtual host's root with
+Passenger.
+To this end, create an Apache2 configuration file with the following
+content:
     <VirtualHost *:80>
         ServerName hitch.local
         DocumentRoot /srv/www/hitch.local
     </VirtualHost>
-Creating required by Passenger directories:
+Next, create directories required by Passenger:
-    mkdir  /srv/www/hitch.local/{public,tmp}
+    mkdir /srv/www/hitch.local/{public,tmp}
-and moving `config.ru` into `/srv/www/hitch.local`.
+and copy `config.ru` into `/srv/www/hitch.local` and
+update `LOAD_PATH` in the copied file.
-With everything in place, after restarting Apache2 the applications
-are accessible from the
+With everything in place, after restarting Apache2,
+the applications are accessible from the
-    http://hitch.local/summer    http://hitch.local/winter
+    http://hitch.local/summer
+and
+    http://hitch.local/winter
 respectively.

data/VERSION.yml CHANGED Viewed

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 2
+:patch: 4

data/examples/rconfig.ru CHANGED Viewed

@@ -1,5 +1,8 @@
-require 'rsummer/summer'
-require 'rwinter/winter'
+$LOAD_PATH.unshift('rsummer')
+require 'summer'
+$LOAD_PATH.unshift('rwinter')
+require 'winter'
 map '/summer' do
   run Sinatra::Summer.new

data/examples/summer/views/index.erb CHANGED Viewed

@@ -2,5 +2,5 @@
 <p><%= image_tag "/images/tatry1.jpg", :closed => true, :alt => @title, :title => @title %></p>
-<p><a href="/winter">Tatra Mountain in Winter</a></p>
+<p><a href="/winter">Tatra Mountains in Winter</a></p>
 <p><%= link_to "Tatry Mountains Rescue Team", "/topr" %></p>

data/examples/winter/config.ru CHANGED Viewed

@@ -1,7 +1,4 @@
-# run with:  thin --rackup config.ru -p 4567 start
-require 'app2'
+require 'winter'
 use Rack::ShowExceptions
-use Rack::Static, :urls => ["/stylesheets", "/javascripts", "/images"], :root => "public"
 run Sinatra::Application

data/examples/winter/public/javascripts/{app2.js → app.js} RENAMED Viewed

File without changes

data/examples/winter/public/stylesheets/{app2.css → app.css} RENAMED Viewed

File without changes

data/examples/winter/views/index.erb CHANGED Viewed

@@ -1,3 +1,5 @@
 <h2><%= @title %></h2>
 <p><%= image_tag "/images/tatry2.jpg", :alt => @title, :title => @title %></p>
+<p><a href="/summer">Tatra Mountains in Summer</a></p>

data/examples/winter/views/layout.erb CHANGED Viewed

@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <%= stylesheet_link_tag "/stylesheets/app2.css" %>
-    <%= javascript_script_tag "/javascripts/app2.js" %>
+    <%= stylesheet_link_tag "/stylesheets/app.css" %>
+    <%= javascript_script_tag "/javascripts/app.js" %>
     <title><%= @title %></title>
   </head>

data/examples/winter/{app2.rb → winter.rb} RENAMED Viewed

File without changes

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wbzyl-sinatra-static-assets
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Wlodek Bzyl
@@ -93,15 +93,15 @@ files:
 - examples/summer/views/index.erb
 - examples/summer/views/layout.erb
 - examples/summer/views/topr.erb
-- examples/winter/app2.rb
 - examples/winter/config.ru
 - examples/winter/public/images/tatry2.jpg
-- examples/winter/public/javascripts/app2.js
-- examples/winter/public/stylesheets/app2.css
+- examples/winter/public/javascripts/app.js
+- examples/winter/public/stylesheets/app.css
 - examples/winter/public/stylesheets/src/skating.png
 - examples/winter/tmp/always_restart.txt
 - examples/winter/views/index.erb
 - examples/winter/views/layout.erb
+- examples/winter/winter.rb
 - lib/sinatra/static_assets.rb
 - test/sinatra_static_assets_test.rb
 - test/test_helper.rb
@@ -139,4 +139,4 @@ test_files:
 - examples/summer/summer.rb
 - examples/rsummer/summer.rb
 - examples/rwinter/winter.rb
-- examples/winter/app2.rb
+- examples/winter/winter.rb