agx 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c786b01d2fd0875eaa51abaa9f21a3669ee747a754834fb4a01984706a3a18a9
-  data.tar.gz: 9f6577a8276c34d4351a43dfdc4aba958724f8ac5ac19578adcbde76495fa63f
+  metadata.gz: e857bc1af586908c17bd9d4979f4d6da3b973e27cec3fa30f5708e76babdf8ad
+  data.tar.gz: a0f1d070afad995898c7793d5fdcc5a52a58bcb4e6c0bef106e0a67d43fb1ed5
 SHA512:
-  metadata.gz: 9d28ce15cfc652a053b107bfa83545d000c009621dff0b7028d381e0d3097972a15ab40da6c81ed7183071cc825773eba19bbb9a46dfe6d66fcdd5841821fc9f
-  data.tar.gz: 1d189d91067e1ce73c38b5f780b6fb3461db778158c5036d8b36c08cdbc676e9b34c286207b545cd0bdc287c666408b42885a295a6663fc2cfae69de341c7d4f
+  metadata.gz: e67bdc8cb9b810593cc3fd57b4332104fa005c8821250549b723d08eef6af666b444441ea3e08a9053841c68012b499b5eacf4d09d2f1ef6db13056a0cdf2586
+  data.tar.gz: 3ed758095b42bd65d51230ece29d2224380af76f1f0384fb2f4a9fa9341eded7d70a2a9d1b1b35db3a3e36d7f97b3dc17e19e539be311e6d9945d8d60d7c7ac4

data/Gemfile

@@ -1,4 +1,9 @@
 source 'https://rubygems.org'
 
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 # Specify your gem's dependencies in agx.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Bryce Johnston
+Copyright (c) 2020 Bryce Johnston
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -72,7 +72,6 @@ expiration timestamp.***
 
 Initiate a sync transaction, make Sync API requests, and end transaction
 
-***Currently only get requests are supported***
 ```ruby
 # To make calls without starting a transaction for resources that don't
 # require it, use the get_nt method
@@ -96,6 +95,21 @@ farms = @agx_sync_client.get("Grower/#{grower.guid}/Farm")
 # Get all server changes on farms accessible for a grower since start_time
 farms = @agx_sync_client.get("Grower/#{grower.guid}/Farm", last_sync_date.to_s)
 
+# Put (insert) a new Grower
+now = Time.now.utc
+new_grower = {
+  "SyncID": @agx_sync_client.sync_id,
+  "ID": SecureRandom.uuid,
+  "Name": "MYNEWGROWER",
+  "ModifiedOn": now,
+  "CreatedOn": now,
+  "CreatorID": @agx_sync_client.sync_id,
+  "EditorID": @agx_sync_client.sync_id,
+  "SchemaVersion": "4.0"
+}
+
+@client.put("Grower", new_grower.to_json)
+
 # etc...
 
 @agx_sync_client.end_transaction
@@ -104,46 +118,13 @@ farms = @agx_sync_client.get("Grower/#{grower.guid}/Farm", last_sync_date.to_s)
 user_transaction_id = nil
 ```
 
-### agX Pictures API
-
-*Note: The pictures API client implementation still needs more work.*
-
-Setup agX Pictures Client
-
-```ruby
-@agx_pictures_client = Agx::Pictures::Client.new(
-  client_id: "your_client_id",
-  client_secret: "your_client_secret",
-  version: "v1",  # optional
-  sync_id: "agx_user_sync_id",
-  access_token: "agx_user_agx_token",
-  refresh_token: "agx_user_refresh_token",
-  token_expires_at: "access_token_expiration_timestamp",
-  filepath: "/path/to/pictures/",
-  prod: true # optional, false for QA
-)
-```
-
-Make get requests for Pictures API images and metadata
-
-***Currently only get requests are supported***
-```ruby
-
-# Get metadata
-image_meta = @agx_pictures_client.get_metadata("661ee0c0-0cbc-4a7b-be39-1a9de49acc86")
-
-# Get image and save to {filepath}/{sync_id}_{picture_id}.jpeg
-image = @agx_pictures_client.get("661ee0c0-0cbc-4a7b-be39-1a9de49acc86")
-# => "/path/to/pictures/7_661ee0c0-0cbc-4a7b-be39-1a9de49acc86.jpeg"
-```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/beaorn/agx-ruby.
+Bug reports and pull requests are welcome on GitHub at https://github.com/cropquest/agx-ruby.
 
 
 ## License

data/agx.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |spec|
   spec.name          = "agx"
   spec.version       = Agx::VERSION
   spec.authors       = ["Bryce Johnston"]
-  spec.email         = ["bryce@beaorn.com"]
+  spec.email         = ["bryce.johnston@hey.com"]
 
   spec.summary       = %q{Ruby client for accessing agX Platform APIs.}
   spec.description   = %q{Ruby client for accessing Proagrica's agX Platform APIs.}
-  spec.homepage      = "https://github.com/beaorn/agx-ruby"
+  spec.homepage      = "https://github.com/cropquest/agx-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "oj", "< 4"
   spec.add_dependency "oauth2", "< 2"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-end
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
+end

data/lib/agx/content/client.rb

@@ -117,7 +117,10 @@ module Agx
           @client_id,
           @client_secret,
           site: @site,
-          token_url: @token_url
+          token_url: @token_url,
+          connection_opts: {
+            request: { timeout: 90 }
+          }
         )
       end
 

data/lib/agx/sync/client.rb

@@ -66,6 +66,19 @@ module Agx
         end
       end
 
+      def put(resource, body)
+        validate_sync_attributes
+
+        url = "#{@api_url}#{resource}?transactionId=#{@transaction_id}"
+
+        begin
+          response = current_token.put(url, {:body => body, :headers => @headers})
+          parse_response(response.body)
+        rescue => e
+          handle_error(e)
+        end
+      end
+
       def start_transaction
         validate_credentials
 
@@ -95,7 +108,7 @@ module Agx
           )
           return true
         rescue => e
-          if e.response && e.response.body == "The specified transaction is invalid or expired."
+          if e.response && e.response.status && e.response.status.to_i >= 400
             return true
           else
             handle_error(e)
@@ -190,6 +203,9 @@ module Agx
             token_url: @token_url,
             options: {
               ssl: { ca_path: "/usr/lib/ssl/certs" }
+            },
+            connection_opts: {
+              request: { timeout: 90 }
             }
           }
         )

data/lib/agx/version.rb

@@ -1,3 +1,3 @@
 module Agx
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agx
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Bryce Johnston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -44,45 +44,45 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 description: Ruby client for accessing Proagrica's agX Platform APIs.
 email:
-- bryce@beaorn.com
+- bryce.johnston@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -106,7 +106,7 @@ files:
 - lib/agx/sync.rb
 - lib/agx/sync/client.rb
 - lib/agx/version.rb
-homepage: https://github.com/beaorn/agx-ruby
+homepage: https://github.com/cropquest/agx-ruby
 licenses:
 - MIT
 metadata: {}
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for accessing agX Platform APIs.