padrino-core 0.9.14 → 0.9.15

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/padrino

@@ -1,25 +1,8 @@
 #!/usr/bin/env ruby
-require 'rubygems' unless defined?(Gem)
+require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
 
-# We load Padrino libs
 padrino_core_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
-# Build Padrino g as an alias of padrino-gen
-if %w(g gen).include?(ARGV[0])
-  ARGV.shift
-  begin
-    # We try to load the vendored padrino-gen if exist
-    padrino_gen_path = File.expand_path('../../../padrino-gen/lib', __FILE__)
-    $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
-    require 'padrino-core/command'
-    require 'padrino-gen/command'
-    Padrino.bin_gen(ARGV)
-  rescue
-    puts "<= You need padrino-gen! Run: gem install padrino-gen"
-  end
-else
-  # We load our cli
-  require 'padrino-core/cli/base'
-  Padrino::Cli::Base.start(ARGV)
-end
+require 'padrino-core/cli/base'
+Padrino::Cli::Base.start(ARGV)

data/lib/padrino-core.rb

@@ -44,11 +44,14 @@ module Padrino
     end
 
     ##
-    # Default encoding to UTF8 if it has not already been set to something else.
+    # Default encoding to UTF8.
     #
     def set_encoding
-      unless RUBY_VERSION >= '1.9'
-        $KCODE = 'U' if $KCODE == 'NONE' || $KCODE.blank?
+      if RUBY_VERSION < '1.9'
+        $KCODE='u'
+      else
+        Encoding.default_external = Encoding::UTF_8
+        Encoding.default_internal = Encoding::UTF_8
       end
       nil
     end

data/lib/padrino-core/application/routing.rb

@@ -12,19 +12,38 @@ module Padrino
   module Routing
     CONTENT_TYPE_ALIASES = { :htm => :html }
 
-    class ::HttpRouter::Route
-      attr_accessor :custom_conditions, :before_filters, :after_filters, :use_layout, :controller
-    end
+    class ::HttpRouter #:nodoc:
+      attr_accessor :runner
+      class Route #:nodoc:
+        attr_accessor :custom_conditions, :before_filters, :after_filters, :use_layout, :controller
+
+        def process_arbitrary_blocks(blocks)
+          blocks.each { |blk| arbitrary { |env| router.runner.instance_eval(&blk) != false } } if blocks
+        end
 
-    class ::Sinatra::Request
-      attr_accessor :match
+        def before_filters=(before_filters)
+          process_arbitrary_blocks(before_filters)
+          @before_filters = before_filters
+        end
 
-      def controller
-        route && route.controller
+        def custom_conditions=(custom_conditions)
+          process_arbitrary_blocks(custom_conditions)
+          @custom_conditions = custom_conditions
+        end
       end
+    end
+
+    module ::Sinatra #:nodoc:
+      class Request #:nodoc:
+        attr_accessor :match
 
-      def route
-        match.matched? ? match.path.route : nil
+        def controller
+          route && route.controller
+        end
+
+        def route
+          match.matched? ? match.path.route : nil
+        end
       end
     end
 
@@ -140,13 +159,11 @@ module Padrino
       #
       # ==== Examples
       #
-      #   router.add('/greedy/{!:greed,.*}')
+      #   router.add('/greedy/:greed')
       #   router.recognize('/simple')
       #
       def router
-        unless @router
-          @router = HttpRouter.new
-        end
+        @router ||= HttpRouter.new
         block_given? ? yield(@router) : @router
       end
       alias :urls :router
@@ -227,14 +244,19 @@ module Padrino
           invoke_hook(:route_added, verb, path, block)
 
           # HTTPRouter route construction
-          route = router.add(path)
+          route = case path
+            when Regexp
+              router.add('/?*').match_path(path)
+            else
+              router.add(path)
+          end
+
           route.name(name) if name
           route.send(verb.downcase.to_sym)
           route.host(options.delete(:host)) if options.key?(:host)
+          route.condition(:user_agent => options.delete(:agent)) if options.key?(:agent)
           route.default_values = options.delete(:default_values)
 
-          route.to(block)
-
           # Add Sinatra conditions
           options.each { |option, args| send(option, *args) }
           conditions, @conditions = @conditions, []
@@ -251,9 +273,15 @@ module Padrino
             route.after_filters  = []
           end
 
+          route.to(block)
+
           route
         end
 
+        def current_controller
+          @_controller && @_controller.last
+        end
+
         ##
         # Returns the final parsed route details (modified to reflect all Padrino options)
         # given the raw route. Raw route passed in could be a named alias or a string and
@@ -273,18 +301,6 @@ module Padrino
           end
 
           if path.kind_of?(String) # path i.e "/index" or "/show"
-            # Backwards compatability
-
-            if path == '(/)'
-              path = '/'
-              warn "WARNING! #{Padrino.first_caller}: #{verb} (/) is deprecated, simply use / instead" if verb != "HEAD"
-            end
-
-            if path =~ /\(\/\)$/
-              path.gsub(/\(\/\)$/, '/?')
-              warn "WARNING! #{Padrino.first_caller}: #{verb} (/) is deprecated, simply use /? instead" if verb != "HEAD"
-            end
-
             # Now we need to parse our 'with' params
             if with_params = options.delete(:with)
               path = process_path_for_with_params(path, with_params)
@@ -345,7 +361,7 @@ module Padrino
         # Used for calculating path in route method
         #
         def process_path_for_parent_params(path, parent_params)
-          parent_prefix = parent_params.uniq.collect { |param| "#{param}/:#{param}_id" }.join("/")
+          parent_prefix = parent_params.flatten.uniq.collect { |param| "#{param}/:#{param}_id" }.join("/")
           File.join(parent_prefix, path)
         end
 
@@ -450,20 +466,17 @@ module Padrino
         # Compatibility with http_router
         #
         def route!(base=self.class, pass_block=nil)
+          base.router.runner = self
           if base.router and match = base.router.recognize(@request)
             if !match.matched?
-              route_eval {
-                match.headers.each{|k,v| response[k] = v}
+              route_eval do
+                match.headers.each {|k,v| response[k] = v}
                 status match.status
-              }
+              end
             elsif match
               @block_params = match.params
               (@params ||= {}).merge!(match.params_as_hash)
               pass_block = catch(:pass) do
-                # Run Sinatra Conditions
-                match.path.route.custom_conditions.each { |cond| throw :pass if instance_eval(&cond) == false }
-                # Run scoped before filters
-                match.path.route.before_filters.each { |bef| throw :pass if instance_eval(&bef) == false }
                 # If present set current controller layout
                 parent_layout = base.instance_variable_get(:@layout)
                 base.instance_variable_set(:@layout, match.path.route.use_layout) if match.path.route.use_layout
@@ -483,7 +496,7 @@ module Padrino
 
           # Run routes defined in superclass.
           if base.superclass.respond_to?(:router)
-            route! base.superclass, pass_block
+            route!(base.superclass, pass_block)
             return
           end
 

data/lib/padrino-core/cli/base.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'thor'
 
 module Padrino
@@ -63,6 +62,26 @@ module Padrino
         IRB.start
       end
 
+      desc "generate", "Executes the Padrino generator with given options."
+      def generate(*args)
+        # Build Padrino g as an alias of padrino-gen
+        begin
+          # We try to load the vendored padrino-gen if exist
+          padrino_gen_path = File.expand_path('../../../../../padrino-gen/lib', __FILE__)
+          $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
+          require 'padrino-core/command'
+          require 'padrino-gen/command'
+          ARGV.shift
+          Padrino.bin_gen(ARGV)
+        rescue
+          puts "<= You need padrino-gen! Run: gem install padrino-gen"
+        end
+      end
+      desc "g", "Executes the Padrino generator with given options."
+      alias :g :generate
+      desc "gen", "Executes the Padrino generator with given options."
+      alias :gen :generate
+
       desc "version", "Show current Padrino Version"
       map "-v" => :version, "--version" => :version
       def version
