sinatra-chassis 1.0.3 → 1.0.4

data/lib/sinatra/chassis.rb

@@ -186,24 +186,24 @@ module Sinatra
       # no template is found, a 404 is called.
       # 
       # In production, the 404 will render the production error template.
-      not_found do
+      app.not_found do
         if settings.catch_all_route?
           view = request.path[1..-1]
           Tilt.mappings.each do |m|
             return send(m.first, view.to_sym) if view_exists?("#{view}.#{m.first}")
           end
         end
-        erb(:error, layout: false, locals: { code: '404', message: 'Not Found' }) if production?
+        erb(:error, layout: false, locals: { code: '404', message: 'Not Found' }) if settings.production?
       end
       
       # Public: Makes production errors prettier by rendering a built in template.
-      configure :production do
-        error(400) { erb :error, layout: false, locals: { code: '400', message: 'Bad Request'           } }
-        error(401) { erb :error, layout: false, locals: { code: '401', message: 'Unauthorized'          } }
-        error(403) { erb :error, layout: false, locals: { code: '403', message: 'Forbidden'             } }
-        error(408) { erb :error, layout: false, locals: { code: '408', message: 'Request Timeout'       } }
-        error(500) { erb :error, layout: false, locals: { code: '500', message: 'Internal Server Error' } }
-        error(502) { erb :error, layout: false, locals: { code: '502', message: 'Bad Gateway'           } }
+      app.configure :production do
+        app.error(400) { erb :error, layout: false, locals: { code: '400', message: 'Bad Request'           } }
+        app.error(401) { erb :error, layout: false, locals: { code: '401', message: 'Unauthorized'          } }
+        app.error(403) { erb :error, layout: false, locals: { code: '403', message: 'Forbidden'             } }
+        app.error(408) { erb :error, layout: false, locals: { code: '408', message: 'Request Timeout'       } }
+        app.error(500) { erb :error, layout: false, locals: { code: '500', message: 'Internal Server Error' } }
+        app.error(502) { erb :error, layout: false, locals: { code: '502', message: 'Bad Gateway'           } }
       end
     end
     

data/lib/sinatra/chassis/helpers.rb

@@ -31,6 +31,7 @@ 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)
+    #          round - Boolean to decide if a number should be rounded (default: true)
     # 
     # Examples
     # 
@@ -50,13 +51,18 @@ module Sinatra
       options[:end_string]     ||= '...'
       options[:decimal]        ||= 2
       options[:trailing_zeros] ||= false
+      options[:round]          ||= true
       
       if x.kind_of? String
         return if x == nil
         words = x.split()
         return words[0..(options[:word_count]-1)].join(' ') + (words.length > options[:word_count] ? options[:end_string] : '')
       elsif numeric? x
-        number = "%.#{options[:decimal]}f" % x.to_f
+        if options[:round] == true
+          number = "%.#{options[:decimal]}f" % x.round(options[:decimal])
+        else
+          number = "%.#{options[:decimal]}f" % x.to_f
+        end
         number = number.to_f unless options[:trailing_zeros]
         return number
       end
@@ -229,7 +235,7 @@ module Sinatra
     def self.registered(app)
       app.enable :sessions
       app.set :session_secret, [*('A'..'Z')].sample(40).join if app.session_secret.nil?
-      use Rack::Flash
+      app.use Rack::Flash
     end
     
   end

data/lib/sinatra/chassis/tasks.rb

@@ -3,5 +3,9 @@
 
 require "#{File.dirname(__FILE__)}/file_manager"
 
+class Sinatra::Application
+  extend Rake::DSL if defined? Rake::DSL
+end
+
 Dir[File.join(File.dirname(__FILE__) + "/../tasks/**/*.rake")].each { |file| import file }
 Dir["./tasks/**/*.rake"].each { |file| import file }

data/lib/sinatra/tasks/assets.rake

@@ -7,12 +7,12 @@ namespace :assets do
     end
     Dir.glob("./public/**/*.coffee").each do |asset|
       File.open(asset.gsub('.coffee', '.js'), 'w') do |f|
-        f.write(CoffeeScript.compile(File.read(asset)))
+        f.write(JSMin.minify(CoffeeScript.compile(File.read(asset))).strip)
       end
     end
     Dir.glob("./public/**/*.scss").each do |asset|
       File.open(asset.gsub('.scss', '.css'), 'w') do |f|
-        f.write(Sass::Engine.for_file(asset, {}).render)
+        f.write(Sass::Engine.for_file(asset, { style: :compressed }).render)
       end
     end
     settings.assets_path.each do |path|

data/lib/sinatra/templates/chassis/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'coffee-script', '>= 2.2.0'
-gem 'kramdown', '>= 0.14.2'
-gem 'sass', '>= 3.2.5'
-gem 'sinatra', '~> 1.3.4'
-gem 'sinatra-chassis', '>= 1.0.0.pre', require: 'sinatra/chassis'
-gem 'sinatra-contrib', '>= 1.3.2', require: 'sinatra/contrib'
+gem 'jsmin', '>= 1.0.1'
+gem 'sass', '>= 3.2.9'
+gem 'sinatra', '>= 1.4.2'
+gem 'sinatra-chassis', '>= 1.0.4', require: 'sinatra/chassis'
+gem 'sinatra-contrib', '>= 1.4.0', require: 'sinatra/contrib'

data/lib/sinatra/templates/chassis/README.md

@@ -1,4 +1,12 @@
 Chassis
 =======
 
-[More Info](http://jarrodtaylor.github.com/sinatra-chassis/)
+Chassis is based on a standard Sinatra application, and runs the same way:
+
+    ~/SampleApp: ruby app.rb
+
+Your application is now running at [localhost:4567](http://localhost:4567).
+
+> Use Ctrl-C to stop the local server.
+
+To learn more: [jarrodtaylor.github.io/sinatra-chassis](http://jarrodtaylor.github.io/sinatra-chassis/)

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

@@ -5,7 +5,6 @@ require 'sinatra/chassis/helpers'
 
 require 'sinatra/reloader' if development?
 
-enable :sessions
 set :session_secret, 'secret123'
 
 require_directory([
@@ -20,10 +19,5 @@ require_directory([
 ])
 
 get '/?' do
-  @readme = ''  
-  File.open('./README.md') do |file|
-  	file.each_line { |line| @readme << line }
-  end
-  
-  erb :readme, layout: false
+  erb "Hello world!"
 end

data/sinatra-chassis.gemspec

@@ -4,10 +4,10 @@ $:.push File.expand_path('../lib', __FILE__)
 Gem::Specification.new do |s|
   
   s.name        = 'sinatra-chassis'
-  s.version     = '1.0.3'
+  s.version     = '1.0.4'
   s.author      = 'Jarrod Taylor'
   s.email       = 'jarrodtaylor@icloud.com'
-  s.homepage    = 'http://jarrodtaylor.github.com/sinatra-chassis'
+  s.homepage    = 'http://jarrodtaylor.github.io/sinatra-chassis'
   s.summary     = 'Chassis is a mutable framework extension for Sinatra.'
   s.description = "Chassis is a mutable framework extension for Sinatra that's designed not just to help you write less code, but to help you focus on less code."
   s.license     = 'MIT'
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   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 'paint', '>= 0.8.6'
   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'
+  s.add_dependency 'sass', '>= 3.2.9'
+  s.add_dependency 'sinatra', '>= 1.4.2'
   
 end

metadata

@@ -1,99 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-chassis
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Jarrod Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-07 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
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.6
 - !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
+        version: 3.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.9
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.4.2
 description: Chassis is a mutable framework extension for Sinatra that's designed
   not just to help you write less code, but to help you focus on less code.
 email: jarrodtaylor@icloud.com
@@ -127,7 +140,6 @@ files:
 - lib/sinatra/templates/chassis/public/robots.txt
 - lib/sinatra/templates/chassis/tmp/restart.txt
 - lib/sinatra/templates/chassis/views/layout.erb
-- lib/sinatra/templates/chassis/views/readme.erb
 - lib/sinatra/templates/datamapper/data/migrations/datamapper_migration.rb
 - lib/sinatra/templates/datamapper/data/seeds/seed.rb
 - lib/sinatra/templates/datamapper/models/datamapper.rb
@@ -138,28 +150,30 @@ files:
 - lib/sinatra/templates/sinatra/tests/routes/routes_tests.rb
 - lib/sinatra/views/error.erb
 - sinatra-chassis.gemspec
-homepage: http://jarrodtaylor.github.com/sinatra-chassis
+homepage: http://jarrodtaylor.github.io/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: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Chassis is a mutable framework extension for Sinatra.
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1e8adbe9c10890d2ddfa21b0b7dd54230406f675
-  data.tar.gz: 6a8ff260d5e3f6d2e04ca5ce5edcd88abe836010
-SHA512:
-  metadata.gz: 8d6d3fbea50867a2453c4ac7ec742b2812ae7fe0bd8d5532ca0a96b24052384df9050104326809b08b02726793fa0b1a2e79ad93fae00f41bf3b9351b9adc15a
-  data.tar.gz: d9b1dac706ee2b3f2046b17cff09878354528203387d9a5877d638fdd1c6e4e884633b1af60cd23104c25552973272493e852027fe17a43f5c627178ab359102

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

@@ -1,23 +0,0 @@
-<!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>
-</head>
-
-<body>
-  
-  <%= Kramdown::Document.new(@readme).to_html %>
-  
-</body>
-</html>