Merge branch 'master' of github.com:ElixirUK/TeSS_api_client

Author: knirirr

README.md

@@ -19,7 +19,8 @@ content_provider = ContentProvider.new(
     "https://upload.wikimedia.org/wikipedia/commons/thumb/8/85/Smiley.svg/2000px-Smiley.svg.png",
     "We're sharing our content with TeSS!"
     )
-content_provider = Uploader.create_or_update_content_provider(content_provider)
+    
+content_provider.create_or_update
 
 material = Material.new(title: 'How to use TeSS API',
                         url: 'http://mysite.org/tess_api',
@@ -31,7 +32,7 @@ material = Material.new(title: 'How to use TeSS API',
                         scientific_topic: ['Computational Biology'],
                         keywords: ['tutorial', 'TeSS', 'sharing'])
 
-Uploader.create_or_update_material(upload_material)
+material.create
 ```
 
 If a website has schema.org content embedded in either RDFa or Microdata formats you can extract it easily. First convert it to RDF, and then use the RdfaExtractor library to parse it.

lib/content_provider.rb

@@ -0,0 +1,63 @@
+module Tess
+  module API
+    module ApiResource
+
+      attr_accessor :last_action, :errors
+
+      def create
+        begin
+          response = Uploader.do_upload(self, true, self.class.data_type, "/#{self.class.resource_path}.json", :post)
+          self.id = response['id']
+          self.last_action = :create
+        rescue RestClient::ExceptionWithResponse => e
+          self.errors = error_message(e)
+        end
+
+        self
+      end
+
+      def update
+        begin
+          Uploader.do_upload(self, true, self.class.data_type, "/#{self.class.resource_path}/#{self.id}.json", :put)
+          self.last_action = :update
+        rescue RestClient::ExceptionWithResponse => e
+          self.errors = error_message(e)
+        end
+
+        self
+      end
+
+      def create_or_update
+        if exists?
+          update
+        else
+          create
+        end
+      end
+
+      def find_or_create
+        create unless exists?
+
+        self
+      end
+
+      def exists?
+        response = Uploader.do_upload(self, false, self.class.data_type, "/#{self.class.resource_path}/check_exists.json", :post)
+        self.id = response['id']
+
+        !response['id'].nil?
+      end
+
+      private
+
+      def error_message(exception)
+        begin
+          JSON.parse(exception.response)
+        rescue JSON::ParserError
+          { error_message: exception }
+        end
+      end
+
+    end
+  end
+end

lib/material.rb

@@ -0,0 +1,34 @@
+module Tess
+  module API
+    class ContentProvider < Resource
+
+      include ApiResource
+
+      def self.data_type
+        :content_provider
+      end
+
+      def self.resource_path
+        'content_providers'
+      end
+
+      attr_accessor :title, :url, :image_url, :description, :id, :content_provider_type, :node_name, :keywords
+
+      PROVIDER_TYPE = {
+          organisation: 'Organisation',
+          portal: 'Portal',
+          project: 'Project'
+      }
+
+      cv_attributes({ content_provider_type: PROVIDER_TYPE, node_name: Tess::API::Node::NODE_NAMES })
+
+      def initialize(params = {})
+        params[:content_provider_type] ||= :organisation
+        params[:node_name] ||= params.delete(:node)
+
+        super
+      end
+
+    end
+  end
+end