padrino-support 0.12.8.1 → 0.12.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7d4c38bd1047d192488330f5631043350e67fd79
-  data.tar.gz: 0cc09985afeba92a48f168042a722cdf974bd6ba
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGY3ODIwZjBhNGE0NzYxMzg4ZmY3NTg2NTMxNzk0NzA3ZjE1YzU3OQ==
+  data.tar.gz: !binary |-
+    YzJmMGZjMGVjMTkyZDExMTdjMGU0MzgxMWY5MTk0MTRiYzBmYTAwMg==
 SHA512:
-  metadata.gz: 1f8011e19c55265eb317e0a4b2049300a59fc8e0854fec51544b3d6bcc122fb951e064821680421cb4f6a137333522b4a82b508687e303cbd644a6e12b0802ad
-  data.tar.gz: 1f773e5a7f31f237ba6d972ee5fff31977b68e09b805fd276fa784a5ca26996a9440de81d49c4e3f3ef2dd8470be441f1bc0fed2eb32476600b3cfb904f7ba6c
+  metadata.gz: !binary |-
+    MzM0ZWRmMjU0OTY3NTlmNzYyODgzZGY0YjU2OWU3NTIwY2JhMWRhMWI5NGFk
+    YWExMzAzZmJkYjBjMWM0MmNjMjExMjFiNGRlZGRlOTM5ZDRlYjM4MTZkYjlk
+    NDEzZmMyNzFjNTEzZjI0Nzc2NDRjNWZiZGUxYjNkMmE2MDM4NTg=
+  data.tar.gz: !binary |-
+    Njk2ZWIzMmFhODAxYjk4MTI2MmViMWE4YzY3ODNhNzg1YzU5OGViZTE2ODVj
+    YzA3OTE5ZGYxNGY0MTQwNDk2MTBhMDE1Y2UxMzFiYWQxODliOGZiZDlhYmE1
+    NTFmZWViZGQ1NTdiODEzZDE0MDM2OGNhZTFlMmQxYjhkN2RkYWE=

data/Rakefile

@@ -1,5 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/lib/padrino-support/core_ext/object_space.rb

@@ -11,21 +11,10 @@ module ObjectSpace
     #    end
     #  end
     #
-    def classes
-      rs = Set.new
-
-      ObjectSpace.each_object(Class).each do |klass|
-        if block_given?
-          if r = yield(klass)
-            # add the returned value if the block returns something
-            rs << r
-          end
-        else
-          rs << klass
-        end
-      end
-
-      rs
+    def classes(&block)
+      warn 'Warning! ObjectSpace.classes will be removed in Padrino 0.14'
+      require 'padrino-core/reloader'
+      Padrino::Reloader::Storage.send(:object_classes, &block)
     end
 
     ##
@@ -39,11 +28,9 @@ module ObjectSpace
     #   ObjectSpace.new_classes(snapshot)
     #
     def new_classes(snapshot)
-      self.classes do |klass|
-        if !snapshot.include?(klass)
-          klass
-        end
-      end
+      warn 'Warning! ObjectSpace.new_classes will be removed in Padrino 0.14'
+      require 'padrino-core/reloader'
+      Padrino::Reloader::Storage.send(:new_classes, snapshot)
     end
   end
 end

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

@@ -4,7 +4,7 @@ de:
       # Benutze die strftime Parameter für die Formatierung
       # Wenn keine Formate angegeben werden, wird "default" benutzt.
       # Du kannst auch weitere Formate hinzufügen, wenn Du möchtest.
-      default: "&d.&m.%Y"
+      default: "%d.%m.%Y"
       short: "%d. %b"
       long: "%d. %B %Y"
       only_day: "%e"

data/lib/padrino-support/utils.rb

@@ -0,0 +1,57 @@
+require 'cgi'
+
+module Padrino
+  module Utils
+    extend self
+
+    ##
+    # Builds an URI query from a Hash or any Object.
+    #
+    # Examples (~ marks here that output is actually escaped by CGI):
+    #
+    #   Utils.build_uri_query(:a => 1, :b => 2)           #=> "a=1&b=2"
+    #   Utils.build_uri_query(:a => [1, 2])               #=> ~"a[]=1&a[]=2"
+    #   Utils.build_uri_query([1, 2], 'namespace')        #=> ~"namespace[]=1&namespace[]=2"
+    #   Utils.build_uri_query(:a => { :d => 2 }, :b => 3) #=> ~"a[d]=2&b=3"
+    #
+    def build_uri_query(object, namespace = nil)
+      case object
+      when Hash
+        object.map do |key, value|
+          next if value == {} || value == []
+          build_uri_query(value, namespace ? "#{namespace}[#{key}]" : key)
+        end.compact.join('&')
+      when Array
+        fail ArgumentError, 'namespace is missing' unless namespace
+        (object.empty? ? [''] : object).map do |value|
+          build_uri_query(value, "#{namespace}[]")
+        end.join('&')
+      else
+        fail ArgumentError, 'namespace is missing' unless namespace
+        "#{CGI.escape(namespace.to_s)}=#{CGI.escape(object.to_s)}"
+      end
+    end
+
+    ##
+    # Recursively duplicates the passed object.
+    #
+    def deep_dup(object)
+      case object
+      when Array
+        object.map{ |value| deep_dup(value) }
+      when Hash
+        object.each_with_object(object.dup.clear) do |(key, value), new_hash|
+          new_hash[deep_dup(key)] = deep_dup(value)
+        end
+      when NilClass, FalseClass, TrueClass, Symbol, Numeric, Method
+        object
+      else
+        begin
+          object.dup
+        rescue TypeError
+          object
+        end
+      end
+    end
+  end
+end

data/lib/padrino-support.rb

@@ -1,7 +1,6 @@
 ##
 # This file loads certain extensions required by Padrino from ActiveSupport.
 #
-require 'active_support/core_ext/module/aliasing'           # alias_method_chain
 require 'active_support/core_ext/hash/reverse_merge'        # reverse_merge
 require 'active_support/core_ext/hash/keys'                 # symbolize_keys
 require 'active_support/core_ext/hash/indifferent_access'   # params[:foo]
@@ -12,9 +11,9 @@ require 'active_support/core_ext/string/output_safety'      # SafeBuffer and htm
 
 require 'padrino-support/core_ext/string/inflections'
 require 'padrino-support/core_ext/string/colorize'
-require 'padrino-support/core_ext/string/undent' # deprecated
 require 'padrino-support/core_ext/object_space'
 require 'padrino-support/file_set'
+require 'padrino-support/utils'
 
 
 ##

data/test/helper.rb

@@ -1,7 +1,6 @@
 ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
 
-require File.expand_path('../../../load_paths', __FILE__)
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'padrino-support'

data/test/test_utils.rb

@@ -0,0 +1,114 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class MiniTest::Spec
+  def assert_query_equal(expected, actual, namespace=nil)
+    assert_equal expected.split('&').sort, Padrino::Utils.build_uri_query(actual, namespace).split('&').sort
+  end
+end
+
+describe 'Padrino::Utils.build_uri_query' do
+  it 'should do simple conversion' do
+    assert_query_equal 'a=10', :a => 10
+  end
+
+  it 'should do cgi escaping' do
+    assert_query_equal 'a%3Ab=c+d', 'a:b' => 'c d'
+  end
+
+  it 'should expand nested hashes' do
+    assert_query_equal 'person%5Blogin%5D=seckar&person%5Bname%5D=Nicholas',
+      :person => { :login => 'seckar', :name => 'Nicholas' }
+  end
+
+  it 'should expand deeply nested hashes' do
+    assert_query_equal 'account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10',
+      { :account => { :person => { :id => 20 } }, :person => {:id => 10} }
+  end
+
+  it 'should accept arrays' do
+    assert_query_equal 'person%5Bid%5D%5B%5D=10&person%5Bid%5D%5B%5D=20',
+      :person => {:id => [10, 20]}
+  end
+
+  it 'should accept empty arrays' do
+    assert_query_equal "person%5B%5D=",
+      [],
+      'person'
+  end
+
+  it 'should expand nested hashes' do
+    assert_query_equal '',
+      {}
+    assert_query_equal 'a=1&b%5Bc%5D=3',
+      { a: 1, b: { c: 3, d: {} } }
+    assert_query_equal '',
+      { a: {b: {c: {}}} }
+    assert_query_equal 'b%5Bc%5D=false&b%5Be%5D=&b%5Bf%5D=&p=12',
+      { p: 12, b: { c: false, e: nil, f: '' } }
+    assert_query_equal 'b%5Bc%5D=3&b%5Bf%5D=',
+      { b: { c: 3, k: {}, f: '' } }
+    assert_query_equal 'b=3',
+      {a: [], b: 3}
+  end
+
+  it 'should accept namespace for hashes' do
+    assert_query_equal "user%5Bname%5D=Nakshay&user%5Bnationality%5D=Indian", 
+      { name: 'Nakshay', nationality: 'Indian' },
+      'user'
+  end
+end
+
+describe 'Padrino::Utils.deep_dup' do
+  it 'should recursively dup array' do
+    array = [1, [2, 3]]
+    dup = Padrino::Utils.deep_dup(array)
+    dup[1][2] = 4
+    assert_equal nil, array[1][2]
+    assert_equal 4, dup[1][2]
+  end
+
+  it 'should recursively dup hash' do
+    hash = { :a => { :b => 'b' } }
+    dup = Padrino::Utils.deep_dup(hash)
+    dup[:a][:c] = 'c'
+    assert_equal nil, hash[:a][:c]
+    assert_equal 'c', dup[:a][:c]
+  end
+
+  it 'should recursively dup array with hash' do
+    array = [1, { :a => 2, :b => 3 } ]
+    dup = Padrino::Utils.deep_dup(array)
+    dup[1][:c] = 4
+    assert_equal nil, array[1][:c]
+    assert_equal 4, dup[1][:c]
+  end
+
+  it 'should recursively dup hash with array' do
+    hash = { :a => [1, 2] }
+    dup = Padrino::Utils.deep_dup(hash)
+    dup[:a][2] = 'c'
+    assert_equal nil, hash[:a][2]
+    assert_equal 'c', dup[:a][2]
+  end
+
+  it 'should dup initial hash values' do
+    zero_hash = Hash.new 0
+    hash = { :a => zero_hash }
+    dup = Padrino::Utils.deep_dup(hash)
+    assert_equal 0, dup[:a][44]
+  end
+
+  it 'should properly dup objects' do
+    object = Object.new
+    dup = Padrino::Utils.deep_dup(object)
+    dup.instance_variable_set(:@a, 1)
+    assert !object.instance_variable_defined?(:@a)
+    assert dup.instance_variable_defined?(:@a)
+  end
+
+  it 'should not double the frozen keys' do
+    hash = { Fixnum => 1 }
+    dup = Padrino::Utils.deep_dup(hash)
+    assert_equal 1, dup.keys.length
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-support
 version: !ruby/object:Gem::Version
-  version: 0.12.8.1
+  version: 0.12.9
 platform: ruby
 authors:
 - Padrino Team
@@ -12,31 +12,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: !binary |-
+          My4x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: !binary |-
+          My4x
 description: A number of support methods and extensions for Padrino framework
 email: padrinorb@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".yardopts"
+- .document
+- .gitignore
+- .yardopts
 - LICENSE.txt
 - Rakefile
 - lib/padrino-support.rb
@@ -66,32 +68,33 @@ files:
 - lib/padrino-support/locale/uk.yml
 - lib/padrino-support/locale/zh_cn.yml
 - lib/padrino-support/locale/zh_tw.yml
+- lib/padrino-support/utils.rb
 - padrino-support.gemspec
 - test/helper.rb
 - test/test_colorize.rb
-- test/test_support_lite.rb
+- test/test_utils.rb
 homepage: http://www.padrinorb.com
 licenses:
 - MIT
 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: []
 rubyforge_project: padrino-support
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Support for padrino

data/test/test_support_lite.rb

@@ -1,50 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-describe "ObjectSpace" do
-  describe "#classes" do
-    it 'should take an snapshot of the current loaded classes' do
-      snapshot = ObjectSpace.classes
-      assert_equal snapshot.include?(Padrino::Logger), true
-    end
-
-    it 'should return a Set object' do
-      snapshot = ObjectSpace.classes
-      assert_equal snapshot.kind_of?(Set), true
-    end
-
-    it 'should be able to process a the class name given a block' do
-      klasses = ObjectSpace.classes do |klass|
-        if klass.name =~ /^Padrino::/
-          klass
-        end
-      end
-
-      assert_equal (klasses.size > 1), true
-      klasses.each do |klass|
-        assert_match /^Padrino::/, klass.to_s
-      end
-    end
-  end
-
-  describe "#new_classes" do
-    before do
-      @snapshot = ObjectSpace.classes
-    end
-
-    it 'should return list of new classes' do
-      class OSTest; end
-      module OSTestModule; class B; end; end
-
-      new_classes = ObjectSpace.new_classes(@snapshot)
-
-      assert_equal new_classes.size, 2
-      assert_equal new_classes.include?(OSTest), true
-      assert_equal new_classes.include?(OSTestModule::B), true
-    end
-
-    it 'should return a Set object' do
-      new_classes = ObjectSpace.new_classes(@snapshot)
-      assert_equal new_classes.kind_of?(Set), true
-    end
-  end
-end