padrino-core 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc93251e3aa682cd94a019446ab096a31f4365d
-  data.tar.gz: b7c3653e92dc92655372e0359422307d84122b19
+  metadata.gz: 851c38a957c7a3b50110244d3b5eb5691091f845
+  data.tar.gz: 131c5ba7f4a596a9079aab6d0571b7cc09eb408c
 SHA512:
-  metadata.gz: 54ff19551060bd54f259c55cf383ab8a39a737a4e31fa3ebd03dd44e2353a41dac726478ebfb42af22fc0a412abef9579e88e8d4adb240df6348fc943cba7f98
-  data.tar.gz: 54d8d4b3a35ffc91e16180b342fdcc8d04d043eb085f2e0e52bb88ee9b4ec3cbee00c9a016e6a972b29951abf772ac0ff6381e7abc7cd72ddf18484ff9abe1dd
+  metadata.gz: ae1ff61464492c25cbb92ee965631a3ed05430f51df3a5431cbd6763c39c4d262c5a9ca0ec92bb8661fe5c9194a8f912414771773b47d02f322a2a0e9fd46437
+  data.tar.gz: 4b37b25021834707ed9b6c267345538b3a2073e428175fe4b0620e3825d167eb0c973ea058e58590e4f223272defb1ec4b254caca66a541d15ae8e0840b36e1d

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

@@ -507,7 +507,7 @@ module Padrino
         path, *route_options[:with] = path if path.is_a?(Array)
         action = path
         path, name, route_parents, options, route_options = *parse_route(path, route_options, verb)
-        options.reverse_merge!(@_conditions) if @_conditions
+        options = @_conditions.merge(options) if @_conditions
 
         method_name = "#{verb} #{path}"
         unbound_method = generate_method(method_name, &block)
@@ -656,8 +656,7 @@ module Padrino
           name = "#{controller_name} #{name}".to_sym unless controller_name.blank?
         end
 
-        # Merge in option defaults.
-        options.reverse_merge!(:default_values => @_defaults)
+        options[:default_values] = @_defaults unless options.has_key?(:default_values)
 
         [path, name, parent_params, options, route_options]
       end

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

@@ -10,7 +10,15 @@ end
 
 module PadrinoTasks
   def self.init(init=false)
-    $LOAD_PATH.unshift(File.expand_path("lib"))
+    lib_path = File.expand_path("lib")
+    unless $LOAD_PATH.any?{ |path| File.expand_path(path) == lib_path }
+      warn <<-EOT
+WARNING! In Padrino >= 0.14.0 cli command `padrino rake` will NOT add
+'./lib' folder to $LOAD_PATH. Please alter your `require` calls accordingly
+if you depend on this behavior.
+      EOT
+      $LOAD_PATH.unshift lib_path
+    end
     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__))
     Rake.application.load_imports

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

@@ -65,7 +65,7 @@ end
 
 Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
   begin
-    load(file)
+    load(File.expand_path(file))
   rescue LoadError => e
     warn "#{file}: #{e.message}"
   end

data/lib/padrino-core/ext/sinatra.rb

@@ -13,17 +13,3 @@ class Sinatra::Request
     route_obj && route_obj.action
   end
 end
-
-##
-# This patches Sinatra to accept UTF-8 urls on JRuby 1.7.6
-#
-if RUBY_ENGINE == 'jruby' && defined?(JRUBY_VERSION) && JRUBY_VERSION > '1.7.4'
-  class Sinatra::Base
-    class << self
-      alias_method :old_generate_method, :generate_method
-      def generate_method(method_name, &block)
-        old_generate_method(method_name.to_sym, &block)
-      end
-    end
-  end
-end

data/lib/padrino-core/logger.rb

@@ -73,7 +73,7 @@ module Padrino
             bench(args[0], args[1], args[2], name)
           else
             if location = resolve_source_location(caller(1).shift)
-              args.prepend(location)
+              args.unshift(location)
             end if enable_source_location?
             push(args * '', name)
           end
@@ -385,6 +385,12 @@ module Padrino
     # @option options [Symbol] :colorize_logging (true)
     #   Whether or not to colorize log messages. Defaults to: true.
     #
+    # @option options [Symbol] :sanitize_encoding (false)
+    #   Logger will replace undefined or broken characters with
+    #   “uFFFD” for Unicode and “?” otherwise.
+    #   Can be an encoding, false or true.
+    #   If it's true, logger sanitizes to Encoding.default_external.
+    #
     def initialize(options={})
       @buffer           = []
       @auto_flush       = options.has_key?(:auto_flush) ? options[:auto_flush] : true
@@ -396,6 +402,8 @@ module Padrino
       @log_static       = options.has_key?(:log_static) ? options[:log_static] : false
       @colorize_logging = options.has_key?(:colorize_logging) ? options[:colorize_logging] : true
       @source_location  = options[:source_location]
+      @sanitize_encoding = options[:sanitize_encoding] || false
+      @sanitize_encoding = Encoding.default_external if @sanitize_encoding == true
       colorize! if @colorize_logging
     end
 
@@ -407,10 +415,12 @@ module Padrino
     # Flush the entire buffer to the log object.
     #
     def flush
-      puts @buffer.size if $l
       return unless @buffer.size > 0
       @@mutex.synchronize do
-        @log.write(@buffer.join(''))
+        @buffer.each do |line|
+          line.encode!(@sanitize_encoding, :invalid => :replace, :undef => :replace) if @sanitize_encoding
+          @log.write(line)
+        end
         @buffer.clear
       end
     end

data/lib/padrino-core/path_router.rb

@@ -56,18 +56,18 @@ module Padrino
       #
       def path(name, *args)
         params = args.extract_options!
-        @routes.each do |route|
-          next unless route.name == name
-          matcher = route.matcher
-          params_for_expand = params.dup
-          if !args.empty? && matcher.mustermann?
-            matcher.names.each_with_index do |matcher_name, index|
-              params_for_expand[matcher_name.to_sym] ||= args[index]
-            end
+        candidates = @routes.select { |route| route.name == name }
+        fail InvalidRouteException if candidates.empty?
+        route = candidates.sort_by! { |route|
+          (params.keys.map(&:to_s) - route.matcher.names).length }.shift
+        matcher = route.matcher
+        params_for_expand = params.dup
+        if !args.empty? && matcher.mustermann?
+          matcher.names.each_with_index do |matcher_name, index|
+            params_for_expand[matcher_name.to_sym] ||= args[index]
           end
-          return matcher.mustermann? ? matcher.expand(params_for_expand) : route.path_for_generation
         end
-        fail InvalidRouteException
+        matcher.mustermann? ? matcher.expand(params_for_expand) : route.path_for_generation
       end
 
       ##

data/lib/padrino-core/path_router/route.rb

@@ -105,6 +105,15 @@ module Padrino
         matcher.expand(params) if matcher.mustermann?
       end
 
+      ##
+      # Overwrites path value by passing new path string.
+      #
+      def path=(pattern)
+        @path = pattern
+        @matcher = nil
+        @significant_variable_names = nil
+      end
+
       ##
       # Returns parameters which is created by the matcher.
       #

data/lib/padrino-core/reloader.rb

@@ -73,8 +73,9 @@ module Padrino
     # We lock dependencies sets to prevent reloading of protected constants
     #
     def lock!
-      klasses = ObjectSpace.classes do |klass|
-        klass._orig_klass_name.split('::').first
+      klasses = Storage.send(:object_classes) do |klass|
+        original_klass_name = klass._orig_klass_name
+        original_klass_name.split('::').first if original_klass_name
       end
       klasses |= Padrino.mounted_apps.map(&:app_class)
       exclude_constants.merge(klasses)

data/lib/padrino-core/reloader/storage.rb

@@ -22,7 +22,7 @@ module Padrino
         file = remove(name)
         @old_entries ||= {}
         @old_entries[name] = {
-          :constants => ObjectSpace.classes,
+          :constants => object_classes,
           :features  => old_features = Set.new($LOADED_FEATURES.dup)
         }
         features = file && file[:features] || []
@@ -32,7 +32,7 @@ module Padrino
 
       def commit(name)
         entry = {
-          :constants => ObjectSpace.new_classes(@old_entries[name][:constants]),
+          :constants => new_classes(@old_entries[name][:constants]),
           :features  => Set.new($LOADED_FEATURES) - @old_entries[name][:features] - [name]
         }
         files[name] = entry
@@ -40,7 +40,7 @@ module Padrino
       end
 
       def rollback(name)
-        new_constants = ObjectSpace.new_classes(@old_entries[name][:constants])
+        new_constants = new_classes(@old_entries[name][:constants])
         new_constants.each{ |klass| Reloader.remove_constant(klass) }
         @old_entries.delete(name)
       end
@@ -50,6 +50,34 @@ module Padrino
       def files
         @files ||= {}
       end
+
+      ##
+      # Returns all the classes in the object space.
+      #
+      def object_classes
+        klasses = Set.new
+
+        ObjectSpace.each_object(Class).each do |klass|
+          if block_given?
+            if filtered_class = yield(klass)
+              klasses << filtered_class
+            end
+          else
+            klasses << klass
+          end
+        end
+
+        klasses
+      end
+
+      ##
+      # Returns a list of object space classes that are not included in "snapshot".
+      #
+      def new_classes(snapshot)
+        object_classes do |klass|
+          snapshot.include?(klass) ? nil : klass
+        end
+      end
     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.13.1' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.2' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/helper.rb

@@ -9,6 +9,7 @@ require 'builder'
 require 'rack/test'
 require 'yaml'
 require 'padrino-core'
+require 'tilt/haml'
 
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'

data/test/test_logger.rb

@@ -82,12 +82,27 @@ describe "PadrinoLogger" do
       assert_match /log via alias/, @log.string
     end
 
-    it 'should not blow up on mixed or broken encoodings' do
-      skip
+    it 'should not blow up on mixed or broken encodings' do
       setup_logger(:log_level => :error, :auto_flush => false)
-      @logger.error "\xD0".force_encoding('BINARY')
-      @logger << 'фыв'
+      binary_data = "\xD0".force_encoding('BINARY')
+      utf8_data = 'фыв'
+      @logger.error binary_data
+      @logger.error utf8_data
       @logger.flush
+      assert @log.string.include?(utf8_data)
+      assert @log.string.force_encoding('BINARY').include?(binary_data)
+    end
+
+    it 'should sanitize mixed or broken encodings if said so' do
+      encoding = 'windows-1251'
+      setup_logger(:log_level => :error, :auto_flush => false, :sanitize_encoding => encoding)
+      @log.string.encode! encoding
+      binary_data = "\xD0".force_encoding('BINARY')
+      utf8_data = 'фыв'
+      @logger.error binary_data
+      @logger.error utf8_data
+      @logger.flush
+      assert_match /\?.*фыв/m, @log.string.encode(Encoding.default_external)
     end
 
     it 'should log an application' do

data/test/test_routing.rb

@@ -85,6 +85,17 @@ describe "Routing" do
     assert_equal "tester", body
   end
 
+  it 'should recognize route even if paths are duplicated' do
+    mock_app do
+      get(:index) {}
+      get(:index, :with => :id) {}
+      get(:index, :with => :id, :provides => :json) {}
+    end
+    assert_equal "/", @app.url_for(:index)
+    assert_equal "/1234", @app.url_for(:index, :id => "1234")
+    assert_equal "/1234.json?baz=baz", @app.url_for(:index, :id => "1234", :format => "json", :baz => "baz")
+  end
+
   it 'should fail with unrecognized route exception when not found' do
     mock_app do
       get(:index){ "okey" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,82 +19,82 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: mustermann19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 description: The Padrino core gem required for use of this framework
@@ -105,9 +105,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -168,7 +168,6 @@ files:
 - test/fixtures/apps/external_apps/fake_root.rb
 - test/fixtures/apps/helpers/class_methods_helpers.rb
 - test/fixtures/apps/helpers/instance_methods_helpers.rb
-- test/fixtures/apps/helpers/support.rb
 - test/fixtures/apps/helpers/system_helpers.rb
 - test/fixtures/apps/kiq.rb
 - test/fixtures/apps/lib/myklass.rb
@@ -220,17 +219,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
@@ -257,7 +256,6 @@ test_files:
 - test/fixtures/apps/external_apps/fake_root.rb
 - test/fixtures/apps/helpers/class_methods_helpers.rb
 - test/fixtures/apps/helpers/instance_methods_helpers.rb
-- test/fixtures/apps/helpers/support.rb
 - test/fixtures/apps/helpers/system_helpers.rb
 - test/fixtures/apps/kiq.rb
 - test/fixtures/apps/lib/myklass.rb

data/test/fixtures/apps/helpers/support.rb

@@ -1 +0,0 @@
-require 'active_support/logger_silence'