sinatra-mvc 0.0.2 → 0.0.3

data/README.md

@@ -12,16 +12,17 @@ with this document.
 A rule of thumb: In command line examples, a `$` prefix means your own
 user and a `#` prefix is a root terminal.
 
+A big fat warning: Sinatra MVC < 0.1.0 is not fit for production. The API
+_will_ change with almost _every_ release during sub-0.1.0 development.
+Feel free to play around with it, though.
+
 System Dependencies
 -------------------
 
 Your system needs to have a working Ruby 1.9.2 installation (or later,
 but I haven't tested that). You'll also need some kind of database. The
-currently supported databases are:
-
-* MySQL
-* PostgreSQL
-* Sqlite3
+currently supported databases are all of the database backends
+[supported][10] by DataMapper.
 
 Sinatra MVC also has the possibility to use Memcache as a session storage
 system. This is the default. It's recommended as well.
@@ -68,7 +69,6 @@ mirrors of the development tree at wasda.nl.
     - or if you prefer github -
     $ git clone git://github.com/jorrizza/sinatra-mvc.git
     $ cd sinatra-mvc
-    $ rm sinatra-mvc-*.gem
     $ gem build sinatra-mvc.gemspec
     # gem install sinatra-mvc-*.gem
 
@@ -99,6 +99,28 @@ in the `Gemfile`, will be available to your project. For further
 documentation about the `Gemfile`, read the [Bundler documentation about
 the `Gemfile`][17]
 
+Sharing your project with others
+--------------------------------
+
+The project is prepared for use in Git and Mercurial. It's recommended to
+make a repository of your project directory right from the get-go.
+
+For example, when using Mercurial:
+
+    $ cd $HOME/src/my_project
+    $ hg init
+    $ hg add * .gitignore .hgignore
+    $ hg commit -m "First commit."
+
+When your friend clones your repository, the Bundler cache is not included.
+The Bundler installer has to be re-run for a clone of your project.
+
+Again, an example using Mercurial:
+
+    $ hg clone ~jameshacker/src/my_project $HOME/src/my_project
+    $ cd $HOME/src/my_project
+    $ bundle install --path vendor --binstubs
+
 Updating
 --------
 
@@ -113,6 +135,7 @@ To get the latest updates from the repository, just pull (and merge if needed).
     $ hg update
     - or when using github -
     $ git pull
+    $ rm sinatra-mvc-*.gem
     $ gem build sinatra-mvc.gemspec
     # gem install sinatra-mvc-*.gem
 
@@ -455,6 +478,7 @@ Just don't use these as variables within controllers and views, mkay?
 [7]: http://rubydoc.info/gems/dm-core/1.0.2/frames
 [8]: https://github.com/jorrizza/sinatra-mvc
 [9]: https://bitbucket.org/jorrizza/sinatra-mvc
+[10]: https://github.com/search?langOverride=&q=dm+adapter&repo=&start_value=1&type=Repositories
 [12]: http://www.rubydoc.info/gems/dm-migrations/1.0.2/frames
 [13]: http://www.rubydoc.info/gems/dm-aggregates/1.0.2/frames
 [14]: http://www.rubydoc.info/gems/dm-validations/1.0.2/frames

data/bin/sinatra-mvc

@@ -5,4 +5,6 @@ PROJECT = ENV['PROJECT'] ? ENV['PROJECT'] : '.'
 
 Dir.chdir PROJECT do
   require 'sinatra-mvc'
+
+  SinatraMVC.run!
 end

data/lib/sinatra-mvc.rb

@@ -15,17 +15,15 @@ $:.push PROJECT
 
 # Guess what. We need these.
 require 'rubygems'
-require 'sinatra'
-require 'erubis'
-
-# i18n using R18n.
-require 'sinatra/r18n'
+require 'sinatra/base'
 
 # Load all of the core modules, in order.
+require 'sinatra-mvc/base'
+require 'sinatra-mvc/i18n'
 require 'sinatra-mvc/settings'
+require 'sinatra-mvc/environment_helpers'
 require 'sinatra-mvc/view_prefix'
 require 'sinatra-mvc/render_params'
-require 'sinatra-mvc/database_connection'
 require 'sinatra-mvc/session_store'
 require 'sinatra-mvc/flash_messages'
 require 'sinatra-mvc/post_handler'
@@ -37,8 +35,6 @@ require 'bundler/setup'
 
 # Load the application.
 require 'conf/environment'
+require 'sinatra-mvc/database_connection'
 require 'sinatra-mvc/load_app'
 require 'sinatra-mvc/load_utils'
-
-# Start the classic mode.
-set :run, true

data/lib/sinatra-mvc/base.rb

@@ -0,0 +1,3 @@
+# The base application class of Sinatra MVC.
+class SinatraMVC < Sinatra::Base
+end

data/lib/sinatra-mvc/conditional_form_field.rb

@@ -1,14 +1,15 @@
-# Simple helper to display form field data when available.
-# It prefers params, but when unavailable it'll use the supplied object (if available).
-
-helpers do
-  def c(field, object = nil)
-    if params.has_key? field.to_s
-      h params[field.to_s]
-    elsif object.respond_to? field
-      h object.send(field)
-    else
-      ""
+class SinatraMVC
+  helpers do
+    # Simple helper to display form field data when available.
+    # It prefers params, but when unavailable it'll use the supplied object (if available).
+    def c(field, object = nil)
+      if params.has_key? field.to_s
+        h params[field.to_s]
+      elsif object.respond_to? field
+        h object.send(field)
+      else
+        ""
+      end
     end
   end
 end

data/lib/sinatra-mvc/database_connection.rb

@@ -1,15 +1,18 @@
+# These DataMapper parts are required by Sinatra MVC.
 require 'dm-core'
 require 'dm-types'
 require 'dm-validations'
 
-# Add translations to models
+# Add translations to models.
 require 'r18n-core/translated'
 
-# When we're developing, some DataMapper debug would be nice.
-if development?
-  DataMapper::Logger.new $stdout, :debug
-  #DataMapper::Model.raise_on_save_failure = true
+class SinatraMVC
+  # When we're developing, some DataMapper debug would be nice.
+  if development?
+    DataMapper::Logger.new $stdout, :debug
+    #DataMapper::Model.raise_on_save_failure = true
+  end
 end
 
 # Set up our database connection.
-DataMapper.setup :default, Settings.settings['database_connection']
+DataMapper.setup :default, SinatraMVC::Settings.settings['database_connection']

data/lib/sinatra-mvc/environment_helpers.rb

@@ -0,0 +1,23 @@
+class SinatraMVC
+  # In classic mode, the helpers are available in request
+  # context. Now we have to re-supply these because some people
+  # use them a lot. Using the Delegator is a bit too much for
+  # this use case.
+  helpers do
+    # Is my application running in development mode?
+    # Uses Rack's environment.
+    def development?
+      settings.environment == 'development'
+    end
+    # Is my application running in test mode?
+    # Uses Rack's environment.
+    def test?
+      settings.environment == 'test'
+    end
+    # Is my application running in production mode?
+    # Uses Rack's environment.
+    def production?
+      settings.environment == 'production'
+    end
+  end
+end

data/lib/sinatra-mvc/escaping.rb

@@ -1,7 +1,8 @@
-# Like rails, make h() escape HTML characters.
-
-helpers do
-  def h(s)
-    Rack::Utils.escape_html s
+class SinatraMVC
+  helpers do
+    # Like rails, make h() escape HTML characters.
+    def h(s)
+      Rack::Utils.escape_html s
+    end
   end
 end

data/lib/sinatra-mvc/flash_messages.rb

@@ -1,4 +1,10 @@
-# Flash messages on redirect
+# Flash messages on redirect.
+# See https://github.com/vast/sinatra-redirect-with-flash
+
 require 'rack-flash'
-use Rack::Flash
 require 'sinatra/redirect_with_flash'
+
+class SinatraMVC
+  use Rack::Flash
+  register Sinatra::RedirectWithFlash
+end

data/lib/sinatra-mvc/i18n.rb

@@ -0,0 +1,6 @@
+# i18n using R18n.
+require 'sinatra/r18n'
+
+class SinatraMVC
+  register Sinatra::R18n
+end

data/lib/sinatra-mvc/load_app.rb

@@ -1,12 +1,16 @@
-# Loads the app recursively.
-# It does this by first loading all of the models and then
-# the controllers (app components if you will).
+# Load the models in Object scope.
+Dir.glob(File.join PROJECT, 'models', '**', '*.rb').sort.each do |file|
+  require file
+end
 
-def load_app(dir)
-  Dir.glob(File.join PROJECT, dir, '**', '*.rb').sort.each do |file|
-    load file
+class SinatraMVC
+  # Load the app recursively.
+  # We have to run the code in our SinatraMVC class. We'll be nice to
+  # our developers and don't require them to open the class in every
+  # app file.
+  Dir.glob(File.join PROJECT, 'app', '**', '*.rb').sort.each do |file|
+    # TODO I'm sure we can think of a better way to do this.
+    self.class_eval File.new(file).read, file
   end
-end
 
-load_app 'models'
-load_app 'app'
+end

data/lib/sinatra-mvc/post_handler.rb

@@ -1,67 +1,68 @@
-# Utility functions to handle POST data.
-# TODO: Write post_object_multi for field[] input fields
-
-helpers do
-  # Makes fetch more readable
-  def n
-    :n
-  end
-  
-  # Create or modify a single object from POST data.
-  # We assume the programmer isn't stupid, and actually provided a DataMapper
-  # class or object as the first argument.
-  # The second and third arguments supply a redirection mechanism on succes
-  # and failure. By default it's the referer. When nil, no redirection will
-  # take place.
-  def fetch(mode, input,
-            the_way_forward = request.env['HTTP_REFERER'],
-            the_way_back = request.env['HTTP_REFERER'])
-
-    # Get the proper object and class.
-    if input.is_a? DataMapper::Resource
-      the_object = input
-      the_class = the_object.class
-    else
-      the_class = input
-      the_object = the_class.new
+class SinatraMVC
+  # Utility functions to handle POST data.
+  # TODO: Write post_object_multi for field[] input fields
+  helpers do
+    # Makes fetch more readable
+    def n
+      :n
     end
+    
+    # Create or modify a single object from POST data.
+    # We assume the programmer isn't stupid, and actually provided a DataMapper
+    # class or object as the first argument.
+    # The second and third arguments supply a redirection mechanism on succes
+    # and failure. By default it's the referer. When nil, no redirection will
+    # take place.
+    def fetch(mode, input,
+              the_way_forward = request.env['HTTP_REFERER'],
+              the_way_back = request.env['HTTP_REFERER'])
 
-    # fetch 1, ...
-    if mode == 1
-      # Check for each parameter if we've got a model field
-      # and call the setter for that field and redirect.
-      params.each do |field, value|
-        method = (field + '=').to_sym
-        if the_object.respond_to? method
-          the_object.send(method, value)
-        end
+      # Get the proper object and class.
+      if input.is_a? DataMapper::Resource
+        the_object = input
+        the_class = the_object.class
+      else
+        the_class = input
+        the_object = the_class.new
       end
 
-      # If the object's valid, save and redirect. If not, show all
-      # the errors to the user at the way back location. We also make
-      # sure the same error doesn't show twice.
-      if the_object.valid?
-        the_object.save
-        redirect the_way_forward unless the_way_forward.nil?
-      else
-        flash[:error] = []
-        found_errors = []
-        the_object.errors.each_pair do |field, error|
-          field = field.to_s
-          field.gsub! /_id$/, ''
-          error.each do |e|
-            unless found_errors.include? [field, error]
-              flash[:error] << t[the_class.inspect.downcase.to_sym][field.to_sym] + ': ' + e
-              found_errors << [field, error]
+      # fetch 1, ...
+      if mode == 1
+        # Check for each parameter if we've got a model field
+        # and call the setter for that field and redirect.
+        params.each do |field, value|
+          method = (field + '=').to_sym
+          if the_object.respond_to? method
+            the_object.send(method, value)
+          end
+        end
+
+        # If the object's valid, save and redirect. If not, show all
+        # the errors to the user at the way back location. We also make
+        # sure the same error doesn't show twice.
+        if the_object.valid?
+          the_object.save
+          redirect the_way_forward unless the_way_forward.nil?
+        else
+          flash[:error] = []
+          found_errors = []
+          the_object.errors.each_pair do |field, error|
+            field = field.to_s
+            field.gsub! /_id$/, ''
+            error.each do |e|
+              unless found_errors.include? [field, error]
+                flash[:error] << t[the_class.inspect.downcase.to_sym][field.to_sym] + ': ' + e
+                found_errors << [field, error]
+              end
             end
           end
+          redirect the_way_back unless the_way_back.nil?
         end
-        redirect the_way_back unless the_way_back.nil?
+      elsif mode == :n
+        raise NotImplementedError, 'Sorry, fetch n, ... is not implemented yet.'
+      else
+        raise ArgumentError, 'No such mode: ' + mode.inspect
       end
-    elsif mode == :n
-      raise NotImplementedError, 'Sorry, fetch n, ... is not implemented yet.'
-    else
-      raise ArgumentError, 'No such mode: ' + mode.inspect
     end
   end
 end

data/lib/sinatra-mvc/render_params.rb

@@ -1,18 +1,19 @@
-# This will enable neat parameters like Rails and PHP have.
-# You know, the variable[key] things.
-# From the Sinatra book.
-
-before do
-  new_params = {}
-  params.each_pair do |full_key, value|
-    this_param = new_params
-    split_keys = full_key.split(/\]\[|\]|\[/)
-    split_keys.each_index do |index|
-      break if split_keys.length == index + 1
-      this_param[split_keys[index]] ||= {}
-      this_param = this_param[split_keys[index]]
-   end
-   this_param[split_keys.last] = value
+class SinatraMVC
+  # This will enable neat parameters like Rails and PHP have.
+  # You know, the variable[key] things.
+  # From the Sinatra book.
+  before do
+    new_params = {}
+    params.each_pair do |full_key, value|
+      this_param = new_params
+      split_keys = full_key.split(/\]\[|\]|\[/)
+      split_keys.each_index do |index|
+        break if split_keys.length == index + 1
+        this_param[split_keys[index]] ||= {}
+        this_param = this_param[split_keys[index]]
+      end
+      this_param[split_keys.last] = value
+    end
+    request.params.replace new_params
   end
-  request.params.replace new_params
 end

data/lib/sinatra-mvc/session_store.rb

@@ -1,14 +1,15 @@
-# Sessions for Sinatra
-# Both cookie based as Memcache based sessions are supported
-
-case settings.session_backend
-when :cookie
-  secret = (0..50).map do
-    (65 + rand(25)).chr
-  end.join
-  use Rack::Session::Cookie, :expire_after => settings.session_max_age, :key => 'sinatra.mvc.session', :secret => secret
-when :memcache
-  use Rack::Session::Memcache, :expire_after => settings.session_max_age, :key => 'sinatra.mvc.session', :namespace => 'sinatra:mvc:session', :memcache_server => settings.session_store
-else
-  raise 'Unknown session backend: ' + settings.session_backend.inspect
+class SinatraMVC
+  # Sessions for Sinatra
+  # Both cookie based as Memcache based sessions are supported
+  case settings.session_backend
+  when :cookie
+    secret = (0..50).map do
+      (65 + rand(25)).chr
+    end.join
+    use Rack::Session::Cookie, :expire_after => settings.session_max_age, :key => 'sinatra.mvc.session', :secret => secret
+  when :memcache
+    use Rack::Session::Memcache, :expire_after => settings.session_max_age, :key => 'sinatra.mvc.session', :namespace => 'sinatra:mvc:session', :memcache_server => settings.session_store
+  else
+    raise 'Unknown session backend: ' + settings.session_backend.inspect
+  end
 end

data/lib/sinatra-mvc/settings.rb

@@ -2,28 +2,37 @@
 
 require 'psych'
 
-class Settings
-  def self.load(filename)
-    begin
-      @@settings = Psych.load_file filename
-    rescue
-      raise 'Could not load configuration! Psych said: ' + $!.to_s
+class SinatraMVC
+  # The settings loading class. It pretty much takes care of loading
+  # the settings from your project's settings.yml file.
+  class Settings
+
+    # Loads the settings file and populates the Settings class.
+    # Later, these settings will be passed into Sinatra's set().
+    def self.load(filename)
+      begin
+        @@settings = Psych.load_file filename
+      rescue
+        raise 'Could not load configuration! Psych said: ' + $!.to_s
+      end
     end
-  end
 
-  def self.settings
-    @@settings
+    # Public class attr_reader of the settings.
+    # It's just the output of Psych.load_file, really.
+    def self.settings
+      @@settings
+    end
   end
-end
 
-Settings.load File.join(PROJECT, 'conf', 'settings.yml')
+  Settings.load File.join(PROJECT, 'conf', 'settings.yml')
 
-# Now we have to feed the Sinatra settings
-Settings.settings.each_pair do |setting, value|
-  case setting
-  when 'views_root', 'translations', 'public'
-    set setting.to_sym, File.join(PROJECT, value)
-  else
-    set setting.to_sym, value
+  # Now we have to feed the Sinatra settings
+  Settings.settings.each_pair do |setting, value|
+    case setting
+    when 'views_root', 'translations', 'public'
+      set setting.to_sym, File.join(PROJECT, value)
+    else
+      set setting.to_sym, value
+    end
   end
 end

data/lib/sinatra-mvc/view_prefix.rb

@@ -1,17 +1,21 @@
-# Set the view prefix right if the
-# first part of the URL exists as a subdir
-# of our main view directory.
+class SinatraMVC
+  # Set the view prefix right if the first part of the URL exists as a subdir
+  # of our main view directory.
+  # This construction enables us to recreate some liberty we had in classic
+  # mode, in which set() could be called in the request scope.
+  before do |obj|
+    obj.class.class_exec request do |request|
+      first_dir = request.env['REQUEST_URI'].split('/')[1]
 
-before do
-  first_dir = request.env['REQUEST_URI'].split('/')[1]
-
-  if first_dir
-    if File.directory? File.join(settings.views_root, first_dir)
-      set :views, File.join(settings.views_root, first_dir)
-    else
-      set :views, settings.views_root
+      if first_dir
+        if File.directory? File.join(settings.views_root, first_dir)
+          set :views, File.join(settings.views_root, first_dir)
+        else
+          set :views, settings.views_root
+        end
+      else
+        set :views, settings.views_root
+      end
     end
-  else
-    set :views, settings.views_root
   end
 end

data/skel/Gemfile

@@ -11,7 +11,13 @@ gem 'maruku'
 gem 'dm-migrations'
 gem 'dm-aggregates'
 
+# Datamapper connection methods.
+gem 'dm-mysql-adapter'
+#gem 'dm-postgres-adapter'
+#gem 'dm-sqlite-adapter'
+
 # Some often used template utilities. Add/enable at will.
+gem 'erubis'
 # gem 'RedCloth'
 # gem 'liquid'
 # gem 'less'

data/skel/conf/environment.rb

@@ -6,5 +6,6 @@ require 'dm-aggregates'
 require 'dm-migrations'
 
 # Templating Engines
+require 'erubis'
 #require 'redcloth'
 #require 'liquid'

data/skel/config.ru

@@ -4,5 +4,5 @@
 ::PROJECT = File.expand_path(File.dirname(__FILE__))
 Dir.chdir ::PROJECT do
   require 'sinatra-mvc'
-  run Sinatra::Application
+  run SinatraMVC
 end

data/skel/views/docs.md

@@ -12,16 +12,17 @@ with this document.
 A rule of thumb: In command line examples, a `$` prefix means your own
 user and a `#` prefix is a root terminal.
 
+A big fat warning: Sinatra MVC < 0.1.0 is not fit for production. The API
+_will_ change with almost _every_ release during sub-0.1.0 development.
+Feel free to play around with it, though.
+
 System Dependencies
 -------------------
 
 Your system needs to have a working Ruby 1.9.2 installation (or later,
 but I haven't tested that). You'll also need some kind of database. The
-currently supported databases are:
-
-* MySQL
-* PostgreSQL
-* Sqlite3
+currently supported databases are all of the database backends
+[supported][10] by DataMapper.
 
 Sinatra MVC also has the possibility to use Memcache as a session storage
 system. This is the default. It's recommended as well.
@@ -68,7 +69,6 @@ mirrors of the development tree at wasda.nl.
     - or if you prefer github -
     $ git clone git://github.com/jorrizza/sinatra-mvc.git
     $ cd sinatra-mvc
-    $ rm sinatra-mvc-*.gem
     $ gem build sinatra-mvc.gemspec
     # gem install sinatra-mvc-*.gem
 
@@ -99,6 +99,28 @@ in the `Gemfile`, will be available to your project. For further
 documentation about the `Gemfile`, read the [Bundler documentation about
 the `Gemfile`][17]
 
+Sharing your project with others
+--------------------------------
+
+The project is prepared for use in Git and Mercurial. It's recommended to
+make a repository of your project directory right from the get-go.
+
+For example, when using Mercurial:
+
+    $ cd $HOME/src/my_project
+    $ hg init
+    $ hg add * .gitignore .hgignore
+    $ hg commit -m "First commit."
+
+When your friend clones your repository, the Bundler cache is not included.
+The Bundler installer has to be re-run for a clone of your project.
+
+Again, an example using Mercurial:
+
+    $ hg clone ~jameshacker/src/my_project $HOME/src/my_project
+    $ cd $HOME/src/my_project
+    $ bundle install --path vendor --binstubs
+
 Updating
 --------
 
@@ -113,6 +135,7 @@ To get the latest updates from the repository, just pull (and merge if needed).
     $ hg update
     - or when using github -
     $ git pull
+    $ rm sinatra-mvc-*.gem
     $ gem build sinatra-mvc.gemspec
     # gem install sinatra-mvc-*.gem
 
@@ -455,6 +478,7 @@ Just don't use these as variables within controllers and views, mkay?
 [7]: http://rubydoc.info/gems/dm-core/1.0.2/frames
 [8]: https://github.com/jorrizza/sinatra-mvc
 [9]: https://bitbucket.org/jorrizza/sinatra-mvc
+[10]: https://github.com/search?langOverride=&q=dm+adapter&repo=&start_value=1&type=Repositories
 [12]: http://www.rubydoc.info/gems/dm-migrations/1.0.2/frames
 [13]: http://www.rubydoc.info/gems/dm-aggregates/1.0.2/frames
 [14]: http://www.rubydoc.info/gems/dm-validations/1.0.2/frames

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joris van Rooij
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 +01:00
+date: 2011-01-12 00:00:00 +01:00
 default_executable: sinatra-mvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,7 +150,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: dm-mysql-adapter
+  name: memcache-client
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -162,45 +162,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: dm-postgres-adapter
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: memcache-client
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id014
 description: A custom MVC stack that tries to keep the lightweight Sinatra feeling, while adding structure to an already awesome workflow.
 email: jorrizza@jrrzz.net
 executables: 
@@ -212,7 +173,10 @@ extra_rdoc_files: []
 
 files: 
 - bin/sinatra-mvc
+- lib/sinatra-mvc/base.rb
+- lib/sinatra-mvc/i18n.rb
 - lib/sinatra-mvc/escaping.rb
+- lib/sinatra-mvc/environment_helpers.rb
 - lib/sinatra-mvc/load_utils.rb
 - lib/sinatra-mvc/render_params.rb
 - lib/sinatra-mvc/database_connection.rb