@@ -86,7 +105,7 @@ module Padrino
         end
 
       protected
-        def self.banner(task)
+        def self.banner(task=nil, *args)
           "padrino #{task.name}"
         end
 

data/lib/padrino-core/cli/rake.rb

@@ -4,9 +4,10 @@ Rake.application.instance_variable_set(:@rakefile, __FILE__)
 
 module PadrinoTasks
   def self.init
-    Padrino::Tasks.files.flatten.uniq.each { |ext| load(ext) }
+    Padrino::Tasks.files.flatten.uniq.each { |ext| load(ext) rescue puts "<= Failed load #{ext}" } unless @_init
     Rake.application.init
     Rake.application.top_level
+    @_init = true
   end
 end
 

data/lib/padrino-core/loader.rb

@@ -1,5 +1,38 @@
 module Padrino
   class << self
+
+    ##
+    # Hooks to be called before a load/reload
+    #
+    # ==== Examples
+    #
+    #   before_load do
+    #     pre_initialize_something
+    #   end
+    #
+    #
+    def before_load(&block)
+      @_before_load ||= []
+      @_before_load << Proc.new(&block) if block_given?
+      @_before_load
+    end
+
+    ##
+    # Hooks to be called after a load/reload
+    #
+    # ==== Examples
+    #
+    #   after_load do
+    #     DataMapper.finalize
+    #   end
+    #
+    #
+    def after_load(&block)
+      @_after_load ||= []
+      @_after_load << Proc.new(&block) if block_given?
+      @_after_load
+    end
+
     ##
     # Requires necessary dependencies as well as application files from root lib and models
     #
@@ -8,9 +41,11 @@ module Padrino
       @_called_from = first_caller
       set_encoding
       set_load_paths(*load_paths) # We set the padrino load paths
+      Padrino.logger # Initialize our logger
+      before_load.each { |bl| bl.call } # Run before hooks
       dependency_paths.each { |path| require_dependency(path) }
       Reloader::Stat.run! # We need to fill our Stat::CACHE
-      Padrino.logger # Initialize our logger
+      after_load.each { |al| al.call } # Run after hooks
       Thread.current[:padrino_loaded] = true
     end
 
@@ -18,7 +53,9 @@ module Padrino
     # Method for reloading required applications and their files
     #
     def reload!
+      before_load.each { |bl| bl.call } # Run before hooks
       Reloader::Stat.reload! # detects the modified files
+      after_load.each { |al| al.call } # Run after hooks
     end
 
     ##
@@ -53,12 +90,13 @@ module Padrino
     # With +require_dependencies+ we don't have this problem.
     #
     # ==== Examples
+    #
     #   # For require all our app libs we need to do:
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
     #
     def require_dependencies(*paths)
       # Extract all files to load
-      files = paths.map { |path| Dir[path] }.flatten
+      files = paths.map { |path| Dir[path] }.flatten.uniq.sort
 
       while files.present?
         # We need a size to make sure things are loading
@@ -72,9 +110,14 @@ module Padrino
           begin
             Reloader::Stat.safe_load(file)
             files.delete(file)
-          rescue Exception => e
+          rescue LoadError => e
             errors << e
-            failed << files
+            failed << file
+          rescue NameError => e
+            errors << e
+            failed << file
+          rescue Exception => e
+            raise e
           end
         end
 
@@ -99,6 +142,7 @@ module Padrino
 
     ##
     # Appends custom dependency patterns to the be loaded for Padrino
+    #
     # ==== Examples
     #    Padrino.custom_dependencies("#{Padrino.root}/foo/bar/*.rb")
     #
@@ -126,4 +170,4 @@ module Padrino
       $:.uniq!
     end
   end # self
-end # Padrino
+end # Padrino

data/lib/padrino-core/locale/nl.yml

@@ -0,0 +1,30 @@
+nl:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d-%m-%Y"
+      short: "%d %b"
+      long: "%d %B %Y"
+
+    day_names: [zondag, maandag, dinsdag, woensdag, donderdag, vrijdag, zaterdag]
+    abbr_day_names: [zo, ma, di, wo, do, vr, za]
+    month_names: [~, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november]
+    abbr_month_names: [~, jan, feb, maa, apr, mei, jun, jul, aug, sep, okt, nov, dec]
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%a %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%d %B %Y %H:%M"
+    am: "am"
+    pm: "pm"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " en "
+      last_word_connector: " en "

data/lib/padrino-core/locale/pl.yml

@@ -0,0 +1,30 @@
+pl:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d"
+      short: "%d %b"
+      long: "%d %B %Y"
+
+    day_names: [Niedziela, Poniedziałek, Wtorek, Środa, Czwartek, Piątek, Sobota]
+    abbr_day_names: [nie, pon, wto, śro, czw, pia, sob]
+    month_names: [~, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
+    abbr_month_names: [~, sty, lut, mar, kwi, maj, cze, lip, sie, wrz, paź, lis, gru]
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%a, %d %b %Y, %H:%M:%S %z"
+      short: "%d %b, %H:%M"
+      long: "%d %B %Y, %H:%M"
+    am: "przed południem"
+    pm: "po południu"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " i "
+      last_word_connector: " i "

data/lib/padrino-core/reloader.rb

@@ -189,23 +189,10 @@ module Padrino
         ##
         # Removes the specified class and constant.
         #
-        # Additionally this removes the specified class from the subclass list of every superclass that
-        # tracks it's subclasses in an array returned by _subclasses_list. Classes that wish to use this
-        # functionality are required to alias the reader for their list of subclasses
-        # to _subclasses_list. Plugins for ORMs and other libraries should keep this in mind.
-        #
         def remove_constant(const)
           return if Padrino::Reloader.exclude_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) } &&
                    !Padrino::Reloader.include_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) }
 
-          superklass = const
-          until (superklass = superklass.superclass).nil?
-            if superklass.respond_to?(:_subclasses_list)
-              superklass.send(:_subclasses_list).delete(klass)
-              superklass.send(:_subclasses_list).delete(klass.to_s)
-            end
-          end
-
           parts = const.to_s.split("::")
           base = parts.size == 1 ? Object : Object.full_const_get(parts[0..-2].join("::"))
           object = parts[-1].to_s
@@ -221,11 +208,11 @@ module Padrino
         # Searches Ruby files in your +Padrino.root+ and monitors them for any changes.
         #
         def rotation
-          paths = Dir[Padrino.root("*")].unshift(Padrino.root).reject { |path| !File.directory?(path) }
-
-          files = paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
+          paths  = Dir[Padrino.root("*")].unshift(Padrino.root).
+                                          reject { |path| Padrino::Reloader.exclude.include?(path) || !File.directory?(path) }
+          files  = paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten.uniq
 
