baza 0.0.19 → 0.0.20

data/lib/baza/row.rb

@@ -1,23 +1,26 @@
 class Baza::Row
+  include Baza::DatabaseModelFunctionality
+
   attr_reader :args, :data
-  
-  def is_knj?; return true; end
-  
+
+  def knj?
+    true
+  end
+
   def initialize(args)
     @args = {}
     args.each do |key, value|
       @args[key.to_sym] = value
     end
-    
-    @args[:db] = $db if !@args[:db] and $db and $db.class.to_s == "Baza::Db"
-    @args[:objects] = $objects if !@args[:objects] and $objects and $objects.is_a?(Baza::ModelHandler)
-    @args[:col_id] = :id if !@args[:col_id]
-    raise "No table given." if !@args[:table]
-    
-    if @args[:data] and (@args[:data].is_a?(Integer) or @args[:data].is_a?(Fixnum) or @args[:data].is_a?(String))
+
+    @args[:objects] = $objects if !@args[:objects] && $objects && $objects.is_a?(Baza::ModelHandler)
+    @args[:col_id] ||= :id
+    raise "No table given." unless @args[:table]
+
+    if @args[:data] && (@args[:data].is_a?(Integer) || @args[:data].is_a?(Fixnum) || @args[:data].is_a?(String))
       @data = {@args[:col_id].to_sym => @args[:data].to_s}
-      self.reload
-    elsif @args[:data] and @args[:data].is_a?(Hash)
+      reload
+    elsif @args[:data] && @args[:data].is_a?(Hash)
       @data = {}
       @args[:data].each do |key, value|
         @data[key.to_sym] = value
@@ -25,71 +28,61 @@ class Baza::Row
     elsif @args[:id]
       @data = {}
       @data[@args[:col_id].to_sym] = @args[:id]
-      self.reload
+      reload
     else
-      raise ArgumentError.new("Invalid data: #{@args[:data].to_s} (#{@args[:data].class.to_s})")
+      raise ArgumentError.new("Invalid data: #{@args[:data]} (#{@args[:data].class})")
     end
   end
-  
+
   def db
-    if !@args[:force_selfdb]
-      curthread = Thread.current
-      if curthread.is_a?(Knj::Thread) and curthread[:knjappserver] and curthread[:knjappserver][:db]
-        return curthread[:knjappserver][:db]
-      end
-    end
-    
-    return @args[:db]
+    @args.fetch(:db)
   end
-  
+
   def ob
     return @args[:objects] if @args.key?(:objects)
-    return $ob if $ob and $ob.is_a?(Baza::ModelHandler)
-    return false
+    false
   end
-  
-  alias :objects :ob
-  
+
+  alias_method :objects, :ob
+
   def reload
-    last_id = self.id
-    data = self.db.single(@args[:table], {@args[:col_id] => self.id})
-    if !data
-      raise Errno::ENOENT.new("Could not find any data for the object with ID: '#{last_id}' in the table '#{@args[:table].to_s}'.")
+    last_id = id
+    data = db.single(@args[:table], @args[:col_id] => id)
+    unless data
+      raise Errno::ENOENT, "Could not find any data for the object with ID: '#{last_id}' in the table '#{@args[:table]}'."
     end
-    
+
     @data = {}
     data.each do |key, value|
       @data[key.to_sym] = value
     end
   end
-  
+
   def update(newdata)
-    self.db.update(@args[:table], newdata, {@args[:col_id] => self.id})
-    self.reload
-    
-    if self.ob
-      self.ob.call("object" => self, "signal" => "update")
-    end
+    db.update(@args[:table], newdata, @args[:col_id] => id)
+    reload
+
+    ob.call("object" => self, "signal" => "update") if ob
   end
-  
+
   def delete
-    self.db.delete(@args[:table], {@args[:col_id] => self.id})
-    self.destroy
+    db.delete(@args[:table], @args[:col_id] => id)
+    destroy
   end
-  
+
   def destroy
     @args = nil
     @data = nil
   end
-  
-  def has_key?(key)
-    return @data.key?(key.to_sym)
+
+  def key?(key)
+    @data.key?(key.to_sym)
   end
-  
+
   def [](key)
-    raise "No valid key given." if !key
-    raise "No data was loaded on the object? Maybe you are trying to call a deleted object?" if !@data
-    
+    raise "No valid key given." unless key
+    raise "No data was loaded on the object? Maybe you are trying to call a deleted object?" unless @data
+
     if @data.key?(key)
       return @data[key]
     elsif @data.key?(key.to_sym)
@@ -97,57 +90,62 @@ class Baza::Row
     elsif @data.key?(key.to_s)
       return @data[key.to_s]
     end
-    
-    raise "No such key: #{key.to_s}."
+
+    raise "No such key: #{key}."
   end
-  
+
   def []=(key, value)
