poefy-pg 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562ca9a5d0e1e8fc84fce3f1d2cc1191f67b72b8
-  data.tar.gz: 532339860c2f1ad84288c8232162b31de8854154
+  metadata.gz: 2c046258dedd30f3dfa12687e8a51dcb0109b321
+  data.tar.gz: 23b5c577a8daab3e38b9641147926fbdb7a072a4
 SHA512:
-  metadata.gz: 8a95524ade873f8ff08785a8d4abdb94bb808f15c92fb73bf5fb6daa11f6c9f62f288ef86d44fc305f186a31eb6ea2369927f9471a769b00bb88c6a713cfa270
-  data.tar.gz: 1f7f41a631894cb7191805f0d8024290dc2757c0f1fdcd2c10ba4d3c6a69dbf4f5341407d5174262ce1f8ec00c0ef146339dea24cf540d688d713b35580863b6
+  metadata.gz: 63057472cba2d216ae52ff984595fd850ff0eb41f45e454301f0ca8c9cfe8fa9e937ad7a31c6cbd5bbb7d2351ae136cdefb2d191c46e6c900968936c61b849dc
+  data.tar.gz: f48350f446d19cb4ba49d13124038e9312be7c00e0d91f6105a84fb985e3d85f77e81ded0d76ccd74ac669dd996f9ded59ab48f561cf1b6bcdbece1c5a5c8501

data/lib/poefy/pg.rb

@@ -15,22 +15,25 @@ module Poefy
 
   class Database
 
-    # Open a connection, execute a query, close the connection.
+    # Details for the database connection.
+    def self.connection
+      PG.connect(
+        :dbname   => 'poefy',
+        :user     => 'poefy',
+        :password => 'poefy'
+      )
+    end
+
+    # Open a class-wide connection, execute a query.
     def self.single_exec! sql, sql_args = nil
       output = nil
       begin
-        con = PG.connect(
-          :dbname   => 'poefy',
-          :user     => 'poefy',
-          :password => 'poefy'
-        )
+        @@con ||= Database::connection
         output = if sql_args
-          con.exec(sql, [*sql_args]).values
+          @@con.exec(sql, [*sql_args]).values
         else
-          con.exec(sql).values
+          @@con.exec(sql).values
         end
-      ensure
-        con.close if con
       end
       output
     end
@@ -137,11 +140,7 @@ module Poefy
 
       # Open a connection to the database.
       def open_connection
-        @db ||= PG.connect(
-          :dbname   => 'poefy',
-          :user     => 'poefy',
-          :password => 'poefy'
-        )
+        @db ||= Database::connection
       end
 
       # Execute a query.
@@ -225,9 +224,9 @@ module Poefy
           db.prepare key.to_s, 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/pg/version.rb

@@ -6,7 +6,7 @@ module Poefy
   module Pg
 
     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-pg.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('pg',    '~> 0.21', '>= 0.21.0')
 end

data/spec/poefy_pg_spec.rb

@@ -119,26 +119,31 @@ describe Poefy::Poem, "-- Postgres" 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, "-- Postgres" 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, "-- Postgres" 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, "-- Postgres" 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
 
@@ -306,11 +319,12 @@ describe Poefy::Poem, "-- Postgres" 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
@@ -334,12 +348,13 @@ describe Poefy::Poem, "-- Postgres" 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-pg
 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: pg
   requirement: !ruby/object:Gem::Requirement