poefy-sqlite3 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601ccce9d7cf3212b804700e0071548fe4e88669
-  data.tar.gz: 6619ec5b781ff1677302925782bd86369dc484e9
+  metadata.gz: 8806b7669ce6afbcea42c28575acb64b355e021a
+  data.tar.gz: b15888762fcb9e759934545eb8f634bfbe5cd8b5
 SHA512:
-  metadata.gz: 51a75059555a8147f33b70776fe1d17255e487d4b0e8f77e708b61a1cf1e1240a861625a6810a83c72f882022800ada63bbb67ec8c1f52de6e1ae719fac4e5a0
-  data.tar.gz: 66644fda8fd56121eeedc553958136a917a0a0e9f7fd2de5952f3258eb6972a1c34dcd89904d4c5ff5ae2ba47e9c33c0b87d3422215b4d3f980503fe4d8cf780
+  metadata.gz: de5980e39718fdf884bac2c715915ed88ac7296a8150843e14af004caab42fd9c72e080ff383ec2eb7dba2326591e532b167cf172a3f6cbfd948bf7e4b79779a
+  data.tar.gz: e330587bdbe424830769e1b7b6104fad7b305a4aef621d3864556968c1204705b868bff5e907fb39a259cb2c236c00b9cb796480f14a176e588ad8f32583433a

data/lib/poefy/sqlite3.rb

@@ -231,9 +231,9 @@ module Poefy
           @sproc[key] = db.prepare value
         end
       rescue
-        handle_error \
-          "ERROR: Database table structure is invalid.\n" +
-          "       Please manually DROP the corrupt table and recreate it."
+        msg = "ERROR: Database table structure is invalid." +
+            "\n       Please manually DROP the corrupt table and recreate it."
+        raise Poefy::StructureInvalid.new(msg)
       end
 
       # Find rhymes and counts greater than a certain length.

data/lib/poefy/sqlite3/version.rb

@@ -6,7 +6,7 @@ module Poefy
   module Sqlite3
 
     def self.version_number
-      major = 0
+      major = 1
       minor = 1
       tiny  = 0
       pre   = nil
@@ -16,7 +16,7 @@ module Poefy
     end
 
     def self.version_date
-      '2017-10-02'
+      '2017-10-31'
     end
 
   end

data/poefy-sqlite3.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec',       '~> 3.0')
   s.add_development_dependency('ruby_rhymes', '~> 0.1')
 
-  s.add_runtime_dependency('poefy',   '~> 1.0', '>= 1.0.0')
+  s.add_runtime_dependency('poefy',   '~> 1.1', '>= 1.1.0')
   s.add_runtime_dependency('sqlite3', '~> 1.3', '>= 1.3.13')
 end

data/spec/poefy_sqlite3_spec.rb

@@ -119,26 +119,31 @@ describe Poefy::Poem, "-- SQLite" do
 
     describe ":rhyme option" do
 
-      describe "should return nil" do
+      describe "should raise Poefy::MissingFormOrRhyme" do
         it "blank, no argument" do
-          poem = @poefy.poem
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
         it "({  })" do
-          poem = @poefy.poem ({  })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({  })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
         it "({ rhyme: nil })" do
-          poem = @poefy.poem ({ rhyme: nil })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ rhyme: nil })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
         it "({ rhyme: ' ' })" do
-          poem = @poefy.poem ({ rhyme: ' ' })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ rhyme: ' ' })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
         it "({ rhyme: '' })" do
-          poem = @poefy.poem ({ rhyme: '' })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ rhyme: '' })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
       end
 
@@ -165,23 +170,25 @@ describe Poefy::Poem, "-- SQLite" do
         end
       end
 
-      describe "should be nil if can't parse rhyme string" do
+      describe "should raise error if can't parse rhyme string" do
         rhymes = %w{a1 b1 ab1 Ab1 AAAAABb1 1 1111 1122 11221 ;;::1. }
         rhymes += ['AA Bb1','11 11','11 1 1','..1.']
         rhymes.each do |i|
           it "({ rhyme: '#{i}' })" do
-            poem = @poefy.poem ({ rhyme: i })
-            expect(poem).to be_nil
+            expect {
+              @poefy.poem ({ rhyme: i })
+            }.to raise_error(Poefy::RhymeError)
           end
         end
       end
 
-      describe "should be nil if can't complete rhyme string" do
+      describe "should raise error if can't complete rhyme string" do
         rhymes = %w{aaaaaa abcd aaaaabbbbb}
         rhymes.each do |i|
           it "({ rhyme: '#{i}' })" do
-            poem = @poefy.poem ({ rhyme: i })
-            expect(poem).to be_nil
+            expect {
+              @poefy.poem ({ rhyme: i })
+            }.to raise_error(Poefy::NotEnoughData)
           end
         end
       end
@@ -201,12 +208,13 @@ describe Poefy::Poem, "-- SQLite" do
         end
       end
 
-      describe "should be nil if can't complete repeating rhyme string" do
+      describe "should raise error if can't complete repeating rhyme string" do
         lines = 200
         it "({ rhyme: ('A'..'D').to_a.map { |i| i * #{lines} }.join })" do
           rhyme = ('A'..'D').to_a.map { |i| i * lines }.join
-          poem = @poefy.poem ({ rhyme: rhyme })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ rhyme: rhyme })
+          }.to raise_error(Poefy::NotEnoughData)
         end
       end
 
@@ -221,29 +229,34 @@ describe Poefy::Poem, "-- SQLite" do
         end
       end
 
-      describe "should be nil if given a named form it can't fulfil" do
+      describe "should raise error if given a named form it can't fulfil" do
         it "({ form: 'sonnet' })" do
-          poem = @poefy.poem ({ form: 'sonnet' })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ form: 'sonnet' })
+          }.to raise_error(Poefy::NotEnoughData)
         end
         it "({ form: :villanelle })" do
-          poem = @poefy.poem ({ form: :villanelle })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ form: 'villanelle' })
+          }.to raise_error(Poefy::NotEnoughData)
         end
       end
 
-      describe "should be nil if given a junk named form" do
+      describe "should raise error if given a junk named form" do
         it "({ form: 'sonnet_junk' })" do
-          poem = @poefy.poem ({ form: 'sonnet_junk' })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ form: 'sonnet_junk' })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
         it "({ form: :not_a_form })" do
-          poem = @poefy.poem ({ form: :not_a_form })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ form: :not_a_form })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
         it "({ form: :not_a_form, indent: '0010' })" do
-          poem = @poefy.poem ({ form: :not_a_form, indent: '0010' })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ form: :not_a_form, indent: '0010' })
+          }.to raise_error(Poefy::MissingFormOrRhyme)
         end
       end
 
@@ -308,11 +321,12 @@ describe Poefy::Poem, "-- SQLite" do
           expect(poem.count).to be 14
         end
       end
-      describe "should fail to be created" do
+      describe "should raise Poefy::NotEnoughData" do
         it "({ form: :sonnet, acrostic: 'qqqqqqqqqqqqqq' })" do
-          poem = @poefy.poem ({ form: :sonnet,
-                                acrostic: 'qqqqqqqqqqqqqq' })
-          expect(poem).to be_nil
+          expect {
+            @poefy.poem ({ form: :sonnet,
+                           acrostic: 'qqqqqqqqqqqqqq' })
+          }.to raise_error(Poefy::NotEnoughData)
         end
       end
     end
@@ -336,12 +350,13 @@ describe Poefy::Poem, "-- SQLite" do
         end
       end
 
-      describe "should fail to be created" do
+      describe "should raise Poefy::NotEnoughData" do
         forms_fail.each do |form|
           it "({ form: #{form} })" do
             4.times do
-              poem = @poefy.poem ({ form: form })
-              expect(poem).to be_nil
+              expect {
+                @poefy.poem ({ form: form })
+              }.to raise_error(Poefy::NotEnoughData)
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poefy-sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,20 +72,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement