datapackage 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b986907d114eedf9c0de5138f42b50934f249d7c
-  data.tar.gz: 0a011fae8e6e404b6ca5df4ae1bd878056523930
+  metadata.gz: 24359f31d78a11bb84030f328d756d2eeeddf3ff
+  data.tar.gz: 66bf2e40772e87ddb61278934ecfa89bcacd19c4
 SHA512:
-  metadata.gz: 3f8747b92725b9c94c70dece7dd38e82b93e5e4151b70d94c66faaed4ae121ef055783afc3a0b81ade12e639ddbb59c88a2f985002b0d48581e89327f7690ee6
-  data.tar.gz: 4f4fae0f01f0ac90f008f0e76fc4875cc35ad54cb195e870920a5b8fae4f24b5026030201737b6a547a720b39e995406a2a6fa7e6a79cd3ee7e2fee7e0df58b6
+  metadata.gz: 003a61b6fe90164f3ade94ebd60c203ca7391f983a3b8fe3dc919bbbfefae50e95bbc2de8262f555dd1a15b5d12921f21f55be23c115426ecc12ebf7d383c24b
+  data.tar.gz: 02f13d64df668a0f532bb4d28ec11714dca9086fbc0771eb3e083dcb28992eb7644b743380425fa04b7bf4c6ae282eca8cbc1329951a9678ee90c57816e94f9a

data/README.md

@@ -108,20 +108,23 @@ first_resource.tabular?
 first_resource.source
 ```
 
-You can then read the source depending on its `source_type`: `inline`, `remote` or `local`.
+You can then read the source depending on its type. For example if resource is local and not multipart it could by open as a file: `File.open(resource.source)`.
 
 If a resource complies with the [Tabular Data Resource spec](https://specs.frictionlessdata.io/tabular-data-resource/) or uses the
-`tabular-data-resource` [profile](#profiles) you can make a [TableSchema::Table](https://github.com/frictionlessdata/tableschema-rb) for it:
+`tabular-data-resource` [profile](#profiles) you can read resource rows:
 
 ```ruby
-package.resources[0].tabular?
-table = package.resources[0].table
+resoure = package.resources[0]
+resource.tabular?
+resource.headers
+resource.schema
 
-# Read the entire table at once
-data = table.read
+# Read the the whole rows at once
+data = resource.read
+data = resource.read(keyed: true)
 
 # Or iterate through it
-data = table.iter {|row| print row}
+data = resource.iter {|row| print row}
 ```
 
 See [TableSchema](https://github.com/frictionlessdata/tableschema-rb) documentation for other things you can do with tabular resource.

data/lib/datapackage/resource.rb

@@ -67,8 +67,40 @@ module DataPackage
 
     alias :tabular :tabular?
 
+    def headers
+      if !tabular
+        nil
+      end
+      get_table.headers
+    end
+
+    def schema
+      if !tabular
+        nil
+      end
+      get_table.schema
+    end
+
+    def iter(*args, &block)
+      if !tabular
+        message ='Methods iter/read are not supported for non tabular data'
+        raise ResourceException.new message
+      end
+      get_table.iter(*args, &block)
+    end
+
+    def read(*args, &block)
+      if !tabular
+        message ='Methods iter/read are not supported for non tabular data'
+        raise ResourceException.new message
+      end
+      get_table.read(*args, &block)
+    end
+
+    # Deprecated
+
     def table
-      @table ||= TableSchema::Table.new(self.source, self['schema']) if tabular?
+      get_table
     end
 
     # Private
@@ -90,6 +122,10 @@ module DataPackage
       end
     end
 
+    def get_table
+      @table ||= TableSchema::Table.new(self.source, self['schema']) if tabular?
+    end
+
     def apply_defaults!
       self['profile'] ||= DataPackage::DEFAULTS[:resource][:profile]
       self['encoding'] ||= DataPackage::DEFAULTS[:resource][:encoding]

data/lib/datapackage/version.rb

@@ -1,3 +1,3 @@
 module DataPackage
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datapackage
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Leigh Dodds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema