safe_intern 1.1.0 → 1.1.1

data/.travis.yml

@@ -1,4 +1,4 @@
-script:         rake spec
+script:  "rake spec && rake test_string"
 
 rvm:
   - 1.9.3

data/History.md

@@ -1,3 +1,12 @@
+1.1.1 (2014-04-05)
+------------------
+* Fixing bug in patched String class for Ruby 1.9.3
+* Optimizing code in patched String for Ruby >2.0.0
+
+1.1.0 (2014-04-04)
+------------------
+* Adding support for Ruby 1.9.3
+
 1.0.1 (2014-03-25)
 ------------------
 * Fixed Rakefile by adding dependencies

data/README.md

@@ -41,6 +41,10 @@ much more efficient than doing something like
 
     Symbol.all_symbols.map(&:to_s).include?(untrusted_string)
 
+This gem is also compatible with Ruby 1.9.3, where it falls back to enumerating
+all Symbols and caching the results. It is slightly more efficient than Ruby
+implementation, but still much slower than the implementation for Ruby 2.0.
+
 With the ability to query for known symbols, `intern` and `to_sym` methods can 
 be patched. There are two possible behaviours when called on unknown string:
 
@@ -104,7 +108,7 @@ This gem provides implementation of both in `SafeIntern::ExceptionPatch` and
       trusted_string.intern(:allow_unsafe)
 
 ## Requirements
-* [Ruby] >= 2.0.0
+* [Ruby] >= 1.9.3
 
 ## See also
 

data/Rakefile

@@ -13,6 +13,11 @@ Rake::ExtensionTask.new "symbol_defined"
 RSpec::Core::RakeTask.new
 task :spec => :compile
 
+desc 'Test patched String provided by SafeIntern'
+task :test_string => :compile do
+  system 'rspec spec/safe_intern/string_spec_man.rb'
+end
+
 # :rubocop task
 Rubocop::RakeTask.new
 

data/ext/symbol_defined/symbol_defined.c

@@ -61,8 +61,4 @@ void Init_symbol_defined()
 {
     cSafeIntern = rb_define_module("SafeIntern");
     rb_define_module_function(cSafeIntern, "symbol_defined?", symbol_defined, 1);
-
-#ifndef RUBY2
-    st_init_table_with_size(&cached_symbols, 1000);
-#endif
 }

data/lib/safe_intern/exception_patch.rb

@@ -6,19 +6,13 @@
 
 module SafeIntern
   module ExceptionPatch
-    def intern(allow_unsafe = nil)
-      if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
-        super()
-      else
-        fail UnsafeInternException
-      end
-    end
-
-    def to_sym(allow_unsafe = nil)
-      if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
-        super()
-      else
-        fail UnsafeInternException
+    %w(intern to_sym).each do |method|
+      define_method(method) do |allow_unsafe = nil|
+        if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
+          super()
+        else
+          fail UnsafeInternException
+        end
       end
     end
   end

data/lib/safe_intern/nil_patch.rb

@@ -6,19 +6,13 @@
 
 module SafeIntern
   module NilPatch
-    def intern(allow_unsafe = nil)
-      if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
-        super()
-      else
-        nil
-      end
-    end
-
-    def to_sym(allow_unsafe = nil)
-      if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
-        super()
-      else
-        nil
+    %w(intern to_sym).each do |method|
+      define_method(method) do |allow_unsafe = nil|
+        if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
+          super()
+        else
+          nil
+        end
       end
     end
   end

data/lib/safe_intern/string.rb

@@ -12,5 +12,20 @@ require 'safe_intern'
 # Usage: require 'safe_intern/string'
 #
 class ::String
-  prepend SafeIntern::ExceptionPatch
+  if RUBY_VERSION.start_with?('2')
+    prepend SafeIntern::ExceptionPatch
+
+  else
+    old_intern = instance_method(:intern)
+
+    %w(intern to_sym).each do |method|
+      define_method(method) do |allow_unsafe = nil|
+        if allow_unsafe == :allow_unsafe || SafeIntern.symbol_defined?(self)
+          old_intern.bind(self).call
+        else
+          fail UnsafeInternException
+        end
+      end
+    end
+  end
 end

data/safe_intern.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |gem|
   gem.name        = 'safe_intern'
-  gem.version     = '1.1.0'
-  gem.date        = '2014-03-25'
+  gem.version     = '1.1.1'
+  gem.date        = Date.today.to_s
   gem.summary     = 'Safe String#intern'
   gem.description = 'Safe implementation of String#intern'
   gem.authors     = ["Jan Rusnacko"]
@@ -12,8 +12,8 @@ Gem::Specification.new do |gem|
   gem.homepage    = 'https://github.com/jrusnack/safe_intern'
   gem.license     = 'MIT'
   gem.cert_chain  = ['certs/gem-jrusnack.pem']
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rake-compiler'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rake', '>= 10.0.0'
+  gem.add_development_dependency 'rake-compiler', '>= 0.9'
+  gem.add_development_dependency 'rspec', '>= 2.14'
+  gem.add_development_dependency 'rubocop', '>= 0'
 end

data/spec/safe_intern/exception_patch_spec.rb

@@ -8,10 +8,12 @@ require 'spec_helper'
 
 describe SafeIntern::ExceptionPatch do
   context 'intern' do
-    it_behaves_like 'safe-intern', SafeIntern::ExceptionPatch, :intern
+    rnd = rand(100_000).to_s.extend(SafeIntern::ExceptionPatch)
+    it_behaves_like 'safe-intern', SafeIntern::ExceptionPatch, :intern, rnd
   end
 
   context 'to_sym' do
-    it_behaves_like 'safe-intern', SafeIntern::ExceptionPatch, :to_sym
+    rnd = rand(100_000).to_s.extend(SafeIntern::ExceptionPatch)
+    it_behaves_like 'safe-intern', SafeIntern::ExceptionPatch, :to_sym, rnd
   end
 end

data/spec/safe_intern/nil_patch_spec.rb

@@ -8,10 +8,12 @@ require 'spec_helper'
 
 describe SafeIntern::NilPatch do
   context '#intern' do
-    it_behaves_like 'safe-intern', SafeIntern::NilPatch, :intern
+    rnd = rand(100_000).to_s.extend(SafeIntern::NilPatch)
+    it_behaves_like 'safe-intern', SafeIntern::NilPatch, :intern, rnd
   end
 
   context '#to_sym' do
-    it_behaves_like 'safe-intern', SafeIntern::NilPatch, :to_sym
+    rnd = rand(100_000).to_s.extend(SafeIntern::NilPatch)
+    it_behaves_like 'safe-intern', SafeIntern::NilPatch, :to_sym, rnd
   end
 end

data/spec/safe_intern/string_spec_man.rb

@@ -0,0 +1,37 @@
+# Copyright (C) 2014 Jan Rusnacko
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of the
+# MIT license.
+
+require 'spec_helper'
+
+# Run this file manually with:
+#
+#     rspec spec/safe_intern/string_spec_man.rb
+#
+# or with rake:
+#
+#     rake test_string
+#
+# This cannot be run by rspec along with the rest of the tests, because rspec
+# loads this file before running any tests. Upon loading, require loads patched
+# String class, which makes other testcases fail, as they extend singleton
+# classes of strings, when String class is patched already (so super() calls
+# patched methods of String class).
+#
+# For now, I don`t want to go into forking for just three testcases.
+
+describe 'String patched' do
+  require 'safe_intern/string'
+
+  context 'intern' do
+    rnd = rand(100_000).to_s
+    it_behaves_like 'safe-intern', SafeIntern::ExceptionPatch, :intern, rnd
+  end
+
+  context 'to_sym' do
+    rnd = rand(100_000).to_s
+    it_behaves_like 'safe-intern', SafeIntern::ExceptionPatch, :to_sym, rnd
+  end
+end

data/spec/safe_intern_helper.rb

@@ -4,7 +4,9 @@
 # modify, copy, or redistribute it subject to the terms and conditions of the
 # MIT license.
 
-shared_examples 'safe-intern' do |patch, method|
+# takes patch and method to test. nxstr is string that would result in new
+# symbol defined when intern is called on it
+shared_examples 'safe-intern' do |patch, method, nxstr|
   it 'should convert to Symbol if it already exists' do
     'Object'.extend(patch).send(method).should be_eql(:Object)
   end
@@ -12,18 +14,18 @@ shared_examples 'safe-intern' do |patch, method|
   it 'should not create new Symbol if it does not already exist' do
     case patch.name
     when 'SafeIntern::NilPatch'
-      'DoesNotExist'.extend(patch).send(method).should be_nil
+      nxstr.send(method).should be_nil
     when 'SafeIntern::ExceptionPatch'
-      expect { 'DoesNotExist'.extend(patch).send(method) }.to raise_error
+      expect { nxstr.send(method) }.to raise_error
     else
       fail
     end
-    Symbol.all_symbols.map(&:to_s).should_not include('DoesNotExist')
+    Symbol.all_symbols.map(&:to_s).should_not include(nxstr)
   end
 
   it 'should accept :allow_unsafe as optional parameter' do
-    rnd = rand(100_000).to_s
-    Symbol.all_symbols.map(&:to_s).should_not include(rnd)
-    rnd.extend(patch).send(method, :allow_unsafe).should be_eql(rnd.to_sym)
+    Symbol.all_symbols.map(&:to_s).should_not include(nxstr)
+    nxstr.intern(:allow_unsafe)
+    Symbol.all_symbols.map(&:to_s).should include(nxstr)
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: safe_intern
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Jan Rusnacko
@@ -9,62 +10,70 @@ autorequire:
 bindir: bin
 cert_chain:
 - certs/gem-jrusnack.pem
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Safe implementation of String#intern
@@ -74,8 +83,8 @@ extensions:
 - ext/symbol_defined/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - History.md
 - LICENSE
@@ -92,30 +101,32 @@ files:
 - safe_intern.gemspec
 - spec/safe_intern/exception_patch_spec.rb
 - spec/safe_intern/nil_patch_spec.rb
+- spec/safe_intern/string_spec_man.rb
 - spec/safe_intern_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jrusnack/safe_intern
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Safe String#intern
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: aee18090fdd063ac1c39176b72b319fb5afb83b0
-  data.tar.gz: 56868cfedd38626f90c81c3fe8a8956b62d343a0
-SHA512:
-  metadata.gz: c6da40ab4b1ee204193716b29277b00660400462761a2c70979387f0f651cee7e98714aaedc754b52980b3d8d0ff5df6f592d3378175e3846da119bb852493cf
-  data.tar.gz: f38721903a27577dc326ad868c01624d715e99b669b65bde829f30203e301ca5fc74c6ccbe11f74cff94bb59a884291bc734247127fe66f696bc998e14e9a516