artemis_api 0.5.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d26e2f48257f9de7ae7ce3d4b23ea245fdc7d3408a1467bd09b279275240523d
-  data.tar.gz: 673cd71c200ec4f0bdf793b70df3e5075b16a0b37e1ad8f3d008ba3d6deed0a3
+  metadata.gz: '028bbc37f004d68e6513d33cd96c577933d05a0690de059cb737f26a19d8405c'
+  data.tar.gz: 5d403657733f1e76b2dd4f3416126f9f06484c402ec3fc544e33725d935200ea
 SHA512:
-  metadata.gz: 914e649b5638e024bff44c404daf3c19c0fe4b02e17ec2829b9bbe2057c8e396f48c2a4923af5774cdaacd5473e3c85f16cb88414f6e5fa8ed9a543089d16598
-  data.tar.gz: 78e811dc747f089a520f6cf39b4c8fe080a035fcb285e9b048538b614bbbce3a9099fd98763694f8946b7318896a6ade38408ab171da34a1323cbf2424f6c399
+  metadata.gz: f6cb7bbf6da754d24ab0b9e5cbc3bd83391d4cdb13268a99c81c9c244ba2671dc82b7fa3bf62b91cf97c05a8b3a1f4cf5045be2854463f9e52587915e2c2f063
+  data.tar.gz: ba63182e17d76c7d90224a0d87a6073b8314203cbffc7422ecde68937eb11084fcd8cfb8d56058d71143c852d3d8cf6f34a0d6ac704144f4956bcaf1b002e8f8

data/.ruby-version

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

data/Gemfile.lock

@@ -1,28 +1,31 @@
 PATH
   remote: .
   specs:
-    artemis_api (0.5.1)
+    artemis_api (0.7.4)
       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 (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.14.1)
     multi_xml (0.6.0)
@@ -33,17 +36,21 @@ GEM
       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.2.2)
+    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
@@ -53,8 +60,9 @@ DEPENDENCIES
   artemis_api!
   bundler (~> 1.16)
   minitest (~> 5.0)
+  pry
   rake (~> 13.0)
   webmock
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

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"
 
@@ -23,9 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "oauth2"
 
+  spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  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

@@ -12,8 +12,13 @@ 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/custom_fields'
+require 'artemis_api/custom_data'
 
 module ArtemisApi
   # Your code goes here...

data/lib/artemis_api/batch.rb

@@ -4,6 +4,8 @@ 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)

data/lib/artemis_api/client.rb

@@ -1,10 +1,21 @@
 module ArtemisApi
   class Client
     require 'oauth2'
-    attr_reader :options, :objects, :access_token, :refresh_token, :oauth_client,
-                :oauth_token, :expires_at
-
-    def initialize(access_token: nil, refresh_token: nil, expires_at: nil, auth_code: nil, redirect_uri: nil, options: {})
+    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
@@ -15,8 +26,29 @@ module ArtemisApi
       @options = options
       @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])
 
+      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
@@ -25,23 +57,15 @@ module ArtemisApi
         @oauth_token = OAuth2::AccessToken.from_hash(
                         oauth_client,
                         {access_token: @access_token,
-                         refresh_token: @refresh_token,
-                         expires_at: @expires_at})
-      elsif 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
+                        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}"
@@ -62,7 +86,7 @@ module ArtemisApi
 
     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}"
@@ -91,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)
@@ -104,8 +128,26 @@ module ArtemisApi
       @objects[type]&.delete(id.to_i)
     end
 
-    def refresh
+    def auto_refresh!
+      refresh! if @oauth_token.expired?
+    end
+
+    def refresh!
+      old_refresh_token = @oauth_token.refresh_token
+
       @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)
@@ -130,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
@@ -144,20 +186,30 @@ 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

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,48 +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)
-      ArtemisApi::ResourceUnit.find(id: unit_id, facility_id: id, client: client, include: include)
+    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
@@ -66,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

@@ -1,6 +1,7 @@
 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)

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

@@ -11,7 +11,7 @@ module ArtemisApi
     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.5.1"
+  VERSION = '0.7.4'.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/resource_unit_test.rb

@@ -5,20 +5,29 @@ class ResourceUnitTest < Minitest::Test
     get_client
     get_facility
 
-    stub_request(:get, "http://localhost:3000/api/v3/facilities/#{@facility.id}/resource_units")
-      .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}}]}.to_json)
+    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)
+    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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: artemis_api
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.4
 platform: ruby
 authors:
 - Jamey Hampton
-autorequire: 
+- Carlos Betancourt Carrero
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -25,33 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        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: '13.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +82,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,14 +109,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+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,9 @@ files:
 - lib/artemis_api/batch.rb
 - lib/artemis_api/client.rb
 - lib/artemis_api/completion.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
@@ -126,6 +146,8 @@ files:
 - 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
@@ -142,6 +164,7 @@ files:
 - 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
@@ -150,7 +173,7 @@ homepage: https://github.com/artemis-ag/artemis_api/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: An API wrapper for the ArtemisAg API
 test_files: []