markovite 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9228ae1173249e835b7a51bff00e748a4cda2a134592a3bf630bbc55320fcbe1
-  data.tar.gz: 51d7fca721c7598b77185ad7729176b1c60957889d53a8be70d6d1865b670b5c
+  metadata.gz: a45b08ff10130126c3f0325fca5a1a1d23d31b942e0430d088f73b6ab812faac
+  data.tar.gz: 698a6acf00459bb8f61f8325e48f2c096b36af8de6890126d2e68c2a0d994627
 SHA512:
-  metadata.gz: b83bc1f1b4995779073a53ec19a542c80e6aac02a3995b44f51d16e875fbe12137fb540aabdfc7c4b03e65ff79e3322a3fc8fff60f6b4937bf1e6c7899b22e3f
-  data.tar.gz: 55826f34f74b4c2cf8cf7cdd9a07310b7466927424d478da49e2ddf2b09455469d128f1e1513561f58261471e8cb67a626d58720bf7d4b820fbefdd36ef217ce
+  metadata.gz: d2579a001419cf3ca5913d8d55b7d05b98f5628de91c7b128b9276d58fc22cb2fded0237dc0852df1f2c4c15c1d461ac7e4f522fca1d002c9cae254ede2eb4fc
+  data.tar.gz: e5a2b74db3c68cde040a1d935d9c62237d6f076fa2d82893cdcbed0a7b42171ca8e47d71c76bcff15c7c663ef1edd1e231e5dbd1353dc78a2d8023d246c4c381

data/Gemfile.lock

@@ -1,17 +1,21 @@
 PATH
   remote: .
   specs:
-    markovite (0.2.3)
+    markovite (0.2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
     diff-lcs (1.3)
+    interception (0.5)
     method_source (0.9.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    pry-rescue (1.4.5)
+      interception (>= 0.5)
+      pry
     rake (10.4.2)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -34,6 +38,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   markovite!
   pry
+  pry-rescue
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/lib/markovite/dict.rb

@@ -9,13 +9,13 @@ class Dictionary
 
   attr_accessor :chain, :sentence_split, :sentences
   attr_reader :depth
-  def initialize(sentence_split, depth = 2)
-    self.sentence_split = sentence_split
+  def initialize(sentence_split = nil, depth = 2)
+    self.sentence_split = sentence_split || SentenceSplit.new
     # The following line ensures a new array is created for each new key
     # instead of using the memory address of the first array created    raise exception "First argument must contain a SplitSentence instance" if sentence_split.class != SentenceSplit
     # as the default value
     self.chain = Hash.new { |h, k| h[k] = [] }
-    self.sentences = sentence_split.sentences
+    self.sentences = sentence_split.split_text
     @depth = depth
     construct_chain
   end
@@ -30,7 +30,8 @@ class Dictionary
 
   def expand_chain(text)
     new_sentences = sentence_split.split_text(text)
-    self.sentences += sentence_split.sentences
+    sentence_split.expand_corpus(text)
+    self.sentences += new_sentences
     construct_chain(new_sentences)
   end
 

data/lib/markovite/splitter.rb

@@ -19,18 +19,13 @@ class SplitSentence
 
   #look into detecting abbreviations!
 
-  attr_accessor :sentences, :corpus
+  attr_accessor :corpus
 
-  def initialize(corpus)
+  def initialize(corpus = "")
     self.corpus = corpus.dup
-    self.sentences = []
     split_text
   end
 
-  def clear_sentences
-    sentences.clear
-  end
-
   # We will want to change this to something that splits the words into an
   # array, then we will make another pass through the word array to find
   # where a sentence begins and ends
@@ -41,31 +36,36 @@ class SplitSentence
   # capitalized, and the end of the sentence will end with some sort of punctuation.
 
   def split_text(new_text = nil)
-    clear_sentences
     current_sentence = []
+    sentences = []
     new_text = new_text || corpus
     all_words = split_words(new_text)
     all_words.each do |word|
       if is_end_of_sentence?(word)
-        current_sentence = add_sentence(current_sentence, word)
+        sentences << add_sentence(current_sentence, word)
+        current_sentence.clear
       elsif has_newline?(word)
         newline_words = split_newline(word)
-        current_sentence = add_sentence(current_sentence, newline_words[0])
+        sentences << add_sentence(current_sentence, newline_words[0])
+        current_sentence.clear
         current_sentence << newline_words[1]
       else
         current_sentence << word
       end
     end
-    add_sentence(current_sentence, nil) if !current_sentence.empty?
+    sentences << add_sentence(current_sentence, nil) if !current_sentence.empty?
     sentences
   end
 
+  def expand_corpus(text)
+    self.corpus += "\n" + text
+  end
+
   private
 
   def add_sentence(sentence, word)
     sentence << word if word
-    sentences << sentence.compact.join(" ")
-    []
+    sentence.compact.join(" ")
   end
 
   def split_words(text)

data/lib/markovite/version.rb

@@ -1,3 +1,3 @@
 module Markovite
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/markovite.rb

@@ -14,7 +14,20 @@ module Markovite
       parse_file(filename, dict_depth) if filename
     end
 
-    def parse_string(text, dict_depth=DEFAULT_DEPTH)
+    def self.combine(left_chain, right_chain, dict_depth = nil)
+      dict_depth = dict_depth || left_chain.depth
+      new_chain = Markovite::Chain.new
+      new_chain.parse_string(left_chain.corpus, dict_depth)
+      new_chain.parse_string(right_chain.corpus, dict_depth)
+      new_chain
+    end
+
+    def corpus
+      split.corpus
+    end
+
+    def parse_string(text, dict_depth=nil)
+      dict_depth = dict_depth || self.depth || DEFAULT_DEPTH
       depth_check(dict_depth)
       if chainer
         add_from_text(text)
@@ -81,6 +94,7 @@ module Markovite
       #look into refactoring this
       @depth = dict_depth
       self.split = SplitSentence.new(text)
+      @corpus = split.corpus
       self.dictionary = Dictionary.new(split, depth)
       self.chainer = Chainer.new(dictionary)
     end

data/markovite.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-rescue"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markovite
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Alexandra Wright
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "Doctors hate this one weird trick that generates really good looking
   gibberish! \n Markovite is simple, but powerful markov chain generator that is designed
   to be hackable to your heart's delight"
@@ -93,6 +107,7 @@ files:
 - lib/markovite/version.rb
 - markovite.gemspec
 - pkg/markovite-0.2.2.gem
+- pkg/markovite-0.2.3.gem
 homepage: https://github.com/f3mshep/ruby_markovify
 licenses:
 - MIT