padrino-core 0.11.0 → 0.11.1

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

@@ -64,6 +64,8 @@ class HttpRouter
 
   # @private
   class Route
+    VALID_HTTP_VERBS.replace %w[GET POST PUT PATCH DELETE HEAD OPTIONS LINK UNLINK]
+
     attr_accessor :use_layout, :controller, :action, :cache, :cache_key, :cache_expires_in, :parent
 
     def before_filters(&block)
@@ -88,7 +90,13 @@ class HttpRouter
     end
 
     def significant_variable_names
-      @significant_variable_names ||= @original_path.nil? ? [] : @original_path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
+      @significant_variable_names ||= if @original_path.is_a?(String)
+        @original_path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
+      elsif @original_path.is_a?(Regexp) and @original_path.respond_to?(:named_captures)
+        @original_path.named_captures.keys.map(&:to_sym)
+      else
+        []
+      end
     end
   end
 

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

@@ -7,8 +7,9 @@ require 'padrino-gen'
 
 module PadrinoTasks
   def self.init(init=false)
+    $LOAD_PATH.unshift(File.expand_path("lib")) # Adds "lib" to the load path
     Padrino::Tasks.files.flatten.uniq.each { |rakefile| Rake.application.add_import(rakefile) rescue puts "<= Failed load #{ext}" }
-    load(File.expand_path('../rake_tasks.rb', __FILE__))
+    load(File.expand_path('../rake_tasks.rb', __FILE__)) # Load default rake tasks
     Rake.application.load_imports
   end
 

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

@@ -5,8 +5,8 @@ de:
       # Wenn keine Formate angegeben werden, wird "default" benutzt.
       # Du kannst auch weitere Formate hinzufügen, wenn Du möchtest.
       default: "&d.&m.%Y"
-      short: "%b %d"
-      long: "%B %d, %Y"
+      short: "%d. %b"
+      long: "%d. %B %Y"
       only_day: "%e"
 
     day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
@@ -20,9 +20,9 @@ de:
 
   time:
     formats:
-      default: "%a, %d %b %Y %H:%M:%S %z"
-      short: "%d %b %H:%M"
-      long: "%B %d, %Y %H:%M"
+      default: "%a, %d. %b %Y %H:%M:%S %z"
+      short: "%d. %b %H:%M"
+      long: "%d. %B %Y %H:%M"
     am: "am"
     pm: "pm"
 
@@ -31,4 +31,4 @@ de:
     array:
       words_connector: ", "
       two_words_connector: " und "
-      last_word_connector: ", und "
+      last_word_connector: " und "

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

@@ -4,15 +4,15 @@ zh_cn:
       # 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: "%b%d日"
-      long: "%Y年%b%d日"
+      default: "%Y 年 %m 月 %d 日"
+      short: "%b 月 %d 日"
+      long: "公元 %Y 年 %B 月 %d 日"
       only_day: "%e"
 
     day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
     abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    abbr_month_names: [~, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
     order:
       - year
       - month
@@ -20,15 +20,15 @@ zh_cn:
 
   time:
     formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
+      default: "%Y 年 %b 月 %d 日 %H:%M:%S %z"
+      short: "%d 月 %b 日 %H:%M"
+      long: "%Y 年 %B 月 %d 日 %H 时 %M 分"
     am: "上午"
     pm: "下午"
 
 # Used in array.to_sentence.
   support:
     array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
+      words_connector: "，"
+      two_words_connector: "和"
+      last_word_connector: "，还有"

data/lib/padrino-core/reloader.rb

@@ -51,7 +51,7 @@ module Padrino
         # Detect changed files
         rotation do |file, mtime|
           # Retrive the last modified time
-          new_file = MTIMES[file].nil?
+          new_file       = MTIMES[file].nil?
           previous_mtime = MTIMES[file] ||= mtime
           logger.devel "Detected a new file #{file}" if new_file
           # We skip to next file if it is not new and not modified
@@ -74,15 +74,9 @@ module Padrino
       # Remove files and classes loaded with stat
       #
       def clear!
-        MTIMES.clear
-        LOADED_CLASSES.each do |file, klasses|
-          klasses.each { |klass| remove_constant(klass) }
-          LOADED_CLASSES.delete(file)
-        end
-        LOADED_FILES.each do |file, dependencies|
-          dependencies.each { |dependency| $LOADED_FEATURES.delete(dependency) }
-          $LOADED_FEATURES.delete(file)
-        end
+        clear_modification_times
+        clear_loaded_classes
+        clear_loaded_files_and_features
       end
 
       ##
@@ -115,56 +109,46 @@ module Padrino
       # A safe Kernel::require which issues the necessary hooks depending on results
       #
       def safe_load(file, options={})
-        began_at    = Time.now
-        force, file = options[:force], figure_path(file)
+        began_at = Time.now
+        force    = options[:force]
+        file     = figure_path(file)
+        reload   = should_reload?(file)
+        m_time   = modification_time(file)
 
-        # Check if file was changed or if force a reload
-        reload = MTIMES[file] && File.mtime(file) > MTIMES[file]
-        return if !force && !reload && MTIMES[file]
+        return if !force && m_time && !reload
 
-        # Removes all classes declared in the specified file
-        if klasses = LOADED_CLASSES.delete(file)
-          klasses.each { |klass| remove_constant(klass) }
-        end
-
-        # Remove all loaded fatures with our file
-        if features = LOADED_FILES[file]
-          features.each { |feature| $LOADED_FEATURES.delete(feature) }
-        end
+        remove_loaded_file_classes(file)
+        remove_loaded_file_features(file)
 
         # Duplicate objects and loaded features before load file
         klasses = ObjectSpace.classes
         files   = Set.new($LOADED_FEATURES.dup)
 
-        # Now we can reload dependencies of our file
-        if features = LOADED_FILES.delete(file)
-          features.each { |feature| safe_load(feature, :force => true) }
-        end
+        reload_deps_of_file(file)
 
         # And finally load the specified file
         begin
           logger.devel :loading, began_at, file if !reload
           logger.debug :reload,  began_at, file if  reload
+
           $LOADED_FEATURES.delete(file) if files.include?(file)
-          verbosity_was, $-v = $-v, nil
+          Padrino::Utils.silence_output
           loaded = false
           require(file)
           loaded = true
-          MTIMES[file] = File.mtime(file)
+          update_modification_time(file)
         rescue SyntaxError => e
           logger.error "Cannot require #{file} due to a syntax error: #{e.message}"
         ensure
-          $-v = verbosity_was
+          Padrino::Utils.unsilence_output
           new_constants = ObjectSpace.new_classes(klasses)
           if loaded
-            # Store the file details
-            LOADED_CLASSES[file] = new_constants
-            LOADED_FILES[file]   = Set.new($LOADED_FEATURES) - files - [file]
-            # Track only features in our Padrino.root
-            LOADED_FILES[file].delete_if { |feature| !in_root?(feature) }
+            process_loaded_file(:file      => file, 
+                                :constants => new_constants, 
+                                :files     => files)
           else
             logger.devel "Failed to load #{file}; removing partially defined constants"
-            new_constants.each { |klass| remove_constant(klass) }
+            unload_constants(new_constants)
           end
         end
       end
@@ -197,6 +181,101 @@ module Padrino
       end
 
       private
+
+      ###
+      # Clear instance variables that keep track of 
+      # loaded features/files/mtimes
+      #
+      def clear_modification_times
+        MTIMES.clear
+      end
+      
+      def clear_loaded_classes
+        LOADED_CLASSES.each do |file, klasses|
+          klasses.each { |klass| remove_constant(klass) }
+          LOADED_CLASSES.delete(file)
+        end
+      end
+
+      def clear_loaded_files_and_features
+        LOADED_FILES.each do |file, dependencies|
+          dependencies.each { |dependency| $LOADED_FEATURES.delete(dependency) }
+          $LOADED_FEATURES.delete(file)
+        end
+      end
+
+      ###
+      # Macro for mtime query
+      #
+      def modification_time(file)
+        MTIMES[file]
+      end
+
+      ###
+      # Macro for mtime update
+      #
+      def update_modification_time(file)
+        MTIMES[file] = File.mtime(file)
+      end
+
+      ###
+      # Tracks loaded file features/classes/constants
+      #
+      def process_loaded_file(*args)
+        options       = args.extract_options!
+        new_constants = options[:constants]
+        files         = options[:files]
+        file          = options[:file]
+
+        # Store the file details
+        LOADED_CLASSES[file] = new_constants
+        LOADED_FILES[file]   = Set.new($LOADED_FEATURES) - files - [file]
+
+        # Track only features in our Padrino.root
+        LOADED_FILES[file].delete_if { |feature| !in_root?(feature) }
+      end
+
+      ###
+      # Unloads all constants in new_constants
+      #
+      def unload_constants(new_constants)
+        new_constants.each { |klass| remove_constant(klass) }
+      end
+
+      ###
+      # Safe load dependencies of a file
+      #
+      def reload_deps_of_file(file)
+        if features = LOADED_FILES.delete(file)
+          features.each { |feature| safe_load(feature, :force => true) }
+        end
+      end
+
+      ##
+      # Check if file was changed or if force a reload
+      #
+      def should_reload?(file)
+        MTIMES[file] && File.mtime(file) > MTIMES[file]
+      end
+
+      ##
+      # Removes all classes declared in the specified file
+      #
+      def remove_loaded_file_classes(file)
+        if klasses = LOADED_CLASSES.delete(file)
+          klasses.each { |klass| remove_constant(klass) }
+        end 
+      end
+
+      ##
+      # Remove all loaded fatures with our file
+      #
+      def remove_loaded_file_features(file)
+        if features = LOADED_FILES[file]
+          features.each { |feature| $LOADED_FEATURES.delete(feature) }
+        end
+      end
+
       ##
       # Return the mounted_apps providing the app location
       # Can be an array because in one app.rb we can define multiple Padrino::Appplications
@@ -220,15 +299,21 @@ module Padrino
       # and monitors them for any changes.
       #
       def rotation
-        files  = Padrino.load_paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
-        files  = files | Padrino.mounted_apps.map { |app| app.app_file }
-        files  = files | Padrino.mounted_apps.map { |app| app.app_obj.dependencies }.flatten
-        files.uniq.map do |file|
+        files_for_rotation.uniq.map do |file|
           file = File.expand_path(file)
           next if Padrino::Reloader.exclude.any? { |base| file.index(base) == 0 } || !File.exist?(file)
           yield file, File.mtime(file)
         end.compact
       end
+
+      ##
+      # Creates an array of paths for use in #rotation
+      #
+      def files_for_rotation
+        files  = Padrino.load_paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
+        files  = files | Padrino.mounted_apps.map { |app| app.app_file }
+        files  = files | Padrino.mounted_apps.map { |app| app.app_obj.dependencies }.flatten
+      end
     end # self
 
     ##

data/lib/padrino-core/support_lite.rb

@@ -242,3 +242,19 @@ I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n
 # Used to determine if this file has already been required
 #
 module SupportLite; end
+
+module Padrino
+  class Utils
+    ###
+    # Silences output verbosity level so load
+    # errors are not visible when safe_load(file)
+    #
+    def self.silence_output
+      @verbosity_level, $-v = $-v, nil
+    end
+
+    def self.unsilence_output
+      $-v = @verbosity_level
+    end
+  end
+end

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.11.0' unless defined?(Padrino::VERSION)
+  VERSION = '0.11.1' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/test_routing.rb

@@ -207,6 +207,14 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  should 'allow regex url with format' do
+    mock_app do
+      get(/.*/, :provides => :any) { "regexp" }
+    end
+    get "/anything"
+    assert_equal "regexp", body
+  end
+
   should 'use padrino url method' do
     mock_app do
     end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
+  prerelease: 
 platform: ruby
 authors:
 - Padrino Team
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,6 +65,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,6 +73,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,29 +81,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
 description: The Padrino core gem required for use of this framework
@@ -198,27 +211,31 @@ files:
 - test/test_support_lite.rb
 homepage: http://www.padrinorb.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -239546567818067895
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: The required Padrino core gem
 test_files:
 - test/fixtures/app_gem/Gemfile

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9f915e954014b964f9d5afccd9999d80cd888c05
-  data.tar.gz: 0f64be604ae666519fdd77d32413f9bdf4c32986
-SHA512:
-  metadata.gz: f5b45a55ece397aabf5c7e9d4c961a51edeaa882156962222a0b41d718e62c000fa301f954236fa1599d94e8f2e19109e538b775a2c651c94dfefabf6f187073
-  data.tar.gz: 7796c665daf7a323174e265e3fbc23d71cef98cc9ae1427cb0d5a3d18a3352fdd861fab8adb83308b01c6f4e2f7b1e3bd6ab372493b6032c43f41431dabbb15e