parsed-attributes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81ae9f69a48cc5c297e88bd575697e490e9c952
-  data.tar.gz: 217584c4424daabf5aafcbaa070ef09be3e11f4f
+  metadata.gz: cb567d0b511aa92402e92e102bead9f810efc2c4
+  data.tar.gz: 0dfd9fea52e36b6a923aa89ab016e3f5202323ec
 SHA512:
-  metadata.gz: 411b1e5a04b11779e8cef16d3a443bbcccba89506b34449dc78d5fa48cd2920d72d02dc177aa577a9c646c1f0e352337d0fb703bcb46d9e9fab86c2453b2f413
-  data.tar.gz: b08606048a4e79f250a1e619ac9493b719e0f3989dc5c62095c7a9e03715557299785af27079d270e6e03880000cae92ed776cc4d64bffe7ce90ee84fde53846
+  metadata.gz: 95615c9b181463833d99f1a5d6424c438282a24bd8ccad5bfb29e29045425d856bf05e7a314377f7fa7887d13d89cdeb376428bb1cddf19f5c2f6182e472f67f
+  data.tar.gz: 67e707b700895528463868ea7067c850fb6061531b61502b7fa574f4d6bb503b8ce5d66f1cdaaef77971455ec7e09ec1afd43ea91ad68a217ab0703a1e3664d3

data/lib/parsed/http/basicauth.rb

@@ -0,0 +1,19 @@
+require_relative '../base'
+require_relative '../../parsers/http/basicauth'
+module Parsed
+  module HTTP
+    module BasicAuth
+      include Parsed::Base
+
+      ##
+      # Defines an attribute pair to handle de/encoding HTTP Basic auth strings
+      # ---
+      # Accepts default options, see Parsed:Base
+      def http_basic_auth_attribute(name, options = {})
+        __define_parsed_attributes_all_methods name, options do |raw_value|
+          ::BasicAuth.parse raw_value
+        end
+      end
+    end
+  end
+end

data/lib/parsers/http/basicauth.rb

@@ -0,0 +1,31 @@
+class BasicAuth
+  class ParserError < StandardError
+  end
+
+  attr_accessor :username, :password
+  def initialize(user, pass)
+    @username = user
+    @password = pass
+  end
+
+  def userpwd
+    "#{@username}:#{@password}"
+  end
+
+  def to_s
+    [self.userpwd].pack('m').strip
+  end
+
+  def self.parse(raw_value)
+    decoded = raw_value.unpack("m").first
+    si = decoded.index ':'
+    raise ParserError.new 'Malformed string, expecting ":"' if si.nil?
+
+    username = decoded[0...si]
+    password = decoded[si + 1..-1]
+
+    raise ParserError.new 'Username cannot be blank' if username.empty?
+    self.new username, password
+  end
+
+end

data/lib/parsers/http/cookie.rb

@@ -21,7 +21,7 @@ class Cookie
 
   def to_s
     cookie = ["#{@name}=#{@value}"]
-    cookie << "Expires=#{@expires}" if defined? @expires
+    cookie << "Expires=#{@expires}" if defined?(@expires) and !defined?(@max_age)
     cookie << "Max-Age=#{@max_age == Time.at(0) ? 0 : self.age_left }" if defined? @max_age
     cookie << "Domain=#{@domain}"   if defined? @domain
     cookie << "Path=#{@path}"       if defined? @path
@@ -32,7 +32,7 @@ class Cookie
 
   def to_h
     h = { name: @name, value: @value }
-    h[:expires]   = @expires   if defined? @expires
+    h[:expires]   = @expires   if defined?(@expires) and !defined?(@max_age)
     h[:max_age]   = @max_age   if defined? @max_age
     h[:domain]    = @domain    if defined? @domain
     h[:path]      = @path      if defined? @path
@@ -48,12 +48,6 @@ class Cookie
   class Parser
     attr_reader :name, :value, :expires, :max_age, :domain, :path, :secure, :http_only
 
-    def self.empty?(val)
-      return true if val.nil?
-      return true if val.respond_to?(:size) && val.size == 0
-      return false
-    end
-
     def initialize(options = {})
       @time         = options[:time]
       @default_path = options[:default_path] || ''
@@ -61,7 +55,7 @@ class Cookie
 
     def to_h
       h = { name: @name, value: @value }
-      h[:expires]   = @expires   if defined? @expires
+      h[:expires]   = @expires   if defined?(@expires) and !defined?(@max_age)
       h[:max_age]   = @max_age   if defined? @max_age
       h[:domain]    = @domain    if defined? @domain
       h[:path]      = @path      if defined? @path
@@ -93,12 +87,12 @@ class Cookie
     end
 
     def name_and_value!(chunk)
-      raise ParserError.new "Name cannot be blank"             if Parser.empty? chunk
+      raise ParserError.new "Name cannot be blank"             if chunk.nil? or chunk.empty?
       raise ParserError.new "Name/value pair must include '='" if chunk.size == 1
       @name  = chunk[0]
       @value = chunk[1]
 
-      raise ParserError.new "Name cannot be blank" if Parser.empty? @name
+      raise ParserError.new "Name cannot be blank" if @name.empty?
     end
 
     def attribute!(chunk)
@@ -115,12 +109,12 @@ class Cookie
     end
 
     def expires!(val)
-      raise ParserError.new 'Expires cannot have a blank value' if Parser.empty?(val)
+      raise ParserError.new 'Expires cannot have a blank value' if val.empty?
       @expires = val
     end
 
     def max_age!(val)
-      raise ParserError.new 'Max-Age cannot have a blank value' if Parser.empty?(val)
+      raise ParserError.new 'Max-Age cannot have a blank value' if val.empty?
 
       unless val =~ /^-?\d+$/
         raise ParserError.new "Expected integer for Max-Age instead of #{val}"
@@ -135,12 +129,12 @@ class Cookie
     end
 
     def domain!(val)
-      raise ParserError.new 'Domain cannot have a blank value' if Parser.empty?(val)
+      raise ParserError.new 'Domain cannot have a blank value' if val.empty?
       @domain = (val[0] == '.' ? val[1..-1] : val).downcase
     end
 
     def path!(val)
-      if Parser.empty?(val) || val[0] != '/'
+      if val.empty? || val[0] != '/'
         @path = @default_path
       else
         @path = val

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsed-attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Morgen Peschke
@@ -21,8 +21,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/parsed/base.rb
+- lib/parsed/http/basicauth.rb
 - lib/parsed/http/cookie.rb
 - lib/parsed/json.rb
+- lib/parsers/http/basicauth.rb
 - lib/parsers/http/cookie.rb
 homepage: https://github.com/morgen-peschke/parsed-attributes
 licenses: