tusks 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 408ceaca49432fc3be46b178ad26f733c48d81c9
-  data.tar.gz: 5b7b79891270d0c9e0e473607052fe6b62c985f7
+  metadata.gz: 542e9e0f4408ff9f256d1975cf5c5a735de6a712
+  data.tar.gz: 0913c0c30b22c00ee3c2c68f767dbb45c6f3e55d
 SHA512:
-  metadata.gz: d0f6cf8e4813555f8264d1e2e68e3a3a6ca14fb2d918141747099cf46fd794bd695a799d2046e7632873bf55d08c82bf01f4cc994c0270da8a5a3e0ff1a750b3
-  data.tar.gz: 4e7a281c47cee1924d1bddfc1bde4bc55461acd07dbe4bd7bc2fd109d01d8522b2a164c244fc2c3b3ca0329e9b518f32dfdb251422e73d4cb3464879b7e68400
+  metadata.gz: 4e7add263084790c134e34f25bec48cc037c5c8ab78a80eea7d2630be494b2bb37ba479810618a62393c46ae6e6f7fcbb9967e822906502cfacacdf1195a68c2
+  data.tar.gz: 172ff5c399d9110f9eb171f4885460fd81760d378e903fbb1294528dafd904c014e0806520e4f7f8e140441b95ac1525386e4a5102cfd0119d573b34e0ac3db2

data/lib/tusks.rb

@@ -1,3 +1,8 @@
-require 'tusks/types/init'
-require 'tusks/error/init'
-require 'tusks/connection'
+require 'pg'
+
+%w(array connection float hash integer error nil string version).each do |lib|
+  require "tusks/#{lib}"
+end
+
+module Tusks
+end

data/lib/tusks/connection.rb

@@ -50,9 +50,9 @@ module Tusks
     end
 
     def execute_function(sproc_name, *args)
-      connect if !connected?
+      connect if !in_transaction?
       @conn.exec(build_sql_string(sproc_name, *args))
-      disconnect
+      disconnect if !in_transaction?
     end
 
     def build_sql_string(sproc_name, *args)

data/lib/tusks/error.rb

@@ -0,0 +1,5 @@
+module Tusks
+  class TusksError < StandardError; end
+  class NestedArrayError < TusksError; end
+  class UnsupportedTypeError < TusksError; end
+end

data/lib/tusks/version.rb

@@ -1,3 +1,3 @@
 module Tusks
-  VERSION = '0.0.0'
+  VERSION = '0.0.1'
 end

data/spec/tusks/connection_spec.rb

@@ -6,6 +6,23 @@ module Tusks
       @connection = Connection.new({'key1' => 'value 1', 'key2' => 'value 2'})
     end
 
+    context 'when first created' do
+      it 'should set the passed in options as the connection options' do
+        expect(@connection.instance_variable_get(:@options)).to eql ({
+          'key1' => 'value 1',
+          'key2' => 'value 2'
+        })
+      end
+
+      it 'should not claim to be in a transaction' do
+        expect(@connection.in_transaction?).to be false
+      end
+
+      it 'should not claim to be connected' do
+        expect(@connection.connected?).to be false
+      end
+    end
+
     context 'after defining a function interface' do
       before :each do
         @connection.functions do
@@ -29,7 +46,7 @@ module Tusks
 
       context 'a method defined by #no_results' do
         before :each do
-          @connection.stub(:execute_function)
+          allow(@connection).to receive(:execute_function)
         end
 
         it 'should return nil' do
@@ -44,14 +61,14 @@ module Tusks
 
       context 'a method defined by #one_result' do
         it 'should execute the function with the correct name and arguments' do
-          @connection.stub(:execute_function).and_return([])
+          allow(@connection).to receive(:execute_function).and_return([])
           expect(@connection).to receive(:execute_function).with(:one, 'arg 1', 'arg 2')
           @connection.one('arg 1', 'arg 2')
         end
 
         context 'that has results' do
           before :each do
-            @connection.stub(:execute_function).and_return([{
+            allow(@connection).to receive(:execute_function).and_return([{
               'key 1' => 'value 1',
               'key 2' => 'value 2'
             }])
@@ -67,7 +84,7 @@ module Tusks
 
         context 'that has no results' do
           before :each do
-            @connection.stub(:execute_function).and_return([])
+            allow(@connection).to receive(:execute_function).and_return([])
           end
 
           it 'should return nil' do
@@ -78,14 +95,14 @@ module Tusks
 
       context 'a method defined by #many_results' do
         it 'should execute the function with the correct name and arguments' do
-          @connection.stub(:execute_function).and_return([])
-          @connection.should receive(:execute_function).with(:many, 'arg 1', 'arg 2')
+          allow(@connection).to receive(:execute_function).and_return([])
+          expect(@connection).to receive(:execute_function).with(:many, 'arg 1', 'arg 2')
           @connection.many('arg 1', 'arg 2')
         end
 
         context 'that has results' do
           before :each do
-            @connection.stub(:execute_function).and_return([
+            allow(@connection).to receive(:execute_function).and_return([
               {
                 'key 1' => 'value 1',
                 'key 2' => 'value 2'
@@ -114,7 +131,7 @@ module Tusks
         context 'that has no results' do
           context 'when passed no records' do
             before :each do
-              @connection.stub(:execute_function).and_return []
+              allow(@connection).to receive(:execute_function).and_return []
             end
 
             it 'should return an empty array' do
@@ -134,8 +151,8 @@ module Tusks
         it 'should build the proper SQL string' do
           arg1 = double('arg1')
           arg2 = double('arg2')
-          arg1.stub(:to_pg_s).and_return('arg1#to_pg_s')
-          arg2.stub(:to_pg_s).and_return('arg2#to_pg_s')
+          allow(arg1).to receive(:to_pg_s).and_return('arg1#to_pg_s')
+          allow(arg2).to receive(:to_pg_s).and_return('arg2#to_pg_s')
 
           expect(@connection.instance_eval {
             build_sql_string(
@@ -148,26 +165,9 @@ module Tusks
 
       context 'without arguments' do
         it 'should build the proper SQL string' do
-          @connection.instance_eval { build_sql_string('function_name') }.should eql 'SELECT * FROM function_name()'
+          expect(@connection.instance_eval { build_sql_string('function_name') }).to eql 'SELECT * FROM function_name()'
         end
       end
     end
-
-    context 'when first created' do
-      it 'should set the passed in options as the connection options' do
-        @connection.instance_variable_get(:@options).should eql ({
-          'key1' => 'value 1',
-          'key2' => 'value 2'
-        })
-      end
-
-      it 'should not claim to be in a transaction' do
-        expect(@connection.in_transaction?).to be false
-      end
-
-      it 'should not claim to be connected' do
-        expect(@connection.connected?).to be false
-      end
-    end
   end
 end

data/tusks.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0'
+
+  s.add_runtime_dependency 'pg', '~> 0.17', '>= 0.17.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tusks
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Craig McCown
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 description: Tusks is built for Ruby application developers who want to access their
   Postgres database exclusively using functions. It abstracts away ugly serialization
   functionality, enables easy transaction management, and provides a declarative way
@@ -44,27 +64,23 @@ files:
 - LICENSE.md
 - README.md
 - lib/tusks.rb
+- lib/tusks/array.rb
 - lib/tusks/connection.rb
-- lib/tusks/error/init.rb
-- lib/tusks/error/nested_array_error.rb
-- lib/tusks/error/tusks_error.rb
-- lib/tusks/error/unsupported_type_error.rb
-- lib/tusks/types/array.rb
-- lib/tusks/types/float.rb
-- lib/tusks/types/hash.rb
-- lib/tusks/types/init.rb
-- lib/tusks/types/integer.rb
-- lib/tusks/types/nil.rb
-- lib/tusks/types/string.rb
+- lib/tusks/error.rb
+- lib/tusks/float.rb
+- lib/tusks/hash.rb
+- lib/tusks/integer.rb
+- lib/tusks/nil.rb
+- lib/tusks/string.rb
 - lib/tusks/version.rb
 - spec/spec_helper.rb
+- spec/tusks/array_spec.rb
 - spec/tusks/connection_spec.rb
-- spec/tusks/types/array_spec.rb
-- spec/tusks/types/float_spec.rb
-- spec/tusks/types/hash_spec.rb
-- spec/tusks/types/integer_spec.rb
-- spec/tusks/types/nil_spec.rb
-- spec/tusks/types/string_spec.rb
+- spec/tusks/float_spec.rb
+- spec/tusks/hash_spec.rb
+- spec/tusks/integer_spec.rb
+- spec/tusks/nil_spec.rb
+- spec/tusks/string_spec.rb
 - tusks.gemspec
 homepage: https://github.com/craigrmccown/tusks
 licenses:
@@ -92,10 +108,10 @@ specification_version: 4
 summary: Easily call PostgreSQL functions from Ruby.
 test_files:
 - spec/spec_helper.rb
+- spec/tusks/array_spec.rb
 - spec/tusks/connection_spec.rb
-- spec/tusks/types/array_spec.rb
-- spec/tusks/types/float_spec.rb
-- spec/tusks/types/hash_spec.rb
-- spec/tusks/types/integer_spec.rb
-- spec/tusks/types/nil_spec.rb
-- spec/tusks/types/string_spec.rb
+- spec/tusks/float_spec.rb
+- spec/tusks/hash_spec.rb
+- spec/tusks/integer_spec.rb
+- spec/tusks/nil_spec.rb
+- spec/tusks/string_spec.rb

data/lib/tusks/error/init.rb

@@ -1,3 +0,0 @@
-require_relative 'tusks_error'
-require_relative 'nested_array_error'
-require_relative 'unsupported_type_error'

data/lib/tusks/error/nested_array_error.rb

@@ -1,3 +0,0 @@
-module Tusks
-  class NestedArrayError < TusksError; end
-end

data/lib/tusks/error/tusks_error.rb

@@ -1,3 +0,0 @@
-module Tusks
-  class TusksError < StandardError; end
-end

data/lib/tusks/error/unsupported_type_error.rb

@@ -1,3 +0,0 @@
-module Tusks
-  class UnsupportedTypeError < TusksError; end
-end

data/lib/tusks/types/init.rb

@@ -1,6 +0,0 @@
-require_relative 'array'
-require_relative 'float'
-require_relative 'hash'
-require_relative 'integer'
-require_relative 'nil'
-require_relative 'string'