assaydepot 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa533354a0d547e58f3126a353a07aa5addb768a
-  data.tar.gz: 6b96d17cdf3d767ecff0abda1b4059c394b223e3
+SHA256:
+  metadata.gz: ac3e59291589c598212136d3054ea0c5abc24c594b7278f3ab69b28c25fa7509
+  data.tar.gz: 3cabe89cd8cd5c7828a6de608ccf5587867ab707bbda355900b6cd9830c50528
 SHA512:
-  metadata.gz: c674589b7d71bc9ffb11cfd8a13d798502c08fe06656044fb9909d66a86f27729a4745e10a060d9c5fb14690d213035cd74bb85fc0ab5da507bfd7f96621dee5
-  data.tar.gz: 899c7ea6a6bbce87b2cc3c16e5ab1c89a701c5ed85d7754ba03f660ef902e197489c4213925aaca48af6ca464545a9e77eac6c55a92e7e3aa3585d40ccb1351c
+  metadata.gz: e68c24ab5fd611118b446d7a987336a364d062dd772fa2b920b213f4611f08bd64a0895d0501934bc5679e9cfc3d2092d1c9bf5164e4afec34bd1bcb50e78b94
+  data.tar.gz: 0c0c9f56eca381700ccb7cdc2c9d25823ecfb932e5b8f297330b976dd7e9504f1a6bcd101223123d66d3b9a2702217c1014c9b07cd4b2bbdb89a861c40064003

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.ruby-version
 .yardoc
 Gemfile.lock
 InstalledFiles

data/.rspec

@@ -0,0 +1 @@
+--format documentation

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 gem 'pry'
 gem 'pry-byebug'
-gem 'uri-query_params'
 gem 'dotenv-rails', groups: [:development, :test]
 
 # Specify your gem's dependencies in assaydepot.gemspec

data/README.md

@@ -1,10 +1,10 @@
-# Assay Depot ![Build Status](https://secure.travis-ci.org/assaydepot/assaydepot-rb.png) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/assaydepot/assaydepot-rb)
+# Scientist.com
 
-Ruby interface for Assay Depot's online laboratory (http://www.assaydepot.com).
+Ruby interface for Scientist.com's (formerly Assay Depot's) research services marketplace (http://www.scientist.com).
 
-## Assay Depot Developer Program
+## Scientist.com Developer Program
 
-An authentication token is required for the API to function. If you would like access to the API, please email cpetersen@assaydepot.com.
+An authentication token is required for the API to function. If you would like access to the API, please email support@scientist.com.
 
 ## Installation
 
@@ -22,16 +22,32 @@ Or install it yourself as:
 
 ## Basic Usage
 
+### Storefront
+
 ```ruby
 require 'assaydepot'
 AssayDepot.configure do |config|
   config.access_token = "1234567890"
-  config.url = "https://www.assaydepot.com/api"
+  config.url = "https://app.scientist.com"
 end
 wares = AssayDepot::Ware.find("Antibody")
 wares.total
 ```
 
+### Backoffice
+
+```ruby
+require 'assaydepot'
+AssayDepot.configure do |config|
+  config.access_token = "1234567890"
+  config.url = "https://backoffice.scientist.com"
+end
+quoted_ware = AssayDepot::QuotedWare.get()
+```
+
+## API Documentation
+See the [Scientist.com API documentation](https://assaydepot.github.io/scientist_api_docs/#introduction) for details on the Scientist.com API resources and code examples using this SDK.
+
 ## Using Facets
 
 ```ruby
@@ -56,7 +72,7 @@ providers.count
 ## Get Details
 ```ruby
 providers = AssayDepot::Provider.where(:starts_with => "a")
-AssayDepot::Provider.get(providers.first["id"])
+AssayDepot::Provider.get(id: providers.first["id"])
 ```
 
 ## Contributing
@@ -69,4 +85,4 @@ AssayDepot::Provider.get(providers.first["id"])
 
 ## License
 
-The Assay Depot Ruby SDK is released under the MIT license.
+The Scientist.com Ruby SDK is released under the MIT license.

data/assaydepot.gemspec

@@ -2,14 +2,14 @@
 require File.expand_path('../lib/assaydepot/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Christopher Petersen"]
-  gem.email         = ["christopher.petersen@gmail.com"]
-  gem.description   = %q{This is the first version of Assay Depot's Ruby SDK. It provides read access to Services and Vendors through assaydepot.com's JSON API.}
+  gem.authors       = ["Christopher Petersen", "Ron Ranauro"]
+  gem.email         = ["chris@scientist.com", "ron@scientist.com"]
+  gem.description   = %q{The Scientist Ruby SDK. It provides read access to Services and Suppliers through scientist.com's JSON API.}
   gem.summary       = %q{Provides read access to Assay Depot's Services and Vendors.}
   gem.homepage      = "https://github.com/assaydepot/assaydepot-rb"
 
   gem.add_dependency('json')
-  gem.add_dependency('uri-query_params')
+  gem.add_dependency('rack')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')

data/lib/assaydepot/client.rb

@@ -1,7 +1,7 @@
 require "open-uri"
 require "json"
-require 'uri/query_params'
 require 'net/http'
+require 'rack'
 
 module AssayDepot
   class Client
@@ -10,75 +10,86 @@ module AssayDepot
       @endpoint = options[:endpoint]
     end
 
-    def request(url, params={}, headers={}, auth={})
-      uri = URI( "#{url}" )
-      uri.query = URI.encode_www_form( params ) unless params.keys.length == 0
+    def request(url = nil, params={}, headers={}, auth={})
+      uri = url.nil? ? get_uri(params) : URI( "#{url}" )
+      puts "CLIENT.REQUEST HOST [#{uri.host}] URI [#{uri.request_uri}] PARAMS [#{params.inspect}]" if ENV["DEBUG"] == "true"
+      uri.query = Rack::Utils.build_nested_query(params) unless params.keys.length == 0
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme === 'https'
       request = Net::HTTP::Get.new(uri.request_uri)
+      request["Authorization"] = "Bearer #{AssayDepot.access_token}" unless params[:access_token] || auth[:username]
       request.basic_auth auth[:username], auth[:password] unless auth[:username].nil?
       res = http.request(request)
       JSON.parse(res.body)
     end
 
-    def get(params={})
+    def get(params: {})
       uri = get_uri( params )
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme === 'https'
       request = Net::HTTP::Get.new(uri.request_uri)
+      puts "CLIENT.GET HOST [#{uri.host}] URI [#{uri.request_uri}] PARAMS [#{params.inspect}]" if ENV["DEBUG"] == "true"
       request["Authorization"] = "Bearer #{AssayDepot.access_token}" unless params[:access_token]
       res = http.request(request)
-      JSON.parse(res.body)
+      res.body
     end
 
-    def put(body={}, params={})
+    def put(body: {}, params: {})
       uri = get_uri( params )
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme === 'https'
       request = Net::HTTP::Put.new(uri.request_uri)
+      puts "CLIENT.PUT HOST [#{uri.host}] URI [#{uri.request_uri}] BODY [#{body.inspect}] PARAMS [#{params.inspect}]" if ENV["DEBUG"] == "true"
       request["Authorization"] = "Bearer #{AssayDepot.access_token}" unless params[:access_token]
       request["Content-Type"] = "application/json"
       if (body.keys.length > 0)
         request.body = body.to_json
       end
       res = http.request(request)
-      JSON.parse(res.body)
+      res.body
     end
 
-    def post(body={}, params={})
+    def post(body: {}, params: {})
       uri = get_uri( params )
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme === 'https'
       request = Net::HTTP::Post.new(uri.request_uri)
+      puts "CLIENT.POST HOST [#{uri.host}] URI [#{uri.request_uri}] BODY [#{body.inspect}] PARAMS [#{params.inspect}]" if ENV["DEBUG"] == "true"
       request["Authorization"] = "Bearer #{AssayDepot.access_token}" unless params[:access_token]
       request["Accept"] = "application/json"
       request["Content-Type"] = "application/json"
-      if (body.keys.length > 0)
+      if (body && body.keys.length > 0)
         request.body = body.to_json
       end
       res = http.request(request)
-      JSON.parse(res.body)
+      res.body
     end
 
-    def delete(params={})
+    def delete(params: {})
       uri = get_uri( params )
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = uri.scheme === 'https'
       request = Net::HTTP::Delete.new(uri.request_uri)
+      puts "CLIENT.DELETE HOST [#{uri.host}] URI [#{uri.request_uri}]}] PARAMS [#{params.inspect}]" if ENV["DEBUG"] == "true"
       request["Authorization"] = "Bearer #{AssayDepot.access_token}" unless params[:access_token]
       res = http.request(request)
-      JSON.parse(res.body)
+      res.body
     end
 
-    def search(query, facets, params={})
+    def search(query: nil, facets: {}, params: {})
       params["q"] = query if query != ""
-      facets.map do |name,value|
+      facets&.map do |name,value|
         params["facets[#{name}][]"] = value
       end
-      get(params)
+      get(params: params)
     end
 
     private
 
     def get_uri( params )
       uri = URI( "#{AssayDepot.url}/#{@endpoint}" )
-      uri.query = URI.encode_www_form( params ) unless params.keys.length == 0
+      uri.query = Rack::Utils.build_nested_query(params) unless params.keys.length == 0
       uri
     end
   end
-end
+end

data/lib/assaydepot/endpoints.rb

@@ -1,10 +1,10 @@
 module AssayDepot
 
   class Category
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint(id, "categories")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "categories", format)
     end
 
     def self.ref_name
@@ -13,34 +13,38 @@ module AssayDepot
   end
 
   class DynamicForm
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint(id, "dynamic_forms")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "dynamic_forms", format)
     end
   end
 
   class Info
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint(nil, "info")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(nil, "info", format)
     end
   end
 
   class Organization
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint(id, "organizations")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "organizations", format)
     end
   end
 
   class QuoteGroup
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint(id, "quote_groups")
+    def self.mine
+      get(id: "mine")
+    end
+
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "quote_groups", format)
     end
 
     def self.ref_name
@@ -49,10 +53,10 @@ module AssayDepot
   end
 
   class AddNote
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id)
-      "/quote_groups/#{id}/add_note"
+    def self.endpoint(id, format="json")
+      "/quote_groups/#{id}/add_note.#{format}"
     end
 
     def self.ref_name
@@ -61,10 +65,22 @@ module AssayDepot
   end
 
   class QuotedWare
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
+
+    def self.proposals(id, format="json")
+      get(id: "#{id[:id]}/proposals", format: format)
+    end
+
+    def self.purchase_orders(id, format="json")
+      get(id: "#{id[:id]}/purchase_orders", format: format)
+    end
+
+    def self.messages(id, format="json")
+      get(id: "#{id[:id]}/messages", format: format)
+    end
 
-    def self.endpoint(id=nil)
-      get_endpoint(id, "quoted_wares")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "quoted_wares", format)
     end
 
     def self.ref_name
@@ -73,10 +89,10 @@ module AssayDepot
   end
 
   class Provider
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint( id, "providers" )
+    def self.endpoint(id=nil, format="json")
+      get_endpoint( id, "providers", format)
     end
 
     def self.search_type
@@ -89,10 +105,10 @@ module AssayDepot
   end
 
   class ProviderWare
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id)
-      "/providers/#{id.is_a?(Array) ? id[0] : id}/wares.json"
+    def self.endpoint(id, format="json")
+      "/providers/#{id.is_a?(Array) ? id[0] : id}/wares.#{format}"
     end
 
     def self.ref_name
@@ -101,10 +117,14 @@ module AssayDepot
   end
 
   class User
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
+
+    def self.profile
+      get(id: "profile")
+    end
 
-    def self.endpoint(id=nil)
-      get_endpoint(id == nil || id[0] == nil ? nil : 'profile', "users")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id == nil || id[0] == nil ? nil : 'profile', "users", format)
     end
 
     def self.ref_name
@@ -113,10 +133,10 @@ module AssayDepot
   end
 
   class Ware
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint( id, "wares" )
+    def self.endpoint(id=nil, format="json")
+      get_endpoint( id, "wares", format)
     end
 
     def self.search_type
@@ -129,13 +149,13 @@ module AssayDepot
   end
 
   class WareProvider
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id)
+    def self.endpoint(id, format="json")
       if (id.is_a?(Array) && id.length > 1)
-        url = "/wares/#{id[0]}/providers/#{id[1]}.json"
+        url = "/wares/#{id[0]}/providers/#{id[1]}.#{format}"
       else
-        url = "/wares/#{id.is_a?(Array) ? id[0] : id}/providers.json"
+        url = "/wares/#{id.is_a?(Array) ? id[0] : id}/providers.#{format}"
       end
       url
     end
@@ -146,10 +166,10 @@ module AssayDepot
   end
 
   class Webhook
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(id=nil)
-      get_endpoint(id, "webhook_config")
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "webhook_config", format)
     end
 
     def self.ref_name
@@ -158,9 +178,9 @@ module AssayDepot
   end
 
   class TokenAuth
-    include ::AssayDepot::Model
+    include ::AssayDepot::SearchModel
 
-    def self.endpoint(site="")
+    def self.endpoint(site="", format=nil)
       "#{site}/oauth/token?grant_type=client_credentials"
     end
 
@@ -168,4 +188,49 @@ module AssayDepot
       "access_token"
     end
   end
+
+  class PurchaseOrder
+    include ::AssayDepot::DatabaseModel
+
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "purchase_orders", format)
+    end
+
+    def self.ref_name
+      "purchase_orders"
+    end
+  end
+
+  class List
+    include ::AssayDepot::DatabaseModel
+
+    def self.create(slug, name)
+      post(body: { slug: slug, name: name })
+    end
+
+    def self.endpoint(id=nil, format="json")
+      get_endpoint(id, "dynamic_lists", format)
+    end
+
+    def self.ref_name
+      "dynamic_lists"
+    end
+  end
+
+  class ListItem
+    include ::AssayDepot::SearchModel
+
+    def self.endpoint(id, format="json")
+      if (id.is_a?(Array) && id.length > 1)
+        url = "/dynamic_lists/#{id[0]}/items/#{id[1]}.#{format}"
+      else
+        url = "/dynamic_lists/#{id.is_a?(Array) ? id[0] : id}/items.#{format}"
+      end
+      url
+    end
+
+    def self.ref_name
+      "items"
+    end
+  end
 end

data/lib/assaydepot/model.rb

@@ -1,18 +1,35 @@
 require 'forwardable'
 module AssayDepot
-  module Model
+  module DatabaseModel
     module ClassMethods
-
-      def get_token(client_id, client_secret, site)
-        response = Client.new.request(AssayDepot::TokenAuth.endpoint(site), {}, {}, {:username => client_id, :password => client_secret})
-        response[AssayDepot::TokenAuth.ref_name]
+      def all(options = {})
+        self.new.all(options)
       end
+    end
 
-      def get_endpoint( id, endpoint )
-        id = id[0] if id && id.kind_of?(Array)
-        id ? "#{endpoint}/#{id}.json" : "#{endpoint}.json"
+    def self.included(base)
+      base.include AssayDepot::Model
+      base.extend AssayDepot::Model::ClassMethods
+      base.extend ClassMethods
+    end
+
+    def all(options = {})
+      result = self.clone
+      result.internal_options = options
+      result
+    end
+
+    # Overridden from Model
+    def internal_results
+      unless @internal_results
+        @internal_results = JSON.parse(Client.new(endpoint: self.class.endpoint(nil)).get(params: @internal_options))
       end
+      @internal_results
+    end
+  end
 
+  module SearchModel
+    module ClassMethods
       # find and where to modify params
       def find(query)
         self.new.find(query)
@@ -21,55 +38,97 @@ module AssayDepot
       def where(conditions={})
         self.new.where(conditions)
       end
+    end
 
-      # HTTP request verbs
-      # optional "id" followed by optional hash
-      def get(*id, **params)
-        Client.new(:endpoint => endpoint(id)).get(params)
+    def self.included(base)
+      base.extend AssayDepot::Model::ClassMethods
+      base.extend ClassMethods
+      base.include AssayDepot::Model
+      base.include AssayDepot::Pageable
+
+      attr_accessor :search_query
+      attr_accessor :search_facets
+    end
+
+    def initialize(options={})
+      @internal_options = options[:search_options] || { }
+      @search_query = options[:search_query] || ""
+      @search_facets = options[:search_facets] || { }
+    end
+
+    def facets
+      internal_results["facets"]
+    end
+
+    def find(query)
+      result = self.clone
+      result.search_query = query
+      result
+    end
+
+    def where(conditions={})
+      result = self.clone
+      result.search_facets = self.search_facets ? self.search_facets.merge(conditions) : conditions
+      result
+    end
+
+    # Overridden from Model
+    def internal_results
+      unless @internal_results
+        results = Client.new(endpoint: self.class.endpoint(nil)).search(query: search_query, facets: search_facets, params: internal_options)
+        @internal_results = JSON.parse(results)
+      end
+      @internal_results
+    end
+  end
+
+  module Model
+    module ClassMethods
+      def get_token(client_id, client_secret, site)
+        response = Client.new.request(AssayDepot::TokenAuth.endpoint(site), {}, {}, {:username => client_id, :password => client_secret})
+        response[AssayDepot::TokenAuth.ref_name]
       end
 
-      def put(*id, **params)
+      def get_endpoint(id, endpoint, format = "json")
+        id = id[0] if id && id.kind_of?(Array)
+        id ? "#{endpoint}/#{id}.#{format}" : "#{endpoint}.#{format}"
+      end
 
-        id, body, params = get_variable_args(id, params)
-        # puts "id #{id}, body #{body.to_s}, params #{params}"
-        Client.new(:endpoint => endpoint(id)).put( body, params )
+      # HTTP request verbs
+      # optional "id" followed by optional hash
+      def get(id: nil, params: {}, format: "json")
+        puts "GET id #{id}, params #{params}" if ENV["DEBUG"] == "true"
+        result = Client.new(endpoint: endpoint(id, format)).get(params: params)
+        return JSON.parse(result) if format == "json"
+        result
       end
 
-      def patch(*id, **params)
-        id, body, params = get_variable_args(id, params)
-        Client.new(:endpoint => endpoint(id)).put( body, params )
+      def put(id: nil, body: nil, params: {}, format: "json")
+        puts "PUT id #{id}, body #{body.to_s}, params #{params}" if ENV["DEBUG"] == "true"
+        result = Client.new(endpoint: endpoint(id, format)).put( body: body, params: params )
+        return JSON.parse(result) if format == "json"
+        result
       end
 
-      def post(*id, **params)
-        id, body, params = get_variable_args(id, params)
-        Client.new(:endpoint => endpoint(id)).post( body, params )
+      def patch(id: nil, body: nil, params: {}, format: "json")
+        puts "PATCH id #{id}, body #{body.to_s}, params #{params}" if ENV["DEBUG"] == "true"
+        result = Client.new(endpoint: endpoint(id, format)).put( body: body, params: params )
+        return JSON.parse(result) if format == "json"
+        result
       end
 
-      def delete(*id, **params)
-        Client.new(:endpoint => endpoint(id)).delete(params)
+      def post(id: nil, body: nil, params: {}, format: "json")
+        puts "POST id #{id}, body #{body.to_s}, params #{params}" if ENV["DEBUG"] == "true"
+        result = Client.new(endpoint: endpoint(id, format)).post( body: body, params: params )
+        return JSON.parse(result) if format == "json"
+        result
       end
 
-      def get_variable_args(id, params)
-
-        if (id && id.length > 1 && (id[1].is_a?(Integer) || id[1].is_a?(String)))
-          body = params
-          params = {}
-        elsif (id && id.length > 1)
-          body = id[1]
-          id = id[0]
-        elsif (id && id[0].is_a?(Hash))
-          body = id.last
-          id = nil
-        elsif (id && id.length == 1 && id[0].is_a?(Hash) == false)
-          body = params
-          id = id[0]
-          params = {}
-        else
-          body = params
-          params = {}
-          id = nil
-        end
-        [id, body, params]
+      def delete(id: nil, body: nil, params: {}, format: "json")
+        puts "DELETE id #{id}, params #{params}" if ENV["DEBUG"] == "true"
+        result = Client.new(endpoint: endpoint(id, format)).delete(params: params)
+        return JSON.parse(result) if format == "json"
+        result
       end
     end
 
@@ -98,73 +157,58 @@ module AssayDepot
                       :reject,
                       :reverse
 
-      attr_accessor :search_query
-      attr_accessor :search_facets
-      attr_accessor :search_options
+      attr_accessor :internal_options
+    end
 
-      def initialize(options={})
-        @search_query = options[:search_query] || ""
-        @search_facets = options[:search_facets] || {}
-        @search_options = options[:search_options] || {:page => 1}
-      end
+    def initialize(options={})
+      @internal_options = options[:search_options] || { }
+    end
 
-      def initialize_copy(source)
-        super
-        @search_query = @search_query.dup
-        @search_facets = @search_facets.dup
-      end
+    def initialize_copy(source)
+      super
+      @search_query = @search_query.dup
+      @search_facets = @search_facets.dup
+    end
 
-      def query_time
-        search_results["query_time"]
-      end
-      def total
-        search_results["total"]
-      end
-      def page
-        search_results["page"]
-      end
-      def per_page
-        search_results["per_page"]
-      end
-      def facets
-        search_results["facets"]
-      end
+    def query_time
+      internal_results["query_time"]
+    end
 
-      def page(page_num)
-        options( { "page" => page_num } )
-      end
+    def total
+      internal_results["total"]
+    end
 
-      def per_page(page_size)
-        options( { "per_page" => page_size } )
-      end
+    def options(options={})
+      result = self.clone
+      result.internal_options = self.internal_options ? self.internal_options.merge(options) : options
+      result
+    end
 
-      def find(query)
-        result = self.clone
-        result.search_query = query
-        result
-      end
+    def private_results
+      internal_results[self.class.ref_name]
+    end
 
-      def where(conditions={})
-        result = self.clone
-        result.search_facets = self.search_facets ? self.search_facets.merge(conditions) : conditions
-        result
-      end
+    # def internal_results
+    #   # To be overridden
+    #   # If I leave this method in, it gets called, possibly a problem with the order of inclusion
+    # end
+  end
 
-      def options(options={})
-        result = self.clone
-        result.search_options = self.search_options ? self.search_options.merge(options) : options
-        result
-      end
+  module Pageable
+    def page
+      internal_results["page"]
+    end
 
-      def private_results
-        search_results[self.class.ref_name]
-      end
-      def search_results
-        unless @search_results
-          @search_results = Client.new(:endpoint => self.class.endpoint(nil)).search(search_query, search_facets, search_options)
-        end
-        @search_results
-      end
+    def per_page
+      internal_results["per_page"]
+    end
+
+    def page(page_num)
+      options( { "page" => page_num } )
+    end
+
+    def per_page(page_size)
+      options( { "per_page" => page_size } )
     end
   end
 end

data/lib/assaydepot/version.rb

@@ -1,3 +1,3 @@
 module AssayDepot
-  VERSION = "0.0.5"
+  VERSION = "0.1.1"
 end

data/spec/assaydepot_backoffice_spec.rb

@@ -0,0 +1,30 @@
+require 'assaydepot'
+require 'dotenv'
+Dotenv.load
+
+describe AssayDepot do
+  context "scientist_api backoffice tests" do
+    before(:all) do
+      AssayDepot.configure do |config|
+        config.access_token = ENV['BACKOFFICE_ACCESS_TOKEN']
+        config.url = "#{ENV['BACKOFFICE_SITE']}/api/v2"
+      end
+    end
+
+    context "info" do
+      let(:info) { AssayDepot::Info.get() }
+
+      it "info version V2" do
+        info["api_version"].should == "V2"
+      end
+    end
+
+    context "quoted wares" do
+      let(:qw) { AssayDepot::QuotedWare.get() }
+
+      it "get all quoted wares" do
+        qw.is_a?(Array).should == true
+      end
+    end
+  end
+end

data/spec/assaydepot_spec.rb

@@ -5,10 +5,9 @@ Dotenv.load
 describe AssayDepot do
   context "when accessing the api via token client credentials" do
     before(:all) do
-      site = "http://dev.scientist.com:3000"
       AssayDepot.configure do |config|
         config.access_token = ENV['ACCESS_TOKEN']
-        config.url = "#{site}/api/v2"
+        config.url = "#{ENV['SITE']}/api/v2"
       end
     end
 
@@ -24,7 +23,7 @@ describe AssayDepot do
       end
 
       context "and getting the details for the first ware" do
-        let(:ware_result) { AssayDepot::Ware.get(wares.first["id"]) }
+        let(:ware_result) { AssayDepot::Ware.get(id: wares.first["id"]) }
 
         it "should have a ware" do
           ware_result["ware"].should_not be_nil
@@ -110,14 +109,14 @@ describe AssayDepot do
       end
 
       context "and getting the details for the first provider" do
-        let(:provider_result) { AssayDepot::Provider.get(providers.first["id"]) }
+        let(:provider_result) { AssayDepot::Provider.get(id: providers.first["id"]) }
 
-        it "should have a provider" do
+        it "have a provider" do
           provider_result["provider"].should_not be_nil
         end
 
-        it "should have a description" do
-          provider_result["provider"]["description"].should_not be_nil
+        it "have keywords" do
+          expect(provider_result['provider']).to have_key('keywords')
         end
       end
     end

data/spec/assaydepot_wrapper_spec.rb

@@ -5,10 +5,9 @@ Dotenv.load
 describe AssayDepot do
   context "scientist_api tests" do
     before(:all) do
-      site = "http://dev.scientist.com:3000"
       AssayDepot.configure do |config|
         config.access_token = ENV['ACCESS_TOKEN']
-        config.url = "#{site}/api/v2"
+        config.url = "#{ENV['SITE']}/api/v2"
       end
     end
 
@@ -27,7 +26,7 @@ describe AssayDepot do
       end
 
       it "get specific category" do
-        category = AssayDepot::Category.get(categories[AssayDepot::Category.ref_name].first[:id])
+        category = AssayDepot::Category.get(id: categories[AssayDepot::Category.ref_name].first[:id])
         categories[AssayDepot::Category.ref_name][0][:id].should == category[:id]
       end
     end
@@ -40,7 +39,7 @@ describe AssayDepot do
       end
 
       it "get specific organization" do
-        organization = AssayDepot::Organization.get(organizations.first["id"])
+        organization = AssayDepot::Organization.get(id: organizations.first["id"])
         organizations.first["id"].should == organization["id"]
       end
     end
@@ -54,28 +53,28 @@ describe AssayDepot do
 
       it "get specific provider" do
         id = providers[AssayDepot::Provider.ref_name].first["id"]
-        provider = AssayDepot::Provider.get(id)
+        provider = AssayDepot::Provider.get(id: id)
         id.is_a?(Integer).should == true
         id.should == provider["provider"]["id"]
       end
 
       it "get wares for a specific provider" do
         id = providers[AssayDepot::Provider.ref_name].first["id"]
-        ware = AssayDepot::ProviderWare.get(id)
+        ware = AssayDepot::ProviderWare.get(id: id)
         ware[AssayDepot::ProviderWare.ref_name].is_a?(Array).should == true
       end
 
       it "update specific provider attribute" do
         id = providers[AssayDepot::Provider.ref_name].first["id"]
         num_employees = rand(1000)
-        response = AssayDepot::Provider.put(id, {number_of_employees: num_employees});
+        response = AssayDepot::Provider.put(id: id, body: { number_of_employees: num_employees });
         response["code"].should == "forbidden"
       end
 
     end
 
     context "quote groups" do
-      let(:qg) { AssayDepot::QuoteGroup.get('mine')}
+      let(:qg) { AssayDepot::QuoteGroup.mine }
 
       it "quote groups mine" do
         qg[AssayDepot::QuoteGroup.ref_name].is_a?(Array).should == true
@@ -83,7 +82,7 @@ describe AssayDepot do
 
       it "quote groups specific id" do
         id = qg[AssayDepot::QuoteGroup.ref_name].first["id"]
-        response = AssayDepot::QuoteGroup.get( id )
+        response = AssayDepot::QuoteGroup.get( id: id )
         response["id"].should == id
       end
 
@@ -91,7 +90,7 @@ describe AssayDepot do
         id = qg[AssayDepot::QuoteGroup.ref_name].first["id"]
         title_text = "This is some #{rand(1000)} text."
         body_text = "This is some #{rand(1000)} body text."
-        response = AssayDepot::AddNote.post(id, {
+        response = AssayDepot::AddNote.post(id: id, body: {
           note: {
             title: title_text,
             body: body_text
@@ -101,17 +100,9 @@ describe AssayDepot do
       end
     end
 
-    context "quoted wares" do
-      let(:qw) { AssayDepot::QuotedWare.get() }
-
-      it "get all quoted wares" do
-        qw.is_a?(Array).should == true
-      end
-    end
-
     context "users" do
       let(:users) { AssayDepot::User.get() }
-      let(:profile) { AssayDepot::User.get('profile') }
+      let(:profile) { AssayDepot::User.profile }
 
       it "get all users" do
         users[AssayDepot::User.ref_name].is_a?(Array).should == true
@@ -130,12 +121,12 @@ describe AssayDepot do
       end
 
       it "get specific ware" do
-        ware = AssayDepot::Ware.get( wares[AssayDepot::Ware.ref_name].first["id"] )
+        ware = AssayDepot::Ware.get( id: wares[AssayDepot::Ware.ref_name].first["id"] )
         wares[AssayDepot::Ware.ref_name].first["id"].should == ware["ware"]["id"]
       end
 
       it "get providers for a ware id" do
-        response = AssayDepot::WareProvider.get( wares[AssayDepot::Ware.ref_name].first["id"] )
+        response = AssayDepot::WareProvider.get( id: wares[AssayDepot::Ware.ref_name].first["id"] )
         response[AssayDepot::WareProvider.ref_name].is_a?(Array).should == true
       end
     end
@@ -149,15 +140,15 @@ describe AssayDepot do
         @provider_id = providers[AssayDepot::Provider.ref_name].first["id"]
         @provider_name = providers[AssayDepot::Provider.ref_name].first["name"]
         sleep(1)
-        @delete = AssayDepot::WareProvider.delete( @ware_id, @provider_id )
-        @ware_provider_response = AssayDepot::WareProvider.post( @ware_id, @provider_id )
+        @delete = AssayDepot::WareProvider.delete( id: [@ware_id, @provider_id] )
+        @ware_provider_response = AssayDepot::WareProvider.post( id: [@ware_id, @provider_id] )
         # TODO: this should not be needed
         sleep(2)
-        @ware_provider = AssayDepot::WareProvider.get( @ware_id )
-        @provider_ware = AssayDepot::ProviderWare.get( @provider_id )
-        @clean_up = AssayDepot::WareProvider.delete( @ware_id, @provider_id )
-        @provider_clean_up = AssayDepot::WareProvider.get( @ware_id )
-        @ware_clean_up = AssayDepot::ProviderWare.get( @provider_id )
+        @ware_provider = AssayDepot::WareProvider.get( id: @ware_id )
+        @provider_ware = AssayDepot::ProviderWare.get( id: @provider_id )
+        @clean_up = AssayDepot::WareProvider.delete( id: [@ware_id, @provider_id] )
+        @provider_clean_up = AssayDepot::WareProvider.get( id: @ware_id )
+        @ware_clean_up = AssayDepot::ProviderWare.get( id: @provider_id )
       end
 
       it "make sure provider is not published" do
@@ -197,9 +188,17 @@ describe AssayDepot do
       end
     end
 
+    context "quoted wares" do
+      let(:qw) { AssayDepot::QuotedWare.get() }
+
+      it "deny quoted wares" do
+        qw.is_a?(Array).should == false
+      end
+    end
+
     context "webhooks" do
       it "create a web hook for this user" do
-        response = AssayDepot::Webhook.put({
+        response = AssayDepot::Webhook.put(body: {
           name: "This is another new 'name'.",
           bogus_key: "ignore_me"
         })
@@ -209,7 +208,7 @@ describe AssayDepot do
       end
 
       it "create a web hook for this user (patch) and verify (get)" do
-        response = AssayDepot::Webhook.patch({
+        response = AssayDepot::Webhook.patch(body: {
           name: "And another new 'name'.",
           bogus_key: "ignore_me"
         })

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: assaydepot
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Christopher Petersen
+- Ron Ranauro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uri-query_params
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,15 +81,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This is the first version of Assay Depot's Ruby SDK. It provides read
-  access to Services and Vendors through assaydepot.com's JSON API.
+description: The Scientist Ruby SDK. It provides read access to Services and Suppliers
+  through scientist.com's JSON API.
 email:
-- christopher.petersen@gmail.com
+- chris@scientist.com
+- ron@scientist.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md
@@ -103,6 +106,7 @@ files:
 - lib/assaydepot/event.rb
 - lib/assaydepot/model.rb
 - lib/assaydepot/version.rb
+- spec/assaydepot_backoffice_spec.rb
 - spec/assaydepot_spec.rb
 - spec/assaydepot_wrapper_spec.rb
 homepage: https://github.com/assaydepot/assaydepot-rb
@@ -123,11 +127,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provides read access to Assay Depot's Services and Vendors.
 test_files:
+- spec/assaydepot_backoffice_spec.rb
 - spec/assaydepot_spec.rb
 - spec/assaydepot_wrapper_spec.rb