pump 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27f8a3e058da84aed35138707b6be1836abb45e8
-  data.tar.gz: 7d4e25c6424008b13f67aef733eb6bddbc586afd
+  metadata.gz: 6b930e2c3f51715a45b93e926ee3f1919d5958a9
+  data.tar.gz: 9deabda70b6c60e6829faa5303ed8c155b87a3d8
 SHA512:
-  metadata.gz: dbede9b7e563335f30ed7682644ce43eb974dc21ce2bae10257d44b9520cd29a63523f3b2e87f9b61bc9a662d3ec8bf83ec7d53d8da08a8e0c5b7c86f61f368e
-  data.tar.gz: 32020a5f3bc48ca51f9cb1e2b6872547e8dbfff045607549ce431076a7d11d503e1369714d5b99f7f6eb4a285c95df495147002265b3a6036ffaccbfd41e393d
+  metadata.gz: 27f537da752f98e0a036c193f9424f9dc55face76e0689acfbff4a73584a4ada0689e89eb741cf13a32f3f36ad92b66c337b4c845ea4bf4d02eb70d17630f5e0
+  data.tar.gz: 005b91800f465e6f14977fc1e203e41410ec4d26120138842ca7bd44d4e5312d2287a9d68b325ff7784d3b4e0fb26909e5aef51e2db7a079da92d5544a05c645

data/CHANGES.md

@@ -1,6 +1,12 @@
 ### dev
 
-[full changelog](http://github.com/yolk/pump/compare/v0.6.4...master)
+[full changelog](http://github.com/yolk/pump/compare/v0.6.5...master)
+
+### 0.6.5 / 2014-07-03
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.4...v0.6.5)
+
+* XML: Remove ilegal chars from string values
 
 ### 0.6.4 / 2013-11-08
 

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in pump.gemspec
 gemspec
 
+gem 'guard-rspec', '~>4.0'
 gem 'rb-fsevent' if RUBY_PLATFORM.include?("x86_64-darwin")

data/gemfiles/activesupport-3-2

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 gem "activemodel", "3.2.13"
 gem "oj"
 
-gem 'rspec', '>= 2.4.0'
+gem 'rspec', '>= 2.14'
 gem 'rake'

data/gemfiles/activesupport-4

@@ -3,5 +3,5 @@ source "http://rubygems.org"
 gem "activemodel", "4.0"
 gem "oj"
 
-gem 'rspec', '>= 2.4.0'
+gem 'rspec', '>= 2.14'
 gem 'rake'

data/lib/pump/version.rb

@@ -1,3 +1,3 @@
 module Pump
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/pump/xml.rb

@@ -61,6 +61,36 @@ module Pump
     def add_instruct?
       encoder_options.has_key?(:instruct) ? encoder_options[:instruct] : true
     end
+
+    VALID_CHAR = [
+      0x9, 0xA, 0xD,
+      (0x20..0xD7FF),
+      (0xE000..0xFFFD),
+      (0x10000..0x10FFFF)
+    ]
+
+    VALID_XML_CHARS = Regexp.new('^['+
+      VALID_CHAR.map { |item|
+        case item
+        when Fixnum
+          [item].pack('U').force_encoding('utf-8')
+        when Range
+          [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
+        end
+      }.join +
+    ']*$')
+
+    def remove_ilegal_chars(string)
+      return string if !string.is_a?(String) || string =~ VALID_XML_CHARS
+      out = ""
+      string.chars.each do |c|
+        case c.ord
+        when *VALID_CHAR
+          out << c
+        end
+      end
+      out
+    end
   end
 end
 

data/lib/pump/xml/value.rb

@@ -10,7 +10,7 @@ module Pump
       end
 
       def to_s(plain_path=nil)
-        "\#{#{plain_path || plain}#{cast}}"
+        "\#{#{remove_ilegal_chars}#{plain_path || plain}#{cast}}"
       end
 
       private
@@ -22,6 +22,10 @@ module Pump
           '.to_s.encode(:xml => :text)'
         end
       end
+
+      def remove_ilegal_chars
+        "remove_ilegal_chars " if !options[:typecast] && !options[:xmlsafe]
+      end
     end
   end
 end

data/pump.gemspec

@@ -21,5 +21,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport",           ">=3.2"
   gem.add_dependency "oj",                      ">=2.0"
   gem.add_development_dependency "rspec",       ">= 2.12.0"
-  gem.add_development_dependency "guard-rspec", ">=2.2.2"
 end

data/spec/pump/xml/value_spec.rb

@@ -15,7 +15,7 @@ describe Pump::Xml::Value do
   end
 
   describe "#to_s" do
-    its(:to_s) { should eql("\#{object.method_name.to_s.encode(:xml => :text)}") }
+    its(:to_s) { should eql("\#{remove_ilegal_chars object.method_name.to_s.encode(:xml => :text)}") }
 
     context "with option :xmlsafe => true" do
       subject { Pump::Xml::Value.new("method_name", {}, [], :xmlsafe => true) }
@@ -23,9 +23,15 @@ describe Pump::Xml::Value do
       its(:to_s) { should eql("\#{object.method_name}") }
     end
 
+    context "with option :typecast => :xmlschema" do
+      subject { Pump::Xml::Value.new("method_name", {}, [], :typecast => :xmlschema) }
+
+      its(:to_s) { should eql("\#{object.method_name.xmlschema}") }
+    end
+
     context "with path name" do
       it do
-        subject.to_s('custom_path').should eql("\#{custom_path.to_s.encode(:xml => :text)}")
+        subject.to_s('custom_path').should eql("\#{remove_ilegal_chars custom_path.to_s.encode(:xml => :text)}")
       end
     end
   end

data/spec/pump/xml_spec.rb

@@ -14,6 +14,14 @@ describe Pump::Xml do
       xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny</name>\n</person>\n")
     end
 
+    context "with ilegal chars" do
+      let(:person) { Struct.new(:name, :age, :last_name).new("Benny \u001APenny", 9, "Hellman") }
+
+      it "returns xml string" do
+        xml.encode(person).should eql("#{XML_INSTRUCT}<person>\n  <name>Benny Penny</name>\n</person>\n")
+      end
+    end
+
     context "with array" do
 
       context "with one entry" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pump
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Sebastian Munz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
 description: Fast but inflexible XML and JSON encoding for ruby objects.
 email:
 - sebastian@yo.lk