-          files.map{ |file|
+          files.map { |file|
             next if Padrino::Reloader.exclude.any? { |base| file =~ /^#{base}/ }
 
             found, stat = figure_path(file, paths)

data/lib/padrino-core/router.rb

@@ -38,7 +38,7 @@ module Padrino
     end
 
     def sort!
-      @mapping = @mapping.sort_by { |h, p, m, a| [(-1.0 / 0.0), -p.size] }
+      @mapping = @mapping.sort_by { |h, p, m, a| -p.size }
     end
 
     def map(options={})
@@ -76,4 +76,4 @@ module Padrino
       [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{rPath}"]]
     end
   end
-end
+end

data/lib/padrino-core/support_lite.rb

@@ -49,6 +49,11 @@ if defined?(ActiveSupport::CoreExtensions::Hash) && !Hash.method_defined?(:slice
     include ActiveSupport::CoreExtensions::Hash::DeepMerge
     include ActiveSupport::CoreExtensions::Hash::ReverseMerge
     include ActiveSupport::CoreExtensions::Hash::Slice
+
+    def ordered_collect(&block)
+      keys = self.stringify_keys.keys.sort
+      keys.collect { |key| block.call(key, self[key.to_sym]) }
+    end
   end
 end
 
@@ -62,7 +67,7 @@ module ObjectSpace
     # Returns all the classes in the object space.
     def classes
       klasses = []
-      ObjectSpace.each_object(Class) {|o| klasses << o}
+      ObjectSpace.each_object(Class)  { |o| klasses << o }
       klasses
     end
   end
@@ -86,14 +91,14 @@ end unless Object.method_defined?(:full_const_get)
 class FileSet
   # Iterates over every file in the glob pattern and yields to a block
   # Returns the list of files matching the glob pattern
-  # FileSet.glob_require('padrino-core/application/*.rb', __FILE__) { |file| load file }
+  # FileSet.glob('padrino-core/application/*.rb', __FILE__) { |file| load file }
   def self.glob(glob_pattern, file_path=nil, &block)
     glob_pattern = File.join(File.dirname(file_path), glob_pattern) if file_path
     file_list = Dir.glob(glob_pattern).sort
     file_list.each { |file| block.call(file) }
     file_list
   end
-  
+
   # Requires each file matched in the glob pattern into the application
   # FileSet.glob_require('padrino-core/application/*.rb', __FILE__)
   def self.glob_require(glob_pattern, file_path=nil)
@@ -104,4 +109,4 @@ end unless defined?(FileSet)
 ##
 # Loads our locales configuration files
 #
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)

data/lib/padrino-core/version.rb

@@ -5,11 +5,11 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.14' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.15' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #
   def self.version
     VERSION
   end
-end # Padrino
+end # Padrino

data/padrino-core.gemspec

@@ -1,16 +1,14 @@
 require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
-require 'rubygems'
-require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = "padrino-core"
   s.rubyforge_project = "padrino-core"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = %q{padrinorb@gmail.com}
-  s.summary = %q{The required Padrino core gem}
-  s.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-core"
-  s.description = %q{The Padrino core gem required for use of this framework}
-  s.default_executable = %q{padrino}
+  s.email = "padrinorb@gmail.com"
+  s.summary = "The required Padrino core gem"
+  s.homepage = "http://www.padrinorb.com"
+  s.description = "The Padrino core gem required for use of this framework"
+  s.default_executable = "padrino"
   s.executables = ["padrino"]
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
@@ -18,6 +16,16 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-core.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = 'lib'
-  s.add_bundler_dependencies :core, :development
-end
+  s.require_path = "lib"
+  s.add_dependency("sinatra", ">= 1.0.0")
+  s.add_dependency("http_router", ">= 0.3.13")
+  s.add_dependency("thor", ">= 0.13.0")
+  # If you want try our test on AS edge.
+  # $ AS=edge rake test
+  if ENV['AS'] == "edge"
+    s.add_dependency("activesupport", ">= 3.0.0.beta4")
+    s.add_dependency("tzinfo")
+  else
+    s.add_dependency("activesupport", ">= 2.3.8")
+  end
+end

data/test/fixtures/dependencies/a.rb

@@ -1,4 +1,9 @@
-A = "A"
+# This file will be safe loaded three times.
+# The first one fail because B and C constant are not defined
+# The second one file because B requires C constant so will not be loaded
+# The third one B and C are defined
 
 # But here we need some of b.rb
-A_result = [B, A]
+A_result = [B, C]
+
+A = "A"

data/test/fixtures/dependencies/b.rb

@@ -1,4 +1,4 @@
-B = "B"
+# But here we need some of c.rb and a.rb
+B_result = C
 
-# Here we need some of c.rb
-B_result = [C, B]
+B = "B"

data/test/fixtures/dependencies/d.rb

@@ -0,0 +1,4 @@
+D  = 0 unless defined?(D)
+D += 1
+
+raise "SomeThing"

data/test/test_application.rb

@@ -51,4 +51,4 @@ class TestApplication < Test::Unit::TestCase
       assert_equal "Foo in html", body
     end
   end
-end
+end

data/test/test_dependencies.rb

@@ -1,14 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestDependencies < Test::Unit::TestCase
-  context 'when we require a dependency that have another dependecy' do
+  context 'when we require a dependency that have another dependency' do
 
-    should 'raise an error without padrino' do
-      assert_raise NameError do
-        require "fixtures/dependencies/a.rb"
-        require "fixtures/dependencies/b.rb"
-        require "fixtures/dependencies/c.rb"
+    should 'raise an error without reloading it twice' do
+      silence_warnings do
+        assert_raise(RuntimeError) do
+          Padrino.require_dependencies(
+            Padrino.root("fixtures/dependencies/a.rb"),
+            Padrino.root("fixtures/dependencies/b.rb"),
+            Padrino.root("fixtures/dependencies/c.rb"),
+            Padrino.root("fixtures/dependencies/d.rb")
+          )
+        end
       end
+      assert_equal 1, D
     end
 
     should 'resolve dependency problems' do
@@ -19,9 +25,8 @@ class TestDependencies < Test::Unit::TestCase
           Padrino.root("fixtures/dependencies/c.rb")
         )
       end
-      assert_equal ["B", "A"], A_result
-      assert_equal ["C", "B"], B_result
+      assert_equal ["B", "C"], A_result
+      assert_equal "C", B_result
     end
   end
-
 end

data/test/test_mounter.rb

@@ -147,4 +147,4 @@ class TestMounter < Test::Unit::TestCase
       assert_equal "Im Demo 2", body
     end
   end
-end
+end

data/test/test_rendering.rb

@@ -365,5 +365,4 @@ class TestRendering < Test::Unit::TestCase
       assert_equal 'THIS. IS. SPARTA!', body
     end
   end
-
 end

data/test/test_routing.rb

@@ -27,6 +27,19 @@ class TestRouting < Test::Unit::TestCase
     }
   end
 
+  should 'accept regexp routes' do
+    mock_app do
+      get(%r{/fob|/baz}) { "regexp" }
+      get("/foo")        { "str" }
+    end
+    get "/foo"
+    assert_equal "str", body
+    get "/fob"
+    assert_equal "regexp", body
+    get "/baz"
+    assert_equal "regexp", body
+  end
+
   should "parse routes with question marks" do
     mock_app do
       get("/foo/?"){ "okey" }
@@ -53,6 +66,17 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "2", body
   end
 
+  should "match user agents" do
+    app = mock_app do
+      get("/main", :agent => /IE/){ "hello IE" }
+      get("/main"){ "hello" }
+    end
+    get "/main"
+    assert_equal "hello", body
+    get "/main", {}, {'HTTP_USER_AGENT' => 'This is IE'}
+    assert_equal "hello IE", body
+  end
+
   should "not generate overlapping head urls" do
     app = mock_app do
       get("/main"){ "hello" }
@@ -471,17 +495,19 @@ class TestRouting < Test::Unit::TestCase
     mock_app do
       controllers :project do
         get(:index, :parent => :user) { "index #{params[:user_id]}" }
+        get(:index, :parent => [:user, :section]) { "index #{params[:user_id]} #{params[:section_id]}" }
         get(:edit, :with => :id, :parent => :user) { "edit #{params[:id]} #{params[:user_id]}"}
         get(:show, :with => :id, :parent => [:user, :product]) { "show #{params[:id]} #{params[:user_id]} #{params[:product_id]}"}
       end
     end
     get "/user/1/project"
     assert_equal "index 1", body
+    get "/user/1/section/3/project"
+    assert_equal "index 1 3", body
     get "/user/1/project/edit/2"
     assert_equal "edit 2 1", body
     get "/user/1/product/2/project/show/3"
     assert_equal "show 3 1 2", body
-
   end
 
   should "apply parent to controller" do
@@ -610,8 +636,8 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'html', body
   end
 
-  should 'allows custom route-conditions to be set via route options' do
-    protector = Module.new {
+  should 'allows custom route-conditions to be set via route options and halt' do
+    protector = Module.new do
       def protect(*args)
         condition {
           unless authorize(params["user"], params["password"])
@@ -619,7 +645,7 @@ class TestRouting < Test::Unit::TestCase
           end
         }
       end
-    }
+    end
 
     mock_app do
       register protector
@@ -644,6 +670,39 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "hey", body
   end
 
+  should 'allows custom route-conditions to be set via route options using two routes' do
+    protector = Module.new do
+      def protect(*args)
+        condition { authorize(params["user"], params["password"]) }
+      end
+    end
+
+    mock_app do
+      register protector
+
+      helpers do
+        def authorize(username, password)
+          username == "foo" && password == "bar"
+        end
+      end
+
+      get "/", :protect => true do
+        "hey"
+      end
+
+      get "/" do
+        "go away"
+      end
+    end
+
+    get "/"
+    assert_equal "go away", body
+
+    get "/", :user => "foo", :password => "bar"
+    assert ok?
+    assert_equal "hey", body
+  end
+
   should 'scope filters in the given controller' do
     mock_app do
       before { @global = 'global' }
@@ -759,7 +818,6 @@ class TestRouting < Test::Unit::TestCase
     post "/.json"
     assert_equal "This is the post index.json", body
     post "/.js"
-    assert_match "Sinatra doesn't know this ditty", body
     assert_equal 404, status
   end
 
@@ -859,4 +917,4 @@ class TestRouting < Test::Unit::TestCase
     post @app.url(:posts, :create, :format => :js, :bar => 'bar', :baz => 'baz', :id => 5)
     assert_equal "POST CREATE bar - baz - 5", body, "should properly post to create action"
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 9
-  - 14
-  version: 0.9.14
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,10 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-08-28 00:00:00 +02:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,26 +36,26 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  name: sinatra
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: http_router
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 9
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 13
+        version: 0.3.13
   type: :runtime
-  name: http_router
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +68,10 @@ dependencies:
         - 0
         version: 0.13.0
   type: :runtime
-  name: thor
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,105 +84,7 @@ dependencies:
         - 8
         version: 2.3.8
   type: :runtime
-  name: activesupport
-  prerelease: false
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  name: rake
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  name: mocha
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  name: rack-test
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
-  type: :development
-  name: webrat
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 2
-        - 22
-        version: 2.2.22
-  type: :development
-  name: haml
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 2
-        - 10
-        - 3
-        version: 2.10.3
-  type: :development
-  name: shoulda
-  prerelease: false
-  version_requirements: *id010
 description: The Padrino core gem required for use of this framework
 email: padrinorb@gmail.com
 executables: 
@@ -218,6 +122,8 @@ files:
 - lib/padrino-core/locale/es.yml
 - lib/padrino-core/locale/fr.yml
 - lib/padrino-core/locale/it.yml
+- lib/padrino-core/locale/nl.yml
+- lib/padrino-core/locale/pl.yml
 - lib/padrino-core/locale/pt_br.yml
 - lib/padrino-core/locale/ru.yml
 - lib/padrino-core/locale/tr.yml
@@ -235,6 +141,7 @@ files:
 - test/fixtures/dependencies/a.rb
 - test/fixtures/dependencies/b.rb
 - test/fixtures/dependencies/c.rb
+- test/fixtures/dependencies/d.rb
 - test/helper.rb
 - test/test_application.rb
 - test/test_core.rb
@@ -248,7 +155,7 @@ files:
 - test/test_routing.rb
 - test/test_server.rb
 has_rdoc: true
-homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-core
+homepage: http://www.padrinorb.com
 licenses: []
 
 post_install_message: