baza 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f015976dbd7947d3e767c03acbe2c5d5483c1548
-  data.tar.gz: 2c1d7124db801479e2fcbeb1b48bc2bcc4305654
+  metadata.gz: 42b6791018fcaf0f3e04a3eb8301393bcdaf2f64
+  data.tar.gz: a7508267b64062649af744f47abf319c1a3a2357
 SHA512:
-  metadata.gz: 2f28b9caab9178b57d0dd4576fa07914076a0c9b8305ba8fc853f301cd86473c0769113db5521a5b06a993809b39599ebad34bbed57368724e66d4ad5ce7f92a
-  data.tar.gz: 44fcf2c1583d49a375f6e1afff64b565901efb65c285d1dce8c31b96f8d04a619834182608018c7ff11c387861b81fea77a4d72300a4eeeb6bec2d2abd72d511
+  metadata.gz: 69ffd8e05652c09a35d8bb4a9fabbdfb0a625081114890a5c42db2bd3f285fd2ad8d51faf3bbd142e41371d3711fbc30737927b9030d0807944ec310d88a336f
+  data.tar.gz: 290ee5f1b7ee025af1c72fe1d0ed99dbf0737249f9bbbc7bbfdc2fb7bedf8f123935d53ba5fb746d9ed4a273df29584e2cc6f22163a3770fcf9ae645904fb592

data/Gemfile

@@ -5,26 +5,24 @@ source "http://rubygems.org"
 
 gem "datet", "~> 0.0.25"
 gem "wref", "~> 0.0.8"
-gem "array_enumerator", "~> 0.0.7"
+gem "array_enumerator", "~> 0.0.10"
 gem "string-cases", "~> 0.0.1"
 gem 'event_handler', '~> 0.0.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-group :development do
+group :development, :test do
   gem "rspec"
   gem "rdoc"
   gem "bundler"
   gem "jeweler"
-
-  if RUBY_ENGINE == "jruby"
-    gem "jdbc-sqlite3"
-    gem "activerecord-jdbc-adapter"
-  else
-    gem "sqlite3"
-    gem "mysql2"
-  end
-
+  gem 'pry'
+  gem 'jdbc-sqlite3', platform: :jruby
+  gem 'jdbc-mysql', platform: :jruby
+  gem 'activerecord-jdbc-adapter', platform: :jruby
+  gem 'sqlite3', platform: :ruby
+  gem 'mysql', platform: :ruby
+  gem 'mysql2', platform: :ruby
   gem "activerecord"
 end
 

data/Gemfile.lock

@@ -1,45 +1,51 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activerecord-jdbc-adapter (1.3.17)
+      activerecord (>= 2.2)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    array_enumerator (0.0.7)
+    addressable (2.3.8)
+    arel (6.0.0)
+    array_enumerator (0.0.10)
     builder (3.2.2)
-    codeclimate-test-reporter (0.4.1)
+    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.0)
     datet (0.0.25)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     event_handler (0.0.0)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    git (1.2.8)
-    github_api (0.12.1)
+    ffi (1.9.10-java)
+    git (1.2.9.1)
+    github_api (0.12.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    hashie (3.3.1)
-    highline (1.6.21)
-    i18n (0.6.11)
+    hashie (3.4.2)
+    highline (1.7.2)
+    i18n (0.7.0)
+    jdbc-mysql (5.1.35)
+    jdbc-sqlite3 (3.8.10.1)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -49,49 +55,64 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    json (1.8.1-java)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    multi_json (1.10.1)
+    json (1.8.3)
+    json (1.8.3-java)
+    jwt (1.5.1)
+    method_source (0.8.2)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
+    mysql (2.9.1)
     mysql2 (0.3.18)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    nokogiri (1.6.3.1-java)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-java)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    simplecov (0.9.1)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     sqlite3 (1.3.10)
     string-cases (0.0.1)
-    thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     wref (0.0.8)
@@ -102,13 +123,18 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
-  array_enumerator (~> 0.0.7)
+  activerecord-jdbc-adapter
+  array_enumerator (~> 0.0.10)
   bundler
   codeclimate-test-reporter
   datet (~> 0.0.25)
   event_handler (~> 0.0.0)
+  jdbc-mysql
+  jdbc-sqlite3
   jeweler
+  mysql
   mysql2
+  pry
   rdoc
   rspec
   sqlite3

data/README.md

@@ -176,7 +176,8 @@ puts "Table: #{index.table}"
 
 ## Copying databases
 ```ruby
-db_mysql = Baza::Db.new(type: :mysql, subtype: :mysql2, ...)
+db_mysql = Baza::Db.new(type: :mysql, ...)
+db_mysql2 = Baza::Db.new(type: :mysql2, ...)
 db_sqlite = Baza::Db.new(type: :sqlite3, path: ...)
 
 db_mysql.copy_to(db_sqlite)
@@ -215,7 +216,7 @@ end
 ```
 
 ## Contributing to baza
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.17 ruby lib
+# stub: baza 0.0.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2015-05-31"
+  s.date = "2015-07-16"
   s.description = "A database abstraction layer, model framework and database framework."
   s.email = "kj@gfish.com"
   s.extra_rdoc_files = [
@@ -28,56 +28,94 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "baza.gemspec",
-    "include/cloner.rb",
-    "include/column.rb",
-    "include/db.rb",
-    "include/dbtime.rb",
-    "include/driver.rb",
-    "include/drivers/active_record/active_record.rb",
-    "include/drivers/mysql/mysql.rb",
-    "include/drivers/mysql/mysql_column.rb",
-    "include/drivers/mysql/mysql_columns.rb",
-    "include/drivers/mysql/mysql_index.rb",
-    "include/drivers/mysql/mysql_indexes.rb",
-    "include/drivers/mysql/mysql_result.rb",
-    "include/drivers/mysql/mysql_result_java.rb",
-    "include/drivers/mysql/mysql_result_mysql2.rb",
-    "include/drivers/mysql/mysql_result_unbuffered.rb",
-    "include/drivers/mysql/mysql_sqlspecs.rb",
-    "include/drivers/mysql/mysql_table.rb",
-    "include/drivers/mysql/mysql_tables.rb",
-    "include/drivers/sqlite3/sqlite3.rb",
-    "include/drivers/sqlite3/sqlite3_column.rb",
-    "include/drivers/sqlite3/sqlite3_columns.rb",
-    "include/drivers/sqlite3/sqlite3_index.rb",
-    "include/drivers/sqlite3/sqlite3_indexes.rb",
-    "include/drivers/sqlite3/sqlite3_result.rb",
-    "include/drivers/sqlite3/sqlite3_result_java.rb",
-    "include/drivers/sqlite3/sqlite3_sqlspecs.rb",
-    "include/drivers/sqlite3/sqlite3_table.rb",
-    "include/drivers/sqlite3/sqlite3_tables.rb",
-    "include/dump.rb",
-    "include/errors.rb",
-    "include/idquery.rb",
-    "include/index.rb",
-    "include/model.rb",
-    "include/model_custom.rb",
-    "include/model_handler.rb",
-    "include/model_handler_sqlhelper.rb",
-    "include/query_buffer.rb",
-    "include/revision.rb",
-    "include/row.rb",
-    "include/sqlspecs.rb",
-    "include/table.rb",
     "lib/baza.rb",
+    "lib/baza/base_sql_driver.rb",
+    "lib/baza/cloner.rb",
+    "lib/baza/column.rb",
+    "lib/baza/db.rb",
+    "lib/baza/dbtime.rb",
+    "lib/baza/driver.rb",
+    "lib/baza/drivers/active_record.rb",
+    "lib/baza/drivers/active_record/columns.rb",
+    "lib/baza/drivers/active_record/indexes.rb",
+    "lib/baza/drivers/active_record/result.rb",
+    "lib/baza/drivers/active_record/tables.rb",
+    "lib/baza/drivers/mysql.rb",
+    "lib/baza/drivers/mysql/column.rb",
+    "lib/baza/drivers/mysql/columns.rb",
+    "lib/baza/drivers/mysql/index.rb",
+    "lib/baza/drivers/mysql/indexes.rb",
+    "lib/baza/drivers/mysql/result.rb",
+    "lib/baza/drivers/mysql/sqlspecs.rb",
+    "lib/baza/drivers/mysql/table.rb",
+    "lib/baza/drivers/mysql/tables.rb",
+    "lib/baza/drivers/mysql/unbuffered_result.rb",
+    "lib/baza/drivers/mysql2.rb",
+    "lib/baza/drivers/mysql2/column.rb",
+    "lib/baza/drivers/mysql2/columns.rb",
+    "lib/baza/drivers/mysql2/index.rb",
+    "lib/baza/drivers/mysql2/indexes.rb",
+    "lib/baza/drivers/mysql2/result.rb",
+    "lib/baza/drivers/mysql2/table.rb",
+    "lib/baza/drivers/mysql2/tables.rb",
+    "lib/baza/drivers/mysql_java.rb",
+    "lib/baza/drivers/mysql_java/column.rb",
+    "lib/baza/drivers/mysql_java/columns.rb",
+    "lib/baza/drivers/mysql_java/index.rb",
+    "lib/baza/drivers/mysql_java/indexes.rb",
+    "lib/baza/drivers/mysql_java/table.rb",
+    "lib/baza/drivers/mysql_java/tables.rb",
+    "lib/baza/drivers/sqlite3.rb",
+    "lib/baza/drivers/sqlite3/column.rb",
+    "lib/baza/drivers/sqlite3/columns.rb",
+    "lib/baza/drivers/sqlite3/index.rb",
+    "lib/baza/drivers/sqlite3/indexes.rb",
+    "lib/baza/drivers/sqlite3/result.rb",
+    "lib/baza/drivers/sqlite3/sqlspecs.rb",
+    "lib/baza/drivers/sqlite3/table.rb",
+    "lib/baza/drivers/sqlite3/tables.rb",
+    "lib/baza/drivers/sqlite3/unbuffered_result.rb",
+    "lib/baza/drivers/sqlite3_java.rb",
+    "lib/baza/drivers/sqlite3_java/column.rb",
+    "lib/baza/drivers/sqlite3_java/columns.rb",
+    "lib/baza/drivers/sqlite3_java/index.rb",
+    "lib/baza/drivers/sqlite3_java/indexes.rb",
+    "lib/baza/drivers/sqlite3_java/table.rb",
+    "lib/baza/drivers/sqlite3_java/tables.rb",
+    "lib/baza/drivers/sqlite3_java/unbuffered_result.rb",
+    "lib/baza/drivers/sqlite3_rhodes.rb",
+    "lib/baza/dump.rb",
+    "lib/baza/errors.rb",
+    "lib/baza/idquery.rb",
+    "lib/baza/index.rb",
+    "lib/baza/jdbc_driver.rb",
+    "lib/baza/jdbc_result.rb",
+    "lib/baza/model.rb",
+    "lib/baza/model_custom.rb",
+    "lib/baza/model_handler.rb",
+    "lib/baza/model_handler_sqlhelper.rb",
+    "lib/baza/query_buffer.rb",
+    "lib/baza/result_base.rb",
+    "lib/baza/revision.rb",
+    "lib/baza/row.rb",
+    "lib/baza/sqlspecs.rb",
+    "lib/baza/table.rb",
     "shippable.yml",
-    "spec/include/cloner_spec.rb",
-    "spec/include/drivers/active_record_spec.rb",
-    "spec/include/drivers/mysql_spec.rb",
-    "spec/include/drivers/sqlite3_spec.rb",
-    "spec/info_active_record.rb",
+    "spec/cloner_spec.rb",
+    "spec/drivers/active_record_mysql2_spec.rb",
+    "spec/drivers/active_record_mysql_spec.rb",
+    "spec/drivers/active_record_sqlite3_spec.rb",
+    "spec/drivers/mysql2_spec.rb",
+    "spec/drivers/mysql_spec.rb",
+    "spec/drivers/sqlite3_spec.rb",
     "spec/info_active_record_example.rb",
-    "spec/info_active_record_shippable.rb",
+    "spec/info_active_record_mysql.rb",
+    "spec/info_active_record_mysql2.rb",
+    "spec/info_active_record_mysql2_shippable.rb",
+    "spec/info_active_record_mysql_shippable.rb",
+    "spec/info_active_record_sqlite3.rb",
+    "spec/info_mysql2_example.rb",
+    "spec/info_mysql2_shippable.rb",
     "spec/info_mysql_example.rb",
     "spec/info_mysql_shippable.rb",
     "spec/info_sqlite3.rb",
@@ -90,7 +128,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.0"
   s.summary = "A database abstraction layer, model framework and database framework."
 
   if s.respond_to? :specification_version then
@@ -99,41 +137,56 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<datet>, ["~> 0.0.25"])
       s.add_runtime_dependency(%q<wref>, ["~> 0.0.8"])
-      s.add_runtime_dependency(%q<array_enumerator>, ["~> 0.0.7"])
+      s.add_runtime_dependency(%q<array_enumerator>, ["~> 0.0.10"])
       s.add_runtime_dependency(%q<string-cases>, ["~> 0.0.1"])
       s.add_runtime_dependency(%q<event_handler>, ["~> 0.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<jdbc-sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<jdbc-mysql>, [">= 0"])
+      s.add_development_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<mysql>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
     else
       s.add_dependency(%q<datet>, ["~> 0.0.25"])
       s.add_dependency(%q<wref>, ["~> 0.0.8"])
-      s.add_dependency(%q<array_enumerator>, ["~> 0.0.7"])
+      s.add_dependency(%q<array_enumerator>, ["~> 0.0.10"])
       s.add_dependency(%q<string-cases>, ["~> 0.0.1"])
       s.add_dependency(%q<event_handler>, ["~> 0.0.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
+      s.add_dependency(%q<jdbc-mysql>, [">= 0"])
+      s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<mysql>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
     end
   else
     s.add_dependency(%q<datet>, ["~> 0.0.25"])
     s.add_dependency(%q<wref>, ["~> 0.0.8"])
-    s.add_dependency(%q<array_enumerator>, ["~> 0.0.7"])
+    s.add_dependency(%q<array_enumerator>, ["~> 0.0.10"])
     s.add_dependency(%q<string-cases>, ["~> 0.0.1"])
     s.add_dependency(%q<event_handler>, ["~> 0.0.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
+    s.add_dependency(%q<jdbc-mysql>, [">= 0"])
+    s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<mysql>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
   end