Merge pull request #1612 from padrino/liberate-helpers

move support_lite and locale to padrino-support gem, restructure it
padrino · Mar 6, 2014 · 6c992df · 6c992df
2 parents 4ed70dc + 7ed97d3
commit 6c992df
Show file tree

Hide file tree

Showing 51 changed files with 396 additions and 303 deletions.
diff --git a/Gemfile b/Gemfile
@@ -45,6 +45,7 @@ end
    padrino-gen
    padrino-helpers
    padrino-mailer
+   padrino-support
 ].each do |dep|
   gem dep, :path => File.expand_path('../' + dep, __FILE__)
 end
diff --git a/Rakefile b/Rakefile
@@ -10,6 +10,7 @@ GEM_NAME = 'padrino-framework'
 
 padrino_gems = %w[
   padrino-core
+  padrino-support
   padrino-gen
   padrino-helpers
   padrino-mailer

diff --git a/padrino-admin/test/helper.rb b/padrino-admin/test/helper.rb
@@ -8,7 +8,6 @@
 require 'rack/test'
 require 'rack'
 require 'thor/group'
-require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'
 require 'dm-core'
 require 'dm-migrations'

diff --git a/padrino-core/lib/padrino-core.rb b/padrino-core/lib/padrino-core.rb
@@ -1,6 +1,6 @@
 require 'sinatra/base'
 require 'padrino-core/version'
-require 'padrino-core/support_lite'
+require 'padrino-support'
 require 'padrino-core/application'
 
 require 'padrino-core/caller'

diff --git a/padrino-core/lib/padrino-core/application/rendering.rb b/padrino-core/lib/padrino-core/application/rendering.rb
@@ -1,4 +1,4 @@
-require 'padrino-core/support_lite' unless defined?(SupportLite)
+require 'padrino-support'
 
 module Padrino
   ##

diff --git a/padrino-core/lib/padrino-core/application/routing.rb b/padrino-core/lib/padrino-core/application/routing.rb
@@ -1,5 +1,5 @@
 require 'http_router' unless defined?(HttpRouter)
-require 'padrino-core/support_lite' unless defined?(SupportLite)
+require 'padrino-support'
 
 ##
 # Adds to Sinatra +controller+ informations

diff --git a/padrino-core/lib/padrino-core/support_lite.rb b/padrino-core/lib/padrino-core/support_lite.rb
diff --git a/padrino-core/padrino-core.gemspec b/padrino-core/padrino-core.gemspec
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options  = ["--charset=UTF-8"]
 
+  s.add_dependency("padrino-support", Padrino.version)
   s.add_dependency("tilt", "~> 1.4.1")
   if ENV["SINATRA_EDGE"]
     s.add_dependency("sinatra")

diff --git a/padrino-core/test/helper.rb b/padrino-core/test/helper.rb
@@ -5,11 +5,13 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'i18n'
+require 'padrino-support'
 require 'padrino-core'
 require 'json'
 require 'builder'
 require 'rack/test'
 require 'rack'
+require 'yaml'
 
 # Rubies < 1.9 don't handle hashes in the properly order so to prevent
 # this issue for now we remove extra values from mimetypes.

diff --git a/padrino-gen/lib/padrino-gen.rb b/padrino-gen/lib/padrino-gen.rb
@@ -1,4 +1,3 @@
-require 'padrino-core/support_lite'
 require 'padrino-core/tasks'
 require 'padrino-gen/command'
 require 'active_support/ordered_hash'

diff --git a/padrino-gen/lib/padrino-gen/generators/cli.rb b/padrino-gen/lib/padrino-gen/generators/cli.rb
@@ -25,8 +25,7 @@ def load_boot
           if File.exist?(boot)
             require File.expand_path(boot)
           else
-            # If we are outside app we need to load support_lite
-            require 'padrino-core/support_lite' unless defined?(SupportLite)
+            require 'padrino-support'
           end
         rescue StandardError => e
           puts "=> Problem loading #{boot}"

diff --git a/padrino-helpers/lib/padrino-helpers.rb b/padrino-helpers/lib/padrino-helpers.rb
@@ -1,4 +1,4 @@
-require 'padrino-core/support_lite' unless defined?(SupportLite)
+require 'padrino-support'
 require 'i18n'
 require 'enumerator'
 require 'active_support/time_with_zone'               # next extension depends on this

diff --git a/padrino-helpers/padrino-helpers.gemspec b/padrino-helpers/padrino-helpers.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options  = ["--charset=UTF-8"]
 
-  s.add_dependency("padrino-core", Padrino.version)
+  s.add_dependency("padrino-support", Padrino.version)
   s.add_dependency("i18n", "~> 0.6", ">= 0.6.7")
 end
diff --git a/padrino-mailer/lib/padrino-mailer.rb b/padrino-mailer/lib/padrino-mailer.rb
@@ -3,7 +3,6 @@
 rescue LoadError
   require 'sinatra/tilt'
 end
-require 'padrino-core/support_lite' unless defined?(SupportLite)
 
 module Padrino
   ##

diff --git a/padrino-support/.document b/padrino-support/.document
@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+-
+README.rdoc
+LICENSE.txt
diff --git a/padrino-support/.gitignore b/padrino-support/.gitignore
@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+test/tmp/*
diff --git a/padrino-support/.yardopts b/padrino-support/.yardopts
@@ -0,0 +1 @@
+--title 'Padrino Support Documentation' --protected