datapackage 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 577f0cccc791f7f81d19b087038ec6061dcee12a
+  data.tar.gz: 9cac27e6e3eaa0be69575afd50a7193e5a7fb23c
+SHA512:
+  metadata.gz: ff2eaf11c9605f6fc20019b285747f952de6563da74e6fc2f5d0eb6d3f650fc32d1d40f44e44776a3f17f56152fa2479d6ff5a37d3f253eae4420144054db829
+  data.tar.gz: e83f013ca8d5be9c002b43abda33c89d906f9162722a4044267c652e2e96d3d5612d39c5727cc094941fc97e3f62e1f53862bd8d0499975a3d837dac45ab6f90

data/bin/datapackage

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift File.join( File.dirname(__FILE__), "..", "lib")
-
+require 'colorize'
 require 'datapackage'
 
 
@@ -14,22 +14,26 @@ package = DataPackage::Package.new(ARGV[0])
 
 messages = package.validate(:simpledataformat)
 
+print "Package #{package.name.colorize(:light_blue)} is "
+
 if messages[:errors].length == 0
-    puts "Package #{package.name} is VALID"
+    puts "VALID".green
 else
-    puts "Package #{package.name} is INVALID"
-    puts "Errors: "
+    puts "INVALID".red
+    puts
+    puts "Errors: ".red
     messages[:errors].each_with_index do |msg, idx|
-        puts "#{idx+1}. #{msg[:type]} error. #{msg[:fragment]}"
-        puts "  #{msg[:message]}"
+        puts "#{idx+1}. #{msg[:type].capitalize.to_s.red} error at #{msg[:fragment]}"
+        puts "   #{msg[:message]}"
     end    
 end
 
+puts
 if !messages[:warnings].empty?
-    puts "Warnings: "
+    puts "Warnings: ".yellow
     messages[:warnings].each_with_index do |msg, idx|
-        puts "#{idx+1}. #{msg[:type]} warning. #{msg[:fragment]}"
-        puts "  #{msg[:message]}"
+        puts "#{idx+1}. #{msg[:type].capitalize.to_s.yellow} warning at #{msg[:fragment]}"
+        puts "   #{msg[:message]}"
     end    
 end
 

data/lib/datapackage/validator.rb

@@ -131,7 +131,11 @@ module DataPackage
         def validate_resource(package, resource, path)
             super(package, resource, path)
             
-            if !csv?(resource)
+            if !resource["mediatype"] && !resource["format"]
+              add_warning(:metadata, "#{resource["name"]} does not specify either a mediatype or format", path )
+            end
+              
+            if !csv?(resource, package)
                 add_error(:integrity, "#{resource["name"]} is not a CSV file", path )
             else  
                 schema = resource["schema"]              
@@ -139,7 +143,7 @@ module DataPackage
                     add_error(:metadata, "#{resource["name"]} does not have a schema", path )
                 else
                     messages = JSON::Validator.fully_validate(@jsontable_schema, schema, :errors_as_objects => true)
-                    @messages[:errors] += adjust_messages(messages, :metadata, path + "/schema/")                                                                                   
+                    @messages[:errors] += adjust_messages(messages, :metadata, path + "/schema/")
                 end  
                           
                 if resource["dialect"]
@@ -150,7 +154,10 @@ module DataPackage
                 if package.resource_exists?( package.resolve_resource( resource ) )
                     if resource["schema"] && resource["schema"]["fields"]
                         fields = resource["schema"]["fields"]
-                        declared_fields = fields.map{ |f| f["name"] }
+                        declared_fields = fields.map{ |f| f["name"] }.compact
+                        if declared_fields == []
+                          add_error(:metadata, "Schema does not declare any named fields", path + "/schema/fields")
+                        end
                         headers = headers(package, resource, path)
                         
                         #set algebra to finding fields missing from schema and/or CSV file
@@ -172,9 +179,10 @@ module DataPackage
             
         end
                 
-        def csv?(resource)
+        def csv?(resource, package)
             resource["mediatype"] == "text/csv" ||
-            resource["format"] == "csv"       
+            resource["format"] == "csv" || 
+            package.resolve_resource(resource).split(".").last == "csv"
         end  
         
         def headers(package, resource, path)

data/lib/datapackage/version.rb

@@ -1,3 +1,3 @@
 module DataPackage
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: datapackage
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Leigh Dodds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -115,40 +116,38 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
+- README.md
 - bin/datapackage
-- etc/jsontable-schema.json
-- etc/datapackage-schema.json
 - etc/README.md
 - etc/csvddf-dialect-schema.json
+- etc/datapackage-schema.json
+- etc/jsontable-schema.json
 - lib/datapackage.rb
-- lib/datapackage/validator.rb
 - lib/datapackage/package.rb
+- lib/datapackage/validator.rb
 - lib/datapackage/version.rb
-- LICENSE.md
-- README.md
 homepage: http://github.com/theodi/datapackage.rb
 licenses: []
+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
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for working with data packages
 test_files: []
-has_rdoc: