sinatra-support 1.2.1 → 1.2.2

data/HISTORY.md

@@ -1,14 +1,20 @@
-Latest version - Aug 19, 2011
------------------------------
+v1.2.2 - Sep 01, 2011
+---------------------
+
+### Added:
+  * `Sinatra::AppModule` for writing partial applications as modules
+
+v1.2.1 - Aug 19, 2011
+---------------------
 
 ### Fixed:
   * Fixed `Sinatra::CompressedJS` to link to the production version on 
-  production.
+  production
 
 ### Misc changes:
-  * Make tests more forgiving to account for different Compass/CS/etc versions.
-  * Improve CompressedJS docs.
-  * Updated gem dependencies to have a required version.
+  * Make tests more forgiving to account for different Compass/CS/etc versions
+  * Improve CompressedJS docs
+  * Updated gem dependencies to have a required version
 
 v1.2.0 - May 27, 2011
 ---------------------

data/lib/sinatra/support.rb

@@ -15,6 +15,7 @@ module Sinatra
   autoload :MultiRender,     File.expand_path('../support/multirender', __FILE__)
   autoload :CompassSupport,  File.expand_path('../support/compasssupport', __FILE__)
   autoload :CompressedJS,    File.expand_path('../support/compressedjs', __FILE__)
+  autoload :AppModule,       File.expand_path('../support/appmodule', __FILE__)
 
   module Support
   end

data/lib/sinatra/support/appmodule.rb

@@ -0,0 +1,55 @@
+# Allows you to write parts of an application as a module.
+#
+# == Usage
+#
+#   require 'sinatra/support/module'
+#   
+# Create a part of your application by placing the usual Sinatra directives
+# (@get@, @helpers@, @configure@, etc) in a module. Be sure to @include
+# Sinatra::AppModule@ first.
+#
+#   module LoginModule
+#     include Sinatra::AppModule
+#
+#     helpers do
+#       def logged_in?
+#         # ...
+#       end
+#     end
+#
+#     get '/login' do
+#       # ...
+#     end
+#   end
+#
+# In your Sinatra application, simply include the module to bring those routes
+# and helpers in.
+#
+#   class MyApplication < Sinatra::Base
+#     include LoginModule
+#   end
+#
+module Sinatra::AppModule
+  def self.included(controller)
+    controller.extend ClassMethods
+  end
+
+  module ClassMethods
+    def included(app)
+      deferred.each { |(method, args, blk)| app.send method, *args, &blk }
+    end
+
+    def method_missing(meth, *args, &blk)
+      defer meth, *args, &blk
+      nil
+    end
+
+    def defer(what, *a, &blk)
+      deferred << [what, a, blk]
+    end
+
+    def deferred
+      @deferred ||= Array.new
+    end
+  end
+end

data/lib/sinatra/support/jssupport.rb

@@ -30,7 +30,6 @@
 #   # Gemfile
 #   gem "coffee-script", require: "coffee_script"
 #
-#
 module Sinatra::JsSupport
   def self.registered(app)
     app.set :js_max_age, app.development? ? 0 : 86400*30

data/lib/sinatra/support/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Support
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
 
     def self.version
       VERSION

data/test/helper.rb

@@ -6,7 +6,7 @@ require 'haml'
 require 'mocha'
 require 'rack/test'
 require 'nokogiri'
-require 'sinatra'
+require 'sinatra/base'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
 $:.unshift File.dirname(__FILE__)

data/test/test_appmodule.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../helper', __FILE__)
+
+class AppModuleTest < Test::Unit::TestCase
+  module MyModule
+    include Sinatra::AppModule
+
+    module MyHelpers
+      def apple(); "Apple"; end
+    end
+
+    helpers MyHelpers
+
+    helpers do
+      def banana(); "Banana"; end
+    end
+
+    get('/') { "Hello" }
+    get('/apple') { apple }
+    get('/banana') { banana }
+
+    configure do
+      set :skittles, "rainbow"
+    end
+
+    set :saturn, 'big'
+  end
+
+  class App < Sinatra::Base
+    include MyModule
+  end
+
+  include Rack::Test::Methods
+  def app() App; end
+
+  test "hello" do
+    get '/'
+    assert last_response.body == "Hello"
+  end
+
+  test "helpers in a module" do
+    get '/apple'
+    assert last_response.body == 'Apple'
+  end
+
+  test "helpers" do
+    get '/banana'
+    assert last_response.body == 'Banana'
+  end
+
+  test "configure block" do
+    assert App.skittles == 'rainbow'
+  end
+
+  test "set" do
+    assert App.saturn == 'big'
+  end
+end

data/test/test_css.rb

@@ -12,21 +12,28 @@ class CssAppTest < Test::Unit::TestCase
     App.new
   end
 
+  def assert_css(css)
+    left  = last_response.body.gsub(/[ \r\n\t]+/m, '')
+    right = css.gsub(/[ \r\n\t]+/m, '')
+
+    assert_equal left, right
+
+  end
   test "sass" do
     get '/css/style-sass.css'
 
-    assert_equal "body, #sass {\n  color: #333333; }\n", last_response.body
+    assert_css "body, #sass {\n  color: #333333; }\n"
   end
 
   test "scss" do
     get '/css/style-scss.css'
 
-    assert_equal "body, #scss {\n  color: #333333; }\n", last_response.body
+    assert_css "body, #scss {\n  color: #333333; }\n"
   end
 
   test "less" do
     get '/css/style-less.css'
 
-    assert_equal "body, #less { color: #333333; }\n", last_response.body
+    assert_css "body, #less { color: #333333; }\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-support
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000 +08:00
+date: 2011-09-01 00:00:00.000000000 +08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153502260 !ruby/object:Gem::Requirement
+  requirement: &2164375900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153502260
+  version_requirements: *2164375900
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153501840 !ruby/object:Gem::Requirement
+  requirement: &2164365880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153501840
+  version_requirements: *2164365880
 - !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &2153501300 !ruby/object:Gem::Requirement
+  requirement: &2164364860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 0.0.38
   type: :development
   prerelease: false
-  version_requirements: *2153501300
+  version_requirements: *2164364860
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153500800 !ruby/object:Gem::Requirement
+  requirement: &2164364300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 3.1.2
   type: :development
   prerelease: false
-  version_requirements: *2153500800
+  version_requirements: *2164364300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153500340 !ruby/object:Gem::Requirement
+  requirement: &2164363520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2153500340
+  version_requirements: *2164363520
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153499880 !ruby/object:Gem::Requirement
+  requirement: &2164362660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153499880
+  version_requirements: *2164362660
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2153521920 !ruby/object:Gem::Requirement
+  requirement: &2164361740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153521920
+  version_requirements: *2164361740
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2153521460 !ruby/object:Gem::Requirement
+  requirement: &2164360960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.11.5
   type: :development
   prerelease: false
-  version_requirements: *2153521460
+  version_requirements: *2164360960
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2153521000 !ruby/object:Gem::Requirement
+  requirement: &2164360260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *2153521000
+  version_requirements: *2164360260
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &2153520540 !ruby/object:Gem::Requirement
+  requirement: &2164359520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,29 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2153520540
+  version_requirements: *2164359520
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2164358940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164358940
+- !ruby/object:Gem::Dependency
+  name: less
+  requirement: &2164358120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164358120
 description: Sinatra-support includes many helpers for forms, errors and many amazing
   things.
 email:
@@ -132,6 +154,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/sinatra/support/appmodule.rb
 - lib/sinatra/support/compasssupport.rb
 - lib/sinatra/support/compat-1.8.6.rb
 - lib/sinatra/support/compressedjs.rb
@@ -164,6 +187,7 @@ files:
 - test/fixtures/multirender/views_2/contact.haml
 - test/fixtures/multirender/views_2/home.haml
 - test/helper.rb
+- test/test_appmodule.rb
 - test/test_compass_app.rb
 - test/test_compressed_js_app.rb
 - test/test_country.rb
@@ -181,7 +205,7 @@ files:
 - HISTORY.md
 - Rakefile
 has_rdoc: true
-homepage: http://github.com/sinefunc/sinatra-support
+homepage: http://sinefunc.com/sinatra-support
 licenses: []
 post_install_message: 
 rdoc_options: []