-    self.update(key.to_sym => value)
-    self.reload
+    update(key.to_sym => value)
+    reload
   end
-  
+
   def id
-    return @data[@args[:col_id]]
+    @data[@args[:col_id]]
   end
-  
+
+  def to_param
+    id
+  end
+
   def title
-    if @args[:col_title]
-      return @data[@args[:col_title].to_sym]
-    end
-    
+    return @data[@args[:col_title].to_sym] if @args[:col_title]
+
     if @data.key?(:title)
       return @data[:title]
     elsif @data.key?(:name)
       return @data[:name]
     end
-    
-    raise "'col_title' has not been set for the class: '#{self.class.to_s}'."
+
+    raise "'col_title' has not been set for the class: '#{self.class}'."
+  end
+
+  alias_method :name, :title
+
+  def each(*args, &blk)
+    @data.each(*args, &blk)
   end
-  
-  alias :name :title
-  
-  def each(&args)
-    return @data.each(&args)
+
+  def each_value(*args, &blk)
+    @data.each_value(*args, &blk)
   end
-  
+
   def to_hash
-    return @data.clone
+    @data.clone
   end
-  
+
   def esc(str)
-    return self.db.escape(str)
+    db.escape(str)
   end
-  
-  def method_missing(*args)
-    func_name = args[0].to_s
-    if match = func_name.match(/^(\S+)\?$/) and @data.key?(match[1].to_sym)
-      if @data[match[1].to_sym] == "1" or @data[match[1].to_sym] == "yes"
+
+  def method_missing(func_name, *args)
+    if match = func_name.to_s.match(/^(\S+)\?$/) && @data.key?(match[1].to_sym)
+      if @data[match[1].to_sym] == "1" || @data[match[1].to_sym] == "yes"
         return true
-      elsif @data[match[1].to_sym] == "0" or @data[match[1].to_sym] == "no"
+      elsif @data[match[1].to_sym] == "0" || @data[match[1].to_sym] == "no"
         return false
       end
     end
-    
-    raise sprintf("No such method: %s", func_name)
+
+    super
   end
-end
+end

data/lib/baza/sqlspecs.rb

@@ -2,4 +2,4 @@ class Baza::Sqlspecs
   def initialize(args)
     @args = args
   end
-end
+end

data/lib/baza/table.rb

@@ -1,4 +1,8 @@
 class Baza::Table
+  include Baza::DatabaseModelFunctionality
+
+  attr_reader :db
+
   def to_s
     "#<#{self.class.name} name=\"#{name}\">"
   end
@@ -6,4 +10,31 @@ class Baza::Table
   def inspect
     to_s
   end
+
+  def rows(*args)
+    ArrayEnumerator.new do |yielder|
+      db.select(name, *args) do |data|
+        yielder << Baza::Row.new(
+          db: db,
+          table: name,
+          data: data
+        )
+      end
+    end
+  end
+
+  def row(id)
+    data = rows({id: id}, limit: 1).fetch
+    raise Baza::Errors::RowNotFound unless data
+
+    Baza::Row.new(
+      db: db,
+      table: name,
+      data: data
+    )
+  end
+
+  def to_param
+    name
+  end
 end

data/lib/baza.rb

@@ -1,31 +1,64 @@
-require 'wref'
-require 'datet'
-require 'string-cases'
+require "array_enumerator"
+require "wref"
+require "datet"
+require "string-cases"
 
 class Baza
-  #Autoloader for subclasses.
+  # Autoloader for subclasses.
   def self.const_missing(name)
-    file_name = name.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase
+    file_name = name.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase
     require "#{File.dirname(__FILE__)}/baza/#{file_name}.rb"
     raise "Still not defined: '#{name}'." unless Baza.const_defined?(name)
-    return Baza.const_get(name)
+    Baza.const_get(name)
   end
 
-  def self.default_db=(db)
-    @default_db = db
+  class << self
+    attr_writer :default_db
   end
 
   def self.default_db
     unless @default_db
       config_file = "#{Dir.pwd}/config/baza_database.rb"
+      init_file = "#{Dir.pwd}/config/initializers/baza_database.rb"
 
-      load(config_file)
+      begin
+        load(config_file)
+      rescue LoadError
+        load(init_file)
+      end
 
       unless @default_db.is_a?(Baza::Db)
         raise "Config file didn't return a Baza::Db: #{@default_db.class.name}"
       end
     end
 
-    return @default_db
+    @default_db
+  end
+
+  def self.drivers
+    Enumerator.new do |yielder|
+      Dir.foreach("#{File.dirname(__FILE__)}/baza/drivers") do |file|
+        if (match = file.match(/\A(.+?)\.rb\Z/))
+          load_driver(match[1])
+
+          driver_name = StringCases.snake_to_camel(match[1])
+          yielder << {
+            class: Baza::Driver.const_get(driver_name),
+            snake_name: match[1],
+            camel_name: driver_name
+          }
+        end
+      end
+    end
+  end
+
+  def self.load_driver(name)
+    require_relative "baza/drivers/#{name}"
+
+    loads = %w(databases database tables table columns column indexes index result)
+    loads.each do |load|
+      file_path = "#{File.dirname(__FILE__)}/baza/drivers/#{name}/#{load}"
+      require_relative file_path if File.exist?(file_path)
+    end
   end
 end

data/shippable.yml

@@ -12,5 +12,6 @@ before_script:
   - mysql -e 'CREATE DATABASE baza;'
 script:
   - CODECLIMATE_REPO_TOKEN=98c06de7271764c9cd7bbde7cee4ddfa0d3e7db4bd9933f17779100276672e5f bundle exec rspec
+  - bundle exec rake best_practice_project:run
 notifications:
    email: false

data/spec/cloner_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Baza::Cloner do
-  it 'can clone drivers' do
-    require 'info_active_record_mysql'
+  it "can clone drivers" do
+    require "info_active_record_mysql"
     conn = Baza::InfoActiveRecordMysql.connection
     baza_db = Baza::Cloner.from_active_record_connection(conn[:conn])
-    expect(baza_db.query('SELECT 1 AS test').fetch[:test].to_s).to eq '1'
+    expect(baza_db.query("SELECT 1 AS test").fetch[:test].to_s).to eq "1"
   end
 end

data/spec/drivers/active_record_mysql2_spec.rb

@@ -1,14 +1,14 @@
 require "spec_helper"
 
-unless RUBY_PLATFORM == 'java'
+unless RUBY_PLATFORM == "java"
   describe Baza::Driver::ActiveRecord do
-    let(:constant) {
+    let(:constant) do
       name = described_class.name.split("::").last
       const_name = "InfoActiveRecordMysql2"
       require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
       raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
       Baza.const_get(const_name)
-    }
+    end
 
     it_behaves_like "a baza driver"
     it_should_behave_like "a baza tables driver"

data/spec/drivers/active_record_mysql_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
 describe Baza::Driver::ActiveRecord do
-  let(:constant) {
+  let(:constant) do
     name = described_class.name.split("::").last
     const_name = "InfoActiveRecordMysql"
     require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
     raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
     Baza.const_get(const_name)
-  }
+  end
 
   it_behaves_like "a baza driver"
   it_should_behave_like "a baza tables driver"

data/spec/drivers/active_record_sqlite3_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
 describe Baza::Driver::ActiveRecord do
-  let(:constant) {
+  let(:constant) do
     name = described_class.name.split("::").last
     const_name = "InfoActiveRecordSqlite3"
     require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
     raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
     Baza.const_get(const_name)
-  }
+  end
 
   it_behaves_like "a baza driver"
   it_should_behave_like "a baza tables driver"

data/spec/drivers/mysql2_spec.rb

@@ -10,6 +10,7 @@ describe Baza::Driver::Mysql2 do
   end
 
   it_should_behave_like "a baza driver"
+  it_should_behave_like "a baza databases driver"
   it_should_behave_like "a baza tables driver"
   it_should_behave_like "a baza columns driver"
   it_should_behave_like "a baza indexes driver"

data/spec/drivers/mysql_spec.rb

@@ -10,6 +10,7 @@ describe Baza.const_get(:Driver).const_get(:Mysql) do
   end
 
   it_should_behave_like "a baza driver"
+  it_should_behave_like "a baza databases driver"
   it_should_behave_like "a baza tables driver"
   it_should_behave_like "a baza columns driver"
   it_should_behave_like "a baza indexes driver"

data/spec/drivers/sqlite3_spec.rb

@@ -19,7 +19,8 @@ describe Baza::Driver::Sqlite3 do
     db = Baza::InfoSqlite3.new.db
     db2 = Baza::InfoSqlite3.new.db
 
-    db.tables.create(:test_table, {
+    db.tables.create(
+      :test_table,
       columns: [
         {name: "id", type: :int, autoincr: true, primarykey: true},
         {name: "testname", type: :varchar, null: true}
@@ -27,7 +28,7 @@ describe Baza::Driver::Sqlite3 do
       indexes: [
         "testname"
       ]
-    })
+    )
 
     table1 = db.tables["test_table"]
     cols1 = table1.columns
@@ -36,9 +37,7 @@ describe Baza::Driver::Sqlite3 do
       table1.insert(testname: "TestRow#{count}")
     end
 
-    expect {
-      table2 = db2.tables[:test_table]
-    }.to raise_error(Errno::ENOENT)
+    expect { table2 = db2.tables[:test_table] }.to raise_error(Baza::Errors::TableNotFound)
 
     db.copy_to(db2)
 

data/spec/info_active_record_example.rb

@@ -13,22 +13,20 @@ class Baza::InfoActiveRecord
     )
     @conn ||= @conn_pool.connection
 
-    return {pool: @conn_pool, conn: @conn}
+    {pool: @conn_pool, conn: @conn}
   end
 
   def initialize
     data = Baza::InfoActiveRecord.connection
 
-    @db = Baza::Db.new(
+    @db = Baza::Db.new({
       type: :active_record,
       conn: data[:conn]
-    )
+    }.merge(args))
   end
 
   def before
-    @db.tables.list.each do |name, table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_active_record_mysql.rb

@@ -4,31 +4,30 @@ class Baza::InfoActiveRecordMysql
   def self.connection
     require "active_record"
 
-    conn_pool = ::ActiveRecord::Base.establish_connection(
+    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
       adapter: "mysql",
       host: "localhost",
       database: "baza-test",
       username: "baza-test",
       password: "BBH7djRUKzL5nmG3"
     )
-    conn = conn_pool.connection
+    @conn ||= @conn_pool.connection
 
-    return {pool: conn_pool, conn: conn}
+    {pool: @conn_pool, conn: @conn}
   end
 
   def initialize(args = {})
     @data = Baza::InfoActiveRecordMysql.connection
+    @data.fetch(:conn).reconnect!
 
     @db = Baza::Db.new({
       type: :active_record,
-      conn: @data[:conn]
+      conn: @data.fetch(:conn)
     }.merge(args))
   end
 
   def before
-    @db.tables.list.each do |name, table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_active_record_mysql2.rb

@@ -13,7 +13,7 @@ class Baza::InfoActiveRecordMysql2
     )
     @conn ||= @conn_pool.connection
 
-    return {pool: @conn_pool, conn: @conn}
+    {pool: @conn_pool, conn: @conn}
   end
 
   def initialize(args = {})
@@ -26,9 +26,7 @@ class Baza::InfoActiveRecordMysql2
   end
 
   def before
-    @db.tables.list.each do |name, table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_active_record_mysql2_shippable.rb

@@ -12,7 +12,7 @@ class Baza::InfoActiveRecordMysql2
     )
     conn = conn_pool.connection
 
-    return {pool: conn_pool, conn: conn}
+    {pool: conn_pool, conn: conn}
   end
 
   def initialize
@@ -25,9 +25,7 @@ class Baza::InfoActiveRecordMysql2
   end
 
   def before
-    @db.tables.list.each do |name, table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_active_record_mysql_shippable.rb

@@ -12,7 +12,7 @@ class Baza::InfoActiveRecordMysql
     )
     conn = conn_pool.connection
 
-    return {pool: conn_pool, conn: conn}
+    {pool: conn_pool, conn: conn}
   end
 
   def initialize
@@ -25,9 +25,7 @@ class Baza::InfoActiveRecordMysql
   end
 
   def before
-    @db.tables.list.each do |name, table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_active_record_sqlite3.rb

@@ -5,7 +5,7 @@ class Baza::InfoActiveRecordSqlite3
     require "active_record"
 
     path = "#{Dir.tmpdir}/baza_sqlite3_test_#{Time.now.to_f.to_s.hash}_#{Random.rand}.sqlite3"
-    File.unlink(path) if File.exists?(path)
+    File.unlink(path) if File.exist?(path)
 
     @conn_pool ||= ::ActiveRecord::Base.establish_connection(
       adapter: "sqlite3",
@@ -13,7 +13,7 @@ class Baza::InfoActiveRecordSqlite3
     )
     @conn ||= @conn_pool.connection
 
-    return {pool: @conn_pool, conn: @conn}
+    {pool: @conn_pool, conn: @conn}
   end
 
   def initialize(args = {})
@@ -21,14 +21,13 @@ class Baza::InfoActiveRecordSqlite3
 
     @db = Baza::Db.new({
       type: :active_record,
-      conn: data[:conn]
+      conn: data[:conn],
+      index_append_table_name: true
     }.merge(args))
   end
 
   def before
-    @db.tables.list.each do |name, table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_mysql2_example.rb

@@ -12,7 +12,7 @@ class Baza::InfoMysql
   end
 
   def before
-    @db.tables.list.each do |name, table|
+    @db.tables.list do |table|
       table.drop
     end
   end

data/spec/info_mysql2_shippable.rb

@@ -11,7 +11,7 @@ class Baza::InfoMysql2
   end
 
   def before
-    @db.tables.list.each do |name, table|
+    @db.tables.list do |table|
       table.drop
     end
   end

data/spec/info_mysql_example.rb

@@ -12,7 +12,7 @@ class Baza::InfoMysql
   end
 
   def before
-    @db.tables.list.each do |name, table|
+    @db.tables.list do |table|
       table.drop
     end
   end