sinatra-chassis 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3dee18d111fd9c81d315b44e6fc176c6410bb65f
+  data.tar.gz: 4ef2b7f3b4bd25c912278b997946224481815c99
+SHA512:
+  metadata.gz: 05fd9b565adfa76bd0a9286313c6602b30b8063cc0634fec5882fc839477392d0b62449932c0cfc225d310bf578c081167f29a64609b46ee919cc50077ff8c8e
+  data.tar.gz: 9f8e6cecca2519a2f4e5af8b6258c6d2e8cd122600cc534876f7e36743c59c132816802fe5e70e0fbbe49a7fa2e52dd0166c9c649cc3756db3e9dedaec764832

data/bin/chassis

@@ -11,27 +11,27 @@ switches = {
 }
 
 # Internal: Parses command options and runs associated methods.
-#
+# 
 # Example
 #   ~: chassis -g -h ~/Projects/my_new_app
-#
+# 
 # Each command is self documenting.
 options = OptionParser.new do |opt|
   opt.banner = 'Options:'
-
+  
   opt.on('-g', '--git', 'Init a git repo, add the first commit') { switches[:git] = true }
-
+  
   opt.on('-h', '--heroku', 'Create a Heroku app') { switches[:heroku] = true }
-
+  
   opt.on('--skip-bundle', 'Don\'t run bundle install') { switches[:bundler] = false }
-
+  
   opt.parse!
 end
 
 # If app name is given, create application.
 if ARGV[0]
   app = ARGV[0]
-
+  
   unless File.exists? app
     puts "  Creating #{app}:"
     puts LABELS[:add] + app
@@ -40,27 +40,27 @@ if ARGV[0]
     puts "#{app} already exists."
     exit
   end
-
+  
   copy_directory "#{TEMPLATES}/chassis", app
-
+  
   if switches[:bundler]
     puts LABELS[:run] + 'bundle'
     system "cd #{app} && bundle install"
   end
-
+  
   puts LABELS[:run] + 'chmod -r 0755'
   FileUtils.chmod_R 0755, app
-
+  
   if switches[:git]
     puts LABELS[:run] + 'git'
     system "cd #{app} && git init && git add . && git commit -m 'First!'"
   end
-
+  
   if switches[:heroku]
     puts LABELS[:run] + 'heroku'
     system "cd #{app} && heroku create && git push heroku master"
   end
-
+  
   puts "\n  Next steps:\n    cd #{app}\n    ruby app.rb\n\n"
   exit
 end

data/lib/sinatra/chassis.rb

@@ -1,19 +1,19 @@
 require 'sinatra/base'
 
 module Sinatra
-
+  
   # Public: Helpers used in the Chassis module.
   # Can be overriden from an app.
   module ChassisHelpers
-  
+    
     # Public: Compares the request user agent against
     # the mobile_user_agents setting Array items (should contain regexes).
-    #
+    # 
     # Example 
-    #
+    # 
     #   mobile_request?
     #   # => true
-    #
+    # 
     # Returns true/false.
     def mobile_request?
       settings.mobile_user_agents.any? { |agent| request.env['HTTP_USER_AGENT'] =~ agent }
@@ -21,14 +21,14 @@ module Sinatra
     
     # Public: Checks to see if a view template exists.
     # It will check through all registered view directories.
-    #
+    # 
     # template - String of view template filename to look for
-    #
+    # 
     # Example
-    #
+    # 
     #   view_template('show.haml')
     #   # => true
-    #
+    # 
     # Returns true/false.
     def view_exists? template
       Array(settings.views).each { |v| return true if File.exists?("#{v}/#{template}") }
@@ -38,13 +38,14 @@ module Sinatra
     # Public: Prepends the Sinatra find_template method to
     # find .mobile templates if the mobile_views setting is true
     # the request is from a mobile device.
-    #
+    # 
     # Example
-    #
+    # 
     #   erb :my_view
-    #
+    # 
     # Renders the my_view.mobile.erb instead of my_view.erb.
     def find_template views, name, engine, &block
+      enable :reload_templates if settings.mobile_views
       name = "#{name}.mobile"   if
         (settings.mobile_views) &&
         (mobile_request?)       &&
@@ -53,17 +54,17 @@ module Sinatra
     end
     
   end
-
+  
   module Chassis
     
     # Public: Requires all .rb files in a given directory or directories.
-    #
+    # 
     # *args - String(s) or Array of String paths to require
-    #
+    # 
     # Exmaple
-    #
+    # 
     #   require_directory('routes', 'models')
-    #
+    # 
     # Returns nothing.
     def require_directory *args
       args = args.first if args.first.kind_of? Array
@@ -74,37 +75,30 @@ module Sinatra
     
     # Public: Additions to the Sinatra app.
     def self.registered(app)
-
-      # Public: Defines the default load path to be used with require_directory.
-      #
-      # Example
-      #
-      #   require_directory(settings.load_path)
-      app.set :load_path, ['config', 'settings', 'helpers', 'libraries', 'models', 'controllers', 'routes']
-
+      
       # Public: Defines the default mobile user agents.
       app.set :mobile_user_agents, [/iPhone/, /Android.*AppleWebKit/]
       
       # Public: Turns on .mobile view templates.
-      app.enable :mobile_views
+      app.disable :mobile_views
       
       # Public: Determines where to load assets from.
       app.set :assets_path, ['public']
       
       # Public: Compiles .scss file to .css on request.
-      #
+      # 
       # Example
-      #
+      # 
       #   <link rel="stylesheet" type="text/css" href="theme.css">
-      #
+      # 
       # Returns the compiled theme.scss, if it exists.
       # Note that requests to public files bypass this handler.
       app.get '*.css/?' do        
         file = params[:splat].first
-  
+        
         found = false
         type  = nil
-  
+        
         settings.assets_path.each do |path|
           file.sub!("#{path}/", '') unless path == 'public'
           if File.exists?("./#{path}#{file}.css")
@@ -128,23 +122,23 @@ module Sinatra
           end
         else
           pass
-        end      
+        end
       end
-
+      
       # Public: Compiles .coffee file to .js on request.
-      #
+      # 
       # Example
-      #
+      # 
       #   <script type="text/javascript" src"script.js"></script>
-      #
+      # 
       # Returns the compiled script.coffee, if it exists.
       # Note that requests to public files bypass this handler.
       app.get '*.js/?' do
         file = params[:splat].first
-
+        
         found = false
         type  = nil
-
+        
         settings.assets_path.each do |path|
           file.sub!("#{path}/", '') unless path == 'public'
           if File.exists?("./#{path}#{file}.js")
@@ -168,22 +162,22 @@ module Sinatra
           end
         else
           pass
-        end        
+        end
       end
-
+      
       # Public: Adds the internal Chassis views directory to the app.
       # Used for finding the built in error template.
       app.set :views, ['views', File.dirname(__FILE__) + '/views']
-
+      
       # Public: Turns on the catch all route in a not_found request.
       app.enable :catch_all_route
-
+      
       # Public: Handles 404s.
-      #
+      # 
       # If there is no matching route handler, this will return a view template
       # by matching the request path to a /views directory path and file. If
       # no template is found, a 404 is called.
-      #
+      # 
       # In production, the 404 will render the production error template.
       not_found do
         if settings.catch_all_route?

data/lib/sinatra/chassis/file_manager.rb

