artemis_api 0.2.1 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77fb353bfa893d3ff210292444e20d71aa7dd5cf
-  data.tar.gz: 8aaa44cae9c5eec62ff7dfd524e5576ba7d79ce9
+SHA256:
+  metadata.gz: bf8193d6392796c8274e2acb172f6de84afa46ae87bda869c4bf8878225e3b61
+  data.tar.gz: c2b81d0f22021e493588bad0796f4864fa3e09eb77afa098e7e572c974fc2641
 SHA512:
-  metadata.gz: ea1ad95a03f6f486bc66c629300f4726b912ce7213f54e7d26c2231a30a197688dac2dd93f08038b6d950b9e753f501e4b9f3225e8d1457900f63ad928393b10
-  data.tar.gz: 9d9b6ba166a362890551ae8c8b0d3f489d5b71c32e47f9851175f519ce216fec3702f703401a924673b4d97b32abd1698f816ff44f56b6d7b121e107d755b264
+  metadata.gz: 49e421a1abfdedd4381fbb71caceb12deac62eb1ce8ddb43eb0facdda3cdf0a19581c76e5228a58782aca0ee7bbccc7b8d51da843575dbb45859fbf5d1cdd240
+  data.tar.gz: 3e160124c0562942f0c993f979a21e539ef686a9aa3d99b3c0b756e775dd2349bf2955ba14ea6fb3e0e2128dc4982c4085595336ad77adfa2247882793e2feef

data/.ruby-version

@@ -0,0 +1 @@
+2.6.0

data/Gemfile.lock

@@ -1,48 +1,56 @@
 PATH
   remote: .
   specs:
-    artemis_api (0.1.0)
+    artemis_api (0.7.5)
+      oauth2
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    concurrent-ruby (1.1.5)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     hashdiff (0.4.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
+    method_source (1.0.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (3.1.1)
-    rack (2.0.7)
-    rake (10.5.0)
+    rack (2.2.3)
+    rake (13.0.1)
     safe_yaml (1.0.5)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -52,9 +60,9 @@ DEPENDENCIES
   artemis_api!
   bundler (~> 1.16)
   minitest (~> 5.0)
-  oauth2
-  rake (~> 10.0)
+  pry
+  rake (~> 13.0)
   webmock
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/History.txt

@@ -1,5 +1,16 @@
 # coding: UTF-8
 
+=== 0.4.0 / 2019-11-14
+
+* Added pagination functionality to Batch queries
+* Cleaned up filtering and added tests
+* Documentation updates
+
+=== 0.3.0 / 2019-11-04
+
+* Added an alternative OAuth flow that can accept an authorization code
+  directly and handle the creation of the OAuth client and token
+
 === 0.2.1 / 2019-10-28
 
 * Minor updates to documentation

data/README.md

@@ -26,13 +26,15 @@ Or install it yourself as:
 
 ## Usage
 
+#### Instantiating your Client
+
 In order to use this gem, you will need to be set up as a developer in the Artemis Portal. If you're not, please contact Artemis CS in order to get that settled.
 
 Once you have developer access, go to Settings and choose "OAuth 2.0 Applications" at the bottom of the sidebar to set up an application by entering the name and redirect URI you wish to use. You will then be provided with an application ID and a secret ID, which you will need in order to authenticate with Artemis.
 
-(Please note that this gem doesn't currently handle OAuth. You will need to do that on your own in order to generate your access token and refresh token. We recommend using the [OAuth2 gem](https://github.com/oauth-xx/oauth2). You'll also need to pass in the `expires_at` for when your token will exipire.)
+The first step to actually using this gem is to instantiate an instance of `ArtemisApi::Client` and there are two different ways to do so depending on if you're handling OAuth in your own app or not.
 
-Once you have all this info, the first step to actually using this gem is to instantiate an instance of `ArtemisApi::Client` - which requires an access token, a refresh token,
+If you intend to do a full OAuth flow, we recommend using the [OAuth2 gem](https://github.com/oauth-xx/oauth2). After authenticating with OAuth and generating your access token and refresh token, you can use them to instantiate your Client instance. You'll also need to pass in the `expires_at` for when your token will expire. That looks like this:
 
 ```ruby
 options = {app_id: 'your_artemis_application_id',
@@ -45,7 +47,7 @@ client = ArtemisApi::Client.new(access_token: 'your_access_token',
                                 options: options)
 ```
 
-Alternatively, instead of passing in options, you can set those values as ENV variables called `ENV['ARTEMIS_OAUTH_APP_ID']`, `ENV['ARTEMIS_OAUTH_APP_SECRET']` and `ENV['ARTEMIS_BASE_URI']`
+Instead of passing in options, you can set those values as ENV variables called `ENV['ARTEMIS_OAUTH_APP_ID']`, `ENV['ARTEMIS_OAUTH_APP_SECRET']` and `ENV['ARTEMIS_BASE_URI']`
 
 They will be automatically detected and then you don't have to pass in any options:
 ```ruby
@@ -54,6 +56,20 @@ client = ArtemisApi::Client.new(access_token: 'your_access_token',
                                 expires_at: token_expires_at)
 ```
 
+Alternatively, if you're working on a command line tool or otherwise not intending to implement a full OAuth flow, you can generate an authorization code directly and use this code to obtain an access token and a refresh token.
+Do this by creating an OAuth application in your Artemis settings with `urn:ietf:wg:oauth:2.0:oob` as the callback url. Then, clicking the Authorize button directly on Artemis Portal beside it on your application show page will
+provide you directly with an authorization code. Pass it into the Client instantiator like this. (The same rules apply about either passing in options or setting your ENV variables.)
+
+```ruby
+client = ArtemisApi::Client.new(auth_code: 'your_generated_authorization_code')
+```
+
+This authorization code is only valid for one use. If you want to keep connecting using the same authorization grant, you
+need to save the values of `client.access_token`, `client.refresh_token` and `client.expires_at` and use them when
+reinstantiating `client` in the future.
+
+#### Requesting data from Artemis
+
 Once you have a client instance, you can use it to request information from Artemis.
 
 To get user information about the Artemis User that is associated with your application ID:
@@ -152,8 +168,10 @@ ArtemisApi::Batch.find(id: 22, facility_id: 2, client: client, include: "complet
 We also support filtering on several models: Batch, Completion, Discard, Harvest, Zone, Item. It is another optional param and it expects a hash. Here's what that should look like.
 
 ```ruby
-ArtemisApi::Batch.find_all(facility_id: 2, client: client, filters: {view: 'all_batches', search: 'genovese basil'})
+ArtemisApi::Batch.find_all(facility_id: 2, client: client, filters: {search: 'genovese basil'})
 ArtemisApi::Batch.find_all(facility_id: 2, client: client, filters: {ids: [2, 4, 6, 11]})
+ArtemisApi::Batch.find_all(facility_id: 2, client: client, filters: {date_type: 'seeded_at', date_window: "2019-10-31 17:06:42 -0400,2019-11-15 17:06:42 -0500"})
+
 ArtemisApi::Completion.find_all(facility_id: 2, client: client, filters: {crop_batch_ids: [5]})
 ArtemisApi::Harvest.find_all(facility_id: 2, client: client, filters: {crop_batch_ids: [5, 7]})
 ArtemisApi::Discard.find_all(facility_id: 2, client: client, filters: {crop_batch_ids: [6, 7, 9]})
@@ -163,6 +181,12 @@ ArtemisApi::Item.find_all(facility_id: 2, batch_id: 22, client: client, filters:
 
 Note that when you filter by ids or crop_batch_ids, you must pass in an array even if it only has one element.
 
+Pagination is also supported on batches, and is also an optional param that expects a hash. We use the limit/offset method of pagination.
+
+```ruby
+ArtemisApi::Batch.find_all(facility_id: 2, client: client, page: {limit: 10, offset: 60})
+```
+
 The Artemis API is currently mainly read only, but we do support the creation of Subscriptions. These are used to set up webhooks that will make a callback to you whenever a Completion or Batch gets created or updated in the given facility. They require a `subject`, which can currently be either `completions` or `batches`, and a `destination`, which is the url that you want the callback to hit. There are two ways to make that call:
 
 ```ruby

data/artemis_api.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "artemis_api/version"
@@ -6,10 +5,10 @@ require "artemis_api/version"
 Gem::Specification.new do |spec|
   spec.name          = "artemis_api"
   spec.version       = ArtemisApi::VERSION
-  spec.authors       = ["Jamey Hampton"]
-  spec.email         = ["jhampton@artemisag.com"]
+  spec.authors       = ["Jamey Hampton", "Carlos Betancourt Carrero"]
+  spec.email         = ["jhampton@artemisag.com", "cbetancourt@artemisag.com"]
 
-  spec.summary       = %q{An API wrapper for the ArtemisAg API}
+  spec.summary       = "An API wrapper for the ArtemisAg API"
   spec.homepage      = "https://github.com/artemis-ag/artemis_api/"
   spec.license       = "MIT"
 
@@ -21,10 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "oauth2"
+
+  spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "oauth2"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "activesupport"
 end

data/bin/console

@@ -6,9 +6,5 @@ require "artemis_api"
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+require 'pry'
+Pry.start

data/lib/artemis_api.rb

@@ -11,8 +11,15 @@ require 'artemis_api/discard'
 require 'artemis_api/harvest'
 require 'artemis_api/seeding_unit'
 require 'artemis_api/harvest_unit'
+require 'artemis_api/resource_unit'
+require 'artemis_api/crop_variety'
 require 'artemis_api/item'
 require 'artemis_api/subscription'
+require 'artemis_api/stage'
+require 'artemis_api/sub_stage'
+require 'artemis_api/crop_batch_state'
+require 'artemis_api/custom_fields'
+require 'artemis_api/custom_data'
 
 module ArtemisApi
   # Your code goes here...

data/lib/artemis_api/batch.rb

@@ -4,20 +4,22 @@ module ArtemisApi
     related_to_one :zone
     related_to_one :seeding_unit
     related_to_one :harvest_unit
+    related_to_many :custom_data
+    related_to_many :custom_fields
 
     def self.find(id:, client:, facility_id:, include: nil, force: false)
       client.find_one(self.json_type, id, facility_id: facility_id, include: include, force: force)
     end
 
-    def self.find_all(client:, facility_id:, include: nil, filters: nil)
-      client.find_all(self.json_type, facility_id: facility_id, include: include, filters: filters)
+    def self.find_all(client:, facility_id:, include: nil, filters: nil, page: nil)
+      client.find_all(self.json_type, facility_id: facility_id, include: include, filters: filters, page: page)
     end
 
-    def completions(include: nil)
+    def completions(include: nil, filters: {})
       ArtemisApi::Completion.find_all(facility_id: facility_id,
                                       client: client,
                                       include: include,
-                                      filters: {crop_batch_ids: [id]})
+                                      filters: {crop_batch_ids: [id]}.with_indifferent_access.merge(filters))
     end
 
     def completion(completion_id, include: nil)

data/lib/artemis_api/client.rb

@@ -1,31 +1,71 @@
 module ArtemisApi
   class Client
     require 'oauth2'
-    attr_reader :options, :objects, :access_token, :refresh_token, :oauth_client,
-                :oauth_token, :expires_at
+    attr_reader :options, :objects,
+                :oauth_client, :oauth_token,
+                :access_token, :refresh_token, :expires_at,
+                :on_token_refreshed, :on_token_failed
+
+    def initialize(
+      access_token: nil,
+      refresh_token: nil,
+      expires_at: nil,
+      auth_code: nil,
+      redirect_uri: nil,
+      on_token_refreshed: nil,
+      on_token_failed: nil,
+      options: {}
+    )
+      unless (access_token && refresh_token && expires_at) || auth_code
+        raise ArgumentError.new('You must either provide your access token, refresh token & expires at time, or an authorization code.')
+      end
 
-    def initialize(access_token:, refresh_token:, expires_at:, options: {})
       options[:app_id] ||= ENV['ARTEMIS_OAUTH_APP_ID']
       options[:app_secret] ||= ENV['ARTEMIS_OAUTH_APP_SECRET']
       options[:base_uri] ||= ENV['ARTEMIS_BASE_URI']
       @options = options
-      @access_token = access_token
-      @refresh_token = refresh_token
-      @expires_at = expires_at
+      @objects = {}
+
+      @on_token_refreshed = on_token_refreshed
+      @on_token_failed = on_token_failed
 
       @oauth_client = OAuth2::Client.new(@options[:app_id], @options[:app_secret], site: @options[:base_uri])
-      @oauth_token = OAuth2::AccessToken.from_hash(
-                      oauth_client,
-                      {access_token: @access_token,
-                       refresh_token: @refresh_token,
-                       expires_at: @expires_at})
-      @objects = {}
+
+      if auth_code
+        redirect_uri ||= 'urn:ietf:wg:oauth:2.0:oob'
+
+        @oauth_token = @oauth_client.auth_code.get_token(auth_code, redirect_uri: redirect_uri)
+
+        @access_token = @oauth_token.token
+        @refresh_token = @oauth_token.refresh_token
+        @expires_at = @oauth_token.expires_at
+      else
+        set_oauth_token_from_parts(
+          access_token: access_token,
+          refresh_token: refresh_token,
+          expires_at: expires_at
+        )
+      end
+    end
+
+    def set_oauth_token_from_parts(access_token:, refresh_token:, expires_at:)
+      if access_token && refresh_token && expires_at
+        @access_token = access_token
+        @refresh_token = refresh_token
+        @expires_at = expires_at.to_i
+
+        @oauth_token = OAuth2::AccessToken.from_hash(
+                        oauth_client,
+                        {access_token: @access_token,
+                        refresh_token: @refresh_token,
+                        expires_at: @expires_at})
+      end
     end
 
     def find_one(type, id, facility_id: nil, include: nil, force: false)
       obj = get_record(type, id)
       if !obj || force
-        refresh if @oauth_token.expired?
+        auto_refresh!
 
         path = if facility_id
                  "/api/v3/facilities/#{facility_id}/#{type}/#{id}"
@@ -44,9 +84,9 @@ module ArtemisApi
       obj
     end
 
-    def find_all(type, facility_id: nil, batch_id: nil, include: nil, filters: nil)
+    def find_all(type, facility_id: nil, batch_id: nil, include: nil, filters: nil, page: nil)
       records = []
-      refresh if @oauth_token.expired?
+      auto_refresh!
 
       path = if facility_id && batch_id
                "/api/v3/facilities/#{facility_id}/batches/#{batch_id}/#{type}"
@@ -59,6 +99,7 @@ module ArtemisApi
       query = {}
       query[:include] = include if include
       format_filters(filters, query) if filters
+      format_pagination(page, query) if page
 
       url = build_url(path: path, query: URI.encode_www_form(query))
 
@@ -74,9 +115,9 @@ module ArtemisApi
       @options[:base_uri] + uri.to_s
     end
 
-    def store_record(type, id, data)
+    def store_record(type, id, data, included = nil)
       @objects[type] ||= {}
-      @objects[type][id.to_i] = ArtemisApi::Model.instance_for(type, data, self)
+      @objects[type][id.to_i] = ArtemisApi::Model.instance_for(type, data, included, self)
     end
 
     def get_record(type, id)
@@ -84,19 +125,29 @@ module ArtemisApi
     end
 
     def remove_record(type, id)
-      @objects[type].delete(id.to_i) if record_stored?(type, id)
+      @objects[type]&.delete(id.to_i)
     end
 
-    def record_stored?(type, id)
-      get_record(type, id).present?
+    def auto_refresh!
+      refresh! if @oauth_token.expired?
     end
 
-    def remove_record(type, id)
-      @objects[type].delete(id.to_i)
-    end
+    def refresh!
+      old_refresh_token = @oauth_token.refresh_token
 
-    def refresh
       @oauth_token = @oauth_token.refresh!
+
+      if old_refresh_token != @oauth_token.refresh_token
+        on_token_refreshed && on_token_refreshed.call(self, @oauth_token, old_refresh_token)
+      end
+      @oauth_token
+    rescue OAuth2::Error => err
+      if on_token_failed
+        on_token_failed.call(self, @oauth_token, err)
+        @oauth_token
+      else
+        raise err
+      end
     end
 
     def facilities(include: nil)
@@ -121,8 +172,8 @@ module ArtemisApi
 
     def process_response(response, type)
       json = JSON.parse(response.body)
-      obj = store_record(type, json['data']['id'].to_i, json['data'])
-      process_included_objects(json['included']) if json['included']
+      included = process_included_objects(json['included']) if json['included']
+      obj = store_record(type, json['data']['id'].to_i, json['data'], included)
 
       obj
     end
@@ -135,25 +186,41 @@ module ArtemisApi
         record = store_record(type, obj['id'], obj)
         records << record
       end
+
       process_included_objects(json['included']) if json['included']
 
       records
     end
 
     def process_included_objects(included_array)
+      included = {}
       included_array.each do |included_obj|
-        store_record(included_obj['type'], included_obj['id'], included_obj)
+        type = included_obj['type']
+        obj = store_record(type, included_obj['id'], included_obj)
+
+        next unless obj
+
+        included[type.to_sym] = [] unless included.key?(type.to_sym)
+        included[type.to_sym].push(obj)
       end
+
+      included
     end
 
     def format_filters(filter_hash, query_hash)
       filter_hash.each do |k, v|
-        if v.kind_of?(Array)
+        if v.is_a?(Array)
           query_hash[:"filter[#{k}][]"] = v
         else
           query_hash[:"filter[#{k}]"] = v
         end
       end
     end
+
+    def format_pagination(page_hash, query_hash)
+      page_hash.each do |k, v|
+        query_hash[:"page[#{k}]"] = v
+      end
+    end
   end
 end

data/lib/artemis_api/completion.rb

@@ -1,6 +1,7 @@
 module ArtemisApi
   class Completion < ArtemisApi::Model
     json_type 'completions'
+    related_to_one :crop_batch_state
 
     def self.find(id:, facility_id:, client:, include: nil, force: false)
       client.find_one(self.json_type, id, facility_id: facility_id, include: include, force: force)

data/lib/artemis_api/crop_batch_state.rb

@@ -0,0 +1,5 @@
+module ArtemisApi
+  class CropBatchState < ArtemisApi::Model
+    json_type 'crop_batch_states'
+  end
+end

data/lib/artemis_api/crop_variety.rb

@@ -0,0 +1,5 @@
+module ArtemisApi
+  class CropVariety < ArtemisApi::Model
+    json_type 'crop_varieties'
+  end
+end

data/lib/artemis_api/custom_data.rb

@@ -0,0 +1,5 @@
+module ArtemisApi
+  class CustomData < ArtemisApi::Model
+    json_type 'custom_data'
+  end
+end

data/lib/artemis_api/custom_fields.rb

@@ -0,0 +1,5 @@
+module ArtemisApi
+  class CustomFields < ArtemisApi::Model
+    json_type 'custom_fields'
+  end
+end

data/lib/artemis_api/facility.rb

@@ -14,40 +14,48 @@ module ArtemisApi
       ArtemisApi::Zone.find_all(facility_id: id, client: client, include: include)
     end
 
-    def zone(zone_id, include: nil)
-      ArtemisApi::Zone.find(id: zone_id, facility_id: id, client: client, include: include)
+    def zone(zone_id, include: nil, force: false)
+      ArtemisApi::Zone.find(id: zone_id, facility_id: id, client: client, include: include, force: force)
     end
 
     def batches(include: nil)
       ArtemisApi::Batch.find_all(facility_id: id, client: client, include: include)
     end
 
-    def batch(batch_id, include: nil)
-      ArtemisApi::Batch.find(id: batch_id, facility_id: id, client: client, include: include)
+    def batch(batch_id, include: nil, force: false)
+      ArtemisApi::Batch.find(id: batch_id, facility_id: id, client: client, include: include, force: force)
     end
 
     def users(include: nil)
       ArtemisApi::User.find_all(facility_id: id, client: client, include: include)
     end
 
-    def user(user_id, include: nil)
-      ArtemisApi::User.find(id: user_id, facility_id: id, client: client, include: include)
+    def user(user_id, include: nil, force: false)
+      ArtemisApi::User.find(id: user_id, facility_id: id, client: client, include: include, force: force)
     end
 
     def seeding_units(include: nil)
       ArtemisApi::SeedingUnit.find_all(facility_id: id, client: client, include: include)
     end
 
-    def seeding_unit(unit_id, include: nil)
-      ArtemisApi::SeedingUnit.find(id: unit_id, facility_id: id, client: client, include: include)
+    def seeding_unit(unit_id, include: nil, force: false)
+      ArtemisApi::SeedingUnit.find(id: unit_id, facility_id: id, client: client, include: include, force: force)
+    end
+
+    def resource_units(include: nil)
+      ArtemisApi::ResourceUnit.find_all(facility_id: id, client: client, include: include)
+    end
+
+    def resource_unit(unit_id, include: nil, force: false)
+      ArtemisApi::ResourceUnit.find(id: unit_id, facility_id: id, client: client, include: include, force: force)
     end
 
     def harvest_units(include: nil)
       ArtemisApi::HarvestUnit.find_all(facility_id: id, client: client, include: include)
     end
 
-    def harvest_unit(unit_id, include: nil)
-      ArtemisApi::HarvestUnit.find(id: unit_id, facility_id: id, client: client, include: include)
+    def harvest_unit(unit_id, include: nil, force: false)
+      ArtemisApi::HarvestUnit.find(id: unit_id, facility_id: id, client: client, include: include, force: force)
     end
 
     def subscriptions
@@ -58,6 +66,14 @@ module ArtemisApi
       ArtemisApi::Subscription.find(id: subscription_id, facility_id: id, client: client)
     end
 
+    def stages
+      ArtemisApi::Stage.find_all(id, client)
+    end
+
+    def stage(stage_id)
+      ArtemisApi::Stage.find(stage_id, id, client)
+    end
+
     def create_subscription(subject:, destination:)
       ArtemisApi::Subscription.create(facility_id: id, subject: subject, destination: destination, client: client)
     end

data/lib/artemis_api/model.rb

@@ -1,42 +1,85 @@
 module ArtemisApi
   class Model
-    attr_reader :client, :id, :attributes, :relationships
+    attr_reader :client, :id, :attributes, :relationships, :included
 
-    def self.related_to_one(name)
-      self.send(:define_method, name.to_sym) do
-        relationship = relationships[name.to_s]['data']
-        @client.find_one(relationship['type'], relationship['id'])
+    class << self
+      def related_to_one(name)
+        register_relationship(name)
+
+        send(:define_method, name.to_sym) do
+          related_id = relationships.dig(name.to_s, 'data', 'id')
+          included = client.get_record(name.to_s, related_id)
+
+          return included if included&.present?
+
+          relationship = relationships.dig(name.to_s, 'data')
+          return if relationship.nil?
+
+          @client.find_one(relationship['type'], relationship['id']) unless relationship['id'].to_s.empty? || relationship['id'].nil?
+        end
       end
-    end
 
-    def self.related_to_many(name)
-      self.send(:define_method, name.to_sym) do
-        @client.find_all(self.relationships[name.to_s]['data']['type'])
+      def related_to_many(name)
+        register_relationship(name)
+
+        send(:define_method, name.to_sym) do
+          included = relationships.dig(name.to_s, 'data')&.map do |related|
+            client.get_record(name.to_s, related['id'])
+          end
+
+          return included if included&.present?
+
+          @client.find_all(
+            relationships.dig(name.to_s, 'data', 0, 'type') || name.to_s,
+            filters: { name => id }
+          )
+        end
       end
-    end
 
-    def self.json_type(type = nil)
-      if type
-        @json_type = type
-        @@registered_classes ||= {}
-        @@registered_classes[type] = self
+      def json_type(type = nil)
+        if type
+          @json_type = type
+          @@registered_classes ||= {}
+          @@registered_classes[type] = self
+        end
+        @json_type
       end
-      @json_type
-    end
 
-    def self.instance_for(type, data, client)
-      @@registered_classes[type]&.new(client, data)
+      def instance_for(type, data, included, client)
+        @@registered_classes[type]&.new(client, data, included)
+      end
+
+      def relationships
+        @relationships ||= []
+      end
+
+      private
+
+      def register_relationship(name)
+        relationships << name.to_sym
+      end
     end
 
     def method_missing(name)
-      attributes[name.to_s]
+      respond_to_missing?(name) ? attributes[name.to_s] : super
+    end
+
+    def respond_to_missing?(name)
+      attributes.key?(name.to_s)
     end
 
-    def initialize(client, data)
+    def initialize(client, data, included = nil)
       @client = client
       @id = data['id'].to_i
       @attributes = data['attributes']
       @relationships = data['relationships']
+      @included = included
+    end
+
+    def inspect
+      vars = %i[id attributes].map { |v| "#{v}=#{send(v).inspect}" }.join(', ')
+      vars << ", relationships={#{self.class.relationships.join(', ')}}"
+      "<#{self.class}: #{vars}>"
     end
   end
 end

data/lib/artemis_api/resource_unit.rb

@@ -0,0 +1,14 @@
+module ArtemisApi
+  class ResourceUnit < ArtemisApi::Model
+    json_type 'resource_units'
+    related_to_one :crop_variety
+
+    def self.find(id:, facility_id:, client:, include: nil, force: false)
+      client.find_one(self.json_type, id, facility_id: facility_id, include: include, force: force)
+    end
+
+    def self.find_all(facility_id:, client:, include: nil)
+      client.find_all(self.json_type, facility_id: facility_id, include: include)
+    end
+  end
+end

data/lib/artemis_api/stage.rb

@@ -0,0 +1,15 @@
+module ArtemisApi
+  class Stage < ArtemisApi::Model
+    json_type 'stages'
+    related_to_many :sub_stages
+    related_to_many :zones
+
+    def self.find(id, facility_id, client, include: 'sub_stages,zones', force: false)
+      client.find_one(self.json_type, id, facility_id: facility_id, include: include, force: force)
+    end
+
+    def self.find_all(facility_id, client, include: 'sub_stages,zones')
+      client.find_all(self.json_type, facility_id: facility_id, include: include)
+    end
+  end
+end

data/lib/artemis_api/sub_stage.rb

@@ -0,0 +1,5 @@
+module ArtemisApi
+  class SubStage < ArtemisApi::Model
+    json_type 'sub_stages'
+  end
+end

data/lib/artemis_api/subscription.rb

@@ -6,12 +6,12 @@ module ArtemisApi
       client.find_one(self.json_type, id, facility_id: facility_id, include: include, force: force)
     end
 
-    def self.find_all(facility_id:, client:, include: nil, filters: nil)
-      client.find_all(self.json_type, facility_id: facility_id, include: include, filters: filters)
+    def self.find_all(facility_id:, client:, include: nil)
+      client.find_all(self.json_type, facility_id: facility_id, include: include)
     end
 
     def self.create(facility_id:, subject:, destination:, client:)
-      client.oauth_token.refresh! if client.oauth_token.expired?
+      client.auto_refresh!
 
       url = "#{client.options[:base_uri]}/api/v3/facilities/#{facility_id}/subscriptions"
       params = { body: { subscription: { subject: subject, destination: destination } } }
@@ -22,7 +22,7 @@ module ArtemisApi
     end
 
     def self.delete(id:, facility_id:, client:)
-      client.oauth_token.refresh! if client.oauth_token.expired?
+      client.auto_refresh!
 
       url = "#{client.options[:base_uri]}/api/v3/facilities/#{facility_id}/subscriptions/#{id}"
 

data/lib/artemis_api/user.rb

@@ -5,7 +5,7 @@ module ArtemisApi
 
     def self.get_current(client:, include: nil)
       self.json_type
-      client.refresh if client.oauth_token.expired?
+      client.auto_refresh!
       url = "#{client.options[:base_uri]}/api/v3/user"
       url = "#{url}?include=#{include}" if include
       response = client.oauth_token.get(url)

data/lib/artemis_api/version.rb

@@ -1,3 +1,3 @@
 module ArtemisApi
-  VERSION = "0.2.1"
+  VERSION = '0.7.5'.freeze
 end

data/lib/artemis_api/zone.rb

@@ -1,6 +1,7 @@
 module ArtemisApi
   class Zone < ArtemisApi::Model
     json_type 'zones'
+    related_to_one 'sub_stage'
 
     def self.find(id:, facility_id:, client:, include: nil, force: false)
       client.find_one(self.json_type, id, facility_id: facility_id, include: include, force: force)

data/test/batch_test.rb

@@ -19,6 +19,15 @@ class BatchTest < Minitest::Test
                           relationships: {zone: {data: {id: 1, type: 'zones'}}}
                         },
                         included: [{id: '1', type: 'zones', attributes: {id: 1, name: 'Germination'}}]}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/batches?filter[search]=oct")
+      .to_return(body: {data: [{id: '1', type: 'batches', attributes: {id: 1, arbitrary_id: 'Oct16-Gem-Let'}}, {id: '2', type: 'batches', attributes: {id: 2, name: 'Oct19-Bok-Cho'}}]}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/batches?filter[ids][]=2&filter[ids][]=3")
+      .to_return(body: {data: [{id: '2', type: 'batches', attributes: {id: 2, name: 'Oct19-Bok-Cho'}}]}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/batches?page[limit]=1&page[offset]=4")
+      .to_return(body: {data: [{id: '2', type: 'batches', attributes: {id: 2, name: 'Oct19-Bok-Cho'}}]}.to_json)
   end
 
   def test_finding_all_batches
@@ -55,4 +64,31 @@ class BatchTest < Minitest::Test
     zone = batch.zone
     assert_equal zone.name, 'Germination'
   end
+
+  def test_filtering_by_search_term
+    batches = ArtemisApi::Batch.find_all(facility_id: @facility.id, client: @client, filters: {search: "oct"})
+    assert_equal 2, batches.count
+  end
+
+  def test_filtering_by_ids
+    batches = ArtemisApi::Batch.find_all(facility_id: @facility.id, client: @client, filters: {ids: [2, 3]})
+    assert_equal 1, batches.count
+  end
+
+  def test_filtering_by_date_window
+    ending = Time.now + 2.day
+    beginning = ending - 15.days
+    date_window = [beginning, ending].join(',')
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/batches?filter[date_type]=seeded_at&filter[date_window]=#{CGI.escape(date_window)}")
+      .to_return(body: {data: [{id: 'd1', type: 'batches', attributes: {id: 1, arbitrary_id: 'Oct16-Gem-Let'}}, {id: '2', type: 'batches', attributes: {id: 2, name: 'Oct19-Bok-Cho'}}]}.to_json)
+
+    batches = ArtemisApi::Batch.find_all(facility_id: @facility.id, client: @client, filters: {date_type: "seeded_at", date_window: date_window})
+    assert_equal 2, batches.count
+  end
+
+  def test_pagination
+    batches = ArtemisApi::Batch.find_all(facility_id: @facility.id, client: @client, page: {limit: 1, offset: 4})
+    assert_equal 1, batches.count
+  end
 end

data/test/client_test.rb

@@ -15,6 +15,29 @@ class ClientTest < Minitest::Test
     assert_equal false, @client.oauth_token.expired?
   end
 
+  def test_creating_a_client_instance_with_auth_code
+    stub_request(:post, 'http://localhost:3000/oauth/token')
+      .with(body: {"client_id"=>"12345",
+                    "client_secret"=>"67890",
+                    "code"=>"aJ7xsj7",
+                    "grant_type"=>"authorization_code",
+                    "redirect_uri"=>"urn:ietf:wg:oauth:2.0:oob"})
+      .to_return(status: 200, body: {access_token: 'ya29', refresh_token: 'eyJh', expires_in: 7200, token_type: 'Bearer', created_at: Time.now.to_i}.to_json, headers: { 'Content-Type'=> 'application/json;charset=UTF-8'})
+
+    options = {app_id: '12345',
+               app_secret: '67890',
+               base_uri: 'http://localhost:3000'}
+    @client = ArtemisApi::Client.new(auth_code: 'aJ7xsj7', options: options)
+
+    assert_equal '12345', @client.oauth_client.id
+    assert_equal 'ya29', @client.oauth_token.token
+    assert_equal false, @client.oauth_token.expired?
+  end
+
+  def test_creating_an_invalid_client_instance
+    assert_raises(ArgumentError) { ArtemisApi::Client.new(access_token: 'ya29') }
+  end
+
   def test_current_user
     get_client
     stub_user
@@ -22,4 +45,22 @@ class ClientTest < Minitest::Test
     user = @client.current_user
     assert_equal user.class, ArtemisApi::User
   end
+
+  def test_remove_record
+    get_client
+
+    type = 'subscriptions'
+
+    # model type added once, removed twice
+    @client.store_record(type, 1, 'id' => 1)
+    assert_equal 1, @client.get_record(type, 1).id
+    @client.remove_record(type, 1)
+    assert_nil @client.get_record(type, 1)
+    assert_nothing_raised { @client.remove_record(type, 1) }
+
+    # model type not added, attempt to remove one
+    undefined_type = 'something'
+    assert_nil @client.instance_variable_get(:"@objects")[undefined_type]
+    assert_nothing_raised { @client.remove_record(undefined_type, 1) }
+  end
 end

data/test/completion_test.rb

@@ -9,7 +9,16 @@ class CompletionTest < Minitest::Test
       .to_return(body: {data: [{id: '1', type: 'completions', attributes: {id: 1, action_type: 'start'}}, {id: '2', type: 'completions', attributes: {id: 2, action_type: 'move'}}]}.to_json)
 
     stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/completions/2")
-      .to_return(body: {data: {id: '2', type: 'completions', attributes: {id: 2, action_type: 'move'}}}.to_json)
+      .to_return(body: {data: {id: '2', type: 'completions', attributes: {id: 2, action_type: 'move'}, relationships: { batch: { data: { id: 1, type: 'batches' }}}}}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/completions/2")
+      .to_return(body: {data: {id: '2', type: 'completions', attributes: {id: 2, action_type: 'move'}, relationships: { batch: { data: { id: 1, type: 'batches' }}}}}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/completions?filter[crop_batch_ids][]=2&filter[crop_batch_ids][]=3")
+      .to_return(body: {data: [{id: '1', type: 'completions', attributes: {id: 1, action_type: 'start'}}]}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/completions?filter[parent_id]=2")
+      .to_return(body: {data: [{id: '3', type: 'completions', attributes: {id: 3, action_type: 'process'}}, {id: '4', type: 'completions', attributes: {id: 4, action_type: 'process'}}]}.to_json)
   end
 
   def test_finding_all_completions
@@ -21,4 +30,9 @@ class CompletionTest < Minitest::Test
     completion = ArtemisApi::Completion.find(id: 2, facility_id: @facility.id, client: @client)
     assert_equal 'move', completion.action_type
   end
+
+  def test_filtering_completion_by_crop_batch_ids
+    completions = ArtemisApi::Completion.find_all(facility_id: @facility.id, client: @client, filters: {crop_batch_ids: [2, 3]})
+    assert_equal 1, completions.count
+  end
 end

data/test/discard_test.rb

@@ -60,6 +60,9 @@ class DiscardTest < Minitest::Test
 
       stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/discards")
         .to_return(body: {data: [{id: '1', type: 'discards', attributes: {id: 1, reason_type: 'disease', quantity: 20}}, {id: '2', type: 'discards', attributes: {id: 2, reason_type: 'pests', quantity: 5}}]}.to_json)
+
+      stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/discards?filter[crop_batch_ids][]=2&filter[crop_batch_ids][]=3")
+        .to_return(body: {data: [{id: '1', type: 'discards', attributes: {id: 1, quantity: 4, reason_type: 'pests'}}]}.to_json)
   end
 
   def test_finding_a_specific_discard
@@ -82,4 +85,9 @@ class DiscardTest < Minitest::Test
     discards = ArtemisApi::Discard.find_all(facility_id: @facility.id, client: @client)
     assert_equal 2, discards.count
   end
+
+  def test_filtering_discard_by_crop_batch_ids
+    discards = ArtemisApi::Discard.find_all(facility_id: @facility.id, client: @client, filters: {crop_batch_ids: [2, 3]})
+    assert_equal 1, discards.count
+  end
 end

data/test/resource_unit_test.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+
+class ResourceUnitTest < Minitest::Test
+  def setup
+    get_client
+    get_facility
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/resource_units?include=crop_variety")
+      .to_return(body: {data: [{id: '1', type: 'resource_units', attributes: {id: 1, name: 'Bunch', kind: 'count', conversion_si: 1.0}}, {id: '2', type: 'resource_units', attributes: {id: 2, name: 'grams', kind: 'weight', conversion_si: 1.0}, relationships: { crop_variety: { data: { type: 'crop_varieties', id: 1 }}}}], included: [{ type: 'crop_varieties', id: 1, attributes: { name: '5th Element' } }]}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/resource_units/2")
+      .to_return(body: {data: {id: '2', type: 'resource_units', attributes: {id: 2, name: 'grams', kind: 'weight', conversion_is: 1.0}}}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/resource_units/3?include=crop_variety")
+      .to_return(body: {data: {id: '2', type: 'resource_units', attributes: {id: 3, name: 'grams', kind: 'weight', conversion_is: 1.0}, relationships: { crop_variety: { data: { type: 'crop_varieties', id: 2 } } }}, included: [{ type: 'crop_varieties', id: 2, attributes: { name: 'Boss Hog' } }]}.to_json)
+  end
+
+  def test_finding_all_resource_units
+    resource_units = ArtemisApi::ResourceUnit.find_all(facility_id: @facility.id, client: @client, include: 'crop_variety')
+    assert_equal 2, resource_units.count
+    assert_equal '5th Element', resource_units.last.crop_variety.name
+  end
+
+  def test_finding_a_specific_resource_unit
+    resource_unit = ArtemisApi::ResourceUnit.find(id: 2, facility_id: @facility.id, client: @client)
+    assert_equal 'grams', resource_unit.name
+  end
+
+  def test_resource_unit_has_crop_variety
+    resource_unit = ArtemisApi::ResourceUnit.find(id: 3, facility_id: @facility.id, client: @client, include: 'crop_variety')
+    assert_equal 'Boss Hog', resource_unit.crop_variety.name
+  end
+end

data/test/stage_test.rb

@@ -0,0 +1,39 @@
+require "test_helper"
+
+class StageTest < Minitest::Test
+  def setup
+    get_client
+    get_facility
+
+    stub_request(:get, 'http://localhost:3000/api/v3/facilities/2')
+      .to_return(body: {data: {id: '2', type: 'facilities', attributes: {id: 2, name: 'Rare Dankness'}}}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/stages?include=sub_stages,zones")
+      .to_return(body: {data: [{id: '1', type: 'stages', attributes: {id: 1, name: 'Growth', stage_type: 'growth'}}, {id: '2', type: 'stages', attributes: {id: 2, name: 'Stage 2', stage_type: 'stage_2'}}]}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/stages/1?include=sub_stages,zones")
+      .to_return(body: {data: {id: '1', type: 'stages', attributes: {id: 1, name: 'Growth', stage_type: 'growth'}}}.to_json)
+  end
+
+  def test_finding_all_stages
+    stages = ArtemisApi::Stage.find_all(@facility.id, @client)
+    assert_equal 2, stages.count
+  end
+
+  def test_finding_all_stages_through_facility
+    stages = @facility.stages
+    assert_equal 2, stages.count
+  end
+
+  def test_finding_a_specific_stage
+    stage = ArtemisApi::Stage.find(1, @facility.id, @client)
+    assert_equal 'Growth', stage.name
+    assert_equal 'growth', stage.stage_type
+  end
+
+  def test_finding_a_specific_stage_through_facility
+    stage = @facility.stage(1)
+    assert_equal 'Growth', stage.name
+    assert_equal 'growth', stage.stage_type
+  end
+end

data/test/subscription_test.rb

@@ -53,11 +53,11 @@ class SubscriptionTest < Minitest::Test
 
   def test_deleting_a_subscription
     # find the subscription first to ensure it's in the objects hash
-    subscription = ArtemisApi::Subscription.find(id: 2, facility_id: @facility.id, client: @client)
+    ArtemisApi::Subscription.find(id: 2, facility_id: @facility.id, client: @client)
     assert_equal 1, @client.objects['subscriptions'].count
 
     # then delete it and ensure it has been removed from the objects hash
-    result = ArtemisApi::Subscription.delete(id: 2, facility_id: @facility.id, client: @client)
+    ArtemisApi::Subscription.delete(id: 2, facility_id: @facility.id, client: @client)
     assert_equal 0, @client.objects['subscriptions'].count
   end
 end

data/test/zone_test.rb

@@ -10,6 +10,9 @@ class ZoneTest < Minitest::Test
 
     stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/zones/2")
       .to_return(body: {data: {id: '2', type: 'zones', attributes: {id: 2, name: 'Propagation'}}}.to_json)
+
+    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/zones?filter[seeding_unit_id]=100")
+      .to_return(body: {data: [{id: '2', type: 'zones', attributes: {id: 2, name: 'Propagation'}}]}.to_json)
   end
 
   def test_finding_all_zones
@@ -31,4 +34,9 @@ class ZoneTest < Minitest::Test
     zone = @facility.zone(2)
     assert_equal 'Propagation', zone.name
   end
+
+  def test_filtering_zones_by_seeding_unit_id
+    zones = ArtemisApi::Zone.find_all(facility_id: @facility.id, client: @client, filters: {seeding_unit_id: 100})
+    assert_equal 1, zones.count
+  end
 end

metadata

@@ -1,43 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: artemis_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.7.5
 platform: ruby
 authors:
 - Jamey Hampton
+- Carlos Betancourt Carrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +82,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,11 +112,13 @@ dependencies:
 description: 
 email:
 - jhampton@artemisag.com
+- cbetancourt@artemisag.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -117,6 +134,10 @@ files:
 - lib/artemis_api/batch.rb
 - lib/artemis_api/client.rb
 - lib/artemis_api/completion.rb
+- lib/artemis_api/crop_batch_state.rb
+- lib/artemis_api/crop_variety.rb
+- lib/artemis_api/custom_data.rb
+- lib/artemis_api/custom_fields.rb
 - lib/artemis_api/discard.rb
 - lib/artemis_api/facility.rb
 - lib/artemis_api/harvest.rb
@@ -124,7 +145,10 @@ files:
 - lib/artemis_api/item.rb
 - lib/artemis_api/model.rb
 - lib/artemis_api/organization.rb
+- lib/artemis_api/resource_unit.rb
 - lib/artemis_api/seeding_unit.rb
+- lib/artemis_api/stage.rb
+- lib/artemis_api/sub_stage.rb
 - lib/artemis_api/subscription.rb
 - lib/artemis_api/user.rb
 - lib/artemis_api/version.rb
@@ -139,7 +163,9 @@ files:
 - test/harvest_unit_test.rb
 - test/item_test.rb
 - test/organization_test.rb
+- test/resource_unit_test.rb
 - test/seeding_unit_test.rb
+- test/stage_test.rb
 - test/subscription_test.rb
 - test/test_helper.rb
 - test/user_test.rb
@@ -163,8 +189,7 @@ 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.1
 signing_key: 
 specification_version: 4
 summary: An API wrapper for the ArtemisAg API