decode_this 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c4b63aafa1f2580ea3dc00b82bf73146c4a359
-  data.tar.gz: '08f00f87e58881523aa71363b33b61cf0e04a623'
+  metadata.gz: 606c55fdd8065f0c7684da605cb50dd56ca355eb
+  data.tar.gz: e2474db9de8ae7b5966d9825fd5a111d8fdbc27f
 SHA512:
-  metadata.gz: 0a07a34405062df6be63ac46d30bd2f41be91932ff05ec6eed3625120d26c2971393559d0d083be41530a318057a3692e8cf68e6759258cffd65fe81f1d576e3
-  data.tar.gz: d515dae8347c59fe96deea2c285a90b8e33e29d76cf460cc7fa85699a4a8e56b0c17854153bfac73f698a54136ed024618dad4b72ef239fc68aac4ed2ab309c1
+  metadata.gz: e04f30fa5f0c83a13de6dc2b03fc701ff06d60fd50ccda9dfdcd7cd2b8d5a8a5d834bcf460fe881e460a72d95be37545bef0fbcf3be0b14cff9ac0278741c84f
+  data.tar.gz: b2a607e6a4d02b70bc1280671eaf7649993e649df01916ecd8db16c99bde960d30874528933ceb7a6449b122e5f8bb46b4548e846cbbc2156d5e18a33160fbd8

data/decode_this.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'jwt'
-  spec.add_dependency 'huyettings'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rspec'

data/lib/decode_this/safe_decoding.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 module DecodeThis
   BaseError = Class.new(RuntimeError)
+  ConfigFileNotFoundError = Class.new(BaseError)
   KeyFileNotFoundError = Class.new(BaseError)
   DecodeError = Class.new(BaseError)
 
   class SafeDecoding
-    def self.call(logger = nil, &block)
+    def self.call(logger, &block)
       block.call
 
     rescue JWT::ExpiredSignature => err

data/lib/decode_this/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module DecodeThis
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/decode_this.rb

@@ -1,3 +1,70 @@
 # frozen_string_literal: true
 require 'decode_this/version'
-require 'decode_this/decoder'
+require 'decode_this/safe_decoding'
+require 'yaml'
+require 'jwt'
+
+module DecodeThis
+  def self.decode(header_value)
+    token = token_from_header(header_value)
+
+    safe_decode { JWT.decode(token, public_key, true, algorithm: config['algorithm']).first }
+  end
+
+  def self.config
+    raise ConfigFileNotFoundError.new("Cannot found configuration file in #{@config_path}") unless @config_path
+
+    @config ||= YAML.load(File.open(@config_path))[@env]
+  end
+
+  def self.config_path=(config_path)
+    @config_path = File.expand_path(config_path)
+  end
+
+  def self.config_path
+    @config_path
+  end
+
+  def self.logger
+    @logger
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.env=(env)
+    @env = env.to_s
+  end
+
+  def self.env
+    @env
+  end
+
+  private
+
+  def self.safe_decode(&block)
+    SafeDecoding.call(logger, &block)
+  end
+
+  def self.token_from_header(header_value)
+    return unless header_value
+
+    token = header_value.match(/^#{config['authorization_scheme']} (.+)/)
+    token[1] if token
+  end
+
+  def self.public_key
+    OpenSSL::PKey::RSA.new(pem).public_key
+  end
+
+  def self.pem
+    keys_absolute_path = File.expand_path(config['key_path'])
+
+    if !File.readable?(keys_absolute_path)
+      raise DecodeThis::KeyFileNotFoundError.new("Cannot found file in #{config['key_path']}")
+    end
+
+    File.read(config['key_path'])
+  end
+end

data/spec/{decode_this/decoder_spec.rb → decode_this_spec.rb}

@@ -1,14 +1,19 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-RSpec.describe DecodeThis::Decoder do
-  let(:config_path) { File.expand_path('spec/fixtures/config.yml') }
+RSpec.describe DecodeThis do
+  let(:config_path) { 'spec/fixtures/config.yml' }
   let(:payload) { { field: 'foobar' } }
-  let(:header_value) { encode(payload) }
+  let(:header_value) { encode(payload, config_path) }
   let(:logger) { Logger.new(STDOUT) }
 
+  before do
+    DecodeThis.logger = logger
+    DecodeThis.config_path = config_path
+  end
+
   subject(:decoded_token) do
-    described_class.new(header_value, config_file: config_path, env: :test, logger: logger).call
+    described_class.decode(header_value)
   end
 
   it 'decodes given token correctly' do
@@ -18,10 +23,20 @@ RSpec.describe DecodeThis::Decoder do
   end
 
   context 'when check correct error raising' do
-    context 'when raise error when config file not present' do
-      let(:config_path) { 'spec/fixtures/nonexistent_config.yml' }
+    context 'when raise error when key file not present' do
+      let(:config_path) { 'spec/fixtures/another_nonexistent_config.yml' }
+      let(:header_value) { 'foobar' }
 
       it 'raises ConfigFileNotFoundError' do
+        expect { decoded_token }.to raise_error { DecodeThis::ConfigFileNotFoundError }
+      end
+    end
+
+    context 'when raise error when key file not present' do
+      let(:config_path) { 'spec/fixtures/nonexistent_config.yml' }
+      let(:header_value) { 'foobar' }
+
+      it 'raises KeyFileNotFoundError' do
         expect(logger).to receive(:warn).and_call_original
         expect { decoded_token }.to raise_error { DecodeThis::KeyFileNotFoundError }
       end
@@ -38,6 +53,9 @@ RSpec.describe DecodeThis::Decoder do
 
     context 'when raise error when try to decode by another key' do
       let(:config_path) { File.expand_path('spec/fixtures/another_config.yml') }
+      let(:header) { encode(payload, config_path) }
+
+      before { DecodeThis.config_path = 'spec/fixtures/config.yml' }
 
       it 'raises DecodeError' do
         expect(logger).to receive(:warn).and_call_original

data/spec/fixtures/nonexistent_config.yml

@@ -1,4 +1,4 @@
 test:
   algorithm: 'RS256'
   authorization_scheme: 'Bearer'
-  key_path: './spec/fixtures/notexistent.pem'
+  key_path: './spec/fixtures/nonexistent.pem'

data/spec/spec_helper.rb

@@ -4,8 +4,10 @@ require 'bundler/setup'
 require 'logger'
 require 'decode_this'
 
-def encode(payload)
-  config = Huyettings.new(File.expand_path('spec/fixtures/config.yml'), :test)
-  private_key = OpenSSL::PKey::RSA.new(File.read(config.key_path))
-  "#{config.authorization_scheme} " + JWT.encode(payload, private_key, config.algorithm)
+DecodeThis.env = :test
+
+def encode(payload, config_path = nil)
+  config = YAML.load(File.open(config_path))[DecodeThis.env] || DecodeThis.config
+  private_key = OpenSSL::PKey::RSA.new(File.read(config['key_path']))
+  "#{config['authorization_scheme']} " + JWT.encode(payload, private_key, config['algorithm'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decode_this
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sasha Kotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: huyettings
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +80,9 @@ files:
 - Readme.md
 - decode_this.gemspec
 - lib/decode_this.rb
-- lib/decode_this/decoder.rb
 - lib/decode_this/safe_decoding.rb
 - lib/decode_this/version.rb
-- spec/decode_this/decoder_spec.rb
+- spec/decode_this_spec.rb
 - spec/fixtures/another_config.yml
 - spec/fixtures/another_unsecured.pem
 - spec/fixtures/config.yml
@@ -129,7 +114,7 @@ signing_key:
 specification_version: 4
 summary: Decode token. This token
 test_files:
-- spec/decode_this/decoder_spec.rb
+- spec/decode_this_spec.rb
 - spec/fixtures/another_config.yml
 - spec/fixtures/another_unsecured.pem
 - spec/fixtures/config.yml

data/lib/decode_this/decoder.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-require 'decode_this/safe_decoding'
-require 'openssl'
-require 'jwt'
-require 'huyettings'
-
-module DecodeThis
-  class Decoder
-    attr_reader :header_value, :config_file, :env, :logger
-
-    def initialize(header_value, config_file:, env:, logger: nil)
-      @header_value = header_value
-      @config_file = config_file
-      @env = env
-      @logger = logger
-    end
-
-    def call
-      safe_decode { JWT.decode(token, public_key, true, algorithm: algorithm).first }
-    end
-
-    private
-
-    def config
-      @config ||= Huyettings.new(config_file, env)
-    end
-
-    def algorithm
-      config.algorithm
-    end
-
-    def token
-      return unless header_value
-
-      token = header_value.match(/^#{config.authorization_scheme} (.+)/)
-      token[1] if token
-    end
-
-    def public_key
-      private_key.public_key
-    end
-
-    def safe_decode(&block)
-      DecodeThis::SafeDecoding.call(logger, &block)
-    end
-
-    def private_key
-      OpenSSL::PKey::RSA.new(pem)
-    end
-
-    def pem
-      keys_absolute_path = File.expand_path(config.key_path)
-
-      if !File.readable?(keys_absolute_path)
-        raise DecodeThis::KeyFileNotFoundError.new("Cannot found file in #{config.key_path}")
-      end
-
-      File.read(config.key_path)
-    end
-  end
-end