tracery 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc6be58e9cfc5484a72b215bb1b503c1a61f77fa
-  data.tar.gz: 0e615f4130ccd03df0b33f87abeed9fb294feb2a
+  metadata.gz: 82d55b2e9461be2ad0f98538695e09e94362d57a
+  data.tar.gz: 645505f1d8075356c4dd107cd1c1d4e2de681e40
 SHA512:
-  metadata.gz: ac5e3d659c35f1e313e305a86b87c9f2a403040e92656249209a1564700bf17cbf645b7d2ee374d5349617638e266740e7182fe94e0b225b8d5272b5e82a4ee4
-  data.tar.gz: 43fafcfc0ba52adc1f69f62b03eeccaeed35d2ed9b2537bbba5f3522e10d8020e8e20e04ab58f3f52358b96fd029d1c09277f94f0245b82d735e2b7cf632089e
+  metadata.gz: 3b5be60323a1b3122199f80347cf6b6e2bf09f6212a2b5c601450096664764fc1069f195cb1e3bedbb21c9a1cec225f670a4cb32e936892713ad48ed26b40381
+  data.tar.gz: 898fa3176ac6e37c73ae568bfb8f0d99a6b0ba14100f93de15764369e0d36b66dfa0143719f59fde63a7eb6369b4ee2590e26bebcb144aaf7e65a28e4c0ff7c6

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.7.7 - 2016-07-02
+### Fixed
+- [Capitalize downcases everything but first letter](https://github.com/elib/tracery/issues/20)
+
 ## 0.7.6 - 2016-04-29
 ### Added
 - This CHANGELOG.md file

data/lib/mods-eng-basic.rb

@@ -21,6 +21,15 @@ module Modifiers
             return s + "s"
         end
     end
+
+    def self.capitalize(s)
+        head = s[0]
+        remainder = s[1..-1]
+        return s if(head.nil?)
+        head.upcase!
+        return head if remainder.nil?
+        return head + remainder
+    end
     
     def self.baseEngModifiers
         {
@@ -29,11 +38,11 @@ module Modifiers
             end,
 
             "capitalizeAll" => lambda do |s, parameters|
-                return s.gsub(/\w+/) {|word| word.capitalize}
+                return s.gsub(/\w+/) {|word| capitalize word}
             end,
             
             "capitalize" => lambda do |s, parameters|
-                return s.capitalize
+                return capitalize s
             end,
             
             "a" => lambda do |s, parameters|

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Tracery
-	VERSION = "0.7.6"
+	VERSION = "0.7.7"
 end

data/test/tracery_test.rb

@@ -26,6 +26,10 @@ class TraceryTest < Test::Unit::TestCase
             "monster" => ["dragon", "ogre", "witch", "wizard", "goblin", "golem", "giant", "sphinx", "warlord"],
             "setPronouns" => ["[heroThey:they][heroThem:them][heroTheir:their][heroTheirs:theirs]", "[heroThey:she][heroThem:her][heroTheir:her][heroTheirs:hers]", "[heroThey:he][heroThem:him][heroTheir:his][heroTheirs:his]"],
             "setOccupation" => ["[occupation:baker][didStuff:baked bread,decorated cupcakes,folded dough,made croissants,iced a cake]", "[occupation:warrior][didStuff:fought #monster.a#,saved a village from #monster.a#,battled #monster.a#,defeated #monster.a#]"],
+            "capitalizeMe" => "SOME CAPITAL LETTERS",
+            "capitalizeMore" => "this sentence HAS CAPITALS IN IT",
+            "empty" => "",
+            "single" => "a",
             "origin" => ["#[#setPronouns#][#setOccupation#][hero:#name#]story#"]
         })
         @grammar.addModifiers(Modifiers.baseEngModifiers)
@@ -113,6 +117,31 @@ class TraceryTest < Test::Unit::TestCase
             src: "[pet:#animal#]#nonrecursiveStory# -> #nonrecursiveStory.replace(beach,mall)#"
         },
 
+        modifierCapitalize: {
+            src: "#capitalizeMe.capitalize#",
+            expected: "SOME CAPITAL LETTERS"
+        },
+
+        modifierCapitalizeMore: {
+            src: "#capitalizeMore.capitalize#",
+            expected: "This sentence HAS CAPITALS IN IT"
+        },
+
+        modifierCapitalizeMoreEach: {
+            src: "#capitalizeMore.capitalizeAll#",
+            expected: "This Sentence HAS CAPITALS IN IT"
+        },
+
+        modifierCapitalizeEmpty: {
+            src: "#empty.capitalize#",
+            expected: ""
+        },
+
+        modifierCapitalizeSingle: {
+            src: "#single.capitalize#",
+            expected: "A"
+        },
+
         recursivePush: {
            src: "[pet:#animal#]#recursiveStory#"
         },
@@ -148,7 +177,6 @@ class TraceryTest < Test::Unit::TestCase
         }
         }
 
-        puts
         tests.each { |k,v|
             puts "#{k}: "
             @grammar.clearState
@@ -157,18 +185,19 @@ class TraceryTest < Test::Unit::TestCase
             root = @grammar.expand(source)
             all_errors = root.allErrors
 
-            if(!v[:expected].nil?) then
-                assert(root.finishedText == v[:expected], "\"#{root.finishedText}\" did not match \"#{v[:expected]}\"")
-            else
-                puts "\t#{root.finishedText}"
+            expected = v[:expected]
+
+            if(!expected.nil?) then
+                assert(root.finishedText == expected, "\"#{root.finishedText}\" did not match \"#{expected}\"")
             end
 
             if(is_error) then
-                puts "\tErrors: #{all_errors}"
                 refute(all_errors.empty?, "Expected errors.")
             else
                 assert(all_errors.empty?, "Expected no errors.")
-                refute(root.finishedText.empty?, "Expected non-empty output.")
+                if(!expected.nil? && !expected.empty?) then
+                    refute(root.finishedText.empty?, "Expected non-empty output.")
+                end
             end
         }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracery
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Kate Compton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   Tracery is a library for text generation.