jebediah 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbeb051e39880dea4cae5d7e0fe7b2d0230c946
-  data.tar.gz: 36c446d38ec20cdd3e56de3ffa7a02f73c7b7b2b
+  metadata.gz: 65156594909c339c72e889552c4ab526ccb3cfc3
+  data.tar.gz: 1957eaecb4b60820b57390a086e670b64decb0a0
 SHA512:
-  metadata.gz: 77acab3b464132a814bf2d151e5cc6c63a1167a51a809bced8829c1f9d60902ab68520aadc6aaecbda5a2c100e9cdc4ceba8853ef1633e1c9da16852b478d739
-  data.tar.gz: afccaf5b9598c4c109e102c8bd88efff861972ac040323c43a7ef5f21fac5f71bdad4d1efde00f2fe80e573b99aa4509410eb03cb192d1823613ea5ac66915b7
+  metadata.gz: ea17b8636c130ddf20c474bbeef9f5a108748e7986f8f2d7fffde6524100cc1e12fd4fc448825f038d3b463e923665241870b6289cfdf459af77b561d3fbffb4
+  data.tar.gz: 9a97c11e631d2ef7eeaeff005f6b7e0bd9bf54f73b5d74b7137c15fc9445420b0ab115e057cf0a25ca169c7a7b587c65bc3cd75b6d48fb9ecd9aadfb2396b96c

data/bin/git-jeb

@@ -6,4 +6,4 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'jebediah'
 jeb = Jebediah.new()
-puts jeb.renderResult(jeb.process(`git log --format="%H" -n1`))
+puts jeb.renderResult(jeb.process(`git log --format="%h" -n1`))

data/bin/jebcycle

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 require 'jebediah'
 
 def jeb
-	commit = `git log --format='%h' -n 1`.strip
+	commit = `git log --format='%H' -n 1`.strip
 	`jeb #{commit}`.strip
 end
 

data/lib/jebediah.rb

@@ -1,6 +1,6 @@
 class Jebediah
 	def self.version
-		return "1.0.3"
+		return "1.0.5"
 	end
 
 	def initialize(dictPaths=nil)
@@ -23,6 +23,20 @@ class Jebediah
 		return @dictionaries.length
 	end
 
+	# Maximum hexadecimal string length that can safely be addressed by the dictionary set
+	def maxStringLength
+		weight = @dictionaries.inject(1) { |x, d| x * d.length }
+		bits = (Math.log(weight)/Math.log(2)).floor
+		chars = bits/4
+	end
+
+	# Returns maximum number addressable in the dictionary space
+	def hashFromString(str)
+		str = str[2..-1] if str.start_with?("0x")
+		str = str.to_s[0..maxStringLength-1]
+		hash = Integer("0x" + str)
+	end
+
 	# Load in dictionaries from paths
 	def loadDictionaries(dictPaths)
 		@dictionaries = []
@@ -50,10 +64,18 @@ class Jebediah
 		str =~ /^[0-9a-fA-F]+$/
 	end
 
+	def isHyphenated?(str)
+		str =~ /^[\w-]+$/
+	end
+
 	# Processes arbitrary input formatted as a string
 	def processString(str)
 		if isHash?(str) then
 			return { :type => 'phrase', :result => phraseForHash(str) }
+		elsif(isHyphenated?(str)) then
+			terms = dehyphenatePhrase(str)
+			return { :type => 'hash', :result => hashForPhrase(terms) } unless terms.nil?
+			return { :type => 'unreadable' }
 		else
 			terms = str.split(' ')
 			return { :type => 'hash', :result => hashForPhrase(terms) } if phraseLength == terms.length
@@ -107,7 +129,13 @@ class Jebediah
 		weight = 1
 		hash = 0
 
-		phrase = phrase.gsub(/\s+/m, ' ').strip.split(' ') if phrase.is_a?(String)
+		if phrase.is_a?(String) then
+			if isHyphenated?(phrase) then
+				phrase = dehyphenatePhrase(phrase)
+			else
+				phrase = phrase.gsub(/\s+/m, ' ').strip.split(' ')
+			end
+		end
 
 		# If the phrase doesn't have the same number of words as our nomenclature requires, we can't convert
 		if phrase.length != @dictionaries.length then
@@ -130,6 +158,24 @@ class Jebediah
 		"%07x" % hash
 	end
 
+	def longestMatchInDictionary(words, dict)
+		words.count.times.map { |n| words[0..n].join("-") }.select { |phrase| dict.include?(phrase) }.last.split("-")
+	end
+
+	def dehyphenatePhrase(phrase)
+		phrase = phrase.split("-") if phrase.is_a?(String)
+		split = []
+		@dictionaries.each do |dict|
+			return nil if phrase.empty?
+			match = longestMatchInDictionary(phrase, dict)
+			split << match.join("-")
+			phrase = phrase[match.count .. -1]
+		end
+
+		return nil unless phrase.empty?
+		split
+	end
+
 	# Convert a hash into a phrase, e.g. "abc4321" -> "rightward succeeded seal"
 	# Hash can be supplied as an integer, or hexadecimal string.
 	#
@@ -157,9 +203,8 @@ class Jebediah
 		#   S_n - s_n = S_(n-1),
 
 		begin
-			hash = "0x" + hash if hash.is_a?(String) and !hash.start_with?("0x")
 			weight = @dictionaries.inject(1) { |x, dict| dict.length * x } # L0 L1 L2 ... L_n
-			sum = Integer(hash) % weight
+			sum = hashFromString(hash)
 			lines = [ 0 ] * @dictionaries.length # We fill from the end backwards, so allocate the total size up front
 
 			(@dictionaries.length-1).downto(0) do |n|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jebediah
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Jonas Acres
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Converts hashes to names, and names to hashes