content_spinning 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 725d38ecb0875c5f125823a80e16105d65875327
-  data.tar.gz: feaff568e498f301547e05d5472e7ff4dd9ea4f0
+  metadata.gz: 40f5603ef42234928b5a79823f5e1dcb3dafbe83
+  data.tar.gz: ea05dd01a609b4071e9a184ae2e33484943aeda6
 SHA512:
-  metadata.gz: 1a1c3bfcd8dc80d0690326333d197e6f4ddae3f19e09abad7d318dddcece9c42be5e4d1448bef2eec17ac59335b6ae2de892fa548ea2bc89107952641d2ebd36
-  data.tar.gz: 51550db06f73c46870dfaedc4e90bf913b5cd8f4fbb0b2064d3b6e3bca77b7bf8480633a51f12325d3b4d5d12f2d774a9314a8afebf6966c4d5c52b69715dc57
+  metadata.gz: be82438bb2c4cbb4f1329255ee0b560871dc88db4cca82b07f9286a1b5b061d1d87147d66a1e12fdf08b8f23111151e9a0b4566d4f67fcca1b36b6c24b56df51
+  data.tar.gz: 5dee876c19daa4a780b6cbdbc212a29533250cbf45331964938558ed5f2c6c0eb644ebb23c00d37aa641ffdd5b5dc7b620ed3f2b3b79d1d5a0a40c91a9a16605

data/README.md

@@ -1,5 +1,7 @@
 # Content Spinning
 
+[![Gem Version](https://badge.fury.io/rb/content_spinning.svg)](https://badge.fury.io/rb/content_spinning) [![Build Status](https://travis-ci.org/maximeg/content_spinning.svg?branch=master)](https://travis-ci.org/maximeg/content_spinning)
+
 `ContentSpinning` is a ruby library made to spin some text.
 It manages nested spinning.
 

data/lib/content_spinning.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "content_spinning/core_ext/string"
 require "content_spinning/sentence"
 require "content_spinning/spinner"
@@ -30,30 +31,18 @@ class ContentSpinning
   def parse
     return @root if defined?(@root)
 
-    heap = [Sentence.new]
+    heap = [::ContentSpinning::Sentence.new]
 
     source.scan(/ [{}|] | [^{}|]+ /x).each do |part|
-      current = heap.last
-
-      if part == SPIN_START
-        spinner = ::ContentSpinning::Spinner.new
-        current << spinner
-        heap << spinner
-
-        sentence = ::ContentSpinning::Sentence.new
-        spinner << sentence
-        heap << sentence
-      elsif part == SPIN_OR
-        heap.pop
-        spinner = heap.last
-        sentence = ::ContentSpinning::Sentence.new
-        spinner << sentence
-        heap << sentence
-      elsif part == SPIN_END
-        heap.pop
-        heap.pop
+      case part
+      when SPIN_START
+        modify_heap_for_spin_start(heap)
+      when SPIN_OR
+        modify_heap_for_spin_or(heap)
+      when SPIN_END
+        modify_heap_for_spin_end(heap)
       else
-        current << ::ContentSpinning::String.new(part)
+        heap.last << ::ContentSpinning::String.new(part)
       end
     end
 
@@ -75,14 +64,38 @@ class ContentSpinning
   def spin_with_limit(limit:)
     parsed = parse
 
-    results = Array.new(limit)
-    results.map! do
-      parsed.random
-    end
+    Array.new(limit) { parsed.random }
   end
 
   def to_source
     parse.to_source
   end
 
+  private
+
+  def modify_heap_for_spin_end(heap)
+    heap.pop(2)
+  end
+
+  def modify_heap_for_spin_or(heap)
+    heap.pop
+    current_spinner = heap.last
+
+    new_sentence = ::ContentSpinning::Sentence.new
+    current_spinner << new_sentence
+    heap << new_sentence
+  end
+
+  def modify_heap_for_spin_start(heap)
+    current = heap.last
+
+    new_spinner = ::ContentSpinning::Spinner.new
+    current << new_spinner
+    heap << new_spinner
+
+    new_sentence = ::ContentSpinning::Sentence.new
+    new_spinner << new_sentence
+    heap << new_sentence
+  end
+
 end

data/lib/content_spinning/core_ext/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class String
 
   def spin(limit: nil)

data/lib/content_spinning/sentence.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ContentSpinning
 
   class Sentence < ::Array

data/lib/content_spinning/spinner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ContentSpinning
 
   class Spinner < ::Array

data/lib/content_spinning/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ContentSpinning
 
   class String < ::String

data/lib/content_spinning/version.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 class ContentSpinning
 
   module Version
 
-    STRING = "0.3.0".freeze
+    STRING = "0.3.1"
 
   end
 

data/spec/content_spinning/core_ext/string_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe String do

data/spec/content_spinning_spec.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe ContentSpinning do
-
   describe "#count" do
     it "returns an array" do
       expect(ContentSpinning.new("AaBb").count).to eq(1)
@@ -182,7 +182,7 @@ describe ContentSpinning do
       }.not_to change { source }
     end
 
-    context 'with limit' do
+    context "with limit" do
       before { @old_seed = Random.srand(2736) }
       after { Random.srand(@old_seed) }
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rspec"
 require "content_spinning"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_spinning
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Maxime Garcia
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Content Spinning