sqlite_magic 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjEzZTViZTI2MTgwOTRiODQ4YzEzYzQyN2FkY2I0YmQ1Yjg4YzEzNA==
+    YjUyMTQxNjFkYzcyMzYwNTZhNTVjNWJlNGQ3NDk5NTE1MjUwMjQ4ZQ==
   data.tar.gz: !binary |-
-    ZWIxMGEzZTliNWRiODI5MTFlYTNmYTQxOWYwZDJjOTAzZjliZWEzYQ==
+    YTA4MzE1NjBmMmRhYWJiNDhlY2U2YmNmOTAzMmFkYTRlMzA1YjI3OQ==
 SHA512:
   metadata.gz: !binary |-
-    NzU4M2IwZGQ5ZTRiYmY1NzdmMTFjN2UzY2QyMTkxMzk0NTNhNzMwYzBiMGM5
-    MzRhNjcyZDBiZDgwYmY2ZjdmM2FmODhhNTBjYTY3MDY4MTdjYzliYzUyMGY5
-    MjY2MjdiM2I0NDIzOGU2MTVmMjg2YWFlOTNhMzFmYjUzMjYyNjg=
+    YTY3NWMyYzZiNTgzMzk1ZGUyNzg3ZDYzODNkMWI4ZTBiNjc1ZDA0NDU3NWM4
+    N2ExZWU5YzgwYmIzNGVlMjM0YTFlMDA4ZWU4NzM1YjczZDI2OGVmMWFjMWUz
+    MGFiZDRiZDZhZGRmMmI0MmIzZTM2M2JlNmY1OTZiYzFlYjRhYmU=
   data.tar.gz: !binary |-
-    NzkxMDI5MTQ1YzhhN2U1NDJiMzA2ZGQ3ZWI5NzVmYTJlZmUzYzNhZWI3Y2Q4
-    YzkyZWViZGFlZjZjNDY3YjU0OTNmYTk0MmUzMjEwMWM1MTc3YzdjMGFjODhi
-    OGU2M2EzZDZkYWViY2QzOGJhZGRmY2UyYTdjOWU4NmYxNTY0Y2M=
+    NjcxM2Y1NjAwY2Y1MWU0Mjg3NzM5NmJkZTU2Y2RkM2U1NzViOWUyM2QxMzUz
+    NzI3OWU5MGE3ZjgzZTE4NjI4NDM1YTgwMGJkNGEyODE1MjJmN2Q0OTlkNGYw
+    NmE4ZDI5ZWRhODhiY2I4ZTA2MWI4ZjFkYWQzZGViMDEwMGNhYTU=

data/.travis.yml

@@ -3,6 +3,9 @@ rvm:
   # - "1.8.7"
   - "1.9.2"
   - "1.9.3"
+  - "2.0.0"
+  - "2.1.0"
+  - "2.2.0"
   # - jruby-18mode # JRuby in 1.8 mode
   # - jruby-19mode # JRuby in 1.9 mode
   # - rbx-18mode

data/README.md

@@ -1,6 +1,6 @@
 # SqliteMagic
 [![Build Status](https://travis-ci.org/openc/sqlite_magic.png)](https://travis-ci.org/openc/sqlite_magic)
-Experimental abstraction and refactoring of sqlite utility methods from 
+Experimental abstraction and refactoring of sqlite utility methods from
 scraperwiki-ruby gem
 Note: Not all functionality has yet been duplicated, and this may not work for
 you. Developed and tested on Ruby 1.9.3
@@ -24,8 +24,9 @@ Or install it yourself as:
 TODO: Write usage instructions here
 
 ## Changes
-Allow options to be passed when initializing connection (which will be passed to Sqlite)
-insert\_or\_update no defers to #save\_data when hitting error (which caused a problem when missing field)
+* Allow options to be passed when initializing connection (which will be passed to Sqlite)
+* insert\_or\_update now defers to #save\_data when hitting error (which caused a problem when missing field)
+* busy_timeout can now be set in options
 
 ## Contributing
 

data/lib/sqlite_magic.rb

@@ -12,7 +12,9 @@ module SqliteMagic
   class Connection
     attr_reader :database
     def initialize(db_loc='sqlite.db', options={})
+      busy_timeout = options.delete(:busy_timeout)
       @database = SQLite3::Database.new(db_loc, options)
+      @database.busy_timeout = busy_timeout if busy_timeout
     end
 
     def add_columns(tbl_name, col_names)

data/lib/sqlite_magic/version.rb

@@ -1,3 +1,3 @@
 module SqliteMagic
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/sqlite_magic_spec.rb

@@ -46,6 +46,13 @@ describe SqliteMagic do
         connection = SqliteMagic::Connection.new
         connection.instance_variable_get(:@database).should == @dummy_db
       end
+
+      it "should set busy_timeout if passed as options when opening Sqlite3 db" do
+        SQLite3::Database.should_receive(:new).with('path/to/mynew.db', {}).and_return(@dummy_db)
+        @dummy_db.should_receive(:busy_timeout=).with(12345)
+        connection = SqliteMagic::Connection.new('path/to/mynew.db', :busy_timeout => 12345)
+      end
+
     end
 
     it "should have #database accessor" do
@@ -345,12 +352,12 @@ describe SqliteMagic do
 
     describe '#verbose?' do
       it 'should return false if ENV["VERBOSE"] not set' do
-        @connection.verbose?.should be_false
+        @connection.verbose?.should be_falsy
       end
 
-      it 'should return false if ENV["VERBOSE"] set' do
+      it 'should return true if ENV["VERBOSE"] set' do
         ENV["VERBOSE"] = 'foo'
-        @connection.verbose?.should be_true
+        @connection.verbose?.should be_truthy
         ENV["VERBOSE"] = nil # reset
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlite_magic
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Chris Taggart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sprinkles some magic onto Sqlite3 gem