rubykov 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bdb3e4295782a7bf03967d2f4de67aef65fa64b
-  data.tar.gz: 16e45e2b424bb261476afc2dae7619af27f9bcb6
+  metadata.gz: 9827c73272cba93ae8557afe9cd9158175f5710c
+  data.tar.gz: 3cafc24fa4870f60450dae6d2a5aa692ee3f72c7
 SHA512:
-  metadata.gz: 3570f5ad7f21b459e7f31575b08b4dd27e799189c081b54352bdc2d0bdf5ff04d0672efb664896eec00787951394cc5953c151cb659f7e87b1269ff7dee71a3f
-  data.tar.gz: 8b0fd9ba3513aaf47e58e66bd0f7a252df8a529c29cd45f43ea00547b5782784a502c8deadaed6af757ca1ad4f80f1315378fe22b72a6733fcfaed20f1a885d3
+  metadata.gz: b62a34df1580d94914ca0fe4bb171ba5d7449857e3f7323d72958930a912e9b69e67664eb23ce1b7562f14168890a8b46c549d754848951eaa94998ee875074f
+  data.tar.gz: bc3f35303e83992f01ec220d032a70371682e4a173912807219a34cd924f1416defc62cdf014bb30ffccf9fbb3b2abb42cf8371b0264659ad0637f4490945545

data/README.md

@@ -1,7 +1,17 @@
-### Rubykov
+# Rubykov
 
 Sensible, easy Markov chains in Ruby.
 
+## Installation
+
+Simply add:
+
+```
+gem 'rubykov'
+```
+
+to your Gemfile.
+
 ## Usage
 
 Markov models are generated by an order and a set of training data.

data/lib/rubykov/markov_model.rb

@@ -3,38 +3,22 @@ module Rubykov
     def initialize(order, training_data)
       raise ArgumentError unless order.is_a? Integer
       raise ArgumentError unless training_data.is_a? Array
-      chain_data = {}.tap do |representation|
-        training_data.each_cons(order + 1).each do |datum|
-          key = datum.first(order)
-          value = datum.last
-          if representation.include? key
-            representation[key] << value
-          else
-            representation[key] = [value]
-          end
-        end
-      end
+
       @order = order
-      @representation = chain_data
+      @representation = {}
+      add_data_to_model(training_data)
+    end
+
+    def train(training_data)
+      add_data_to_model(training_data)
     end
 
     def chain
-      Enumerator.new do |y|
-        current_state = @representation.keys.sample
-        current_state.each do |word|
-          y << word
-        end
+      chain_enumerator
+    end
 
-        loop do
-          if @representation[current_state].nil?
-            break
-          else
-            next_word = @representation[current_state].sample
-            y << next_word
-            current_state = current_state.last(@order-1) + [next_word]
-          end
-        end
-      end
+    def chain_with_seed(seed_state)
+      chain_enumerator(seed_state)
     end
 
     def states
@@ -44,5 +28,35 @@ module Rubykov
     def transitions
       @representation
     end
+
+    private
+
+    def add_data_to_model(training_data)
+      training_data.each_cons(@order + 1).each do |datum|
+        key = datum.first(@order)
+        value = datum.last
+        if @representation.include? key
+          @representation[key] << value
+        else
+          @representation[key] = [value]
+        end
+      end
+    end
+
+    def chain_enumerator(seed_state = states.sample)
+      Enumerator.new do |output|
+        current_state = seed_state
+        current_state.each do |word|
+          output << word
+        end
+
+        loop do
+          break if @representation[current_state].nil?
+          next_word = @representation[current_state].sample
+          output << next_word
+          current_state = current_state.last(@order-1) + [next_word]
+        end
+      end
+    end
   end
 end

data/lib/rubykov/text_generator.rb

@@ -1,19 +1,58 @@
 module Rubykov
   class TextGenerator < MarkovModel
     def initialize(order, training_text)
-      super(order, training_text.downcase.gsub('.', ' .').split(' '))
+      super(order, massage_training_text(training_text))
+    end
+
+    def train(training_text)
+      super(massage_training_text(training_text))
     end
 
     def character_limited_output(desired_length)
       length = 0
-      chain.take_while do |word|
-        length += (word.length + 1)
-        length < desired_length
-      end.join(' ').gsub(' .', '.').capitalize
+      words_to_sentences(chain.take_while { |word| length += (word.length + 1); length < desired_length } )
     end
 
     def word_limited_output(desired_length)
-      chain.take(desired_length).join(' ').gsub(' .', '.').capitalize
+      words_to_sentences(chain.take(desired_length))
+    end
+
+    def sentence_limited_output(desired_length)
+      length = 0
+      output = []
+      while length < desired_length
+        output += chain.take_while do |word|
+          length += 1 if is_sentence_finisher?(word)
+          length < desired_length
+        end
+      end
+      words_to_sentences(output)
+    end
+
+    private
+
+    def words_to_sentences(words)
+      massage_word_list(words).join(' ')
+    end
+
+    def massage_word_list(words)
+      output = []
+      words.each_with_index do |word, index|
+        if word =~ /^[^\w\s]+$/
+          output[-1] += word
+        else
+          output << word
+        end
+      end
+      output
+    end
+
+    def is_sentence_finisher?(word)
+      word =~ (/^[?!.]*$/)
+    end
+
+    def massage_training_text(training_text)
+      training_text.downcase.gsub(/[^\w\s]+/) { " #{$&}" }.split(' ')
     end
   end
 end

data/license.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) <2014> <Evan Hemsley>
+Copyright (c) 2014 Evan Hemsley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubykov
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Evan Hemsley