padrino-support 0.12.9 → 0.13.0.beta1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGY3ODIwZjBhNGE0NzYxMzg4ZmY3NTg2NTMxNzk0NzA3ZjE1YzU3OQ==
-  data.tar.gz: !binary |-
-    YzJmMGZjMGVjMTkyZDExMTdjMGU0MzgxMWY5MTk0MTRiYzBmYTAwMg==
+SHA1:
+  metadata.gz: 9da6927993084641e92a81874b6a571ab8ff46a2
+  data.tar.gz: 0b8c80b666d7f1586ceb9de720a3ff071677d52b
 SHA512:
-  metadata.gz: !binary |-
-    MzM0ZWRmMjU0OTY3NTlmNzYyODgzZGY0YjU2OWU3NTIwY2JhMWRhMWI5NGFk
-    YWExMzAzZmJkYjBjMWM0MmNjMjExMjFiNGRlZGRlOTM5ZDRlYjM4MTZkYjlk
-    NDEzZmMyNzFjNTEzZjI0Nzc2NDRjNWZiZGUxYjNkMmE2MDM4NTg=
-  data.tar.gz: !binary |-
-    Njk2ZWIzMmFhODAxYjk4MTI2MmViMWE4YzY3ODNhNzg1YzU5OGViZTE2ODVj
-    YzA3OTE5ZGYxNGY0MTQwNDk2MTBhMDE1Y2UxMzFiYWQxODliOGZiZDlhYmE1
-    NTFmZWViZGQ1NTdiODEzZDE0MDM2OGNhZTFlMmQxYjhkN2RkYWE=
+  metadata.gz: ec043e200f7a73bf4ee06a109af9e80eca022f5fc65ed180abaae2b7f811c37d87811e28b7bc855d5bc381ec775ebbe7c66f8422180be5307a801c32c8574bf1
+  data.tar.gz: 5323aca9c9a6baa6c64f8908274a61dc702c476e923ee784b7174ffb64be3496ef9fba41c84b15463cdab6211a05848ad5b04427f40481465810e54e40274e63

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

@@ -11,10 +11,21 @@ module ObjectSpace
     #    end
     #  end
     #
-    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)
+    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
     end
 
     ##
@@ -28,9 +39,11 @@ module ObjectSpace
     #   ObjectSpace.new_classes(snapshot)
     #
     def new_classes(snapshot)
-      warn 'Warning! ObjectSpace.new_classes will be removed in Padrino 0.14'
-      require 'padrino-core/reloader'
-      Padrino::Reloader::Storage.send(:new_classes, snapshot)
+      self.classes do |klass|
+        if !snapshot.include?(klass)
+          klass
+        end
+      end
     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.rb

@@ -1,6 +1,7 @@
 ##
 # 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]
@@ -13,7 +14,6 @@ require 'padrino-support/core_ext/string/inflections'
 require 'padrino-support/core_ext/string/colorize'
 require 'padrino-support/core_ext/object_space'
 require 'padrino-support/file_set'
-require 'padrino-support/utils'
 
 
 ##
@@ -29,5 +29,5 @@ end
 # In reloader for accessing class_name Foo._orig_klass_name
 #
 class Module
-  alias :_orig_klass_name :name
+  alias :_orig_klass_name :to_s
 end

data/test/test_support_lite.rb

@@ -0,0 +1,50 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-support
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.13.0.beta1
 platform: ruby
 authors:
 - Padrino Team
@@ -12,24 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4x
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4x
+        version: '3.1'
 description: A number of support methods and extensions for Padrino framework
 email: padrinorb@gmail.com
 executables: []
@@ -45,7 +43,6 @@ files:
 - lib/padrino-support/core_ext/object_space.rb
 - lib/padrino-support/core_ext/string/colorize.rb
 - lib/padrino-support/core_ext/string/inflections.rb
-- lib/padrino-support/core_ext/string/undent.rb
 - lib/padrino-support/file_set.rb
 - lib/padrino-support/locale/cs.yml
 - lib/padrino-support/locale/da.yml
@@ -68,11 +65,10 @@ 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_utils.rb
+- test/test_support_lite.rb
 homepage: http://www.padrinorb.com
 licenses:
 - MIT
@@ -84,18 +80,22 @@ 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
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-support
-rubygems_version: 2.6.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Support for padrino
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_colorize.rb
+- test/test_support_lite.rb
+has_rdoc: 

data/lib/padrino-support/core_ext/string/undent.rb

@@ -1,19 +0,0 @@
-##
-# Removes indentation
-#
-# @example
-#   help <<-EOS.undent
-#     Here my help usage
-#      sample_code
-#
-#     Fix
-#   EOS
-#   puts help.red.bold
-#
-class String
-  # Strip unnecessary indentation of the front of a string
-  def undent
-    warn "##{__method__} is deprecated"
-    gsub(/^.{#{slice(/^ +/).size}}/, '')
-  end
-end

data/lib/padrino-support/utils.rb

@@ -1,57 +0,0 @@
-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/test/test_utils.rb

@@ -1,114 +0,0 @@
-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