doorkeeper-jwt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c95e333012ef38f81ceee7a5a2c431d33ecbf1d
-  data.tar.gz: 2e805901112a1968d5c7e21eab8db7a5f5187aa3
+  metadata.gz: a943aa0b9dc65189852d3ab4584371c3254c2ee1
+  data.tar.gz: 2a4f967cbef940a5d3fb5248b419d48adcdb324c
 SHA512:
-  metadata.gz: a14d4bd9c67834b5a2d1384c8140396cc9a3ac261aed4d69278e4b52cfd5c95a0717f87d84af064ca46eaf8e22004e6c7e6127b84ae4335229f33cd0f7283685
-  data.tar.gz: 0ebb2d51b8c517b1de6b13afcf403fdfdaaa3d72692a43abf8155c459b97457d9d1f2cfe6cb2c0cd882ccd283a8bd3d6cac7bc51280919f6b8667115580b5f2e
+  metadata.gz: c15efeba186db245f32174ba86e8eec0e8939f7534d42e19cc05230a20ba9269994c17ecaab588d33cd32a6c77bab5386ec5146111d48430aa1443ce190403c8
+  data.tar.gz: bb1c0da134318b6787b6571ec9c34b269095c0a9f5421d3186ed24ce3ba6c27e6f6494be83dbcca8d90632bcafea06db852ae80311c863e252aa8141bbb6c5d9

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
   - 2.2.1
+addons:
+  code_climate:
+    repo_token: a44faab4cd18aeb4898a374736ac95bbb1de26015e9f53d5c809109e11df1149

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
+gem "codeclimate-test-reporter", group: :test, require: nil

data/doorkeeper-jwt.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jwt", "~> 1.4", ">= 1.4.1"
+  spec.add_dependency "jwt", "~> 1.5.2", ">= 1.5.2"
 
   spec.add_development_dependency "bundler", "~> 1.8", ">= 1.8"
   spec.add_development_dependency "rake", "~> 10.0", ">= 10.0"

data/lib/doorkeeper-jwt.rb

@@ -4,44 +4,66 @@ require 'jwt'
 
 module Doorkeeper
   module JWT
-    def self.generate(opts = {})
-      ::JWT.encode(
-        token_payload(opts),
-        secret_key,
-        encryption_method
-      )
-    end
+    class << self
+      def generate(opts = {})
+        ::JWT.encode(
+          token_payload(opts),
+          secret_key,
+          encryption_method
+        )
+      end
 
-  private
+      private
 
-    def self.token_payload(opts = {})
-      Doorkeeper::JWT.configuration.token_payload.call opts
-    end
+      def token_payload(opts = {})
+        Doorkeeper::JWT.configuration.token_payload.call opts
+      end
 
-    def self.secret_key
-      return secret_key_file if !secret_key_file.nil?
-      return rsa_key if rsa_encryption?
-      Doorkeeper::JWT.configuration.secret_key
-    end
+      def secret_key
+        return secret_key_file unless secret_key_file.nil?
+        return rsa_key if rsa_encryption?
+        return ecdsa_key if ecdsa_encryption?
+        Doorkeeper::JWT.configuration.secret_key
+      end
 
-    def self.secret_key_file
-      return nil if Doorkeeper::JWT.configuration.secret_key_path.nil?
-      OpenSSL::PKey::RSA.new(
-        File.open(Doorkeeper::JWT.configuration.secret_key_path)
-      )
-    end
+      def secret_key_file
+        return nil if Doorkeeper::JWT.configuration.secret_key_path.nil?
+        return rsa_key_file if rsa_encryption?
+        return ecdsa_key_file if ecdsa_encryption?
+      end
 
-    def self.encryption_method
-      return nil unless Doorkeeper::JWT.configuration.encryption_method
-      Doorkeeper::JWT.configuration.encryption_method.to_s.upcase
-    end
+      def encryption_method
+        return nil unless Doorkeeper::JWT.configuration.encryption_method
+        Doorkeeper::JWT.configuration.encryption_method.to_s.upcase
+      end
 
-    def self.rsa_encryption?
-      /RS\d{3}/ =~ encryption_method
-    end
+      def rsa_encryption?
+        /RS\d{3}/ =~ encryption_method
+      end
 
-    def self.rsa_key
-      OpenSSL::PKey::RSA.new(Doorkeeper::JWT.configuration.secret_key)
+      def ecdsa_encryption?
+        /ES\d{3}/ =~ encryption_method
+      end
+
+      def rsa_key
+        OpenSSL::PKey::RSA.new(Doorkeeper::JWT.configuration.secret_key)
+      end
+
+      def ecdsa_key
+        OpenSSL::PKey::EC.new(Doorkeeper::JWT.configuration.secret_key)
+      end
+
+      def rsa_key_file
+        OpenSSL::PKey::RSA.new(secret_key_file_open)
+      end
+
+      def ecdsa_key_file
+        OpenSSL::PKey::EC.new(secret_key_file_open)
+      end
+
+      def secret_key_file_open
+        File.open(Doorkeeper::JWT.configuration.secret_key_path)
+      end
     end
   end
 end

data/lib/doorkeeper-jwt/version.rb

@@ -1,5 +1,5 @@
 module Doorkeeper
   module JWT
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-jwt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chris Warren
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement