sqlite_magic 0.0.2 → 0.0.3

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   # - "1.8.7"
   - "1.9.2"
   - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
+  # - jruby-18mode # JRuby in 1.8 mode
+  # - jruby-19mode # JRuby in 1.9 mode
   # - rbx-18mode
   - rbx-19mode
 # uncomment this line if your project needs to run something other than `rake`:

data/README.md

@@ -23,6 +23,10 @@ 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)
+
 ## Contributing
 
 1. Fork it

data/lib/sqlite_magic.rb

@@ -11,8 +11,8 @@ module SqliteMagic
 
   class Connection
     attr_reader :database
-    def initialize(db_loc='sqlite.db')
-      @database = SQLite3::Database.new(db_loc)
+    def initialize(db_loc='sqlite.db', options={})
+      @database = SQLite3::Database.new(db_loc, options)
     end
 
     def add_columns(tbl_name, col_names)
@@ -54,10 +54,10 @@ module SqliteMagic
 
     # This is an (expensive) convenience method to insert a row (for given unique keys), or if the row already exists
     #
-    def insert_or_update(uniq_keys, values_hash, tbl_name='ocdata')
-      field_names_as_symbol_string = values_hash.keys.map{ |k| ":#{k}" }.join(',') # need to appear as symbols
-
-      sql_statement = "INSERT INTO #{tbl_name} (#{values_hash.keys.join(',')}) VALUES (#{field_names_as_symbol_string})"
+    def insert_or_update(uniq_keys, values_hash, tbl_name='main_table')
+      all_field_names = values_hash.keys
+      field_names_as_symbol_string = all_field_names.map{ |k| ":#{k}" }.join(',') # need to appear as symbols
+      sql_statement = "INSERT INTO #{tbl_name} (#{all_field_names.join(',')}) VALUES (#{field_names_as_symbol_string})"
       database.execute(sql_statement, values_hash)
     rescue SQLite3::ConstraintException => e
       unique_key_constraint = uniq_keys.map { |k| "#{k}=:#{k}" }.join(' AND ')
@@ -65,9 +65,17 @@ module SqliteMagic
       sql_statement = "UPDATE #{tbl_name} SET #{update_keys} WHERE #{unique_key_constraint}"
       database.execute sql_statement, values_hash
     rescue SQLite3::SQLException => e
-      puts "Exception (#{e.inspect}) raised: #{sql_statement}" if verbose?
-      # defer to save_data, which can handle missing tables, columns etc
-      save_data(uniq_keys, values_hash, tbl_name)
+      puts "Exception (#{e.inspect}) raised" if verbose?
+      case e.message
+      when /no such table/
+        create_table(tbl_name, all_field_names, uniq_keys)
+        retry
+      when /has no column/
+        add_columns(tbl_name, all_field_names)
+        retry
+      else
+        raise e
+      end
     end
 
     # #save data into the database

data/lib/sqlite_magic/version.rb

@@ -1,3 +1,3 @@
 module SqliteMagic
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/sqlite_magic_spec.rb

@@ -16,7 +16,7 @@ describe SqliteMagic do
 
   describe SqliteMagic::Connection do
     before do
-      @dummy_db = stub('dummy_sqlite3_database')
+      @dummy_db = double('dummy_sqlite3_database')
       SQLite3::Database.stub(:new).and_return(@dummy_db)
       @connection = SqliteMagic::Connection.new
     end
@@ -28,15 +28,20 @@ describe SqliteMagic do
       end
 
       it "should open up a Sqlite3 database with default name" do
-        SQLite3::Database.should_receive(:new).with('sqlite.db').and_return(@dummy_db)
+        SQLite3::Database.should_receive(:new).with('sqlite.db',{}).and_return(@dummy_db)
         connection = SqliteMagic::Connection.new
       end
 
       it "should use given db_name when setting up Sqlite3" do
-        SQLite3::Database.should_receive(:new).with('path/to/mynew.db').and_return(@dummy_db)
+        SQLite3::Database.should_receive(:new).with('path/to/mynew.db',{}).and_return(@dummy_db)
         connection = SqliteMagic::Connection.new('path/to/mynew.db')
       end
 
+      it "should pass options when opening Sqlite3 db" do
+        SQLite3::Database.should_receive(:new).with('path/to/mynew.db', :foo => 'bar').and_return(@dummy_db)
+        connection = SqliteMagic::Connection.new('path/to/mynew.db', :foo => 'bar')
+      end
+
       it "should store Sqlite3 database in @database instance variable" do
         connection = SqliteMagic::Connection.new
         connection.instance_variable_get(:@database).should == @dummy_db
@@ -256,10 +261,10 @@ describe SqliteMagic do
 
       context 'and no table name given' do
         before do
-          @expected_query = "INSERT INTO ocdata (foo,foo2,foo3,foo4) VALUES (:foo,:foo2,:foo3,:foo4)"
+          @expected_query = "INSERT INTO main_table (foo,foo2,foo3,foo4) VALUES (:foo,:foo2,:foo3,:foo4)"
         end
 
-        it 'should use ocdata table by default' do
+        it 'should use main_table table by default' do
           @dummy_db.should_receive(:execute).with(@expected_query, @datum)
           @connection.insert_or_update(@unique_keys, @datum)
         end
@@ -267,7 +272,7 @@ describe SqliteMagic do
 
       context 'and data already exists' do
         before do
-          @dummy_db.should_receive(:execute).with(/INSERT/, anything).and_raise(SQLite3::ConstraintException.new('constraint failed'))
+          @dummy_db.stub(:execute).with(/INSERT/, anything).and_raise(SQLite3::ConstraintException.new('constraint failed'))
           @expected_update_query = "UPDATE foo_table SET foo=:foo, foo4=:foo4 WHERE foo2=:foo2 AND foo3=:foo3"
         end
 
@@ -275,34 +280,57 @@ describe SqliteMagic do
           @dummy_db.should_receive(:execute).with(@expected_update_query, @datum)
           @connection.insert_or_update(@unique_keys, @datum, 'foo_table')
         end
+
         context 'and no table name given' do
           before do
-            @expected_update_query = "UPDATE ocdata SET foo=:foo, foo4=:foo4 WHERE foo2=:foo2 AND foo3=:foo3"
+            @expected_update_query = "UPDATE main_table SET foo=:foo, foo4=:foo4 WHERE foo2=:foo2 AND foo3=:foo3"
           end
 
-          it 'should use ocdata table by default' do
+          it 'should use main_table table by default' do
             @dummy_db.should_receive(:execute).with(@expected_update_query, @datum)
             @connection.insert_or_update(@unique_keys, @datum)
           end
         end
 
-      end
+        context 'and some columns do not exist' do
+          before do
+            @dummy_db.should_receive(:execute).with(@expected_query, @datum).
+                      and_raise(SQLite3::SQLException.new("table mynewtable has no column named foo") )
+            @expected_update_query = "UPDATE foo_table SET foo=:foo, foo4=:foo4 WHERE foo2=:foo2 AND foo3=:foo3"
+          end
 
-      context 'and SQLite3::SQLException raised' do
-        before do
-          @dummy_db.stub(:execute) # default
-          # raise just once
-          @dummy_db.should_receive(:execute).
-                    and_raise(SQLite3::SQLException )
-        end
+          it 'should create missing fields using all field names and unique keys' do
+            @connection.should_receive(:add_columns).with('foo_table', [:foo,:foo2,:foo3, :foo4])
+            @dummy_db.stub(:execute).with(@expected_update_query, @datum)
 
-        it 'should defer to save_data' do
-          @connection.stub(:create_table)
-          @connection.should_receive(:save_data).with(@unique_keys, @datum, 'foo_table')
+            @connection.insert_or_update(@unique_keys, @datum, 'foo_table')
+          end
 
-          @connection.insert_or_update(@unique_keys, @datum, 'foo_table')
+          it 'should update data' do
+            @connection.stub(:add_columns)
+            @dummy_db.should_receive(:execute).with(@expected_update_query, @datum)
+
+            @connection.insert_or_update(@unique_keys, @datum, 'foo_table')
+          end
         end
+
       end
+
+      # context 'and SQLite3::SQLException raised' do
+      #   before do
+      #     @dummy_db.stub(:execute) # default
+      #     # raise just once
+      #     @dummy_db.should_receive(:execute).
+      #               and_raise(SQLite3::SQLException )
+      #   end
+      #
+      #   it 'should defer to save_data' do
+      #     @connection.stub(:create_table)
+      #     @connection.should_receive(:save_data).with(@unique_keys, @datum, 'foo_table')
+      #
+      #     @connection.insert_or_update(@unique_keys, @datum, 'foo_table')
+      #   end
+      # end
     end
 
     describe '#verbose?' do

metadata

@@ -1,81 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sqlite_magic
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chris Taggart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-03 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Sprinkles some magic onto Sqlite3 gem. Sort of extracted from Scraperwiki gem
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Sprinkles some magic onto Sqlite3 gem. Sort of extracted from Scraperwiki
+  gem
+email:
 - info@opencorporates.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -88,37 +95,32 @@ files:
 - spec/lib/sqlite_magic_spec.rb
 - spec/spec_helper.rb
 - sqlite_magic.gemspec
-has_rdoc: true
 homepage: https://github.com/openc/sqlite_magic
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Sprinkles some magic onto Sqlite3 gem
-test_files: 
+test_files:
 - spec/.DS_Store
 - spec/lib/sqlite_magic_spec.rb
 - spec/spec_helper.rb