@@ -16,13 +16,13 @@ LABELS = {
 TEMPLATES = "#{File.dirname(__FILE__)}/../templates"
 
 # Public: Asks the user if a file should be overwritten.
-#
+# 
 # file - Sting path of file in question
-#
+# 
 # Example
-#
+# 
 #   overwritable? 'path/to/my/file.rb'
-#
+# 
 # Returns true or false based on user selection.
 def overwritable? path
   puts "#{path} already exists. Replace? (yes or no)"
@@ -32,18 +32,18 @@ def overwritable? path
 end
 
 # Public: Adds to the end of a file.
-#
+# 
 # file - String path of file to add to
 # text - text to add
-#
+# 
 # Example
-#
+# 
 #   appent_to_file 'path/to/file.rb', 'Hello, world!'
-#
+# 
 # Returns nothing.
-#
+# 
 # Todo
-#
+# 
 #   - Return true/false based on success.
 def append_to_file file, text
   File.open(file, 'a') {|f| f.write(text) }
@@ -51,14 +51,14 @@ end
 
 # Public: Copies a file from one location to another.
 # Asks the user of existing files should be overwritten.
-#
+# 
 # orignal_file - String path of the file to be copied
 #     new_file - Destination of the copied file
-#
+# 
 # Example
-#
+# 
 #   copy_file 'path/to/original_file.rb', 'path/to/new/location.rb'
-#
+# 
 # Returns true if the file was copied, false if not.
 def copy_file original_file, new_file
   unless File.exists? new_file
@@ -78,17 +78,17 @@ def copy_file original_file, new_file
 end
 
 # Public: Copies a file using ERB to insert variables.
-#
+# 
 # template_file - String path of the template to be copied
 #      new_file - String path of the file to create from the template_file
 #        locals - Hash of variables to pass to the temlate_file
-#
+# 
 # Example
-#
+# 
 #   copy_template "#{TEMPLATES}/path/to/template.rb",
 #                 'path/to/new/file.rb',
 #                 { foo: 'bar' }
-#
+# 
 # Returns true if the template was copied, false if not.
 def copy_template template_file, new_file, locals = {}
   unless File.exists? new_file
@@ -108,19 +108,19 @@ def copy_template template_file, new_file, locals = {}
 end
 
 # Public: Creates a directory if it doesn't already exist.
-#
+# 
 # *args - path(s) as a String, multiple Strings, or an Array of Strings
-#
+# 
 # Examples
-#
+# 
 #   create_directory 'path/to/directory'
 #   create_directory 'path/to/directory', 'path/to/other/directory
 #   create_directory ['path/to/directory', 'path/to/other/directory']
-#
+# 
 # Returns nothing.
-#
+# 
 # Todo
-#
+# 
 #   - Return true/false based on success.
 def create_directory *args
   args = args.first if args.first.kind_of? Array
@@ -129,18 +129,18 @@ end
 
 # Public: Copies a directory (with contents) to another directory.
 # If the new directory doesn't exist, it will be created.
-#
+# 
 # original_dir - String path of the directory to be copied from
 #      new_dir - String path of directory to be copied to
-#
+# 
 # Example
-#
+# 
 #   copy_directory 'path/to/original/directory', 'path/to/new/directory'
-#
+# 
 # Returns nothing.
-#
+# 
 # Todo
-#
+# 
 #   - Return true/false based on success.
 def copy_directory original_dir, new_dir
   create_directory new_dir

data/lib/sinatra/chassis/helpers.rb

@@ -3,25 +3,27 @@ require 'rack-flash'
 
 # Public: Adds helpers
 module Sinatra
-
+  
   module ChassisExtraHelpers
     # Public: Checks if the argument can be evaluated numerically.
-    #
+    # 
     # Example
-    #
-    #   is_numeric?('1')
+    # 
+    #   numeric?('1')
     #   # => true
-    #
-    #   is_numeric?('hello')
+    # 
+    #   numeric?('hello')
     #   # => false
-    #
+    # 
     # Returns true/false.
     def numeric? x
       true if Float(x) rescue false
     end
+    
+#    define_method(:numeric?) { true if Float(x) rescue false }
 
     # Public: Truncates a String or Number.
-    #
+    # 
     #              x - String or Number to truncate
     #     word_count - Integer number of words to return if x is a String (default: 100)
     #     end_string - String appended to the end of the returned String if
@@ -29,19 +31,19 @@ module Sinatra
     #        decimal - Integer number of maximum places after decimal if x is a Number (default: 1)
     # trailing_zeros - Boolean to decide if a returned Number should keep the
     #                  trailing 0's as a String (default: false)
-    #
+    # 
     # Examples
-    #
+    # 
     #   truncate('Lorem ipsum dolor sit amet.', word_count: 3, end_string: '...')
     #   # => 'Lorem ipsum dolor...'
-    #
+    # 
     #   truncate(1.234000, decimal: 1)
     #   # => 1.2
     #   truncate(1.234000, decimal: 5)
     #   # => 1.234
     #   truncate(1.234000, decimal: 5, trailing_zeros: true)
     #   # => '1.23400'
-    #
+    # 
     # Returns a String or Float.
     def truncate x, options = {}
       options[:word_count]     ||= 100
@@ -59,33 +61,33 @@ module Sinatra
         return number
       end
     end
-
+    
     # Public: Uppercases the first letter of each word.
-    #
+    # 
     # Example
-    #
+    # 
     #   titleize('hello world')
     #   # => 'Hello World'
-    #
+    # 
     # Returns a String.
     def titleize x
       title = ''
       x.to_s.split(' ').each { |s| title << s.capitalize + ' ' }
       title
     end
-
+    
     # Public: Compares a string to the request path.
-    #
+    # 
     # path - String to compare against the request path
-    #
+    # 
     # Exmaple
-    #
+    # 
     #   Requested URL: http://localhost:4567/hello/world
     #   active('hello')
     #   # => 'active'
     #   active('goodbye')
     #   # => ''
-    #
+    # 
     # Returns a Sting: 'active' if there's a match, '' if not.
     def active path
       path = Array[path] unless path.kind_of? Array
@@ -97,10 +99,10 @@ module Sinatra
     # Public: Displays an alert unless flash[:alert] if nil.
     # flash[:alert] empties itself after the first request after it's set.
     # To use, set flash[:alert] to a String.
-    #
+    # 
     # Example
     #   <%= alert %>
-    #
+    # 
     # Returns a div with an id of 'alert' and containing the contents
     # of flash[:alert], or if flash[:alert] if nil, returns nothing.
     def alert
@@ -109,20 +111,20 @@ module Sinatra
     
     # Public: Hides an HTML element.
     # Useful in combination with inline true/false comparators.
-    #
+    # 
     # Example
-    #
+    # 
     #   <div style="<%= hidden unless session[:user] %>">Hello, world!</div>
-    #
+    # 
     # Returns a String of CSS.
     def hidden
       'display: none;'
     end
-
+    
     # Public: Converts a Date to select form fields.
     # All generated fields have classes of month_select, day_select, or year_select.
     # None of the options are required, but they are all recommended.
-    #
+    # 
     #  select_name - name attr for fields, appended with '_day', '_month', or '_year'
     #    select_id - id attr for fields, appended with '_day', '_month', or '_year'
     # select_class - class attr for fields, appended with '_day', '_month', or '_year'
@@ -130,9 +132,9 @@ module Sinatra
     #     end_year - last year to use in year select (default: 3 years from now)
     #    day_first - Boolean to show the day before the month (default: false)
     #   month_name - Boolean to display month names (default: false)
-    #
+    # 
     # Example
-    #
+    # 
     #   date_select(
     #     DateTime.now
     #     select_class: 'your_class',
@@ -143,13 +145,13 @@ module Sinatra
     #     day_first: true,
     #     month_name: false
     #   )
-    #
+    # 
     # Returns select fields as a String.
     def date_select date, options = {}
       options[:select_name]  ||= ''
       options[:select_id]    ||= ''
       options[:select_class] ||= ''
-
+      
       unless options[:select_id] == ''
         day_id   = " id='#{options[:select_id]}_day'"
         month_id = " id='#{options[:select_id]}_month'"
@@ -159,7 +161,7 @@ module Sinatra
         month_id = ''
         year_id  = ''
       end
-
+      
       unless options[:select_name] == ''
         day_name   = " name='#{options[:select_name]}_day'"
         month_name = " name='#{options[:select_name]}_month'"
@@ -169,15 +171,15 @@ module Sinatra
         month_name = ''
         year_name  = ''
       end
-
+      
       options[:day_first]    ||= false
       options[:start_year]   ||= Time.now.strftime('%Y').to_i - 3
       options[:end_year]     ||= Time.now.strftime('%Y').to_i + 3
       options[:month_name]   ||= false
-
+      
       options[:start_year] = date.strftime('%Y').to_i if date.strftime('%Y').to_i < options[:start_year]
       options[:end_year]   = date.strftime('%Y').to_i if date.strftime('%Y').to_i > options[:end_year]
-
+      
       months = [
         { num: '01', name: 'January'   },
         { num: '02', name: 'February'  },
@@ -192,37 +194,37 @@ module Sinatra
         { num: '11', name: 'November'  },
         { num: '12', name: 'December'  }
       ]
-
+      
       day = "<select class='day_select #{options[:select_class]}'#{day_id}#{day_name}'>"
         (1..31).each do |d|
           day << "<option value='#{d}' #{'selected' if d == date.strftime('%d').to_i}>#{d}</option>"
         end
       day << "</select>"
-
+      
       month = "<select class='month_select #{options[:select_class]}'#{month_id}#{month_name}>"
         months.each do |m|
           options[:month_name] ? d = m[:name] : d = m[:num]
           month << "<option value='#{m[:num]}' #{'selected' if m[:num] == date.strftime('%m').to_i}>#{d}</option>"
         end    
       month << "</select>"
-
+      
       year = "<select class='year_select #{options[:select_class]}'#{year_id}#{year_name}>"
         (options[:start_year]..options[:end_year]).each do |y|
           year << "<option value='#{y}' #{'selected' if y == date.strftime('%Y').to_i}>#{y}</option>"
         end
       year << "</select>"
-
+      
       if options[:day_first]
         return "#{day} #{month} #{year}"
       else
         return "#{month} #{day} #{year}"
       end
     end
-
+    
   end
-
+  
   module ChassisExtras
-
+    
     # Adds Rack::Flash to the app (requires sessions)
     def self.registered(app)
       app.enable :sessions
@@ -231,7 +233,7 @@ module Sinatra
     end
     
   end
-
+  
   helpers  ChassisExtraHelpers
   register ChassisExtras
 end

data/lib/sinatra/tasks/assets.rake

@@ -23,7 +23,7 @@ namespace :assets do
       end
     end
   end
-
+  
   desc 'Remove compiled assets'
   task :decompile do
     settings.assets_path.each do |path|
@@ -36,5 +36,5 @@ namespace :assets do
       File.delete(asset.gsub('.scss', '.css')) if File.exists?(asset.gsub('.scss', '.css'))
     end
   end
-
+  
 end

data/lib/sinatra/tasks/chassis.rake

@@ -1,14 +1,14 @@
 namespace :chassis do
-
+  
   desc 'Run app in an IRB session'
   task :irb do
-  	require 'irb'
-  	ARGV.clear
-  	IRB.start
+    require 'irb'
+    ARGV.clear
+    IRB.start
   end
   
   namespace :run do
-  
+    
     desc 'Run one or all /tests scripts'
     task :test, :file do |t, args|
       if args.file == nil
@@ -17,7 +17,7 @@ namespace :chassis do
         require "./tests/#{args.file}"
       end
     end
-  
+    
   end
-
+  
 end

data/lib/sinatra/tasks/datamapper.rake

@@ -1,5 +1,5 @@
 namespace :setup do
-
+  
   desc 'Set up DataMapper'
   task :datamapper do
     create_directory './settings'
@@ -15,7 +15,7 @@ namespace :setup do
 end
 
 namespace :dm do
-
+  
   def create_dm_path
     if DataMapper.repository.adapter.options[:path].include? 'sqlite'
       db = DataMapper.repository.adapter.options[:path].split('/').last
@@ -24,7 +24,7 @@ namespace :dm do
   end
   
   namespace :add do
-  
+    
     desc 'Add a data migration' if defined? DataMapper
     task :migration, :name do |t, args|
       if args.name == nil
@@ -68,21 +68,21 @@ namespace :dm do
     end
     
   end
-
+  
   desc 'Auto upgrade one or all models' if defined? DataMapper
-	task :upgrade, :model do |t, args|
+  task :upgrade, :model do |t, args|
     create_dm_path
     args.model == nil ? DataMapper.auto_upgrade! : args.model.constantize.auto_upgrade!
-	end
+  end
   
-	desc 'Auto migrate one or all models' if defined? DataMapper
-	task :migrate, :model do |t, args|
+  desc 'Auto migrate one or all models' if defined? DataMapper
+  task :migrate, :model do |t, args|
     create_dm_path
     args.model == nil ? DataMapper.auto_migrate! : args.model.constantize.auto_migrate!
-	end
-
+  end
+  
   namespace :migrate do
-
+    
     desc 'Migrate up to a specific migration number' if defined? DataMapper
     task :up, :number do |t, args|
       create_dm_path
@@ -90,7 +90,7 @@ namespace :dm do
       Dir['./data/migrations/*.rb'].each { |m| require m }
       args.number == nil ? migrate_up! : migrate_up!(args.number)
     end
-
+    
     desc 'Migrate down to a specific migration number' if defined? DataMapper
     task :down, :number do |t, args|
       create_dm_path
@@ -98,11 +98,11 @@ namespace :dm do
       Dir['./data/migrations/*.rb'].each { |m| require m }
       args.number == nil ? migrate_down! : migrate_down!(args.number)
     end
-
+    
   end
   
   namespace :run do
-  
+    
     desc 'Run one or all /data/seeds scripts' if defined? DataMapper
     task :seed, :file do |t, args|
       if args.file == nil
@@ -111,7 +111,7 @@ namespace :dm do
         require "./data/seeds/#{args.file}"
       end
     end
-  
+    
   end
   
 end

data/lib/sinatra/tasks/pony.rake

@@ -1,5 +1,5 @@
 namespace :setup do
-
+  
   desc 'Set up Pony'
   task :pony do
     create_directory './settings'
@@ -7,5 +7,5 @@ namespace :setup do
     copy_file "#{TEMPLATES}/pony/settings/pony.rb",
               "./settings/pony.rb"
   end
-
+  
 end

data/lib/sinatra/tasks/sinatra.rake

@@ -1,7 +1,7 @@
 namespace :sinatra do
-
-  namespace :add do
   
+  namespace :add do
+    
     desc 'Add a namespaced /routes file'
     task :routes, :namespace do |t, args|
       if args.namespace == nil
@@ -17,7 +17,7 @@ namespace :sinatra do
                     "./tests/routes/#{args.namespace}_tests.rb",
                     { namespace: args.namespace }
     end
-  
+    
   end
-
+  
 end

data/lib/sinatra/templates/chassis/app.rb

@@ -5,16 +5,24 @@ require 'sinatra/chassis/helpers'
 
 require 'sinatra/reloader' if development?
 
-require_directory(settings.load_path)
-
 enable :sessions
 set :session_secret, 'secret123'
 
+require_directory([
+  'config',
+  'settings',
+  'helpers',
+  'libraries',
+  'models',
+  'controllers',
+  'routes'
+])
+
 get '/?' do
   @readme = ''  
   File.open('./README.md') do |file|
   	file.each_line { |line| @readme << line }
   end
   
-	erb :readme, layout: false
+  erb :readme, layout: false
 end

data/lib/sinatra/templates/chassis/views/layout.erb

@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
-	<meta name="description" content="" />
-	<meta name="author" content="" />
-	<title>Your Name Here</title>
-	<link rel="shortcut icon" href="favicon.ico" />
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
+  <meta name="description" content="" />
+  <meta name="author" content="" />
+  <title>Your Name Here</title>
+  <link rel="shortcut icon" href="favicon.ico" />
 </head>
 
 <body>
-	
-	<%= alert %>
-	<%= yield %>
-
+  
+  <%= alert %>
+  <%= yield %>
+  
 </body>
 </html>

data/lib/sinatra/templates/chassis/views/readme.erb

@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="utf-8" />
-	<title>Chassis</title>
-	<style>
-	  body {
-	    font-family: 'Helvetica Neue', Helvetica, sans-serif;
-	    margin: 10% auto;
-	    text-align: center;
-	  }
-	  a, a:visited {
-	    color: #27b1f5;
-	  }
-	</style>
+  <meta charset="utf-8" />
+  <title>Chassis</title>
+  <style>
+    body {
+      font-family: 'Helvetica Neue', Helvetica, sans-serif;
+      margin: 10% auto;
+      text-align: center;
+    }
+    a, a:visited {
+      color: #27b1f5;
+    }
+  </style>
 </head>
 
 <body>
-
+  
   <%= Kramdown::Document.new(@readme).to_html %>
-
+  
 </body>
 </html>

data/lib/sinatra/templates/datamapper/data/migrations/datamapper_migration.rb

@@ -1,5 +1,5 @@
 migration <%= locals[:t] %>, :<%= locals[:migration] %> do
-
+  
   up do
     # create_table :widgets do
     #   column :id, Integer, serial: true
@@ -9,5 +9,5 @@ migration <%= locals[:t] %>, :<%= locals[:migration] %> do
   down do
     # drop_table :widgets
   end
-
+  
 end

data/lib/sinatra/templates/datamapper/models/datamapper.rb

@@ -1,8 +1,8 @@
 class <%= locals[:model].capitalize %>
-	include DataMapper::Resource
-
-	timestamps :at, :on
-	property   :deleted_at, ParanoidDateTime
-	property 	 :id, 				Serial
-
+  include DataMapper::Resource
+  
+  timestamps :at, :on
+  property   :deleted_at, ParanoidDateTime
+  property 	 :id,         Serial
+  
 end

data/lib/sinatra/templates/datamapper/settings/datamapper.rb

@@ -1,16 +1,16 @@
 configure :development do
-	DataMapper::Logger.new $stdout, :debug
-	# DataMapper.setup :default, 'sqlite::memory:'
-	DataMapper.setup :default, "sqlite://#{Dir.pwd}/data/development.sqlite3"
-	# DataMapper.setup :default, 'mysql://username:password@host_url:3306/database_name'
-	# DataMapper.setup :default, 'postgres://username:password@host_url:5432/database_name'
+  DataMapper::Logger.new $stdout, :debug
+  # DataMapper.setup :default, 'sqlite::memory:'
+  DataMapper.setup :default, "sqlite://#{Dir.pwd}/data/development.sqlite3"
+  # DataMapper.setup :default, 'mysql://username:password@host_url:3306/database_name'
+  # DataMapper.setup :default, 'postgres://username:password@host_url:5432/database_name'
 end
 
 configure :production do
-	# DataMapper::Logger.new $stdout, :debug
-	# DataMapper.setup :default, 'sqlite::memory:'
-	# DataMapper.setup :default, "sqlite://#{Dir.pwd}/data/production.sqlite3"
-	# DataMapper.setup :default, 'mysql://username:password@host_url:3306/database_name'
-	# DataMapper.setup :default, 'postgres://username:password@host_url:5432/database_name'
-	# DataMapper.setup(:default, ENV['DATABASE_URL'] || 'postgres://localhost/mydb')
+  # DataMapper::Logger.new $stdout, :debug
+  # DataMapper.setup :default, 'sqlite::memory:'
+  # DataMapper.setup :default, "sqlite://#{Dir.pwd}/data/production.sqlite3"
+  # DataMapper.setup :default, 'mysql://username:password@host_url:3306/database_name'
+  # DataMapper.setup :default, 'postgres://username:password@host_url:5432/database_name'
+  # DataMapper.setup(:default, ENV['DATABASE_URL'] || 'postgres://localhost/mydb')
 end

data/lib/sinatra/templates/datamapper/tests/models/datamapper_tests.rb

@@ -8,9 +8,9 @@ class <%= locals[:model].capitalize %>Tests < MiniTest::Unit::TestCase
   def app
     Sinatra::Application
   end
-
-	# def test_made_by
-	# 	<%= locals[:model] %> = <%= locals[:model].capitalize %>.new
-	# 	assert_equal <%= locals[:model] %>.made_by, 'Acme Corp.'
-	# end
+  
+  # def test_made_by
+  #   <%= locals[:model] %> = <%= locals[:model].capitalize %>.new
+  #   assert_equal <%= locals[:model] %>.made_by, 'Acme Corp.'
+  # end
 end

data/lib/sinatra/templates/pony/settings/pony.rb

@@ -1,27 +1,27 @@
 Pony.options = {
-	via: :smtp,
-	via_options: {
-		address: '',
-		port: '',
-		domain: '',
-		user_name: '',
-		password: '',
-		authentication: :plain,
-		enable_starttls_auto: true
-	}
+  via: :smtp,
+  via_options: {
+    address: '',
+    port: '',
+    domain: '',
+    user_name: '',
+    password: '',
+    authentication: :plain,
+    enable_starttls_auto: true
+  }
 }
 
 # Heroku example:
 
 # Pony.options = {
-# 	via: :smtp,
-# 	via_options: {
-# 		address: 'smtp.sendgrid.net',
-# 		port: '587',
-# 		domain: 'heroku.com',
-# 		user_name: ENV['SENDGRID_USERNAME'],
-# 		password: ENV['SENDGRID_PASSWORD'],
-# 		authentication: :plain,
-# 		enable_starttls_auto: true
-# 	}
+#   via: :smtp,
+#   via_options: {
+#     address: 'smtp.sendgrid.net',
+#     port: '587',
+#     domain: 'heroku.com',
+#     user_name: ENV['SENDGRID_USERNAME'],
+#     password: ENV['SENDGRID_PASSWORD'],
+#     authentication: :plain,
+#     enable_starttls_auto: true
+#   }
 # }

data/lib/sinatra/views/error.erb

@@ -1,36 +1,36 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>Error</title>
-	<style type="text/css">
-		body {
-			font-family: sans-serif;
-			font-size: 16px;
-			padding: 11% 0 0 0;
-			text-align: center;
-		}
-		hr {
-			border: none;
-			border-top: 1px solid silver;
-			width: 50%;
-		}
-		h2 {
-			color: silver;
-			font-style: italic;
-			font-weight: normal;
-		}
-	</style>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Error</title>
+  <style type="text/css">
+    body {
+      font-family: sans-serif;
+      font-size: 16px;
+      padding: 11% 0 0 0;
+      text-align: center;
+    }
+    hr {
+      border: none;
+      border-top: 1px solid silver;
+      width: 50%;
+    }
+    h2 {
+      color: silver;
+      font-style: italic;
+      font-weight: normal;
+    }
+  </style>
 </head>
 
 <body>
-
-	<h1>Error <%= code %></h1>
+  
+  <h1>Error <%= code %></h1>
   
   <hr />
   
   <h2><%= message %></h2>
-
+  
 </body>
 </html>

data/sinatra-chassis.gemspec

@@ -2,9 +2,9 @@
 $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
-
+  
   s.name        = 'sinatra-chassis'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.author      = 'Jarrod Taylor'
   s.email       = 'jarrodtaylor@icloud.com'
   s.homepage    = 'http://jarrodtaylor.github.com/sinatra-chassis'
@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.required_ruby_version = ">= 1.9.2"
-
+  
   s.add_dependency 'coffee-script', '>= 2.2.0'
   s.add_dependency 'paint', '>= 0.8.5'  
   s.add_dependency 'rack-flash3', '>= 1.0.3'
   s.add_dependency 'rack-test', '>= 0.6.2'
   s.add_dependency 'sass', '>= 3.2.5'
   s.add_dependency 'sinatra', '~> 1.3.4'
- 	
+  
 end

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-chassis
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Jarrod Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -154,26 +141,25 @@ files:
 homepage: http://jarrodtaylor.github.com/sinatra-chassis
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Chassis is a mutable framework extension for Sinatra.
 test_files: []