crack 0.3.2 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 0ead2aedf1d6e60619824c1ee539f4f1251d53210a0fe6ce97fc7599243f67df
+  data.tar.gz: 75d22fb0beeb6a2464b60090ed6cd4e1b4e65a7856e0b026dcc0b952aabee940
+SHA512:
+  metadata.gz: ba3875595545781c75ae83fc55776f69b76b1caf50f953b94f3c4fcec1cfd30461128799b19acb33a25065bc302269f0ecba40aec4bcd1194e946d132b348096
+  data.tar.gz: 93fc50484fc549e9e4d3e2a75c98fc3a0661adbccd87e0b5884613ad491594953bd586d3575255a6a4f5e8d7d8a1652af27c141043044d1523a27a41ad14871c

data/lib/crack.rb

@@ -1,5 +1,4 @@
 module Crack
-  VERSION = "0.3.2"
   class ParseError < StandardError; end
 end
 

data/lib/crack/json.rb

@@ -3,15 +3,21 @@
 # The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'yaml'
 require 'strscan'
 
 module Crack
   class JSON
+    def self.parser_exceptions
+      @parser_exceptions ||= [ArgumentError, Psych::SyntaxError]
+    end
+
     def self.parse(json)
-      YAML.load(unescape(convert_json_to_yaml(json)))
-    rescue ArgumentError => e
+      yaml = unescape(convert_json_to_yaml(json))
+      YAML.safe_load(yaml, [Regexp, Date, Time])
+    rescue *parser_exceptions
       raise ParseError, "Invalid JSON string"
+    rescue Psych::DisallowedClass
+      yaml
     end
 
     protected
@@ -24,12 +30,12 @@ module Crack
       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})?)?$/
+      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, []
+        scanner, quoting, marks, pos, date_starts, date_ends = StringScanner.new(json), false, [], nil, [], []
         while scanner.scan_until(/(\\['"]|['":,\/\\]|\\.)/)
           case char = scanner[1]
           when '"', "'"
@@ -42,7 +48,8 @@ module Crack
                 # oh, and increment them for each current mark, each one is an extra padded space that bumps
                 # the position in the final YAML output
                 total_marks = marks.size
-                times << pos+total_marks << scanner.pos+total_marks
+                date_starts << pos+total_marks
+                date_ends << scanner.pos+total_marks
               end
               quoting = false
             end
@@ -62,7 +69,7 @@ module Crack
         if marks.empty?
           json.gsub(/\\\//, '/')
         else
-          left_pos  = [-1].push(*marks)
+          left_pos  = marks.clone.unshift(-1)
           right_pos = marks << json.length
           output    = []
           left_pos.each_with_index do |left, i|
@@ -70,10 +77,22 @@ module Crack
           end
           output = output * " "
 
-          times.each { |i| output[i-1] = ' ' }
+          format_dates(output, date_starts, date_ends)
           output.gsub!(/\\\//, '/')
           output
         end
       end
+
+      def self.format_dates(output, date_starts, date_ends)
+        if YAML.constants.include?('Syck')
+          (date_starts + date_ends).each { |i| output[i-1] = ' ' }
+        else
+          extra_chars_to_be_added = 0
+          date_starts.each do |i|
+            output[i-2+extra_chars_to_be_added] = '!!timestamp '
+            extra_chars_to_be_added += 10
+          end
+        end
+      end
   end
 end

data/lib/crack/version.rb

@@ -0,0 +1,3 @@
+module Crack
+  VERSION = "0.4.4"
+end

data/lib/crack/xml.rb

@@ -2,11 +2,19 @@ require 'rexml/parsers/streamparser'
 require 'rexml/parsers/baseparser'
 require 'rexml/light/node'
 require 'rexml/text'
+require "rexml/document"
 require 'date'
 require 'time'
 require 'yaml'
 require 'bigdecimal'
 
+# The Reason behind redefining the String Class for this specific plugin is to
+# avoid the dynamic insertion of stuff on it (see version previous to this commit).
+# Doing that disables the possibility of efectuating a dump on the structure. This way it goes.
+class REXMLUtiliyNodeString < String
+  attr_accessor :attributes
+end
+
 # This is a slighly modified version of the XMLUtilityNode from
 # http://merb.devjavu.com/projects/merb/ticket/95 (has.sox@gmail.com)
 # It's mainly just adding vowels, as I ht cd wth n vwls :)
@@ -68,7 +76,8 @@ class REXMLUtilityNode #:nodoc:
   end
 
   def to_hash
-    if @type == "file"
+    # ACG: Added a check here to prevent an exception a type == "file" tag has nodes within it
+    if @type == "file" and (@children.first.nil? or @children.first.is_a?(String))
       f = StringIO.new((@children.first || '').unpack('m').first)
       class << f
         attr_accessor :original_filename, :content_type
@@ -81,9 +90,7 @@ class REXMLUtilityNode #:nodoc:
     if @text
       t = typecast_value( unnormalize_xml_entities( inner_html ) )
       if t.is_a?(String)
-        class << t
-          attr_accessor :attributes
-        end
+        t = REXMLUtiliyNodeString.new(t)
         t.attributes = attributes
       end
       return { name => t }
@@ -187,7 +194,7 @@ class REXMLUtilityNode #:nodoc:
 end
 
 module Crack
-	class REXMLParser
+  class REXMLParser
     def self.parse(xml)
       stack = []
       parser = REXML::Parsers::BaseParser.new(xml)
@@ -210,6 +217,7 @@ module Crack
           stack.last.add_node(event[1]) unless event[1].strip.length == 0 || stack.empty?
         end
       end
+
       stack.length > 0 ? stack.pop.to_hash : {}
     end
   end

metadata

@@ -1,84 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: crack
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.4.4
 platform: ruby
-authors: 
+authors:
 - John Nunemaker
-- Wynn Netherland
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-01-09 00:00:00 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies: []
-
-description: 
-email: nunemaker@gmail.com
+description: Really simple JSON and XML parsing, ripped from Merb and Rails.
+email:
+- nunemaker@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- History
-- LICENSE
-- README.rdoc
-- Rakefile
-- crack.gemspec
+extra_rdoc_files: []
+files:
 - lib/crack.rb
 - lib/crack/json.rb
 - lib/crack/util.rb
+- lib/crack/version.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/parser_test.rb
-- test/string_test.rb
-- test/test_helper.rb
-- test/xml_test.rb
 homepage: http://github.com/jnunemaker/crack
-licenses: []
-
-post_install_message: 
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: crack
-rubygems_version: 1.8.10
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3
+signing_key:
+specification_version: 4
 summary: Really simple JSON and XML parsing, ripped from Merb and Rails.
 test_files: []
-

data/History

@@ -1,25 +0,0 @@
-== 0.1.7 2010-02-19
-* 1 minor patch
-  * Added patch from @purp for ISO 8601 date/time format
-== 0.1.6 2010-01-31
-* 1 minor patch
-  * Added Crack::VERSION constant - http://weblog.rubyonrails.org/2009/9/1/gem-packaging-best-practices
-== 0.1.5 2010-01-27
-* 1 minor patch
-  * Strings that begin with dates shouldn't be parsed as such (sandro)
-
-== 0.1.3 2009-06-22
-* 1 minor patch
-  * Parsing a text node with attributes stores them in the attributes method (tamalw)
-
-== 0.1.2 2009-04-21
-* 2 minor patches
-  * Correct unnormalization of attribute values (der-flo)
-  * Fix error in parsing YAML in the case where a hash value ends with backslashes, and there are subsequent values in the hash (deadprogrammer)
-  
-== 0.1.1 2009-03-31
-* 1 minor patch
-  * Parsing empty or blank xml now returns empty hash instead of raising error.
-
-== 0.1.0 2009-03-28
-* Initial release.

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 John Nunemaker
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,42 +0,0 @@
-= crack
-
-Really simple JSON and XML parsing, ripped from Merb and Rails. The XML parser is ripped from Merb and the JSON parser is ripped from Rails. I take no credit, just packaged them for all to enjoy and easily use.
-
-== note on releases
-
-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 crack.gemspec
-* gem install the gem that was built
-
-== note on patches/pull requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== usage
-  
-  gem 'crack'
-  require 'crack' # for xml and json
-  require 'crack/json' # for just json
-  require 'crack/xml' # for just xml
-
-== examples
-  
-  Crack::XML.parse("<tag>This is the contents</tag>")
-    # => {'tag' => 'This is the contents'}
-  
-  Crack::JSON.parse('{"tag":"This is the contents"}')
-    # => {'tag' => 'This is the contents'}
-
-== Copyright
-
-Copyright (c) 2009 John Nunemaker. See LICENSE for details.
-
-== Docs
-
-http://rdoc.info/projects/jnunemaker/crack

data/Rakefile

@@ -1,32 +0,0 @@
-$:.unshift("lib")
-require 'rubygems'
-require 'rake'
-
-$:.unshift(File.expand_path('lib', File.dirname(__FILE__)))
-require 'crack'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "crack"
-    gem.summary = %Q{Really simple JSON and XML parsing, ripped from Merb and Rails.}
-    gem.email = "nunemaker@gmail.com"
-    gem.homepage = "http://github.com/jnunemaker/crack"
-    gem.authors = ["John Nunemaker", "Wynn Netherland"]
-    gem.rubyforge_project = 'crack'
-    gem.version = Crack::VERSION
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = false
-end
-
-task :default => :test

data/crack.gemspec

@@ -1,53 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "crack"
-  s.version = "0.3.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Nunemaker", "Wynn Netherland"]
-  s.date = "2013-01-09"
-  s.email = "nunemaker@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    "History",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "crack.gemspec",
-    "lib/crack.rb",
-    "lib/crack/json.rb",
-    "lib/crack/util.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/parser_test.rb",
-    "test/string_test.rb",
-    "test/test_helper.rb",
-    "test/xml_test.rb"
-  ]
-  s.homepage = "http://github.com/jnunemaker/crack"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "crack"
-  s.rubygems_version = "1.8.10"
-  s.summary = "Really simple JSON and XML parsing, ripped from Merb and Rails."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-