ruby_wordcram 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405e8f60fe4dbae1f2e01fec268f218951e038e0
-  data.tar.gz: '07490b56020c882ec52d2ce621467ba880d6cc5b'
+  metadata.gz: 5d472f8ac87f00a98bf9936e51ee22520775fd25
+  data.tar.gz: c2d9953b6a7ce9b0f4899e0912c666cb45ba2301
 SHA512:
-  metadata.gz: efce853dee8cd3966d66b897c7bc48d119a9e87dcac80f745e89e8c9f6c43b0072e07a8ff0e5cdc042e2a1e2642305200b488470053bd34593d1593ca6a983f3
-  data.tar.gz: ce8eaf5968499b5928358d88a1be28f841eefa8f65a2d0c355d7239d9deb55a82873ec4848489db3a3e7ac29fd931298ff9b62828e7f1f9776ce9470538f8e73
+  metadata.gz: '08a6898e378a4069e8e2cbc380d22d488396b4e14f5a5448760e7bc66bcd30bb3286d9455d77777b7988b5d77566d1d68866b99d5a5a7c37dcee2b20ace3b553'
+  data.tar.gz: c8cb64646d9c30b45f67b97abb9d541d21dcd09bc8ac283e89cd452d89f5f8b4862ee8efec3230390ec6951ba711a23c00a1b60adc3b2fbfb2955114a5903664

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+sudo: false
+
+rvm:
+  - jruby-9.1.12.0
+jdk:
+  - oraclejdk8
+os:
+  - linux

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**v1.0.2** Bump for processing and jsoup updates add travis
+
 **v1.0.1** Supports Placers, specifically ShapeBasedPlacer, and Observer (hence callbacks)
 
 **v1.0.0** First release depends on WordCram-1.0 to supply jars

data/README.md

@@ -1,5 +1,7 @@
 # Ruby Word Cram
 
+[![Gem Version](https://badge.fury.io/rb/ruby_wordcram.svg)](https://badge.fury.io/rb/ruby_wordcram) [![Travis CI](https://travis-ci.org/ruby-processing/WordCram.svg)](https://travis-ci.org/ruby-processing/WordCram)
+
 A gem wrapper for the WordCram library
 
 ![example](https://monkstone.github.io/assets/wordcram.png)

data/Rakefile

@@ -6,7 +6,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: jsoup-1.10.2.jar')
+    f.puts('Class-Path: jsoup-1.10.3.jar')
   end
 end
 

data/acknowledgements.md

@@ -0,0 +1,18 @@
+### Acknowledgements
+
+Surely the original inspiration for WordCram, was Wordle, built by Jonathan Feinberg when at IBM. He has since released an important component namely the cue.language component that I have included in ruby_wordcram (the only alterations I have made are to update the code to take advantage of jdk8 features), this part of the code remains © IBM. There are number of people who contributed to the language elements, and Jonathan credits these [here][credits], but is also probably reading his [faq][faq] if you are thinking of extending the language capabilities (I would be keen to add Welsh, which I think must be available somewhere in the wild). To read even more of Jonathans musings, achievments see his [blog][blog].
+
+The vanilla processing version of Wordcram that I have incorporated here was created by [Dan Bernier][Dan], and currently it has only received the same treatment as cue.language code, ie the java code has been updated from java-1.5 to java-1.8 (in particular anonymous classes have become java-8 lambda). It is possible that further change will include tighter JRuby integration (but it works OK)
+
+[jsoup][jsoup] is a Java library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods. This was pulled directly from maven central.
+
+
+[credits]:http://www.wordle.net/credits
+
+[faq]:http://www.wordle.net/faq
+
+[blog]:http://mrfeinberg.com/
+
+[Dan]:https://github.com/danbernier/WordCram
+
+[jsoup]:https://jsoup.org/

data/docs/_posts/2017-03-07-getting_started.md

@@ -7,7 +7,7 @@ categories: wordcram update
 
 ### Requirements
 
-Requires JRubyArt-1.3.0+ (hence jruby-9.0.8.0+)
+Requires JRubyArt-1.3.0+ (hence jruby-9.1.8.0+)
 
 ### Install the ruby_wordcram gem
 

data/docs/_posts/2017-03-07-under_the_hood.md

@@ -7,7 +7,7 @@ categories: wordcram update
 
 ### The required libraries
 
-- cue.language.jar
+- cue.language (since version-2.0.0 compiled into WordCram.jar)
 
   Created by Jonathan Feinberg
 
@@ -25,9 +25,14 @@ categories: wordcram update
 - WordCram.jar
 
   Created by Dan Bernier
-    WordCram lets you generate word clouds in Processing. It does the heavy lifting – text analysis, collision detection – for you, so you can focus on making your word clouds as beautiful, as revealing, or as silly as you like.
+    WordCram lets you generate word clouds in Processing. It does the heavy lifting – text analysis, collision detection – for you, so you can focus on making your word clouds as beautiful, as revealing, or as silly as you like. Since version 2.0.0 the java code has been updated from java-1.5 to java-1.8, and the java code from the cue.language has aloso been
+    included.
 
 
-- jsoup-1.7.2.jar
+- jsoup-1.10.2.jar (since version 2.0.0)
 
   jsoup is a Java library for working with real-world HTML. It provides a very convenient API for extracting and manipulating data, using the best of DOM, CSS, and jquery-like methods.
+
+### The Build
+
+The build depends on polyglot maven (access to processing core.jar, jsoup.jar is pulled from maven central)

data/docs/_posts/2017-03-12-supported_languages.md

@@ -0,0 +1,23 @@
+---
+layout: post
+title:  "Supported Languages"
+date:   2017-03-12 05:34:13
+categories: wordcram update
+permalink: /languages/
+---
+
+### Supported languages
+
+|       |          |           |         |            |             |
+|--------|----------|------     |----     |-----       |----         |
+|arabic  |  danish  |   finnish | hindi   |   polish   |   slovenian |
+|armenian | dutch   |   french |  hungarian | portuguese | spanish   |
+|catalan  | english  |  german |  italian  |  romanian  | croatian  |
+|esperanto | greek  |  latin  |   russian  |   swedish | czech      |
+|farsi   |   hebrew |  norwegian | slovak   |   turkish | -        |
+
+See cue.language on [github][github] by Jonathan Feinberg, but you could also clone this repo to add an extension (French has already been modified to increase number of stop words by [C. Fuhrman][french] after Jean Veronis). It would kind of neat to include some more Non-English examples than my rather weak [Yin_Yang_mots.rb][mots].
+
+[github]:https://github.com/jdf/cue.language
+[french]:https://github.com/fuhrmanator
+[mots]:https://github.com/ruby-processing/JRubyArt-examples/blob/master/external_library/gem/ruby_wordcram/yin_yang_mots.rb

data/docs/about.md

@@ -4,9 +4,10 @@ title: About
 permalink: /about/
 ---
 
-WordCram is a library for Processing by [Dan Bernier][dan]. WordCram lets you generate word clouds in Processing. It does the heavy lifting – text analysis, collision detection – for you, so you can focus on making your word clouds as beautiful, as revealing, or as silly as you like. [ruby_wordcram gem][gem] is a ruby wrapper for the java processing library Wordcram library by [Dan Bernier][dan]. If you create processing sketches using [JRubyArt][jruby_art] or [propane][propane], mostly all you need to do is `require 'ruby_wordcram'` to use the WordCram library.
+WordCram is a library for Processing by [Dan Bernier][dan]. WordCram lets you generate word clouds in Processing. It does the heavy lifting – text analysis, collision detection – for you, so you can focus on making your word clouds as beautiful, as revealing, or as silly as you like. [ruby_wordcram gem][gem] is a ruby wrapper for the java processing library Wordcram library by [Dan Bernier][dan]. If you create processing sketches using [JRubyArt][jruby_art] or [propane][propane], mostly all you need to do is `require 'ruby_wordcram'` to use the WordCram library. Thanks to tokenizer code from Jonathan Feinberg (cue.language) Wordcram is able to extract words / sentences from text in several [languages][languages].
 
 [jruby_art]: https://ruby-processing.github.io/index.html
 [gem]:https://github.com/ruby-processing/WordCram/
 [dan]:http://wordcram.org/
 [propane]:https://ruby-processing.github.io/propane/
+[languages]:{{site.github.url}}/languages/

data/lib/ruby_wordcram.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: false
+
 if RUBY_PLATFORM == 'java'
   require 'WordCram.jar'
-  require 'jsoup-1.10.2.jar'
-  wc = %w(WordAngler WordColorer WordCram WordFonter WordPlacer WordSkipReason)
-  sh = %w(Colorers ImageShaper Observer Placers Word ShapeBasedPlacer)
+  require 'jsoup-1.10.3.jar'
+  wc = %w[WordAngler WordColorer WordCram WordFonter WordPlacer WordSkipReason]
+  sh = %w[Colorers ImageShaper Observer Placers Word ShapeBasedPlacer]
   WC = wc.concat(sh).freeze
   WC.each do |klass|
     java_import "wordcram.#{klass}"

data/lib/ruby_wordcram/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module WordCram
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/pom.rb

@@ -1,8 +1,16 @@
 project 'Wordcram' do
 
   model_version '4.0.0'
-  id 'wordcram:WordCram:2.0.0'
+  id 'wordcram:WordCram:2.0.1'
   packaging 'jar'
+  description 'WordCram for JRubyArt and propane'
+  organization 'ruby-processing', 'https://ruby-processing.github.io'
+  { 'danbernier' => 'Dan Bernier', 'jdf' => 'Jonathan Feinberg', 'monkstone' => 'Martin Prout' }.each do |key, value|
+    developer key do
+      name value
+      roles 'developer'
+    end
+  end
 
   properties(
   'source.directory' => 'src',
@@ -22,12 +30,12 @@ project 'Wordcram' do
       } )
     end
 
-    jar 'org.processing:core:3.3.0'
-    jar 'org.jsoup:jsoup:1.10.2'
+    jar 'org.processing:core:3.3.4'
+    jar 'org.jsoup:jsoup:1.10.3'
 
     build do
       default_goal 'package'
-      source_directory 'source.directory'
+      source_directory '${source.directory}'
       final_name 'WordCram'
       resource do
         directory 'src'
@@ -42,7 +50,7 @@ project 'Wordcram' do
         execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.jsoup',
           artifactId:  'jsoup',
-          version:  '1.10.2',
+          version:  '1.10.3',
           type:  'jar',
           outputDirectory: '${wordcram.basedir}/lib'
         }

data/pom.xml

@@ -11,8 +11,36 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>wordcram</groupId>
   <artifactId>WordCram</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
   <name>Wordcram</name>
+  <description>WordCram for JRubyArt and propane</description>
+  <organization>
+    <name>ruby-processing</name>
+    <url>https://ruby-processing.github.io</url>
+  </organization>
+  <developers>
+    <developer>
+      <id>danbernier</id>
+      <name>Dan Bernier</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>jdf</id>
+      <name>Jonathan Feinberg</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>monkstone</id>
+      <name>Martin Prout</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
   <properties>
     <source.directory>src</source.directory>
     <wordcram.basedir>${project.basedir}</wordcram.basedir>
@@ -25,16 +53,16 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.0</version>
+      <version>3.3.4</version>
     </dependency>
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.10.2</version>
+      <version>1.10.3</version>
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>source.directory</sourceDirectory>
+    <sourceDirectory>${source.directory}</sourceDirectory>
     <defaultGoal>package</defaultGoal>
     <resources>
       <resource>
@@ -72,7 +100,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.jsoup</groupId>
                     <artifactId>jsoup</artifactId>
-                    <version>1.10.2</version>
+                    <version>1.10.3</version>
                     <type>jar</type>
                     <outputDirectory>${wordcram.basedir}/lib</outputDirectory>
                   </artifactItem>

data/ruby_wordcram.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = %w{README.md LICENSE}
   spec.summary = %q{Updated and extended WordCram library for JRubyArt and propane}
   spec.description =<<-EOS
-  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.3 and processing-3.3
+  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.3.3 and processing-3.4
   EOS
   spec.licenses = %w{Apache-2.0}
   spec.authors = %w{Dan\ Bernier Jonathan\ Feinberg  Martin\ Prout}
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'http://ruby-processing.github.io/WordCram/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/WordCram.jar'
-  spec.files << 'lib/jsoup-1.10.2.jar'
+  spec.files << 'lib/jsoup-1.10.3.jar'
   spec.require_paths = ['lib']
   spec.add_development_dependency 'rake', '~> 12', '>= 12.0'
 end

data/src/cue/lang/Counter.java

@@ -13,7 +13,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-
 package cue.lang;
 
 import java.util.ArrayList;
@@ -26,116 +25,105 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 /**
- * 
+ *
  * @author Jonathan Feinberg <jdf@us.ibm.com>
  * @param <T>
- * 
+ *
  */
 public class Counter<T> {
-	// delegate, don't extend, to prevent unauthorized monkeying with internals
-	private final Map<T, Integer> items = new HashMap<T, Integer>();
-	private int totalItemCount = 0;
-
-	public Counter() {
-        this.BY_FREQ_DESC = new Comparator<Entry<T, Integer>>() {
-            @Override
-            public int compare(final Entry<T, Integer> o1,
-                    final Entry<T, Integer> o2) {
-                return o2.getValue() - o1.getValue();
-            }
-        };
-	}
-
-	public Counter(final Iterable<T> items) {
-        this.BY_FREQ_DESC = new Comparator<Entry<T, Integer>>() {
-            @Override
-            public int compare(final Entry<T, Integer> o1,
-                    final Entry<T, Integer> o2) {
-                return o2.getValue() - o1.getValue();
-            }
-        };
-		noteAll(items);
-	}
-
-	public final void noteAll(final Iterable<T> items) {
-		for (final T t : items) {
-			note(t, 1);
-		}
-	}
-
-	public void note(final T item) {
-		note(item, 1);
-	}
-
-	public void note(final T item, final int count) {
-		final Integer existingCount = items.get(item);
-		if (existingCount != null) {
-			items.put(item, existingCount + count);
-		} else {
-			items.put(item, count);
-		}
-		totalItemCount += count;
-	}
-
-	public void merge(final Counter<T> c) {
-		for (final Entry<T, Integer> e : c.items.entrySet()) {
-			note(e.getKey(), e.getValue());
-		}
-	}
-
-	public int getTotalItemCount() {
-		return totalItemCount;
-	}
-
-	private final Comparator<Entry<T, Integer>> BY_FREQ_DESC;
-
-	/**
-	 * @param n
-	 * @return A list of the min(n, size()) most frequent items
-	 */
-	public List<T> getMostFrequent(final int n) {
-		final List<Entry<T, Integer>> all = getAllByFrequency();
-		final int resultSize = Math.min(n, items.size());
-		final List<T> result = new ArrayList<T>(resultSize);
-		for (final Entry<T, Integer> e : all.subList(0, resultSize)) {
-			result.add(e.getKey());
-		}
-		return Collections.unmodifiableList(result);
-	}
-
-	public List<Entry<T, Integer>> getAllByFrequency() {
-		final List<Entry<T, Integer>> all = new ArrayList<Entry<T, Integer>>(
-				items.entrySet());
-		Collections.sort(all, BY_FREQ_DESC);
-		return Collections.unmodifiableList(all);
-	}
-
-	public Integer getCount(final T item) {
-		final Integer freq = items.get(item);
-		if (freq == null) {
-			return 0;
-		}
-		return freq;
-	}
-
-	public void clear() {
-		items.clear();
-	}
-
-	public Set<Entry<T, Integer>> entrySet() {
-		return Collections.unmodifiableSet(items.entrySet());
-	}
-
-	public Set<T> keySet() {
-		return Collections.unmodifiableSet(items.keySet());
-	}
-
-	public List<T> keyList() {
-		return getMostFrequent(items.size());
-	}
-
-	@Override
-	public String toString() {
-		return items.toString();
-	}
+    // delegate, don't extend, to prevent unauthorized monkeying with internals
+
+    private final Map<T, Integer> items = new HashMap<>();
+    private int totalItemCount = 0;
+
+    public Counter() {
+        this.BY_FREQ_DESC = (final Entry<T, Integer> o1, final Entry<T, Integer> o2) -> o2.getValue() - o1.getValue();
+    }
+
+    public Counter(final Iterable<T> items) {
+        this.BY_FREQ_DESC = (final Entry<T, Integer> o1, final Entry<T, Integer> o2) -> o2.getValue() - o1.getValue();
+        noteAll(items);
+    }
+
+    public final void noteAll(final Iterable<T> items) {
+        for (final T t : items) {
+            note(t, 1);
+        }
+    }
+
+    public void note(final T item) {
+        note(item, 1);
+    }
+
+    public void note(final T item, final int count) {
+        final Integer existingCount = items.get(item);
+        if (existingCount != null) {
+            items.put(item, existingCount + count);
+        } else {
+            items.put(item, count);
+        }
+        totalItemCount += count;
+    }
+
+    public void merge(final Counter<T> c) {
+        c.items.entrySet().forEach((e) -> {
+            note(e.getKey(), e.getValue());
+        });
+    }
+
+    public int getTotalItemCount() {
+        return totalItemCount;
+    }
+
+    private final Comparator<Entry<T, Integer>> BY_FREQ_DESC;
+
+    /**
+     * @param n
+     * @return A list of the min(n, size()) most frequent items
+     */
+    public List<T> getMostFrequent(final int n) {
+        final List<Entry<T, Integer>> all = getAllByFrequency();
+        final int resultSize = Math.min(n, items.size());
+        final List<T> result = new ArrayList<>(resultSize);
+        all.subList(0, resultSize).forEach((e) -> {
+            result.add(e.getKey());
+        });
+        return Collections.unmodifiableList(result);
+    }
+
+    public List<Entry<T, Integer>> getAllByFrequency() {
+        final List<Entry<T, Integer>> all = new ArrayList<>(
+                items.entrySet());
+        Collections.sort(all, BY_FREQ_DESC);
+        return Collections.unmodifiableList(all);
+    }
+
+    public Integer getCount(final T item) {
+        final Integer freq = items.get(item);
+        if (freq == null) {
+            return 0;
+        }
+        return freq;
+    }
+
+    public void clear() {
+        items.clear();
+    }
+
+    public Set<Entry<T, Integer>> entrySet() {
+        return Collections.unmodifiableSet(items.entrySet());
+    }
+
+    public Set<T> keySet() {
+        return Collections.unmodifiableSet(items.keySet());
+    }
+
+    public List<T> keyList() {
+        return getMostFrequent(items.size());
+    }
+
+    @Override
+    public String toString() {
+        return items.toString();
+    }
 }

data/src/cue/lang/NGramIterator.java

@@ -27,15 +27,15 @@ import cue.lang.stop.StopWords;
  * retrieve a sequence of {@link String}s, each of which has n words that appear
  * contiguously within a sentence. "Words" are as defined by the
  * {@link WordIterator}.
- * 
+ *
  * <p>
  * If you don't provide a {@link Locale}, you get the default {@link Locale} for
  * your system, which may or may not be what you want. The {@link Locale} is
  * used by a {@link SentenceIterator} to find sentence breaks.
- * 
+ *
  * <p>
  * Example:
- * 
+ *
  * <pre>
  * final String lyric = "This happened once before. I came to your door. No reply.";
  * for (final String s : new NGramIterator(3, lyric)) {
@@ -44,13 +44,13 @@ import cue.lang.stop.StopWords;
  * for (final String s : new NGramIterator(2, lyric)) {
  *     System.out.println(s);
  * }
- *  
+ *
  * This happened once
  * happened once before
  * I came to
  * came to your
  * to your door
- * 
+ *
  * This happened
  * happened once
  * once before
@@ -60,92 +60,97 @@ import cue.lang.stop.StopWords;
  * your door
  * No reply
  * </pre>
- * 
+ *
  * @author Jonathan Feinberg <jdf@us.ibm.com>
- * 
+ *
  */
 public class NGramIterator extends IterableText {
-	private final SentenceIterator sentenceIterator;
-	private final LinkedList<String> grams = new LinkedList<String>();
-	private final int n;
-	private final StopWords stopWords;
-
-	private String next;
-	private Iterator<String> currentWordIterator;
-
-	public NGramIterator(final int n, final String text) {
-		this(n, text, Locale.getDefault());
-	}
-
-	public NGramIterator(final int n, final String text, final Locale locale) {
-		this(n, text, locale, null);
-	}
-
-	public NGramIterator(final int n, final String text, final Locale locale,
-			final StopWords stopWords) {
-		this.n = n;
-		this.sentenceIterator = new SentenceIterator(text, locale);
-		this.stopWords = stopWords;
-		loadNext();
-	}
-
-        @Override
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-        @Override
-	public String next() {
-		if (next == null) {
-			throw new NoSuchElementException();
-		}
-		final String result = next;
-		loadNext();
-		return result;
-	}
-
-        @Override
-	public boolean hasNext() {
-		return next != null;
-	}
-
-	private void loadNext() {
-		next = null;
-		if (!grams.isEmpty()) {
-			grams.pop();
-		}
-		while (grams.size() < n) {
-			while (currentWordIterator == null
-					|| !currentWordIterator.hasNext()) {
-				if (!sentenceIterator.hasNext()) {
-					return;
-				}
-				grams.clear();
-				currentWordIterator = new WordIterator(sentenceIterator.next())
-						.iterator();
-				for (int i = 0; currentWordIterator.hasNext() && i < n - 1; i++) {
-					maybeAddWord();
-				}
-			}
-			// now grams has n-1 words in it and currentWordIterator hasNext
-			maybeAddWord();
-		}
-		final StringBuilder sb = new StringBuilder();
-		for (final String gram : grams) {
-			if (sb.length() > 0) {
-				sb.append(" ");
-			}
-			sb.append(gram);
-		}
-		next = sb.toString();
-	}
-
-	private void maybeAddWord() {
-		final String nextWord = currentWordIterator.next();
-		if (stopWords != null && stopWords.isStopWord(nextWord)) {
-			grams.clear();
-		} else {
-			grams.add(nextWord);
-		}
-	}
+
+    private final SentenceIterator sentenceIterator;
+    private final LinkedList<String> grams = new LinkedList<>();
+    private final int n;
+    private final StopWords stopWords;
+
+    private String next;
+    private Iterator<String> currentWordIterator;
+
+    public NGramIterator(final int n, final String text) {
+        this(n, text, Locale.getDefault());
+    }
+
+    public NGramIterator(final int n, final String text, final Locale locale) {
+        this(n, text, locale, null);
+    }
+
+    public NGramIterator(final int n, final String text, final Locale locale,
+            final StopWords stopWords) {
+        this.n = n;
+        this.sentenceIterator = new SentenceIterator(text, locale);
+        this.stopWords = stopWords;
+        loadNext();
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String next() {
+        if (next == null) {
+            throw new NoSuchElementException();
+        }
+        final String result = next;
+        loadNext();
+        return result;
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public boolean hasNext() {
+        return next != null;
+    }
+
+    private void loadNext() {
+        next = null;
+        if (!grams.isEmpty()) {
+            grams.pop();
+        }
+        while (grams.size() < n) {
+            while (currentWordIterator == null
+                    || !currentWordIterator.hasNext()) {
+                if (!sentenceIterator.hasNext()) {
+                    return;
+                }
+                grams.clear();
+                currentWordIterator = new WordIterator(sentenceIterator.next())
+                        .iterator();
+                for (int i = 0; currentWordIterator.hasNext() && i < n - 1; i++) {
+                    maybeAddWord();
+                }
+            }
+            // now grams has n-1 words in it and currentWordIterator hasNext
+            maybeAddWord();
+        }
+        final StringBuilder sb = new StringBuilder();
+        grams.forEach((gram) -> {
+            if (sb.length() > 0) {
+                sb.append(" ");
+            }
+            sb.append(gram);
+        });
+        next = sb.toString();
+    }
+
+    private void maybeAddWord() {
+        final String nextWord = currentWordIterator.next();
+        if (stopWords != null && stopWords.isStopWord(nextWord)) {
+            grams.clear();
+        } else {
+            grams.add(nextWord);
+        }
+    }
 }

data/src/cue/lang/SentenceIterator.java

@@ -24,63 +24,68 @@ import java.util.regex.Pattern;
  * Construct with a {@link String}; retrieve a sequence of {@link String}s, each
  * of which is a "sentence" according to Java's built-in model for the given
  * {@link Locale}.
- * 
+ *
  * @author Jonathan Feinberg <jdf@us.ibm.com>
- * 
+ *
  */
 public class SentenceIterator extends IterableText {
-	private final String text;
-	private final BreakIterator breakIterator;
-	int start, end;
 
-	/**
-	 * Uses the default {@link Locale} for the running instance of the JVM.
-	 * 
-	 * @param text
-	 */
-	public SentenceIterator(final String text) {
-		this(text, Locale.getDefault());
-	}
+    private final String text;
+    private final BreakIterator breakIterator;
+    int start, end;
 
-	public SentenceIterator(final String text, final Locale locale) {
-		this.text = text;
-		breakIterator = BreakIterator.getSentenceInstance(locale);
-		breakIterator.setText(text);
-		start = end = breakIterator.first();
-		advance();
-	}
+    /**
+     * Uses the default {@link Locale} for the running instance of the JVM.
+     *
+     * @param text
+     */
+    public SentenceIterator(final String text) {
+        this(text, Locale.getDefault());
+    }
 
-	private static final Pattern ABBREVS = Pattern
-			.compile("(?:Mrs?|Ms|Dr|Rev)\\.\\s*$");
+    public SentenceIterator(final String text, final Locale locale) {
+        this.text = text;
+        breakIterator = BreakIterator.getSentenceInstance(locale);
+        breakIterator.setText(text);
+        start = end = breakIterator.first();
+        advance();
+    }
 
-	private void advance() {
-		start = end;
-		while (hasNext()
-				&& ((end == start) || ABBREVS.matcher(
-						text.substring(start, end)).find())) {
-			end = breakIterator.next();
-		}
-	}
+    private static final Pattern ABBREVS = Pattern
+            .compile("(?:Mrs?|Ms|Dr|Rev)\\.\\s*$");
 
-        @Override
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
+    private void advance() {
+        start = end;
+        while (hasNext()
+                && ((end == start) || ABBREVS.matcher(
+                        text.substring(start, end)).find())) {
+            end = breakIterator.next();
+        }
+    }
 
-        @Override
-	public String next() {
-		if (!hasNext()) {
-			throw new NoSuchElementException();
-		}
-		final String result = text.substring(start, end)
-				.replaceAll("\\s+", " ");
-		advance();
-		return result;
-	}
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
 
-        @Override
-	public final boolean hasNext() {
-		return end != BreakIterator.DONE;
-	}
+    @Override
+    public String next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+        final String result = text.substring(start, end)
+                .replaceAll("\\s+", " ");
+        advance();
+        return result;
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public final boolean hasNext() {
+        return end != BreakIterator.DONE;
+    }
 
 }

data/src/wordcram/WordAngler.java

@@ -16,5 +16,5 @@ public interface WordAngler {
      *            The Word that WordCram is about to draw, and wants to rotate
      * @return the rotation angle for the Word, in radians
      */
-    public float angleFor(Word word);
+    public float angleFor(wordcram.Word word);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wordcram
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dan Bernier
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -32,8 +32,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
-description: "  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.3
-  and processing-3.3\n"
+description: "  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.3.3
+  and processing-3.4\n"
 email: mamba2928@yahoo.co.uk
 executables: []
 extensions: []
@@ -44,10 +44,12 @@ files:
 - ".gitignore"
 - ".mvn/extensions.xml"
 - ".mvn/wrapper/maven-wrapper.properties"
+- ".travis.yml"
 - CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
+- acknowledgements.md
 - docs/.gitignore
 - docs/_config.yml
 - docs/_includes/footer.html
@@ -62,6 +64,7 @@ files:
 - docs/_layouts/post.html
 - docs/_posts/2017-03-07-getting_started.md
 - docs/_posts/2017-03-07-under_the_hood.md
+- docs/_posts/2017-03-12-supported_languages.md
 - docs/_sass/_base.scss
 - docs/_sass/_layout.scss
 - docs/_sass/_syntax-highlighting.scss
@@ -73,7 +76,7 @@ files:
 - example/data/MINYN___.TTF
 - example/test.rb
 - lib/WordCram.jar
-- lib/jsoup-1.10.2.jar
+- lib/jsoup-1.10.3.jar
 - lib/ruby_wordcram.rb
 - lib/ruby_wordcram/version.rb
 - pom.rb
@@ -185,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Updated and extended WordCram library for JRubyArt and propane