rubysl-yaml 2.0.0 → 2.0.2

data/lib/yaml/store.rb

@@ -46,20 +46,15 @@ class YAML::Store < PStore
   #
   # Options passed in through +yaml_opts+ will be used when converting the
   # store to YAML via Hash#to_yaml().
-  def initialize( *o )
-    @opt = {}
-    if String === o.first
-      super(o.shift)
-    end
-    if o.last.is_a? Hash
-      @opt.update(o.pop)
-    end
+  def initialize file_name, yaml_opts = {}
+    @opt = yaml_opts
+    super
   end
 
   # :stopdoc:
 
   def dump(table)
-    @table.to_yaml(@opt)
+    YAML.dump @table
   end
 
   def load(content)
@@ -75,7 +70,7 @@ class YAML::Store < PStore
     false
   end
 
-  EMPTY_MARSHAL_DATA = {}.to_yaml
+  EMPTY_MARSHAL_DATA = YAML.dump({})
   EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
   def empty_marshal_data
     EMPTY_MARSHAL_DATA

data/rubysl-yaml.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.extensions    = ["ext/rubysl/syck/extconf.rb"]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
@@ -21,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
+  spec.add_development_dependency "rubysl-prettyprint", "~> 2.0"
 end

metadata

@@ -1,77 +1,118 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-yaml
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubysl-prettyprint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Ruby standard library YAML.
 email:
 - brixen@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/rubysl/syck/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- ext/rubysl/syck/bytecode.c
+- ext/rubysl/syck/emitter.c
+- ext/rubysl/syck/extconf.rb
+- ext/rubysl/syck/gram.c
+- ext/rubysl/syck/gram.h
+- ext/rubysl/syck/handler.c
+- ext/rubysl/syck/implicit.c
+- ext/rubysl/syck/node.c
+- ext/rubysl/syck/rubyext.c
+- ext/rubysl/syck/syck.c
+- ext/rubysl/syck/syck.h
+- ext/rubysl/syck/token.c
+- ext/rubysl/syck/yaml2byte.c
+- ext/rubysl/syck/yamlbyte.h
 - lib/rubysl/yaml.rb
 - lib/rubysl/yaml/version.rb
 - lib/rubysl/yaml/yaml.rb
+- lib/syck.rb
+- lib/syck/baseemitter.rb
+- lib/syck/basenode.rb
+- lib/syck/constants.rb
+- lib/syck/encoding.rb
+- lib/syck/error.rb
+- lib/syck/loader.rb
+- lib/syck/rubytypes.rb
+- lib/syck/stream.rb
+- lib/syck/tag.rb
+- lib/syck/types.rb
+- lib/syck/yamlnode.rb
+- lib/syck/ypath.rb
 - lib/yaml.rb
 - lib/yaml/dbm.rb
 - lib/yaml/store.rb
-- lib/yaml/syck.rb
 - rubysl-yaml.gemspec
 - spec/add_builtin_type_spec.rb
 - spec/add_domain_type_spec.rb
@@ -116,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby standard library YAML.

data/lib/yaml/syck.rb

@@ -1,53 +0,0 @@
-# $Id$
-#
-# = yaml/syck.rb:
-#
-
-require 'stringio'
-require 'syck/ext/syck'
-require 'syck/error'
-require 'syck/syck'
-require 'syck/tag'
-require 'syck/stream'
-require 'syck/constants'
-require 'syck/rubytypes'
-require 'syck/types'
-
-module Syck
-  #--
-  # For Rubinius, replaces the rb_iterate call to syck_set_ivars.
-  #++
-  def self.set_ivars(hsh, obj)
-    hsh.each do |key, value|
-      obj.instance_variable_set :"@#{key}", value
-    end
-  end
-
-  #--
-  # For Rubinius, replaces the rb_iterate call to syck_merge_i.
-  #++
-  def self.merge_i(ary, hsh)
-    ary.each do |entry|
-      begin
-        entry = Rubinius::Type.coerce_to entry, Hash, :to_hash
-        hsh.update entry
-      rescue
-        # ignore coercion errors
-      end
-    end
-
-    nil
-  end
-
-  #--
-  # For Rubinius, replaces rb_syck_mktime.
-  #++
-  def self.mktime(str)
-    require "date"
-    begin
-      DateTime.parse(str).to_time
-    rescue ArgumentError
-      # nothing
-    end
-  end
-end