al 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa42cadb858988b7a7833de0e82584a1a396023
-  data.tar.gz: 9e455e216ad7176e2529ffff67a74d7f83efc3c2
+  metadata.gz: 916f2172f8334bd4022beba1200fbadc5ef02f99
+  data.tar.gz: 9960379dacc8cb84b26c05da2a5b3e46ea6e5b0e
 SHA512:
-  metadata.gz: 6f6bf956fe3dcd1b41cd41521eb04898631c5ab8252c86a1cf8c1abf33dbd7f9b2f317f5f9b8a9b7c806298a09bfca171f26185009c9f877f6f08cedf3f6a5ae
-  data.tar.gz: 6fbd3ad62290013dbd3216aed8112f5df4ac38fa65d4e0f5e1ed7dd2e5c0698837412183395f6d872c5a68d9ba4c5bd3ee1498def9b19bcbc7ef99e7f0119fcd
+  metadata.gz: 99b589489d1089ae744d4ef4d8b455323958a1810a4a738f6b3ab48599c373d9c5ba7b613ae375485ca5fe44fd9f47b12142f2621c714eca29b6d212156a0f5c
+  data.tar.gz: 133b27b1395a6fb3d3de09fa142b3739b6ee2d52fe630045a801038c083fb4c11633ede447c348aa9f38b42a8006bfd27ed6c934491f1f4bf688515bd0d897ce

data/lib/al.rb

@@ -1,21 +1,25 @@
 class Al
-  def initialize(tag = nil, val = nil)
-    @languages = { DEFAULT => [tag, val] }
+  def initialize(tag = nil, value = nil)
+    unless tag.nil?
+      tag = tag.downcase
+    end
+
+    @languages = { "*" => [tag, value] }
 
-    if tag && val
-      self[tag] = val
+    if tag && value
+      self[tag] = value
     end
   end
 
-  def []=(tag, val)
+  def []=(tag, value)
     tag = preprocess(tag)
 
-    tag.split(DASH).each_with_object("") do |bit, key|
-      key.concat("-#{bit}")
-      @languages[key[1..-1]] ||= [tag, val]
+    tag.split("-").inject do |key, bit|
+      @languages[key] ||= [tag, value]
+      "#{key}-#{bit}"
     end
 
-    @languages[tag] = [tag, val] # ensure xx overwrites a previous xx-yy
+    @languages[tag] = [tag, value] # ensure xx overwrites a previous xx-yy
   end
 
   def [](tag)
@@ -23,97 +27,72 @@ class Al
   end
 
   def pick(header)
-    unless header
-      return @languages[DEFAULT]
-    end
-
-    high = 0.0
-    best = nil
-
-    preprocess(header).split(COMMA).each do |tag|
-      len = tag.size
-      sem = tag.index(SEMICOLON) || len
-      pos = sem
+    find(header) do |tag|
+      length = tag.length
+      dash_index = length
       
-      while pos
-        attempt = tag[0, pos]
-        result  = @languages[attempt]
+      while dash_index
+        result = @languages[tag[0, dash_index]]
 
         if result
-          quality = quality(tag, sem, len)
-
-          if quality > high
-            high = quality
-            best = result
-            
-            if high >= 1.0
-              return best
-            end
-
-            break
-          end
+          break result
         end
 
-        pos = tag.rindex(DASH, -(len - pos) - 1)
+        dash_index = tag.rindex("-".freeze, dash_index - length - 1)
       end
     end
-
-    return best || @languages[DEFAULT]
   end
 
   def strict_pick(header)
-    unless header
-      return @languages[DEFAULT]
-    end
+    find(header) { |tag| @languages[tag] }
+  end
+
+  private
+
+  def find(header, &block)
+    best_quality = 0.0
+    best_result = nil
+
+    preprocess(header.to_s).split(",".freeze).each do |language_range|
+      tag, q = language_range.split(";".freeze, 2)
 
-    high = 0.0
-    best = nil
-
-    preprocess(header).split(COMMA).each do |tag|
-      sem    = tag.index(SEMICOLON) || tag.size
-      result = @languages[tag[0, sem]]
-
-      if result
-        len     = tag.size
-        sem     = tag.index(SEMICOLON) || len
-        quality = quality(tag, sem, len)
-
-        if quality > high
-          high = quality
-          best = result
-          
-          if high >= 1.0
-            return best
-          end
+      unless tag
+        next
+      end
+
+      result = yield(tag)
+
+      unless result
+        next
+      end
+
+      quality = quality(q)
+
+      if quality > best_quality
+        best_quality = quality
+        best_result = result
+
+        if quality >= 1.0
+          break result
         end
       end
     end
 
-    return best || @languages[DEFAULT]
+    return best_result || @languages["*".freeze]
   end
 
-  private
-
-  SPACE = " ".freeze
-  EMPTY = "".freeze
-
-  def preprocess(s)
-    result = s.tr(SPACE, EMPTY)
+  def preprocess(header)
+    result = header.delete(" ".freeze)
     result.downcase!
 
     return result
   end
 
-  def quality(tag, sem, len)
-    q = tag[sem + 3, 10]
+  def quality(q)
+    if q.nil? || q.size < 2
+      return 1.0
+    end
 
-    return q ? Float(q) : 1.0
-  rescue ArgumentError
-    0.0
+    return q[2, 10].to_f
   end
-
-  DEFAULT   = "*".freeze
-  COMMA     = ",".freeze
-  SEMICOLON = ";".freeze
-  DASH      = "-".freeze
 end

data/test/parse_test.rb

@@ -1,5 +1,6 @@
 require "al"
 require "cutest"
+require "securerandom"
 
 test "no input" do
   al = Al.new("en-gb", "british english")
@@ -60,3 +61,13 @@ test "invalid quality values" do
   assert_equal al.pick("en-gb;q=.9, en-us;q=0.8"), ["en-gb", "british english"]
   assert_equal al.pick("en-gb;q=aaa, en-us;q=0.8"), ["en-us", "american english"]
 end
+
+test "gibberish" do
+  al = Al.new("en-gb", "british english")
+
+  assert 1000.times.all? {
+    s = SecureRandom.random_bytes rand(1000)
+    
+    al.pick(s) || raise("failed on: #{s}")
+  }
+end

data/test/pick_test.rb

@@ -47,4 +47,9 @@ test "default value" do
   al["en-GB"] = "british english"
 
   assert_equal al.pick("en-us"), ["en", "english"]
+
+  al = Al.new("EN", "english")
+  al["en-GB"] = "british english"
+
+  assert_equal al.pick("en-us"), ["en", "english"]
 end

data/test/strict_parse_test.rb

@@ -1,5 +1,6 @@
 require "al"
 require "cutest"
+require "securerandom"
 
 test "no input" do
   al = Al.new("en-gb", "british english")
@@ -60,3 +61,13 @@ test "invalid quality values" do
   assert_equal al.strict_pick("en-gb;q=.9, en-us;q=0.8"), ["en-gb", "british english"]
   assert_equal al.strict_pick("en-gb;q=aaa, en-us;q=0.8"), ["en-us", "american english"]
 end
+
+test "gibberish" do
+  al = Al.new("en-gb", "british english")
+
+  assert 1000.times.all? {
+    s = SecureRandom.random_bytes rand(1000)
+    
+    al.strict_pick(s) || raise("failed on: #{s}")
+  }
+end

data/test/strict_pick_test.rb

@@ -46,5 +46,10 @@ test "default value" do
   al = Al.new("en", "english")
   al["en-GB"] = "british english"
 
-  assert_equal al.pick("en-us"), ["en", "english"]
+  assert_equal al.strict_pick("en-us"), ["en", "english"]
+
+  al = Al.new("EN", "english")
+  al["en-GB"] = "british english"
+
+  assert_equal al.strict_pick("en-us"), ["en", "english"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: al
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jip van Reijsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Al stands for Accept-Language
@@ -73,4 +73,3 @@ test_files:
 - test/pick_test.rb
 - test/strict_parse_test.rb
 - test/strict_pick_test.rb
-has_rdoc: