data_package 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a81fd9c748fb4d2a4d138aa4a10303356762bf
-  data.tar.gz: e0748ef555fad62c84b42396d04a69c2bd4ecb85
+  metadata.gz: 8ad6cf50c1fb9c79e9716c1759a8f22a06a938a1
+  data.tar.gz: 2e042771bed18b05c3565251eae90a90abc00c57
 SHA512:
-  metadata.gz: 82c9b285089afd248a35d4367111a237db709036f3e32fa1a91553a0db5e62fb48a75a935c33e0cdd695056dcc229e57a658becb3feec72602b8a01be974197f
-  data.tar.gz: 98bd24c91b056ec3cf7ca3de2ce7f6f81326bddb3975a2fb1db7ca6db22388277730dce07e0ed24b1084a5cc17e9b16edfa82a8a251599df1884ad96ef2d3931
+  metadata.gz: ad22ab12a886cda11fbc789f2899d9e356c2cacb942a0238ddc742ae5e660d2306c77be0d814ccbe14725886fab9d9223ac43943f504de509157fa7501d12bee
+  data.tar.gz: 8e8ae9e91a8836632db62eee6ba8bacf9534d528291e987cd827786596c007c3d161008211ff11148d239605cdd39e024b38349c1174aec4175862fbe4577e5a

data/data_package.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Runtime Dependencies
-  spec.add_runtime_dependency 'rcsv'
-  spec.add_runtime_dependency 'yajl-ruby'
+  spec.add_runtime_dependency 'json'
   spec.add_runtime_dependency 'data_kit'
 
   # Development Dependencies

data/lib/attr_helper/serialization.rb

@@ -1,4 +1,4 @@
-require 'yajl'
+require 'json'
 
 module AttrHelper
   module Serialization
@@ -19,8 +19,11 @@ module AttrHelper
     end
 
     def to_json(options = {})
-      options = {:pretty => true}.merge(options)
-      Yajl::Encoder.encode(to_hash, options)
+      if options[:pretty].nil? || options[:pretty]
+        JSON.pretty_generate(to_hash)
+      else
+        JSON.generate(to_hash)
+      end
     end
   end
 end

data/lib/data_package/package.rb

@@ -96,7 +96,7 @@ module DataPackage
 
         if File.exist?(full_path)
           file = File.open(full_path)
-          new(base_path, Yajl::Parser.parse(file))
+          new(base_path, JSON.parse(File.read(file)))
         else
           raise "Couldn't find datapackage.json at #{path}"
         end

data/lib/data_package/version.rb

@@ -1,3 +1,3 @@
 module DataPackage
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/attr_helpers/serialization_spec.rb

@@ -4,6 +4,6 @@ require 'klass_helper'
 describe AttrHelper do
   it "should serialize" do
     obj = KlassHelper::BaseKlass.new(:name => 'myvalue')
-    obj.to_json.should == Yajl::Encoder.encode({:name => 'myvalue'}, :pretty => true)
+    obj.to_json.should == JSON.pretty_generate({:name => 'myvalue'})
   end
 end

data/spec/data_package/dialect_spec.rb

@@ -30,6 +30,6 @@ describe DataPackage::Dialect do
     dialect.quote_char.should == "\""
     dialect.skip_initial_space.should == true
 
-    dialect.to_json.should == Yajl::Encoder.encode(json, :pretty => true)
+    dialect.to_json.should == JSON.pretty_generate(json)
   end
 end

data/spec/data_package/field_spec.rb

@@ -19,7 +19,7 @@ describe DataPackage::Field do
     field.description.should == json['description']
 
     field.to_hash.should == json
-    field.to_json.should == Yajl::Encoder.encode(field.to_hash, :pretty => true)
+    field.to_json.should == JSON.pretty_generate(field.to_hash)
   end
 
   it "should require a name" do

data/spec/data_package/license_spec.rb

@@ -13,6 +13,6 @@ describe DataPackage::License do
 
     license.id.should == 'PDDL'
     license.url.should == 'http://opendatacommons.org/licenses/pddl/'
-    license.to_json.should == Yajl::Encoder.encode(json, :pretty => true)
+    license.to_json.should == JSON.pretty_generate(json)
   end
 end

data/spec/data_package/person_spec.rb

@@ -16,6 +16,6 @@ describe DataPackage::Person do
     person.email.should == 'josh@modeanalytics.com'
     person.web.should == 'http://www.modeanalytics.com/josh'
 
-    person.to_json.should == Yajl::Encoder.encode(json, :pretty => true)
+    person.to_json.should == JSON.pretty_generate(json)
   end
 end

data/spec/data_package/schema_spec.rb

@@ -23,7 +23,7 @@ describe DataPackage::Schema do
     schema.has_primary_key?.should == true
 
     modified_json = json.merge('primaryKey' => 'income')
-    schema.to_json.should == Yajl::Encoder.encode(modified_json, :pretty => true)
+    schema.to_json.should == JSON.pretty_generate(modified_json)
   end
 
   it "should initialize with string primaryKey" do
@@ -35,7 +35,7 @@ describe DataPackage::Schema do
     schema.fields.first.name.should == 'income'
     schema.primary_key.should == ['income']
     schema.has_primary_key?.should == true
-    schema.to_json.should == Yajl::Encoder.encode(modified_json, :pretty => true)
+    schema.to_json.should == JSON.pretty_generate(modified_json)
   end
 
   it "should have primary key accessor" do
@@ -47,6 +47,6 @@ describe DataPackage::Schema do
     schema.fields.first.name.should == 'income'
     schema.primary_key.should == []
     schema.has_primary_key?.should == false
-    schema.to_json.should == Yajl::Encoder.encode(modified_json, :pretty => true)
+    schema.to_json.should == JSON.pretty_generate(modified_json)
   end
 end

data/spec/data_package/source_spec.rb

@@ -17,6 +17,6 @@ describe DataPackage::Source do
     person.web.should == 'http://www.modeanalytics.com/josh'
 
     person.to_hash.should == json
-    person.to_json.should == Yajl::Encoder.encode(person.to_hash, :pretty => true)
+    person.to_json.should == JSON.pretty_generate(person.to_hash)
   end
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: data_package
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Mode Analytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rcsv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='