oulipo 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oulipo (0.3.0)
+    oulipo (0.3.1)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -14,7 +14,7 @@ Install with `gem install oulipo` and `require 'oulipo'` as needed.
 
 Oulipo can detect lipograms and pangrams.
 
-A lipogram willfully shuns one or more letters of the alphabet.
+A **lipogram** willfully shuns one or more letters of the alphabet.
 
 In the following snippet of a poem, every letter of the alphabet except 'e' is used:
 
@@ -32,7 +32,7 @@ Oulipo.lipogram?(stanza)      # => true
 Oulipo.absent_letters(stanza) # => ['e']
 ```
 
-In contrast, a pangram uses all the letters of the alphabet (often seen jumping lazy dogs):
+In contrast, a **pangram** uses all the letters of the alphabet (often seen jumping lazy dogs):
 
 ```ruby
 sentence = 'Big fjords vex quick waltz nymph.'
@@ -40,9 +40,17 @@ sentence = 'Big fjords vex quick waltz nymph.'
 Oulipo.pangram?(sentence) # => true
 ```
 
+The **prisoner's constraint**, also known as the **Macao constraint**, is a type of lipogram in which no letters can be ascenders (b, d, f, g, h, j, k, l) or descenders (p, q, t, y).
+
+```ruby
+line = "rain's music runs in rivers"
+
+Oulipo.prisoner?(line) # => true
+```
+
 ## Univocalims
 
-A univocalism is a poem written using only one type of vowel.
+A **univocalism** is a poem written using only one type of vowel.
 
 ```ruby
 poem = <<-POEM
@@ -57,7 +65,7 @@ Oulipo.univocalism?(poem) # => true
 
 ## Palindromes
 
-Palindromes read the same way, backwards or forwards:
+**Palindromes** read the same way, backwards or forwards:
 
 ```ruby
 Oulipo.palindrome?('Eva, can I stab bats in a cave?') # => true
@@ -65,7 +73,7 @@ Oulipo.palindrome?('Eva, can I stab bats in a cave?') # => true
 
 ## Chaterisms
 
-A chaterism is a poem where either each successive word in the poem grows by one letter (also known as "snowball poem") or shrinks by one letter.
+A **chaterism** is a poem where either each successive word in the poem grows by one letter (also known as "snowball poem") or shrinks by one letter.
 
 ```ruby
 Oulipo.chaterism? 'Ruby loves poetry!'      # => true
@@ -107,7 +115,7 @@ Oulipo.alliteration?(phrase, :threshold => 0.9) # => false
 
 ## N+7
 
-In N+7 (sometimes known as S+7), each noun in a text is replaced with the noun seven entries after it in a dictionary.
+In **N+7** (sometimes known as **S+7**), each noun in a text is replaced with the noun seven entries after it in a dictionary.
 
 ```ruby
 dictionary = Oulipo::WordList.load('big_list_of_nouns.txt')
@@ -134,7 +142,7 @@ king_john = 'To gild refined gold, to paint the lily'
 Oulipo.n_plus(1, king_john, dictionary) # => 'To mine refined ore, to cast the iron'
 ```
 
-## Extending String
+## String Extensions
 
 You can optionally extend `String`, if you need to.
 

data/lib/oulipo.rb

@@ -8,7 +8,7 @@ module Oulipo
   
   [:absent_letters, :pangram?, :lipogram?, :chaterism?,
    :univocalism?, :snowball?, :palindrome?, :alliteration?,
-   :alliterativity].each do |method|
+   :alliterativity, :present_letters, :prisoner?].each do |method|
       define_singleton_method(method.to_sym) do |*args|
         EnhancedString.new(args.shift).send(method.to_sym, *args)
       end

data/lib/oulipo/string_extensions.rb

@@ -2,6 +2,7 @@ module Oulipo
   module StringExtensions
     ALPHABET = 'a'..'z'
     VOWELS = %w{ a e i o u }
+    ASCENDERS_AND_DESCENDERS = %w{ b d f g h j k l p q t y }
     
     # Whether the string uses alliteration or not.
     # Accepts a :threshold option for determining whether the string
@@ -48,7 +49,6 @@ module Oulipo
     
     # Returns true if only one vowel is used
     def univocalism?
-      present_letters = self.downcase.split('').uniq
       (VOWELS - present_letters).length == 4
     end
     
@@ -67,9 +67,12 @@ module Oulipo
     
     # Returns an array of letters that are absent
     def absent_letters
-      present_letters = self.downcase.split('').uniq
-      missing_letters = ALPHABET.to_a - present_letters
-      missing_letters.empty? ? nil : missing_letters
+      remaining = ALPHABET.to_a - present_letters
+      remaining.empty? ? nil : remaining
+    end
+    
+    def present_letters
+      self.downcase.gsub(/[^a-z]/, '').split('').uniq.sort
     end
     
     # Returns true if all letters of the alphabet are used
@@ -82,5 +85,10 @@ module Oulipo
       !self.pangram?
     end
     
+    # Returns true if no letters are ascenders (b, d, f, g, h, j, k, l) or descenders (p, q, t, y)
+    def prisoner?
+      (ASCENDERS_AND_DESCENDERS & present_letters).empty?
+    end
+    
   end
 end

data/oulipo.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name              = "oulipo"
-  s.version           = "0.3.1"
+  s.version           = "0.3.2"
   s.date              = Time.now.strftime('%Y-%m-%d')
   s.homepage          = "http://github.com/Aupajo/oulipo"
   s.email             = "pete@metanation.com"

data/spec/lipograms_spec.rb

@@ -5,12 +5,19 @@ describe "lipograms and pangrams" do
   
   let(:pangram) { 'The quick brown fox jumps over a lazy god' }
   let(:lipogram) { 'The quick grey fox jumps over lazy gods' }
+  let(:prisoner) { "rain's music runs in rivers" }
+  let(:bradley_manning) { 'bradley e. manning' }
   
   it "shows absent letters" do
     pangram.absent_letters.should be_nil
     lipogram.absent_letters.should == %w{ b n w }
   end
   
+  it "shows present letters" do
+    pangram.present_letters.should == ('a'..'z').to_a
+    lipogram.present_letters.should == ('a'..'z').to_a - %w{ b n w }
+  end
+  
   it "can tell a pangram from a lipogram" do
     lipogram.should be_lipogram
     pangram.should_not be_lipogram
@@ -19,8 +26,16 @@ describe "lipograms and pangrams" do
     pangram.should be_pangram
   end
   
+  it "can tell a prisoner's constraint" do
+    prisoner.should be_prisoner
+    lipogram.should_not be_prisoner
+    pangram.should_not be_prisoner
+    bradley_manning.should_not be_prisoner
+  end
+  
   it "is accessible via Oulipo" do
-    Oulipo.should forward_to_enhanced_string(:lipogram?, :pangram?)
+    Oulipo.should forward_to_enhanced_string(:absent_letters, :present_letters,
+                                             :lipogram?, :pangram?, :prisoner?)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oulipo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors: