Add new material/event attributes from TeSS 1.2 release

Bump Ruby version and various gem versions

Author: fbacall

.github/workflows/tests.yml

@@ -0,0 +1,21 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7', '3.0.4']
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.1 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        with:
+          persist-credentials: false
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake test

.ruby-gemset

@@ -1 +1 @@
-ruby-2.2.6
+ruby-3.0.4

.ruby-version

@@ -1,37 +1,37 @@
-# TeSS API Client
-A gem for uploading data to the [TeSS](http://tess.elixir-uk.org) portal. Use if you have training or event content you wish to push to TeSS.
-
-## Get Started
-Add the TeSS API to your Gemfile and use bundle to install
-
-`$ echo "gem 'tess_api_client', :git => git://github.com/ElixirUK/TeSS_api_client.git" >> Gemfile`
-
-`$ bundle install` 
-
-Create a new ruby script which uses the gem. Use the ContentProvider model to create a new content provider in TeSS and the Material or Event model to create new resources. 
-`$ nano my_upload_script.rb`
-
-```ruby
-require 'tess_api_client'
-
-content_provider = Tess::API::ContentProvider.new(
-    title: 'My Organization Name',
-    url: 'https://my.org.org/',
-    image_url: 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/85/Smiley.svg/2000px-Smiley.svg.png',
-    description: "We're sharing our content with TeSS!")
-
-material = Tess::API::Material.new(
-    title: 'How to use TeSS API',
-    url: 'http://mysite.org/tess_api',
-    short_description: 'Everything you need to know to get you started using the TeSS API',
-    doi: 'http://dx.doi.org/10002-20fk',
-    remote_updated_date: Time.now,
-    content_provider: content_provider, # The content provider is created if needed when the material is created.
-    scientific_topic: ['Computational Biology'],
-    keywords: ['tutorial', 'TeSS', 'sharing'])
-
-material.create
-```
-
-## Futher Examples
-More examples can be found in the `test` directory of this repository, or in the [TeSS Scrapers repository](https://github.com/ElixirTeSS/TeSS_scrapers)
+# TeSS API Client
+A gem for uploading data to the [TeSS](http://tess.elixir-uk.org) portal. Use if you have training or event content you wish to push to TeSS.
+
+## Get Started
+Add the TeSS API to your Gemfile and use bundle to install
+
+`$ echo "gem 'tess_api_client', :git => git://github.com/ElixirUK/TeSS_api_client.git" >> Gemfile`
+
+`$ bundle install` 
+
+Create a new ruby script which uses the gem. Use the ContentProvider model to create a new content provider in TeSS and the Material or Event model to create new resources. 
+`$ nano my_upload_script.rb`
+
+```ruby
+require 'tess_api_client'
+
+content_provider = Tess::API::ContentProvider.new(
+    title: 'My Organization Name',
+    url: 'https://my.org.org/',
+    image_url: 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/85/Smiley.svg/2000px-Smiley.svg.png',
+    description: "We're sharing our content with TeSS!")
+
+material = Tess::API::Material.new(
+    title: 'How to use TeSS API',
+    url: 'http://mysite.org/tess_api',
+    description: 'Everything you need to know to get you started using the TeSS API',
+    doi: 'http://dx.doi.org/10002-20fk',
+    remote_updated_date: Time.now,
+    content_provider: content_provider, # The content provider is created if needed when the material is created.
+    scientific_topic: ['Computational Biology'],
+    keywords: ['tutorial', 'TeSS', 'sharing'])
+
+material.create
+```
+
+## Futher Examples
+More examples can be found in the `test` directory of this repository, or in the [TeSS Scrapers repository](https://github.com/ElixirTeSS/TeSS_scrapers)

README.md

@@ -12,7 +12,8 @@ def self.resource_path
         'content_providers'
       end
 
-      attr_accessor :title, :url, :image_url, :description, :id, :content_provider_type, :node_name, :keywords
+      attr_accessor :title, :url, :image_url, :description, :id, :content_provider_type, :node_name, :keywords,
+                    :contact
 
       PROVIDER_TYPE = {
           organisation: 'Organisation',

lib/tess/api/content_provider.rb

@@ -17,7 +17,11 @@ def self.resource_path
                     :scientific_topic_names, :scientific_topic_uris, :operation_names, :operation_uris,
                     :event_types, :keywords, :start, :end, :sponsors, :online, :for_profit, :venue,
                     :city, :county, :country, :postcode, :latitude, :longitude, :package_ids, :node_ids, :target_audience,
-                    :eligibility, :host_institutions, :capacity, :contact, :external_resources_attributes, :timezone
+                    :eligibility, :host_institutions, :capacity, :contact, :external_resources_attributes, :timezone,
+                    :cost_value, :funding, :attendee_count, :applicant_count, :trainer_count, :feedback, :notes,
+                    :duration, :recognition, :learning_objectives, :prerequisites, :tech_requirements, :cost_basis,
+                    :cost_currency, :fields
+
 
       EVENT_TYPE = {
           awards_and_prizegivings: 'awards_and_prizegivings',

lib/tess/api/event.rb

@@ -13,11 +13,13 @@ def self.resource_path
         'materials'
       end
 
-      attr_accessor :id, :title, :url, :short_description, :long_description, :doi,:last_scraped, :scraper_record,
+      attr_accessor :id, :title, :url, :description, :doi, :last_scraped, :scraper_record,
                     :remote_created_date,  :remote_updated_date, :package_ids, :keywords,
                     :scientific_topic_names, :scientific_topic_uris, :operation_names, :operation_uris,
                     :licence, :difficulty_level, :contributors, :authors, :target_audience, :node_ids,
-                    :external_resources_attributes, :resource_type
+                    :external_resources_attributes, :resource_type, :other_types, :date_created, :date_modified,
+                    :date_published, :prerequisites, :version, :status, :syllabus, :subsets, :contact,
+                    :learning_objectives, :fields
 
       def initialize(params = {})
         params[:last_scraped] = Time.now

lib/tess/api/material.rb

@@ -1,10 +1,7 @@
 module Tess
   module API
     require 'inifile'
-    require 'net/http'
-    require 'net/https'
     require 'json'
-    require 'open-uri'
     require 'digest/sha1'
     require 'rest-client'
 

lib/tess_api_client.rb

@@ -1,31 +1,18 @@
 Gem::Specification.new do |s|
   s.name        = 'tess_api_client'
-  s.version     = '0.3.3'
-  s.date        = '2018-04-30'
+  s.version     = '0.4.0'
+  s.date        = '2022-07-28'
   s.summary     = 'Libraries for uploading files to https://github.com/ElixirTeSS/TeSS'
   s.description = 'Uses the a Custom RoR API on https://tess.elixir-europe.org to upload data in the format being used by the TeSS project.'
   s.authors     = ['Milo Thurston','Niall Beard','Aleksandra Nenadic','Finn Bacall']
   s.email       = 'tess-support@googlegroups.com'
-  s.files       = ['lib/tess_api_client.rb',
-                   'lib/tess/api/api_resource.rb',
-                   'lib/tess/api/content_provider.rb',
-                   'lib/tess/api/exceptions.rb',
-                   'lib/tess/api/has_content_provider.rb',
-                   'lib/tess/api/event.rb',
-                   'lib/tess/api/material.rb',
-                   'lib/tess/api/node.rb',
-                   'lib/tess/api/resource.rb',
-                   'lib/tess/api/uploader.rb'
-  ]
+  s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/ElixirTeSS/TeSS_api_client'
   s.license     = 'BSD'
-  s.add_runtime_dependency 'json', '~> 1.8'
-  s.add_runtime_dependency 'net', '~> 0.3'
   s.add_runtime_dependency 'inifile', '~> 3.0.0'
   s.add_runtime_dependency 'rest-client', '~> 2.0.0'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'test-unit', '~> 3.2.1'
-  s.add_development_dependency 'webmock', '~> 1.24.6'
+  s.add_development_dependency 'webmock'
   s.add_development_dependency 'vcr', '~> 3.0.3'
   s.add_development_dependency 'simplecov'
 end

tess_api_client.gemspec

@@ -15,7 +15,8 @@ class ContentProviderTest < Test::Unit::TestCase
           description: 'Hey!',
           content_provider_type: 'anything?',
           node_name: 'Francis',
-          keywords: ['cat', 'dog'] })
+          keywords: ['cat', 'dog'],
+          contact: 'Jane Smith' })
 
     @content_provider_to_be_created = Tess::API::ContentProvider.new(
         { title: 'Provider of Content',
@@ -96,10 +97,14 @@ class ContentProviderTest < Test::Unit::TestCase
     c.keywords = ['hamster']
     assert_equal ['hamster'], c.keywords
 
+    assert_equal 'Jane Smith', c.contact
+    c.contact = 'Robert Smith'
+    assert_equal 'Robert Smith', c.contact
+
     dump = c.dump
     parsed_json = JSON.parse(c.to_json)
 
-    [:title, :url, :image_url, :description, :id, :content_provider_type, :node_name, :keywords].each do |attr|
+    [:title, :url, :image_url, :description, :id, :content_provider_type, :node_name, :keywords, :contact].each do |attr|
       assert_equal c.send(attr), c[attr.to_s], "Unexpected value of '#{attr}' for content provider when using []"
       assert_equal c.send(attr), dump[attr.to_s], "Unexpected value of '#{attr}' for content provider in hash dump"
       assert_equal c.send(attr).to_s, parsed_json[attr.to_s].to_s, "Unexpected value of '#{attr}' for content provider in JSON"