panoptes-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1672588d0e6aa42f444652e8ba296f7ed5f4b3b
-  data.tar.gz: 05a812e25aa5eb57231af579d8c7af8f1c48fdf0
+  metadata.gz: 540f683db234bc8033e9431841393bb159adde19
+  data.tar.gz: d93345cca9db9d40c24a7abfbf2b15a6a79ac485
 SHA512:
-  metadata.gz: 236008784bec67aa18e2df5e2a735db4ab66b557907e5b7353b4131744e429813dfa388d06e7a69ebba668d78d07fbd002b1f5dfcf466e5eb5be8b1b9ac22718
-  data.tar.gz: 798d2902d8b3e86e16b2525748edb4fecb9c2c074a649f0eab59515f015da0715d55ddd7af64fd067909de6265895386cfe740ab0ced1d46532cbbc656187347
+  metadata.gz: 68939b3810367e0331b6a1d2a0c748d2fdd1d0c0fad07ba6e17925899b1cc8e7d44559f7e03ecf4f23d7fbb59b024d3e3bc2e30e268b3e9b336b2b9057e9872f
+  data.tar.gz: a8d8674148c5fe92a4c7fc3d337ccaec9eea3d90d0683c2f7cad8394b5132db11f415061c3b7b7eea3052064996964488b9915d451a78a758728652079b93c5b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.1
+
+* Automatically loads active public key (as of gem release)
+
 # 0.2.10
 
 * Fix bug with server errors

data/lib/panoptes/client.rb

@@ -17,18 +17,21 @@ require 'panoptes/client/workflows'
 module Panoptes
   class Client
     include Panoptes::Client::Me
+
+    # Panoptes
+    include Panoptes::Client::Classifications
+    include Panoptes::Client::Collections
     include Panoptes::Client::Projects
     include Panoptes::Client::Subjects
     include Panoptes::Client::SubjectSets
     include Panoptes::Client::UserGroups
     include Panoptes::Client::Workflows
 
-    include Panoptes::Client::Discussions
+    # Talk
     include Panoptes::Client::Comments
+    include Panoptes::Client::Discussions
 
-    include Panoptes::Client::Collections
-    include Panoptes::Client::Classifications
-
+    # Cellect
     include Panoptes::Client::Cellect
 
     class GenericError < StandardError; end
@@ -39,12 +42,12 @@ module Panoptes
 
     attr_reader :env, :auth, :panoptes, :talk, :cellect
 
-    def initialize(env: :production, auth: {}, public_key_path: nil, params: nil)
+    def initialize(env: :production, auth: {}, public_key_path: nil)
       @env = env
       @auth = auth
-      @public_key_path = public_key_path
+      @public_key_path = public_key_path || public_key_for_env(env)
       @panoptes = Panoptes::Endpoints::JsonApiEndpoint.new(
-        auth: auth, url: panoptes_url, prefix: '/api', params: params
+        auth: auth, url: panoptes_url, prefix: '/api'
       )
       @talk = Panoptes::Endpoints::JsonApiEndpoint.new(
         auth: auth, url: talk_url
@@ -65,6 +68,17 @@ module Panoptes
       @jwt_signing_public_key ||= OpenSSL::PKey::RSA.new(File.read(@public_key_path))
     end
 
+    def public_key_for_env(env)
+      case env.to_s
+      when "staging"
+        File.expand_path(File.join("..", "..", "..", "data", "doorkeeper-jwt-staging.pub"), __FILE__)
+      when "production"
+        File.expand_path(File.join("..", "..", "..", "data", "doorkeeper-jwt-production.pub"), __FILE__)
+      else
+        nil
+      end
+    end
+
     def panoptes_url
       case env
       when :production, 'production'.freeze

data/lib/panoptes/client/version.rb

@@ -1,5 +1,5 @@
 module Panoptes
   class Client
-    VERSION = "0.3.0".freeze
+    VERSION = "0.3.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panoptes-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: API wrapper for https://panoptes.zooniverse.org