crack 0.4.0 → 0.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: e6d7eabbf55c05bb0d5ad82fa7ba5bda9ffd9d59afa880eb113c17c3045aaa4f
+  data.tar.gz: af13a8caa99d12d057f7ec55c1f9142f0bae6f3ec7ad59c06fbd8cf2be259ef8
+SHA512:
+  metadata.gz: 936f41453b1fe901f44315a4634f489ef57c567287cd88a90534e0afd53bac92ade2376d52558405777c8b8e40beba9b3562c2ab2d887f515bc84d268b268cd2
+  data.tar.gz: c1993458cf230034223899dd739ea6611cc1eb962f1785421ab6fd43d390828288cc6ba1604f9477a5c41e1db915542455bb35dd12d2503a78c571090cbf9501

data/lib/crack/json.rb

@@ -3,29 +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 ||= begin
-        exceptions = [ArgumentError]
-
-        if const_defined?(:Psych)
-          if Psych.const_defined?(:SyntaxError)
-            exceptions << Psych::SyntaxError
-          end
-        end
-
-        exceptions
-      end
+      @parser_exceptions ||= [ArgumentError, Psych::SyntaxError]
     end
 
     def self.parse(json)
-      YAML.load(unescape(convert_json_to_yaml(json)))
+      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
@@ -38,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 '"', "'"
@@ -56,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
@@ -76,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|
@@ -84,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

@@ -1,3 +1,3 @@
 module Crack
-  VERSION = "0.4.0"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: crack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.5
 platform: ruby
 authors:
 - John Nunemaker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 description: Really simple JSON and XML parsing, ripped from Merb and Rails.
 email:
 - nunemaker@gmail.com
@@ -34,60 +31,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- History
-- LICENSE
-- README.md
-- crack.gemspec
 - lib/crack.rb
 - lib/crack/json.rb
 - lib/crack/util.rb
 - lib/crack/version.rb
 - lib/crack/xml.rb
-- script/bootstrap
-- script/release
-- script/test
-- 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
+homepage: https://github.com/jnunemaker/crack
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.4
+signing_key:
+specification_version: 4
 summary: Really simple JSON and XML parsing, ripped from Merb and Rails.
-test_files:
-- 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
+test_files: []

data/.gitignore

@@ -1,7 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-*.gem
-/.bundle

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem "rake"
-gem "jnunemaker-matchy"
-gem "minitest"

data/Gemfile.lock

@@ -1,22 +0,0 @@
-PATH
-  remote: .
-  specs:
-    crack (0.3.2)
-      safe_yaml (~> 0.9.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    jnunemaker-matchy (0.4.0)
-    minitest (5.0.3)
-    rake (10.0.3)
-    safe_yaml (0.9.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  crack!
-  jnunemaker-matchy
-  minitest
-  rake

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.md

@@ -1,44 +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.
-
-## compatibility
-
-* ruby 1.8.7
-* ruby 1.9+ (3 failures related to time parsing, would love it if someone could figure them out)
-
-## 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.
-* `script/test` - this will bootstrap and run the tests
-* 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
-  
-```ruby
-gem 'crack' # in Gemfile
-require 'crack' # for xml and json
-require 'crack/json' # for just json
-require 'crack/xml' # for just xml
-```
-
-## examples
-  
-```ruby
-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/crack.gemspec

@@ -1,20 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/crack/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["John Nunemaker"]
-  gem.email         = ["nunemaker@gmail.com"]
-  gem.description   = %q{Really simple JSON and XML parsing, ripped from Merb and Rails.}
-  gem.summary       = %q{Really simple JSON and XML parsing, ripped from Merb and Rails.}
-  gem.homepage      = "http://github.com/jnunemaker/crack"
-
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "crack"
-  gem.require_paths = ["lib"]
-  gem.version       = Crack::VERSION
-  gem.license       = "MIT"
-
-  gem.add_dependency "safe_yaml", "~> 0.9.0"
-end

data/script/bootstrap

@@ -1,21 +0,0 @@
-#!/bin/sh
-#/ Usage: bootstrap [bundle options]
-#/
-#/ Bundle install the dependencies.
-#/
-#/ Examples:
-#/
-#/   bootstrap
-#/   bootstrap --local
-#/
-
-set -e
-cd $(dirname "$0")/..
-
-[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
-    grep '^#/' <"$0"| cut -c4-
-    exit 0
-}
-
-rm -rf .bundle/{binstubs,config}
-bundle install --binstubs .bundle/binstubs --path .bundle --quiet "$@"

data/script/release

@@ -1,42 +0,0 @@
-#!/bin/sh
-#/ Usage: release
-#/
-#/ Tag the version in the repo and push the gem.
-#/
-
-set -e
-cd $(dirname "$0")/..
-
-[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
-    grep '^#/' <"$0"| cut -c4-
-    exit 0
-}
-
-gem_name=crack
-
-# Build a new gem archive.
-rm -rf $gem_name-*.gem
-gem build -q $gem_name.gemspec
-
-# Make sure we're on the master branch.
-(git branch | grep -q '* master') || {
-  echo "Only release from the master branch."
-  exit 1
-}
-
-# Figure out what version we're releasing.
-tag=v`ls $gem_name-*.gem | sed "s/^$gem_name-\(.*\)\.gem$/\1/"`
-
-echo "Releasing $tag"
-
-# Make sure we haven't released this version before.
-git fetch -t origin
-
-(git tag -l | grep -q "$tag") && {
-  echo "Whoops, there's already a '${tag}' tag."
-  exit 1
-}
-
-# Tag it and bag it.
-gem push $gem_name-*.gem && git tag "$tag" &&
-  git push origin master && git push origin "$tag"

data/script/test

@@ -1,25 +0,0 @@
-#!/bin/sh
-#/ Usage: test [individual test file]
-#/
-#/ Bootstrap and run all tests or an individual test.
-#/
-#/ Examples:
-#/
-#/   # run all tests
-#/   test
-#/
-#/   # run individual test
-#/   test test/controller_instrumentation_test.rb
-#/
-
-set -e
-cd $(dirname "$0")/..
-
-[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
-    grep '^#/' <"$0"| cut -c4-
-    exit 0
-}
-
-script/bootstrap && ruby -I lib -I test -r rubygems \
-  -e 'require "bundler/setup"' \
-  -e '(ARGV.empty? ? Dir["test/**/*_test.rb"] : ARGV).each { |f| load f }' -- "$@"