big_band 0.4.0 → 0.5.0

data/README.md

@@ -42,14 +42,16 @@ Sinatra tool integration:
 * [Haml::More](http://github.com/rkh/haml-more) – Adds more functionality to Haml and Sass
 * [monkey-lib](http://github.com/rkh/monkey-lib) – Thin layer over ruby extension libraries (like ActiveSupport) to make those pluggable
 * [Sinatra::TestHelper](http://github.com/rkh/sinatra-test-helper) – Adds helper methods and better integration for various testing frameworks
+* [Sinatra::Extension](http://github.com/rkh/sinatra-extension) – Mixin to ease Sinatra extension development.
 * [Yard::Sinatra](http://github.com/rkh/yard-sinatra) – Displays Sinatra routes (including comments) in YARD output
 
 Besides those extensions, there are others in the BigBand stack, that are external:
 
-* [Rack Flash](http://github.com/nakajima/rack-flash) by Pat Nakajima
+* [Rack Flash](http://github.com/nakajima/rack-flash) by [Pat Nakajima](http://github.com/nakajima)
+* [Sinatra::DefaultCharset](http://github.com/raggi/sinatra-default_charset) by [James Tucker](http://github.com/raggi)
 
-Goals for 0.4.0
----------------
+General Goals
+-------------
 
 * No sub-project relies on BigBand
 * All sub-projects should work with MRI/REE >= 1.8.6 (including 1.9.x), JRuby >= 1.4.0 and Rubinius >= 1.0

data/TODO.md

@@ -1,47 +1,16 @@
 TODO
 ====
 
-For 0.4.0 release
------------------
-
-All subprojects:
-
-* Add licenses, deps.rip, maybe dependencies file for monk
-
-BigBand:
-
-* Create some sort of website (GitHub Pages?)
-* Write example app
-
-After 0.4.0
------------
-
 General:
 
+* Create some sort of website (GitHub Pages?)
 * Implement more fancy stuff
-* Padrino integration (maybe an example app, maybe some docs, dunno)
-* Monk skeleton using big\_band
-* See if stack\_helper can be extracted and is of any use (stack\_helper branch)
 * Improve inline documentation (YARD tags)
 * Maybe switch to [sinatra-flash](http://github.com/SFEley/sinatra-flash)
 
-sinatra-advanced-routes:
-
-* Make compatible with [Usher](http://github.com/joshbuddy/usher)
-* Make compatible with [padrino-core/routing](http://github.com/padrino/padrino-framework/issues/issue/46)
-
-Subprojects to be published or written:
-
-* queueba (yet another message queue based on redis, maybe)
-* sinatra-postpone
-* "sinatra-queueba" or redis channel for pusher + pusher integration for sinatra
-
-Before 0.5.0
-------------
-
-BigBand:
+haml-more:
 
-* remove `::BigBand`
+* Rewrite Haml::More::CoffeeScript
 
 monkey-lib:
 

data/lib/sinatra/big_band.rb

@@ -1,8 +1,7 @@
 require 'sinatra/base'
 require 'sinatra/sugar'
 require 'async-rack'
-require 'monkey'
-require 'rack/flash'
+require 'monkey-lib'
 
 module Sinatra
   Base.ignore_caller
@@ -25,7 +24,17 @@ module Sinatra
     subclass_extension :namespace
     subclass_extension :reloader, true
     subclass_extension :sugar
-    subclass_extension(:flash, false, false) { |klass| klass.use Rack::Flash, :flash_app_class => klass }
+
+    subclass_extension(:flash, false, false) do |klass|
+      require 'rack/flash'
+      klass.use Rack::Flash, :flash_app_class => klass
+    end
+
+    subclass_extension(:default_charset, false, false) do |klass|
+      # FIXME: Does not work with autoloader?!
+      require 'sinatra/default_charset'
+      klass.register Sinatra::DefaultCharset
+    end
 
     def self.apply_options(klass)
       klass.set :app_file, klass.caller_files.first.expand_path unless klass.app_file?

data/spec/sinatra/big_band_spec.rb

@@ -12,9 +12,14 @@ describe Sinatra::BigBand do
     @example_app ||= set_example_app options
   end
 
+  describe 'sinatra behavior' do
+    before { app set_example_app }
+    it_should_behave_like 'sinatra'
+  end
+
   describe "standard extensions" do
     def extension; Sinatra.const_get @ext_name end
-    [:AdvancedRoutes, :Compass, :ConfigFile, :MoreServer, :Namespace, :Sugar].each do |ext_name|
+    [:AdvancedRoutes, :Compass, :ConfigFile, :MoreServer, :Namespace, :Sugar, :DefaultCharset].each do |ext_name|
       describe ext_name do
         before { @ext_name = ext_name }
         it("should be loaded") { Sinatra.should be_const_defined(ext_name) }
@@ -22,7 +27,7 @@ describe Sinatra::BigBand do
       end
     end
 
-    [:Compass, :ConfigFile, :MoreServer, :Namespace].each do |ext_name|
+    [:Compass, :ConfigFile, :MoreServer, :Namespace, :DefaultCharset].each do |ext_name|
       describe ext_name do
         before { @ext_name = ext_name }
         it("should be excludable") { example_app(:except => ext_name).should_not be_a(extension) }

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
-require "sinatra/rspec"
+require "sinatra/rspec/shared"
 require "sinatra/big_band"
+require "sinatra/default_charset"

data/subproject.rb

@@ -32,6 +32,7 @@ class Subproject < OpenStruct
   new "sinatra-advanced-routes"
   new "sinatra-compass"
   new "sinatra-config-file"
+  new "sinatra-extension"
   new "sinatra-more-server"
   new "sinatra-namespace"
   new "sinatra-reloader"

data/tasks/git.task

@@ -14,6 +14,10 @@ def commit
   "commit -a -m #{ENV['message'].to_s.inspect}"
 end
 
+def tag
+  "tag -a #{ENV['tag'].to_s.inspect} -m #{ENV['tag'].to_s.inspect}"
+end
+
 namespace :git do
   namespace :big_band do
     task(:header) { puts '', '#'*80, "# BigBand" }
@@ -23,6 +27,7 @@ namespace :git do
     task(:diff   => :header) { system "git diff"         }
     task(:tags   => :header) { system "git push --tags"  }
     task(:commit => :header) { system "git #{commit}"    }
+    task(:tag    => :header) { system "git #{tag}"       }
   end
   task :status => "big_band:status"
   task :pull   => "big_band:pull"
@@ -38,4 +43,5 @@ project_namespace :git do
   git_task :diff
   git_task :tags, "push --tags"
   git_task(:commit) { commit }
+  git_task(:tag) { tag }
 end

data/tasks/spec.task

@@ -1,9 +1,10 @@
-def rspec(pattern, format = nil, more_opts = nil, ruby = RUBY)
+def rspec(pattern, format = nil, more_opts = nil, ruby = RUBY, command = 'spec')
   format ||= ENV["FORMAT"] || :progress
   libs  = Dir.glob("{*,.}/lib").join File::PATH_SEPARATOR
   files = Dir.glob(pattern).map { |f| f.inspect }.join " "
   opts  = ["-b -c --format #{format} --loadby mtime --reverse", *more_opts].compact.join " "
-  sh "#{ruby} -I#{libs} -S spec #{opts} #{files}"
+  command = "bundle exec #{command}" if ENV['BUNDLER']
+  sh "RUBYLIB=#{libs.strip}:#{ENV['RUBYLIB'].to_s.strip} #{ruby} -S #{command} #{opts} #{files}"
 end
 
 pattern = "spec/**/*_spec.rb"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: big_band
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -14,205 +15,265 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: async-rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml-more
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: monkey-lib
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra-advanced-routes
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sinatra-compass
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra-config-file
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sinatra-more-server
+  name: sinatra-extension
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sinatra-namespace
+  name: sinatra-more-server
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sinatra-reloader
+  name: sinatra-namespace
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: sinatra-sugar
+  name: sinatra-reloader
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: sinatra-test-helper
+  name: sinatra-sugar
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: yard-sinatra
+  name: sinatra-test-helper
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: rack-flash
+  name: yard-sinatra
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rack-flash
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 1
         - 1
         version: 0.1.1
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: sinatra-default_charset
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id016
 description: Making Sinatra swing.
 email: konstantin.mailinglists@googlemail.com
 executables: []
@@ -246,23 +307,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Making Sinatra swing.