data_package 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e567c149226c03fee2d2c25f524d46decb1b2963
-  data.tar.gz: d98b2f8edf777fb58b46d0cda63431f4f98ba229
+  metadata.gz: c3381512a80b7e68fe5c76b49def2cdca79b1f43
+  data.tar.gz: 1a1c644fdd7a00dee1a712cd9b84f1181ffb692c
 SHA512:
-  metadata.gz: 6806f16ae383a4a8afecf2f5f38cd26ec8a47d64ea76b16f824c81e75d3f086c31de7a7a43380f440b7fa2d06d2f2b09b7ee7f41792ae6686224588a39c9bbff
-  data.tar.gz: a120c9dd83674e0864d6f5d837bbe273a2239f91ea7d1373911b2a69cd6febc49065c2d03c7b92b6dfd6b180ea0c875b6a3219ff46b081a14afee154a6c8f1db
+  metadata.gz: ddd631e94965058ff2c6e674570d6ca2759190de615661c67e653fa65a0cca271cde2d970b42525c0232365346d7a18203e60e4f0640bcae5f0ed3656cb1ba49
+  data.tar.gz: 5136e1b5b3e3e6188db29f76c238589cf3b07f2a891625e2813f971bde614a1ec2e0bf5fd6f86f1dcb72c7274c7e9c2fce99740470a62b6883bc88a8ab1813e9

data/lib/data_package/resource.rb

@@ -1,7 +1,9 @@
 require 'data_kit'
 
 module DataPackage
-  class Resource < Base    
+  class Resource < Base
+    include Enumerable
+
     attr_optional :name
 
     attr_required :data,
@@ -45,7 +47,7 @@ module DataPackage
     #   this makes it possible for scripts to rely on a file location
     #
 
-    def each_row(&block)
+    def each(&block)
       case data_source_type
       when :data
         data.each(&block)
@@ -65,8 +67,6 @@ module DataPackage
       end
     end
 
-    private
-
     def data_source_type
       if data
         :data

data/lib/data_package/schema.rb

@@ -4,7 +4,8 @@ module DataPackage
       fields.collect(&:to_hash)
     }
 
-    attr_optional :primary_key, :key => 'primaryKey'
+    attr_optional :primary_key, :key => 'primaryKey',
+      :serialize => Proc.new{|pkey| pkey.length == 1 ? pkey.first : pkey }
 
     def initialize(attrs = {})
       @fields ||= []
@@ -15,5 +16,13 @@ module DataPackage
     def fields=(json)
       @fields = json.collect{|f| Field.new(f)}
     end
+
+    def primary_key=(json)
+      if json.is_a?(Array)
+        @primary_key = json
+      else
+        @primary_key = [json]
+      end
+    end
   end
 end

data/lib/data_package/version.rb

@@ -1,3 +1,3 @@
 module DataPackage
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/data_package/resource_spec.rb

@@ -12,7 +12,15 @@ describe DataPackage::Resource do
     resource.schema.fields.length.should == 10
     resource.schema.primary_key.should == ['id']
 
-    resource.to_hash.should == standard_resource.merge('format' => 'csv', 'dialect' => DataPackage::Dialect.new.to_hash)
+    modified_resource = standard_resource.merge(
+      'format' => 'csv',
+      'dialect' => DataPackage::Dialect.new.to_hash,
+      'schema' => standard_resource['schema'].merge(
+        'primaryKey' => 'id'
+      )
+    )
+
+    resource.to_hash.should == modified_resource
   end
 
   it "should initialize and deserialize a remote resource" do
@@ -26,15 +34,22 @@ describe DataPackage::Resource do
     resource.schema.fields.length.should == 3
     resource.schema.primary_key.should == ['id']
 
-    resource.to_hash.should == remote_resource.merge('format' => 'csv')
+    modified_resource = remote_resource.merge(
+      'format' => 'csv',
+      'schema' => remote_resource['schema'].merge(
+        'primaryKey' => 'id'
+      )
+    )
+
+    resource.to_hash.should == modified_resource.merge('format' => 'csv')
   end
 
-  describe "#each_row" do
+  describe "#each" do
     it "should enumerate over inline data" do
       resource = DataPackage::Resource.new(base_path, inline_resource)
 
       row_count = 0
-      resource.each_row do |row|
+      resource.each do |row|
         row_count += 1
       end
       row_count.should == 3
@@ -44,7 +59,7 @@ describe DataPackage::Resource do
       resource = DataPackage::Resource.new(base_path, standard_resource)
 
       row_count = 0
-      resource.each_row { |row| row_count += 1 }
+      resource.each { |row| row_count += 1 }
       row_count.should == 10
     end
 

data/spec/data_package/schema_spec.rb

@@ -20,6 +20,19 @@ describe DataPackage::Schema do
     schema.fields.length.should == 1
     schema.fields.first.name.should == 'income'
     schema.primary_key.should == ['income']
-    schema.to_json.should == Yajl::Encoder.encode(json, :pretty => true)
+
+    modified_json = json.merge('primaryKey' => 'income')
+    schema.to_json.should == Yajl::Encoder.encode(modified_json, :pretty => true)
+  end
+
+  it "should initialize with string primaryKey" do
+    modified_json = json.merge('primaryKey' => 'income')
+
+    schema = DataPackage::Schema.new(modified_json)
+
+    schema.fields.length.should == 1
+    schema.fields.first.name.should == 'income'
+    schema.primary_key.should == ['income']
+    schema.to_json.should == Yajl::Encoder.encode(modified_json, :pretty => true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_package
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mode Analytics
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcsv