crack 0.1.8 → 0.2.0

data/README.rdoc

@@ -7,7 +7,7 @@ Really simple JSON and XML parsing, ripped from Merb and Rails. The XML parser i
 Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
 
 * rake gemspec
-* gem build httparty.gemspec
+* gem build crack.gemspec
 * gem install the gem that was built
 
 == note on patches/pull requests

data/Rakefile

@@ -1,6 +1,9 @@
+$:.unshift("lib")
 require 'rubygems'
 require 'rake'
-require File.expand_path('../lib/crack', __FILE__)
+
+$:.unshift(File.expand_path('lib', File.dirname(__FILE__)))
+require 'crack'
 
 begin
   require 'jeweler'
@@ -16,16 +19,7 @@ begin
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = 'crack'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/testtask'
@@ -35,18 +29,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = false
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-
-task :default => :test
+task :default => :test

data/crack.gemspec

@@ -1,60 +1,49 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{crack}
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Nunemaker", "Wynn Netherland"]
-  s.date = %q{2010-07-07}
+  s.authors = [%q{John Nunemaker}, %q{Wynn Netherland}]
+  s.date = %q{2011-09-17}
   s.email = %q{nunemaker@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "crack.gemspec",
-     "lib/crack.rb",
-     "lib/crack/core_extensions.rb",
-     "lib/crack/json.rb",
-     "lib/crack/xml.rb",
-     "test/crack_test.rb",
-     "test/data/twittersearch-firefox.json",
-     "test/data/twittersearch-ie.json",
-     "test/hash_test.rb",
-     "test/json_test.rb",
-     "test/string_test.rb",
-     "test/test_helper.rb",
-     "test/xml_test.rb"
+    "History",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "crack.gemspec",
+    "lib/crack.rb",
+    "lib/crack/core_extensions.rb",
+    "lib/crack/json.rb",
+    "lib/crack/xml.rb",
+    "test/crack_test.rb",
+    "test/data/twittersearch-firefox.json",
+    "test/data/twittersearch-ie.json",
+    "test/hash_test.rb",
+    "test/json_test.rb",
+    "test/string_test.rb",
+    "test/test_helper.rb",
+    "test/xml_test.rb"
   ]
   s.homepage = %q{http://github.com/jnunemaker/crack}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{crack}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.8.9}
   s.summary = %q{Really simple JSON and XML parsing, ripped from Merb and Rails.}
-  s.test_files = [
-    "test/crack_test.rb",
-     "test/hash_test.rb",
-     "test/json_test.rb",
-     "test/string_test.rb",
-     "test/test_helper.rb",
-     "test/xml_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/crack.rb

@@ -1,5 +1,5 @@
 module Crack
-  VERSION = "0.1.8".freeze
+  VERSION = "0.2.0"
   class ParseError < StandardError; end
 end
 

data/lib/crack/core_extensions.rb

@@ -122,7 +122,7 @@ class Hash #:nodoc:
   #     #=> 'one="1" two="TWO"'
   def to_xml_attributes
     map do |k,v|
-      %{#{k.to_s.snake_case.sub(/^(.{1,1})/) { |m| m.downcase }}="#{v}"}
+      %{#{k.to_s.snake_case.sub(/^(.{1,1})/) { |m| m.downcase }}="#{v.to_s.gsub('"', '"')}"}
     end.join(' ')
   end
-end
+end

data/lib/crack/json.rb

@@ -16,16 +16,21 @@ module Crack
 
     protected
       def self.unescape(str)
-        str.gsub(/\\u([0-9a-f]{4})/) { [$1.hex].pack("U") }
+        # Force the encoding to be UTF-8 so we can perform regular expressions
+        # on 1.9.2 without blowing up.
+        # see http://stackoverflow.com/questions/1224204/ruby-mechanize-getting-force-encoding-exception for a similar issue
+        str.force_encoding('UTF-8') if defined?(Encoding) && str.respond_to?(:force_encoding)
+        str.gsub(/\\u0000/, "").gsub(/\\[u|U]([0-9a-fA-F]{4})/) { [$1.hex].pack("U") }
       end
-      
+
       # matches YAML-formatted dates
       DATE_REGEX = /^\d{4}-\d{2}-\d{2}$|^\d{4}-\d{1,2}-\d{1,2}[T \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?)?$/
 
       # Ensure that ":" and "," are always followed by a space
       def self.convert_json_to_yaml(json) #:nodoc:
+        json = String.new(json) #can't modify a frozen string
         scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, []
-        while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
+        while scanner.scan_until(/(\\['"]|['":,\/\\]|\\.)/)
           case char = scanner[1]
           when '"', "'"
             if !quoting
@@ -41,11 +46,17 @@ module Crack
               end
               quoting = false
             end
+          when "/"
+            if !quoting
+              json[scanner.pos - 1] = "!ruby/regexp /"
+              scanner.pos += 13
+              scanner.scan_until(/\/[mix]*/)
+            end
           when ":",","
             marks << scanner.pos - 1 unless quoting
           when "\\"
             scanner.skip(/\\/)
-          end          
+          end
         end
 
         if marks.empty?

data/lib/crack/xml.rb

@@ -82,8 +82,12 @@ class REXMLUtilityNode #:nodoc:
 
     if @text
       t = typecast_value( unnormalize_xml_entities( inner_html ) )
-      t.class.send(:attr_accessor, :attributes)
-      t.attributes = attributes
+      if t.is_a?(String)
+        class << t
+          attr_accessor :attributes
+        end
+        t.attributes = attributes
+      end
       return { name => t }
     else
       #change repeating groups into an array

data/test/hash_test.rb

@@ -3,16 +3,17 @@ require 'test_helper'
 class CrackTest < Test::Unit::TestCase
   context "to_xml_attributes" do
     setup do
-      @hash = { :one => "ONE", "two" => "TWO" }
+      @hash = { :one => "ONE", "two" => "TWO", :three => "it \"should\" work" }
     end
     
-    should "should turn the hash into xml attributes" do
+    should "turn the hash into xml attributes" do
       attrs = @hash.to_xml_attributes
       attrs.should =~ /one="ONE"/m
       attrs.should =~ /two="TWO"/m
+      attrs.should =~ /three="it &quot;should&quot; work"/m
     end
 
-    should 'should preserve _ in hash keys' do
+    should 'preserve _ in hash keys' do
       attrs = {
         :some_long_attribute => "with short value",
         :crash               => :burn,
@@ -38,7 +39,7 @@ class CrackTest < Test::Unit::TestCase
       end
     end
 
-    should 'should not leave a trailing &' do
+    should 'not leave a trailing &' do
       {
         :name => 'Bob', 
         :address => {
@@ -49,8 +50,8 @@ class CrackTest < Test::Unit::TestCase
       }.to_params.should_not =~ /&$/
     end
 
-    should 'should URL encode unsafe characters' do
+    should 'URL encode unsafe characters' do
       {:q => "?&\" +"}.to_params.should == "q=%3F%26%22%20%2B"
     end
   end
-end
+end

data/test/json_test.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 class JsonTest < Test::Unit::TestCase  
   TESTS = {
     %q({"data": "G\u00fcnter"})                   => {"data" => "Günter"},
+		%q({"html": "\u003Cdiv\\u003E"})              => {"html" => "<div>"},
     %q({"returnTo":{"\/categories":"\/"}})        => {"returnTo" => {"/categories" => "/"}},
     %q({returnTo:{"\/categories":"\/"}})          => {"returnTo" => {"/categories" => "/"}},
     %q({"return\\"To\\":":{"\/categories":"\/"}}) => {"return\"To\":" => {"/categories" => "/"}},
@@ -19,6 +20,9 @@ class JsonTest < Test::Unit::TestCase
     # no time zone
     %({a: "2007-01-01 01:12:34"})                 => {'a' => "2007-01-01 01:12:34"},
     %({"bio": "1985-01-29: birthdate"})           => {'bio' => '1985-01-29: birthdate'},
+    %({"regex": /foo.*/})                         => {'regex' => /foo.*/},
+    %({"regex": /foo.*/i})                        => {'regex' => /foo.*/i},
+    %({"regex": /foo.*/mix})                      => {'regex' => /foo.*/mix},
     %([])    => [],
     %({})    => {},
     %(1)     => 1,
@@ -27,24 +31,33 @@ class JsonTest < Test::Unit::TestCase
     %(null)  => nil,
     %(true)  => true,
     %(false) => false,
-    %q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1"
+    %q("http:\/\/test.host\/posts\/1") => "http://test.host/posts/1",
+
+    # \u0000 and \x00 escape sequences
+    %q({"foo":"bar\u0000"}) => {"foo" => "bar"},
+    %q({"foo":"bar\u0000baz"}) => {"foo" => "barbaz"},
+    %q(bar\u0000) => "bar",
+    %q(bar\u0000baz) => "barbaz",
+
+    %q({"foo":"bar\x00"}) => {"foo" => "bar\x00"},
+    %q({"foo":"bar\x00baz"}) => {"foo" => "bar\x00baz"}
   }
   
   TESTS.each do |json, expected|
-    should "should decode json (#{json})" do
+    should "decode json (#{json})" do
       lambda {
         Crack::JSON.parse(json).should == expected
       }.should_not raise_error
     end
   end
 
-  should "should raise error for failed decoding" do
+  should "raise error for failed decoding" do
     lambda {
       Crack::JSON.parse(%({: 1}))
     }.should raise_error(Crack::ParseError)
   end
   
-  should "should be able to parse a JSON response from a Twitter search about 'firefox'" do
+  should "be able to parse a JSON response from a Twitter search about 'firefox'" do
     data = ''
     File.open(File.dirname(__FILE__) + "/data/twittersearch-firefox.json", "r") { |f|
         data = f.read
@@ -55,7 +68,7 @@ class JsonTest < Test::Unit::TestCase
     }.should_not raise_error(Crack::ParseError)
   end
 
-  should "should be able to parse a JSON response from a Twitter search about 'internet explorer'" do
+  should "be able to parse a JSON response from a Twitter search about 'internet explorer'" do
     data = ''
     File.open(File.dirname(__FILE__) + "/data/twittersearch-ie.json", "r") { |f|
         data = f.read

data/test/xml_test.rb

@@ -98,6 +98,16 @@ class XmlTest < Test::Unit::TestCase
     should "default attributes to empty hash if not present" do
       @data['opt']['user'][1].attributes.should == {}
     end
+    
+    should "add 'attributes' accessor methods to parsed instances of String" do
+      @data['opt']['user'][0].respond_to?(:attributes).should be(true)
+      @data['opt']['user'][0].respond_to?(:attributes=).should be(true)
+    end
+    
+    should "not add 'attributes' accessor methods to all instances of String" do
+      "some-string".respond_to?(:attributes).should be(false)
+      "some-string".respond_to?(:attributes=).should be(false)
+    end
   end
 
   should "should typecast an integer" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crack
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -04:00
-default_executable: 
+date: 2011-09-17 00:00:00 Z
 dependencies: []
 
 description: 
@@ -29,7 +29,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - History
 - LICENSE
 - README.rdoc
@@ -47,40 +46,38 @@ files:
 - test/string_test.rb
 - test/test_helper.rb
 - test/xml_test.rb
-has_rdoc: true
 homepage: http://github.com/jnunemaker/crack
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: crack
-rubygems_version: 1.3.6
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Really simple JSON and XML parsing, ripped from Merb and Rails.
-test_files: 
-- test/crack_test.rb
-- test/hash_test.rb
-- test/json_test.rb
-- test/string_test.rb
-- test/test_helper.rb
-- test/xml_test.rb
+test_files: []
+

data/.gitignore

@@ -1,6 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-*.gem