material_service_client 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d59a2ec5fbdca6065dc237f7c83fc80823fc595
-  data.tar.gz: 4df429c8fb65297bd8934c9314b230739c262584
+  metadata.gz: 913d0e9c2b98a4a2142d5f8087cffdb5d97c920d
+  data.tar.gz: b40a24db29bfd035b3f0ccaf46c3eec905c64d0a
 SHA512:
-  metadata.gz: 10e785523716be1cad6acbc38a6be5ad391b2fd4036b68d5dc7c25c7417e8f2c59bdda4560465ef1f487ff303d28c628cacff930150ce7cac0855511daf30a93
-  data.tar.gz: 7cde045256097b3951f2097679d9a07bb7156728fbd768c743a1498e4c04ee28685615ef943bc205f52802420e912e1dbed0706afa0c7aa3f711c87f0c0da1a5
+  metadata.gz: b61e26c437c0a5d1ce429c712dd66b8dbf195b15c5c1a28d2c929d9ce66b6b4a35c92fb5120a97e88fef56ad22f7ef744e3484ea0fdb603227d3a74ce79b965d
+  data.tar.gz: e34fb3413c50086eb5b78d4dbf3ee8025bde8bd5aa33bca3a9c6d2feac17e8e9f0205082d416cf9d38679493bfcc17843173ff4424df8719915b4b6f8986d2d9

data/lib/material_service_client.rb

@@ -1,51 +1,82 @@
 require "material_service_client/version"
+require 'faraday'
+require 'json'
 
 module MaterialServiceClient
-	def self.post(data)
-		conn = get_connection
-		JSON.parse(conn.post('/materials', data.to_json).body)
-	end
+	module Material
+		def self.post(data)
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.post('/materials', data.to_json).body)
+		end
 
-	def self.put(data)
-		uuid = data[:uuid]
-		data_to_send = data.reject{|k,v| k.to_sym == :uuid}
+		def self.put(data)
+			uuid = data[:uuid]
+			data_to_send = data.reject{|k,v| k.to_sym == :uuid}
 
-		conn = get_connection
-		JSON.parse(conn.put('/materials/'+uuid, data_to_send.to_json).body)
-	end
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.put('/materials/'+uuid, data_to_send.to_json).body)
+		end
+
+		def self.get(uuid)
+			return nil if uuid.nil?
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.get('/materials/'+uuid).body)
+		end
+
+		def self.valid?(uuids)
+			conn = MaterialServiceClient::get_connection
+			data = { materials: uuids }
 
-	def self.get(uuid)
-		return nil if uuid.nil?
-		conn = get_connection
-		JSON.parse(conn.get('/materials/'+uuid).body)
+			response = conn.post('/materials/validate', data.to_json)
+			response.body == 'ok'
+		end
+
+		def self.delete(uuid)
+			return nil if uuid.nil?
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.delete('/materials/'+uuid).body)
+		end
 	end
 
-	def self.valid?(uuids)
-		conn = get_connection
-		data = { materials: uuids }
-
-		response = conn.post('/materials/validate', data.to_json)
-		
-		# response = conn.post do |req|
-		# 	req.url '/materials/validate'
-		# 	req.headers['Content-Type'] = 'application/json'
-		# 	req.headers['Accept'] = 'application/json'
-		# 	req.body = { materials: uuids }.to_json
-		# end
-		response.body == 'ok'
-  	end
+	module Container
+		def self.post(data)
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.post('/containers', data.to_json).body)
+		end
+
+		def self.put(data)
+			uuid = data[:uuid]
+			data_to_send = data.reject{|k,v| k.to_sym == :uuid}
+
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.put('/containers/'+uuid, data_to_send.to_json).body)
+		end
+
+		def self.get(uuid)
+			return nil if uuid.nil?
+			conn = MaterialServiceClient::get_connection
+			JSON.parse(conn.get('/containers/'+uuid).body)
+		end
+
+		def self.delete(uuid)
+			return nil if uuid.nil?
+			conn = MaterialServiceClient::get_connection
+			conn.delete('/containers/'+uuid)
+		end
+	end
 
 	private
 
 	def self.get_connection
-		conn = Faraday.new(:url => Rails.application.config.material_url) do |faraday|
+		conn = Faraday.new(:url => ENV['MATERIALS_URL']) do |faraday|
 		  # faraday.use ZipkinTracer::FaradayHandler, 'eve'
-		  faraday.proxy Rails.application.config.material_url
+		  faraday.proxy ENV['MATERIALS_URL']
 		  faraday.request  :url_encoded
 		  faraday.response :logger
-		  faraday.adapter  Faraday.default_adapter 
+		  faraday.adapter  Faraday.default_adapter
 		end
-		conn.headers = {'Content-Type' => 'application/json'} 
+		conn.headers = {'Content-Type' => 'application/json'}
 		conn
 	end
+
 end

data/lib/material_service_client/version.rb

@@ -1,3 +1,3 @@
 module MaterialServiceClient
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/material_service_client.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  
+
   # if spec.respond_to?(:metadata)
   #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   # else
@@ -35,4 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
+  spec.add_dependency "faraday"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_service_client
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Harriet Craven
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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
+        version: '0'
 description: Gem to access the material service API.
 email:
 - hc6@sanger.ac.uk