RubyGems - walters - Versions diffs - 0.0.1 → 0.1.0 - Mend

walters 0.0.1 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

data/LICENSE +1 -15
data/README.md +37 -5
data/Rakefile +65 -0
data/lib/walters/html/cgi.rb +12 -0
data/lib/walters/html/erb.rb +13 -0
data/lib/walters/html/haml.rb +10 -0
data/lib/walters/html/html_safety.rb +19 -0
data/lib/walters/html/rack.rb +11 -0
data/lib/walters/javascript/action_view.rb +11 -0
data/lib/walters/version.rb +1 -1
data/lib/walters/walters.rb +22 -86
data/lib/walters/walters_xni.rb +109 -0
data/spec/spec_helper.rb +8 -0
data/spec/walters/html_escape_spec.rb +58 -0
data/spec/walters/javascript_escape_spec.rb +49 -0
data/walters.gemspec +2 -2
data/{ext → xni-ext}/Rakefile +1 -1
data/{ext → xni-ext}/houdini/buffer.c +0 -0
data/{ext → xni-ext}/houdini/buffer.h +0 -0
data/{ext → xni-ext}/houdini/houdini.h +0 -0
data/{ext → xni-ext}/houdini/houdini_href_e.c +0 -0
data/{ext → xni-ext}/houdini/houdini_html_e.c +0 -0
data/{ext → xni-ext}/houdini/houdini_html_u.c +0 -0
data/{ext → xni-ext}/houdini/houdini_js_e.c +0 -0
data/{ext → xni-ext}/houdini/houdini_js_u.c +0 -0
data/{ext → xni-ext}/houdini/houdini_uri_e.c +0 -0
data/{ext → xni-ext}/houdini/houdini_uri_u.c +0 -0
data/{ext → xni-ext}/houdini/houdini_xml_e.c +0 -0
data/{ext → xni-ext}/houdini/html_unescape.h +0 -0
data/{ext → xni-ext}/walters.cpp +19 -1
data/{ext → xni-ext}/walters_buffer.cpp +19 -1
data/{ext/x86_64-darwin/__xni_walters.cpp → xni-ext/x86_64-darwin/__xni_walters_xni.cpp} +1 -1
data/{ext/x86_64-darwin/walters.h → xni-ext/x86_64-darwin/walters_xni.h} +3 -3
metadata +30 -20

data/LICENSE CHANGED Viewed

@@ -11,18 +11,4 @@
   limitations under the License.
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+  This software also contains code licensed under the GNU General Public License version 2 with a linking exception.

data/README.md CHANGED Viewed

@@ -1,10 +1,11 @@
 walters [![Build Status](https://travis-ci.org/wmeissner/walters.png)](https://travis-ci.org/wmeissner/walters)
 ======
-[Walters](https://github.com/wmeissner/walters) is a JRuby wrapper for the [Houdini](https://github.com/vmg/houdini)
-html escaping library
+[Walters](https://github.com/wmeissner/walters) is a fast HTML (and href, uri, xml, javascript) escaping library for JRuby.
-##### Example usage
+It is optimised for the non-escaping case - i.e. where the input string contains no characters requiring escaping.
+### Example usage
     jruby-1.7.4.dev :001 > require 'walters'
      => true
@@ -12,9 +13,40 @@ html escaping library
      => "&lt;html&gt;"
-The same extension can be used from the legacy CRuby VM as well (aka MRI)
+The same extension can also be used from the legacy CRuby VM for compatibility.
     2.0.0p0 :001 > require 'walters'
      => true
     2.0.0p0 :002 > Walters.escape_html('<html>')
-     => "&lt;html&gt;"
+     => "&lt;html&gt;"
+### Benchmarks
+Escaping 1000 bytes of text requiring escaping 1000000 times under jruby-1.7.4:
+                                user     system      total        real
+    Rack::Utils.escape_html    89.980000   0.230000  90.210000 ( 90.272000)
+    Haml::Helpers.html_escape  50.420000   0.170000  50.590000 ( 51.147000)
+    ERB::Util.html_escape      44.650000   0.130000  44.780000 ( 45.518000)
+    CGI.escapeHTML             36.230000   0.090000  36.320000 ( 36.358000)
+    String#gsub                35.490000   0.090000  35.580000 ( 35.587000)
+    Walters.escape_html        10.090000   0.030000  10.120000 ( 10.126000)
+Escaping 1000 bytes of html-free text 1000000 times under jruby-1.7.4:
+                               user     system      total        real
+    Rack::Utils.escape_html     3.530000   0.010000   3.540000 (  3.601000)
+    Haml::Helpers.html_escape   4.140000   0.010000   4.150000 (  4.196000)
+    ERB::Util.html_escape      11.710000   0.030000  11.740000 ( 11.876000)
+    CGI.escapeHTML              3.440000   0.010000   3.450000 (  3.548000)
+    String#gsub                 3.470000   0.000000   3.470000 (  3.531000)
+    Walters.escape_html         0.660000   0.010000   0.670000 (  0.663000)
+### Punching ducks
+There are monkey-patching shims supplied that replace common html escaping functions with calls to the Walters escape_html function.
+e.g. to patch Rack::Utils.escape_html to use Walters.escape_html:
+    require 'walters/html/rack'
+### Credits
+The escaping routines are based on C code from the [Houdini](https://github.com/vmg/houdini) project, and the specs, benchmarks and monkey patches come from the [escape_utils](https://github.com/brianmario/escape_utils) project

data/Rakefile CHANGED Viewed

@@ -1,6 +1,71 @@
 require 'rake/clean'
+require 'rubygems/package_task'
 require 'rubygems/tasks'
+def gem_spec
+  @gem_spec ||= Gem::Specification.load('walters.gemspec')
+end
+TEST_DEPS = []
+if defined?(JRUBY_VERSION)
+  require 'ant'
+  jar_file = 'lib/walters/walters_ext.jar'
+  CLEAN.include jar_file
+  TEST_DEPS << jar_file
+  gem_spec.files << jar_file
+  directory 'pkg/classes'
+  CLEAN.include 'pkg/classes'
+  desc 'Compile the JRuby extension'
+  task :compile => FileList['pkg/classes', 'jruby-ext/src/**/*.java'] do |t|
+    ant.javac :srcdir => 'jruby-ext/src', :destdir => t.prerequisites.first,
+              :source => '1.6', :target => '1.6', :debug => true, :includeantruntime => false,
+              :classpath => '${java.class.path}:${sun.boot.class.path}'
+  end
+  desc 'Build the jar'
+  file jar_file => :compile do |t|
+    ant.jar :basedir => 'pkg/classes', :destfile => t.name, :includes => '**/*.class'
+  end
+  task :jar => jar_file
+end
 Gem::Tasks.new do |t|
   t.scm.tag.format = '%s'
 end
+task :specs do
+  sh %{#{Gem.ruby} -w -Ilib -S rspec spec}
+end
+namespace 'java' do
+  java_gem_spec = Gem::Specification.new do |s|
+    s.name = gem_spec.name
+    s.version = gem_spec.version
+    s.author = gem_spec.author
+    s.email = gem_spec.email
+    s.homepage = gem_spec.homepage
+    s.summary = gem_spec.summary
+    s.description = gem_spec.description
+    s.files = %w(LICENSE LICENSE-EscapeUtils.txt LICENSE-houdini.txt README.md Rakefile)
+    s.files << Dir['{lib,spec,benchmark}/**/*.rb']
+    s.files << 'lib/walters/walters_ext.jar'
+    s.has_rdoc = false
+    s.license = gem_spec.license
+    s.platform = 'java'
+  end
+  Gem::PackageTask.new(java_gem_spec) do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+    pkg.package_dir = 'pkg'
+  end
+  task :gem => 'lib/walters/walters_ext.jar'
+end
+task 'gem:java' => 'java:gem'

data/lib/walters/html/cgi.rb ADDED Viewed

@@ -0,0 +1,12 @@
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+require_relative 'html_safety'
+module CGI
+  extend ::Walters::HtmlSafety
+  extend ::Walters::HtmlUnescape
+  class << self
+    alias escapeHTML walters_escape_html
+    alias unescapeHTML walters_unescape_html
+  end
+end

data/lib/walters/html/erb.rb ADDED Viewed

@@ -0,0 +1,13 @@
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+require_relative 'html_safety'
+class ERB
+  module Util
+    include ::Walters::HtmlSafety
+    alias html_escape walters_escape_html
+    alias h html_escape
+    module_function :h
+    module_function :html_escape
+  end
+end

data/lib/walters/html/haml.rb ADDED Viewed

@@ -0,0 +1,10 @@
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+require_relative 'html_safety'
+module Haml
+  module Helpers
+    include ::Walters::HtmlSafety
+    alias html_escape walters_escape_html
+  end
+end

data/lib/walters/html/html_safety.rb ADDED Viewed

@@ -0,0 +1,19 @@
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+require 'walters'
+module Walters
+  module HtmlSafety
+    if ''.respond_to? :html_safe?
+      def walters_escape_html(s)
+        if s.html_safe?
+          s.to_s.html_safe
+        else
+          Walters.escape_html(s).html_safe
+        end
+      end
+    else
+      include ::Walters::HtmlEscape
+    end
+  end
+end

data/lib/walters/html/rack.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+require_relative 'html_safety'
+module Rack
+  module Utils
+    include ::Walters::HtmlSafety
+    alias escape_html walters_escape_html
+    module_function :escape_html
+  end
+end

data/lib/walters/javascript/action_view.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+require 'walters'
+module ActionView
+  module Helpers
+    module JavaScriptHelper
+      include ::Walters::JavaScriptEscape
+      alias escape_javascript walters_escape_javascript
+    end
+  end
+end

data/lib/walters/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Walters
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/walters/walters.rb CHANGED Viewed

@@ -1,87 +1,23 @@
-require 'xni'
-module Walters
-  extend XNI::Extension
-  extension 'walters'
-  class Buffer < XNI::DataObject
-    custom_finalizer
-    native :initialize, [ :uint ], :void
-    native :cstring, [], :cstring
-    native :escape_html, [ :cstring, :uint], :bool
-    native :escape_html0, [ :cstring, :uint, :bool ], :bool
-    native :unescape_html, [ :cstring, :uint], :bool
-    native :escape_xml, [ :cstring, :uint], :bool
-    native :escape_uri, [ :cstring, :uint], :bool
-    native :escape_url, [ :cstring, :uint], :bool
-    native :escape_href, [ :cstring, :uint], :bool
-    native :unescape_uri, [ :cstring, :uint], :bool
-    native :unescape_url, [ :cstring, :uint], :bool
-    native :escape_js, [ :cstring, :uint], :bool
-    native :unescape_js, [ :cstring, :uint], :bool
-  end
-  native :free_cstring, [ :pointer ], :void
-  native :read_cstring, [ :pointer ], :cstring
-  native :_escape_html, [ :cstring, :uint, :bool], :pointer
-  native :_unescape_html, [ :cstring, :uint], :pointer
-  native :_escape_xml, [ :cstring, :uint], :pointer
-  native :_escape_uri, [ :cstring, :uint], :pointer
-  native :_escape_url, [ :cstring, :uint], :pointer
-  native :_escape_href, [ :cstring, :uint], :pointer
-  native :_unescape_uri, [ :cstring, :uint], :pointer
-  native :_unescape_url, [ :cstring, :uint], :pointer
-  native :_escape_js, [ :cstring, :uint], :pointer
-  native :_unescape_js, [ :cstring, :uint], :pointer
-  class << self
-    private
-    def cstring(ptr, str)
-      ptr ? read_cstring(ptr) : str
-    ensure
-      free_cstring(ptr) if ptr
-    end
-  end
-  def self.escape_html(src, secure = true)
-    cstring _escape_html(src, src.length, secure), src
-  end
-  def self.unescape_html(src)
-    cstring _unescape_html(src, src.length), src
-  end
-  def self.escape_xml(src)
-    cstring _escape_xml(src, src.length, secure), src
-  end
-  def self.escape_uri(src)
-    cstring _escape_uri(src, src.length, secure), src
-  end
-  def self.escape_url(src)
-    cstring _escape_url(src, src.length, secure), src
-  end
-  def self.escape_href(src)
-    cstring _escape_href(src, src.length, secure), src
-  end
-  def self.unescape_uri(src)
-    cstring _unescape_uri(src, src.length), src
-  end
-  def self.unescape_url(src)
-    cstring _unescape_url(src, src.length), src
-  end
-  def self.escape_js(src)
-    cstring _escape_js(src, src.length, secure), src
-  end
-  def self.unescape_js(src)
-    cstring _unescape_js(src, src.length), src
-  end
+#
+# Copyright (C) 2013 Wayne Meissner
+#
+# This file is part of the Walters project (http://github.com/wmeissner/walters).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+if defined?(JRUBY_VERSION)
+  require 'walters/walters_ext'
+else
+  require_relative 'walters_xni'
 end

data/lib/walters/walters_xni.rb ADDED Viewed

@@ -0,0 +1,109 @@
+#
+# Copyright (C) 2013 Wayne Meissner
+#
+# This file is part of the Walters project (http://github.com/wmeissner/walters).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+require 'xni'
+module Walters
+  extend XNI::Extension
+  extension 'walters'
+  class Buffer < XNI::DataObject
+    custom_finalizer
+    native :initialize, [ :uint ], :void
+    native :cstring, [], :cstring
+    native :escape_html, [ :cstring, :uint], :bool
+    native :escape_html0, [ :cstring, :uint, :bool ], :bool
+    native :unescape_html, [ :cstring, :uint], :bool
+    native :escape_xml, [ :cstring, :uint], :bool
+    native :escape_uri, [ :cstring, :uint], :bool
+    native :escape_url, [ :cstring, :uint], :bool
+    native :escape_href, [ :cstring, :uint], :bool
+    native :unescape_uri, [ :cstring, :uint], :bool
+    native :unescape_url, [ :cstring, :uint], :bool
+    native :escape_js, [ :cstring, :uint], :bool
+    native :unescape_js, [ :cstring, :uint], :bool
+  end
+  native :free_cstring, [ :pointer ], :void
+  native :read_cstring, [ :pointer ], :cstring
+  native :_escape_html, [ :cstring, :uint, :bool], :pointer
+  native :_unescape_html, [ :cstring, :uint], :pointer
+  native :_escape_xml, [ :cstring, :uint], :pointer
+  native :_escape_uri, [ :cstring, :uint], :pointer
+  native :_escape_url, [ :cstring, :uint], :pointer
+  native :_escape_href, [ :cstring, :uint], :pointer
+  native :_unescape_uri, [ :cstring, :uint], :pointer
+  native :_unescape_url, [ :cstring, :uint], :pointer
+  native :_escape_js, [ :cstring, :uint], :pointer
+  native :_unescape_js, [ :cstring, :uint], :pointer
+  class << self
+    private
+    def cstring(ptr, str)
+      if ptr
+        begin
+          str = read_cstring(ptr)
+        ensure
+          free_cstring(ptr)
+        end
+      end
+      str
+    end
+  end
+  def self.escape_html(src, secure = true)
+    cstring _escape_html(src, src.length, secure), src
+  end
+  def self.unescape_html(src)
+    cstring _unescape_html(src, src.length), src
+  end
+  def self.escape_xml(src)
+    cstring _escape_xml(src, src.length), src
+  end
+  def self.escape_uri(src)
+    cstring _escape_uri(src, src.length), src
+  end
+  def self.escape_url(src)
+    cstring _escape_url(src, src.length), src
+  end
+  def self.escape_href(src)
+    cstring _escape_href(src, src.length), src
+  end
+  def self.unescape_uri(src)
+    cstring _unescape_uri(src, src.length), src
+  end
+  def self.unescape_url(src)
+    cstring _unescape_url(src, src.length), src
+  end
+  def self.escape_js(src)
+    cstring _escape_js(src, src.length), src
+  end
+  def self.unescape_js(src)
+    cstring _unescape_js(src, src.length), src
+  end
+end

data/spec/spec_helper.rb ADDED Viewed

@@ -0,0 +1,8 @@
+# encoding: UTF-8
+if defined?(JRUBY_VERSION)
+  system "cd #{File.expand_path('../..', __FILE__)} && ruby -S rake jar"
+else
+  system "cd #{File.expand_path('../../xni-ext', __FILE__)} && ruby -S rake"
+end
+require 'walters'

data/spec/walters/html_escape_spec.rb ADDED Viewed

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+#
+# Copyright (C) 2013 Wayne Meissner
+#
+# This file is part of the Walters project (http://github.com/wmeissner/walters).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+#
+require File.expand_path('../../spec_helper.rb', __FILE__)
+describe 'html escape' do
+  it 'double quotes' do
+    Walters.escape_html("<some_tag some_attr=\"some value\"/>").should == '&lt;some_tag some_attr=&quot;some value&quot;&#47;&gt;'
+  end
+  it 'single quotes' do
+    Walters.escape_html("<some_tag some_attr='some value'/>").should == '&lt;some_tag some_attr=&#39;some value&#39;&#47;&gt;'
+  end
+  it 'ampersand' do
+    Walters.escape_html('<b>Bourbon & Branch</b>').should == '&lt;b&gt;Bourbon &amp; Branch&lt;&#47;b&gt;'
+  end
+  it 'original returned if no escaping required' do
+    str = 'foobar'
+    Walters.escape_html(str).should equal str
+  end
+  it 'all tags escaped' do
+    Walters.escape_html('&<>"\'/').should == '&amp;&lt;&gt;&quot;&#39;&#47;'
+  end
+  it 'plain text followed by tag' do
+    Walters.escape_html('foobar<1>').should == 'foobar&lt;1&gt;'
+  end
+  it 'non-utf8 input' do
+    lambda { Walters.escape_html('<b>Bourbon & Branch</b>'.encode('ISO-8859-1')) }.should raise_error Encoding::CompatibilityError
+  end
+  it 'returned value has same encoding as original' do
+    str = '<b>Bourbon & Branch</b>'.encode('utf-8')
+    Walters.escape_html(str).encoding.should == str.encoding
+  end
+end

data/spec/walters/javascript_escape_spec.rb ADDED Viewed

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+#
+# Copyright (C) 2013 Wayne Meissner
+#
+# This file is part of the Walters project (http://github.com/wmeissner/walters).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This file contains code based on the EscapeUtils project.  See the file LICENSE-EscapeUtils.txt for details.
+#
+describe 'javascript' do
+  it 'quotes and newlines' do
+    Walters.escape_javascript(%(This "thing" is really\n netos\r\n\n')).should == %(This \\"thing\\" is really\\n netos\\n\\n\\')
+  end
+  it 'backslash' do
+    Walters.escape_javascript(%(backslash\\test)).should == %(backslash\\\\test)
+  end
+  it 'closed html tags' do
+    Walters.escape_javascript(%(keep <open>, but dont </close> tags)).should == %(keep <open>, but dont <\\/close> tags)
+  end
+  it 'original returned if no escaping required' do
+    str = 'foobar'
+    Walters.escape_javascript(str).should equal str
+  end
+  it 'input must be utf8' do
+    lambda { Walters.escape_javascript('dont </close> tags'.encode('ISO-8859-1')) }.should raise_error(Encoding::CompatibilityError)
+  end
+  it 'return value has same encoding as input' do
+    str = "dont </close> tags"
+    Walters.escape_javascript(str).encoding.should == Encoding.find('UTF-8')
+  end
+end

data/walters.gemspec CHANGED Viewed

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.summary = 'JRuby wrapper for Houdini'
   s.description = 'JRuby wrapper for Houdini html escaping library'
   s.files = %w(walters.gemspec LICENSE README.md Rakefile)
-  s.files += Dir['lib/**/*.rb', 'ext/**/*.{c,cpp,h}', '{spec,libtest}/**/*.{c,cpp,h,rb}']
+  s.files += Dir['lib/**/*.rb', 'xni-ext/**/*.{c,cpp,h}', '{spec,libtest}/**/*.{c,cpp,h,rb}']
   s.has_rdoc = false
   s.license = 'Apache 2.0'
   s.required_ruby_version = '>= 1.9.3'
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'xni', '>= 0.1.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubygems-tasks'
-  s.extensions = ['ext/Rakefile']
+  s.extensions = ['xni-ext/Rakefile']
 end

data/{ext → xni-ext}/Rakefile RENAMED Viewed

@@ -1,5 +1,5 @@
 require 'xni/compile_task'
 XNI::CompileTask.new('walters') do |t|
-  t.export File.expand_path('../lib/walters.rb')
+  t.export File.expand_path('../lib/walters/walters_xni.rb')
 end

data/{ext → xni-ext}/houdini/buffer.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/buffer.h RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini.h RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_href_e.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_html_e.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_html_u.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_js_e.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_js_u.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_uri_e.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_uri_u.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/houdini_xml_e.c RENAMED Viewed

File without changes

data/{ext → xni-ext}/houdini/html_unescape.h RENAMED Viewed

File without changes

data/{ext → xni-ext}/walters.cpp RENAMED Viewed

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Wayne Meissner
+ *
+ * This file is part of the Walters project (http://github.com/wmeissner/walters).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include <stdlib.h>
 #include <xni.h>
@@ -6,7 +24,7 @@ extern "C" {
   #include "houdini/houdini.h"
 }
-#include "walters.h"
+#include "walters_xni.h"
 XNI_EXPORT void
 walters_free_cstring(RubyEnv *rb, void *cstr)

data/{ext → xni-ext}/walters_buffer.cpp RENAMED Viewed

@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2013 Wayne Meissner
+ *
+ * This file is part of the Walters project (http://github.com/wmeissner/walters).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include <stdlib.h>
 #include <xni.h>
@@ -6,7 +24,7 @@ extern "C" {
   #include "houdini/houdini.h"
 }
-#include "walters.h"
+#include "walters_xni.h"
 struct Walters_Buffer {
     gh_buf gh;

data/{ext/x86_64-darwin/__xni_walters.cpp → xni-ext/x86_64-darwin/__xni_walters_xni.cpp} RENAMED Viewed

@@ -1,5 +1,5 @@
 #include <xni.h>
-#include "walters.h"
+#include "walters_xni.h"
 #include "/Users/wayne/.rvm/gems/ruby-2.0.0-p0/gems/xni-0.1.0/runtime/xni_runtime.h"
 extern "C" void xni_walters_buffer_finalize(void* ext_data, struct Walters_Buffer * a0);

data/{ext/x86_64-darwin/walters.h → xni-ext/x86_64-darwin/walters_xni.h} RENAMED Viewed

@@ -1,5 +1,5 @@
-#ifndef WALTERS_H
-#define WALTERS_H 1
+#ifndef WALTERS_XNI_H
+#define WALTERS_XNI_H 1
 #include <xni.h>
@@ -40,4 +40,4 @@ XNI_EXPORT void * walters__unescape_js(RubyEnv *, const char *, unsigned int);
 XNI_EXPORT int xni_walters_load(RubyVM *,void **);
 XNI_EXPORT void xni_walters_unload(RubyVM *, void *);
-#endif /* WALTERS_H */
+#endif /* WALTERS_XNI_H */

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: walters
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,7 @@ description: JRuby wrapper for Houdini html escaping library
 email: wmeissner@gmail.com
 executables: []
 extensions:
-- ext/Rakefile
+- xni-ext/Rakefile
 extra_rdoc_files: []
 files:
 - walters.gemspec
@@ -89,23 +89,33 @@ files:
 - lib/walters.rb
 - lib/walters/version.rb
 - lib/walters/walters.rb
-- ext/houdini/buffer.c
-- ext/houdini/houdini_href_e.c
-- ext/houdini/houdini_html_e.c
-- ext/houdini/houdini_html_u.c
-- ext/houdini/houdini_js_e.c
-- ext/houdini/houdini_js_u.c
-- ext/houdini/houdini_uri_e.c
-- ext/houdini/houdini_uri_u.c
-- ext/houdini/houdini_xml_e.c
-- ext/walters.cpp
-- ext/walters_buffer.cpp
-- ext/x86_64-darwin/__xni_walters.cpp
-- ext/houdini/buffer.h
-- ext/houdini/houdini.h
-- ext/houdini/html_unescape.h
-- ext/x86_64-darwin/walters.h
-- ext/Rakefile
+- lib/walters/walters_xni.rb
+- lib/walters/html/cgi.rb
+- lib/walters/html/erb.rb
+- lib/walters/html/haml.rb
+- lib/walters/html/html_safety.rb
+- lib/walters/html/rack.rb
+- lib/walters/javascript/action_view.rb
+- xni-ext/houdini/buffer.c
+- xni-ext/houdini/houdini_href_e.c
+- xni-ext/houdini/houdini_html_e.c
+- xni-ext/houdini/houdini_html_u.c
+- xni-ext/houdini/houdini_js_e.c
+- xni-ext/houdini/houdini_js_u.c
+- xni-ext/houdini/houdini_uri_e.c
+- xni-ext/houdini/houdini_uri_u.c
+- xni-ext/houdini/houdini_xml_e.c
+- xni-ext/walters.cpp
+- xni-ext/walters_buffer.cpp
+- xni-ext/x86_64-darwin/__xni_walters_xni.cpp
+- xni-ext/houdini/buffer.h
+- xni-ext/houdini/houdini.h
+- xni-ext/houdini/html_unescape.h
+- xni-ext/x86_64-darwin/walters_xni.h
+- spec/spec_helper.rb
+- spec/walters/html_escape_spec.rb
+- spec/walters/javascript_escape_spec.rb
+- xni-ext/Rakefile
 homepage: http://wiki.github.com/wmeissner/walters
 licenses:
 - Apache 2.0