conlang 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b2be900d933ecb7e56837534a993f5ad6c4219
-  data.tar.gz: e99c3ede33eb2a80daa0fa9a7d9d6b16594d9d7a
+  metadata.gz: 54c3fa9530fea0396261592ac22612c07dd94ad7
+  data.tar.gz: f325285e8db5859dc36ad9015c59e6b943f71a2f
 SHA512:
-  metadata.gz: c01f9db7fc189ea4596934fa6b3dc4b6628340f6f6363b024226c26591df561c5558291bb8e256011d17e2b52e6511355105b4f7a8c12edb6c17594c1424c8ba
-  data.tar.gz: fdd3340b5d0de13370d2a86080543246d0aa409524c393ff49b9c5d61544543e0497243a13c6ba349bc4e7f9be8aaf173757c4d7c131abaabbfb5ea80c78cffb
+  metadata.gz: 10ece298a14025c4e2d4ca094eaf9cc0c30c2f08b1f44e1b7b09299cc9e51ea652c376599c0da3db646fc44eca34908be4133ec3b7e0336c6ce3ab7decc28897
+  data.tar.gz: 00e1fe61645036d72e3b9609688605527cac8dc14a1c9239b58c233a6e4861c8bd7360da960edf8155ef2d4480412f816602b3b8a90c77097870b52463a24dda

data/LANG_FILES_DOC.md

@@ -41,6 +41,21 @@ A phoneme's statistical weight gives
 a priority to the symbol. It must be an
 integer greater than 0 and less than 100.
 
+Replacements
+------------
+Replacements are a way to add exceptions, so they are
+simple ways to avoid complicated expressions.
+
+All replacements are applied at the level of each word
+in order.
+
+	replacements:
+		a: aj
+		ew: ej
+
+The previous replacements would convert
+words like `vakew` to `vajkej`.
+
 Expression and operators
 ------------------------
 Each LANG file has an expression at the end.

data/README.md

@@ -36,7 +36,6 @@ Usage as a **gem**:
 	# an array of strings.
 	p x.get_words(10)
 
-
 There are `*.lang` files as examples at `lang-examples` 
 directory of this [project's source](https://github.com/fluorine/ConlangWordGenerator).
 
@@ -46,8 +45,8 @@ You must create your own .lang files to generate random
 words for your constructed languages.
 
 There files include a simple lightweight markup language
-to describe sets of phonemes, their probability, and a 
-simple regular grammatical expression.
+to describe sets of phonemes, their probability, replacements
+(for exceptions) and a simple regular grammatical expression.
 
 You can learn how to create LANG files [**here**](LANG_FILES_DOC.md).
 Again, examples at `lang-examples` directory can help you a lot.

data/lib/conlang/symbolset.rb

@@ -40,7 +40,10 @@ module ConlangWordGenerator
       accum = 0
       @pairs.each_index do |index|
         accum += @pairs[index][1]
-        return @pairs[index][0] if accum > random
+
+        if accum > random
+          return @pairs[index][0]
+        end
       end
     end
 

data/lib/conlang/version.rb

@@ -1,3 +1,3 @@
 module ConlangWordGenerator
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/conlang/wordgenerator.rb

@@ -31,6 +31,9 @@ class WordGenerator
     @bindings = {}
     @full_expression = ""
 
+    # Bindings for replacements
+    @replacements = {}
+
     # Parse .lang file
     parse_lang_file
 
@@ -46,7 +49,7 @@ class WordGenerator
     # its full grammatical expression.
     File.open(@lang_file, "r:UTF-8") do |file|
       lines_count = 1
-      on_expression = false
+      current = :none
 
       # Evaluating lines
       while (line = file.gets)
@@ -60,18 +63,30 @@ class WordGenerator
           captured = line.scan(/\s*(\w+)\s*:/)
           current_binding = captured[0][0]
           @bindings[current_binding] = ConlangWordGenerator::SymbolSet.new
+          current = :symbols
 
         when /^\s*expression\s*:\s*(#.*)?$/
           # Start of grammatical expression
-          #puts "Evaluating expression:"
-          on_expression = true
-
-        when /^\s*(\S+)\s*[:=]\s*(\d*)\s*(#.*)?$/
-          # Add a symbol to the current SymbolSet's binding
-          @bindings[current_binding].add_pair($1, $2.to_i)
-
+          current = :expression
+
+        when /^\s*replacements\s*:\s*(#.*)?$/
+          # Start of list of replacements
+          current = :replacements
+
+        when /^\s*(\S+)\s*[:=]\s*(\S+)\s*(#.*)?$/
+          # Add bindings
+          case current
+          when :symbols
+            #Add a symbol to the current SymbolSet's binding
+            @bindings[current_binding].add_pair($1, $2.to_i)
+          when :replacements
+            @replacements[$1] = $2
+          else
+            raise LangSyntaxError, "Runtime error when evaluating " +
+                                   "\"#{@lang_file}\" at binding line #{lines_count}."
+          end
         else
-          if on_expression
+          if current == :expression
             # Copying expression
             @full_expression += line.strip
           else
@@ -100,9 +115,18 @@ class WordGenerator
     words = []
 
     qty.times do
-      words += [@evaluated_expression.sample]
+      words += [apply_replacements(@evaluated_expression.sample)]
     end 
 
     words
   end
+
+  # Apply replacements to words
+  def apply_replacements(word)
+    @replacements.each do |pattern, target|
+      word.gsub!(pattern, target)
+    end
+    
+    word
+  end
 end

data/test/test_file_replacements.lang

@@ -0,0 +1,19 @@
+# Thest LANG file for OR operators.
+
+symbols for a vowel:
+   a: 50
+   o: 50
+
+symbols for any constant:
+   p: 33
+   t: 33
+   k: 33      
+
+replacements:
+	p: b
+	t: d
+	k: g
+
+expression:
+# Pattern: /[aobdg][ao]/
+   or(constant, vowel) + or(10, vowel, vowel)

data/test/test_wordgenerator.rb

@@ -43,4 +43,14 @@ class TestWordGenerator < Test::Unit::TestCase
       assert_match(/^[ptk]*[ao]*$/, word)
     end
   end
+
+  #
+  # Test replacements
+  #
+  def test_replacements
+    words = WordGenerator.new(Dir.pwd + "/test/test_file_replacements.lang").get_words(10)
+    words.each do |word|
+      assert_match(/^[aobdg][ao]$/, word)
+    end
+  end
 end

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: conlang
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joseph
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies: []
-description: 'This gem takes constructed grammar and phonemes from a LANG file to
-  generate random words. You can learn how to create LANG files, or explore some sample
-  files, at this project''s source repository on Github: https://github.com/fluorine/ConlangWordGenerator'
+description: 'This gem allow users to generate random words. The user must provide
+  a LANG file with defined phonemes and a regular grammatical expression. You can
+  learn how to create LANG files, or explore some examples, at this project''s source
+  repository on Github: https://github.com/fluorine/ConlangWordGenerator'
 email: fluorine@github.com
 executables:
 - conlang
@@ -34,6 +35,7 @@ files:
 - test/not_lang.gaga
 - test/test_file_maybe.lang
 - test/test_file_or.lang
+- test/test_file_replacements.lang
 - test/test_symbolset.rb
 - test/test_syntax_error.lang
 - test/test_wordgenerator.rb
@@ -62,6 +64,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: 'Full name: ConlangWordGenerator. A statistical random words generator for
-  constructed languages.'
+summary: ConlangWordGenerator. A statistical random word generator for regular grammars.
 test_files: []