tableschema 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69fad2bdd9eb1c16052eaa8e7d94935721b8b40d50c9d25760354d4f3875cb8d
-  data.tar.gz: 642182b87bed0f569d47f93a6c74002e9c1610508cd5cceabc8be32fe5314f2a
+  metadata.gz: 5673159d49f406d03b040bd8dafcabaa8a95ca080e09efd8ec0cd55e29b61343
+  data.tar.gz: 6e8d2797825cbbefab12748669c23af71627b32ca1218609daf8e247094719af
 SHA512:
-  metadata.gz: 07473330bf865ca8b1531e3994ea79ebdcdc3c311320776362c1c3baa52e8ae2bcd2b201f8d337e5e274fd1370a3873e32ba2dac37081ee3a980eecf27eb4cda
-  data.tar.gz: c903e30b4311df2f5c27b4a4d21517572ded8ecc648fbfd9c70555e6b6c81c1445e1ee346cd91651e12a94d8b3475af3e8aaa0ddf016e7835a9e592fa2ed3f32
+  metadata.gz: 21dde94b56b75ee5fc6c64b8994abc6e9689948167d095e68197b9cc3a3fbbe50ec21d369669fabe7d0154bf673631594117cade95934e71946439970ced2e7b
+  data.tar.gz: 504678c0362c581de5c2d904781729cad61c8d09f0543aa6909ff68bec5142227af91bd96e2b242493a897769a164ec9ffffe553410b0b3ee34a0bc3488e4333

data/.github/issue_template.md

@@ -4,4 +4,4 @@ Please replace this line with full information about your idea or problem. If it
 
 ---
 
-Please preserve this line to notify @roll (maintainer of this repository)
+Please preserve this line to notify @roll (lead of this repository)

data/.github/pull_request_template.md

@@ -4,4 +4,4 @@ Please replace this line with full information about your pull request. Make sur
 
 ---
 
-Please preserve this line to notify @roll (maintainer of this repository)
+Please preserve this line to notify @roll (lead of this repository)

data/.github/workflows/general.yml

@@ -0,0 +1,60 @@
+name: general
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - v*.*.*
+  pull_request:
+    branches:
+      - main
+
+jobs:
+
+  # Test
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.4]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: |
+          gem install bundler -v 1.11.2
+          bundle
+      - name: Test software
+        run: rake spec
+      - name: Report coverage
+        uses: codecov/codecov-action@v1
+
+  # Release
+
+  release:
+    if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    needs: [test]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.4
+      - name: Release Gem
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release
+      - name: Release to GitHub
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/Makefile

@@ -2,7 +2,7 @@
 
 
 VERSION := $(shell cat lib/tableschema/version.rb | awk -F\" '{ print $$2 }' | xargs)
-MAINTAINER := $(shell head -n 1 MAINTAINER.md)
+LEAD := $(shell head -n 1 LEAD.md)
 
 
 all: list
@@ -11,15 +11,16 @@ list:
 	@grep '^\.PHONY' Makefile | cut -d' ' -f2- | tr ' ' '\n'
 
 release:
-	git checkout master && git pull origin && git fetch -p
-	git log --pretty=format:"%C(yellow)%h%Creset %s%Cgreen%d" --reverse -20
-	@echo "Releasing v$(VERSION) in 10 seconds. Press <CTRL+C> to abort" && sleep 10
+	git checkout main && git pull origin && git fetch -p && git diff
+	@echo "\nContinuing in 10 seconds. Press <CTRL+C> to abort\n" && sleep 10
+	@git log --pretty=format:"%C(yellow)%h%Creset %s%Cgreen%d" --reverse -20
+	@echo "\nReleasing v$(VERSION) in 10 seconds. Press <CTRL+C> to abort\n" && sleep 10
 	git commit -a -m 'v$(VERSION)' && git tag -a v$(VERSION) -m 'v$(VERSION)'
 	git push --follow-tags
 
 templates:
-	sed -i -E "s/@(\w*)/@$(MAINTAINER)/" .github/issue_template.md
-	sed -i -E "s/@(\w*)/@$(MAINTAINER)/" .github/pull_request_template.md
+	sed -i -E "s/@(\w*)/@$(LEAD)/" .github/issue_template.md
+	sed -i -E "s/@(\w*)/@$(LEAD)/" .github/pull_request_template.md
 
 version:
 	@echo $(VERSION)

data/README.md

@@ -1,10 +1,10 @@
 # tableschema-rb
 
-[![Travis](https://travis-ci.org/frictionlessdata/tableschema-rb.svg?branch=master)](https://travis-ci.org/frictionlessdata/tableschema-rb)
-[![Coveralls](https://coveralls.io/repos/github/frictionlessdata/tableschema-rb/badge.svg?branch=master)](https://coveralls.io/github/frictionlessdata/tableschema-rb?branch=master)
-[![Gem Version](http://img.shields.io/gem/v/tableschema.svg)](https://rubygems.org/gems/tableschema)
-[![SemVer](https://img.shields.io/badge/versions-SemVer-brightgreen.svg)](http://semver.org/)
-[![Gitter](https://img.shields.io/gitter/room/frictionlessdata/chat.svg)](https://gitter.im/frictionlessdata/chat)
+[![Build](https://img.shields.io/github/workflow/status/frictionlessdata/tableschema-rb/general/main)](https://github.com/frictionlessdata/tableschema-rb/actions)
+[![Coverage](https://img.shields.io/codecov/c/github/frictionlessdata/tableschema-rb/main)](https://codecov.io/gh/frictionlessdata/tableschema-rb)
+[![Release](http://img.shields.io/gem/v/tableschema.svg)](https://rubygems.org/gems/tableschema)
+[![Codebase](https://img.shields.io/badge/codebase-github-brightgreen)](https://github.com/frictionlessdata/tableschema-rb)
+[![Support](https://img.shields.io/badge/support-discord-brightgreen)](https://discordapp.com/invite/Sewv6av)
 
 A utility library for working with [Table Schema](https://specs.frictionlessdata.io/table-schema/) in Ruby.
 
@@ -74,7 +74,7 @@ schema = {
     ]
 }
 
-source = 'https://github.com/frictionlessdata/tableschema-rb/raw/master/spec/fixtures/simple_data.csv'
+source = 'https://github.com/frictionlessdata/tableschema-rb/raw/main/spec/fixtures/simple_data.csv'
 
 table = TableSchema::Table.new(source, schema: schema)
 
@@ -99,7 +99,7 @@ Both `iter` and `read` take the optional parameters:
 If you don't have a schema for a CSV, and want to generate one, you can infer a schema like so:
 
 ```ruby
-source = 'https://github.com/frictionlessdata/tableschema-rb/raw/master/spec/fixtures/simple_data.csv' # Can also be a url or array of arrays
+source = 'https://github.com/frictionlessdata/tableschema-rb/raw/main/spec/fixtures/simple_data.csv' # Can also be a url or array of arrays
 
 table = TableSchema::Table.new(source)
 table.infer()

data/lib/tableschema/helpers.rb

@@ -41,5 +41,13 @@ module TableSchema
       }
     end
 
+    def read_file(descriptor)
+      if (descriptor =~ /http/) != 0
+	File.open(descriptor).read
+      else
+        URI.parse(descriptor).open.read
+      end
+    end
+
   end
 end

data/lib/tableschema/schema.rb

@@ -145,7 +145,7 @@ module TableSchema
         descriptor
       elsif descriptor.class == String
         begin
-          JSON.parse(open(descriptor).read, symbolize_names: true)
+          JSON.parse(read_file(descriptor), symbolize_names: true)
         rescue Errno::ENOENT
           raise SchemaException.new("File not found at `#{descriptor}`")
         rescue OpenURI::HTTPError => e

data/lib/tableschema/table.rb

@@ -1,6 +1,6 @@
 module TableSchema
   class Table
-
+    include TableSchema::Helpers
     # Public
 
     attr_reader :headers, :schema
@@ -67,8 +67,8 @@ module TableSchema
     private
 
     def parse_csv(csv)
-      csv = csv.is_a?(Array) ? StringIO.new(array_to_csv csv) : open(csv)
-      CSV.new(csv, @csv_options)
+      csv = csv.is_a?(Array) ? StringIO.new(array_to_csv csv) : read_file(csv)
+      CSV.new(csv, **@csv_options)
     end
 
     def array_to_csv(array)

data/lib/tableschema/version.rb

@@ -1,3 +1,3 @@
 module TableSchema
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.4".freeze
 end

data/tableschema.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10.0"
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json-schema", "~> 2.8.0"
   spec.add_dependency "uuid", "~> 2.3.8"
   spec.add_dependency "tod", "~> 2.1.0"
-  spec.add_dependency "activesupport", "~> 5.1.0"
+  spec.add_dependency "activesupport" #, "~> 5.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableschema
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Open Knowledge Foundation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
 description: 
 email:
 - info@okfn.org
@@ -174,15 +174,15 @@ files:
 - ".github/issue_template.md"
 - ".github/pull_request_template.md"
 - ".github/stale.yml"
+- ".github/workflows/general.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- LEAD.md
 - LICENSE.txt
-- MAINTAINER.md
 - Makefile
 - README.md
 - Rakefile
@@ -245,8 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Table Schema. Formerly known as 'jsontableschema'

data/.travis.yml

@@ -1,28 +0,0 @@
-language:
-  ruby
-
-rvm:
-- 2.3.3
-- 2.4.0
-
-before_install:
-  gem install bundler -v 1.11.2
-
-install:
-  - bundle
-  - gem install rubocop
-
-script:
-  - rake spec
-
-after_success:
-  - rubocop
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: ZOvsryo3ZRUom+YBwpYrqLOQ8Sa/BSmp3igu4k5RcLOIVYwGgN1lLgeleKvFJHbuPwauFOdD3XsoOiHHM6D4d1YvgmSuQROU4Z4zyuGb2vnnAxhvwTvFjecSKVJk+mcvel1EjP+Az0UH2Oom3Dctp+oCpdtJQ3D0tDmvHmJhRQOQJcAhwiXKUMadF6vWvmzHkkaYfxUIwh+Bd5gna2tSImPdX6E4MPba0Lpi+Afhl4Xu3OSRGx4q2NFPrdqqRJj4dqASXREP562VBiiSBvZR/c+2E5MDSUK4J6aUTxaRQKYXN5tDsiXFW6FLc77KS2jYXxPZSsktP80Ms1BYhr1W8pWKBFEJW96uShrIYbyWdkYjqozPShxMl84+cTl+UqtmE7TJSVZClGBz2b1qUgtME2IAjMElR9a/qwCfHzltqitSWvlEvdWrHgd8iIkTuBCKYBgTQeS++zFWLvIOdDSiAHGOE0w2bTL2c53viBn1cRYYpMJR8kOBRjipytBjqzWXQGQi1WYmpD8+J03KHzSCfZolZBqeClcaL2e2ggEaWUH4FIyVk2Df5Rs5MQwXwrb3mFnddetRTHGBhONv1SJ43uBbe/F1y7HVPJeW2/1gg3Gfj4iw/9kdq+KjHJEETQJXVXaKAMiDfzXfNfkLBk8RgLFepfIp13F38myMCWnvtyg=
-  gem: tableschema
-  on:
-    tags: true
-    repo: frictionlessdata/tableschema-rb