baza 0.0.19 → 0.0.20

data/config/best_project_practice_rubocop_todo.yml

@@ -0,0 +1,157 @@
+
+
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-12-20 21:21:20 +0100 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 43
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Enabled: false
+
+# Offense count: 1
+Lint/ConditionPosition:
+  Exclude:
+    - 'lib/baza/model_handler.rb'
+
+# Offense count: 2
+Lint/HandleExceptions:
+  Exclude:
+    - 'spec/model_handler_spec.rb'
+
+# Offense count: 1
+Lint/NonLocalExitFromIterator:
+  Exclude:
+    - 'lib/baza/drivers/sqlite3/column.rb'
+
+# Offense count: 8
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'lib/baza/drivers/mysql/table.rb'
+    - 'lib/baza/drivers/sqlite3/table.rb'
+    - 'lib/baza/model_handler.rb'
+    - 'lib/baza/model_handler_sqlhelper.rb'
+    - 'lib/baza/revision.rb'
+    - 'spec/model_handler_spec.rb'
+
+# Offense count: 1
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/baza/model.rb'
+
+# Offense count: 34
+Lint/UselessAssignment:
+  Enabled: false
+
+# Offense count: 51
+Metrics/AbcSize:
+  Max: 558
+
+# Offense count: 22
+Metrics/BlockNesting:
+  Max: 6
+
+# Offense count: 7
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 684
+
+# Offense count: 67
+Metrics/CyclomaticComplexity:
+  Max: 128
+
+# Offense count: 31
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 311
+
+# Offense count: 8
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 382
+
+# Offense count: 66
+Metrics/PerceivedComplexity:
+  Max: 160
+
+# Offense count: 1
+Style/AccessorMethodName:
+  Exclude:
+    - 'lib/baza/db.rb'
+
+# Offense count: 1
+Style/AsciiComments:
+  Exclude:
+    - 'lib/baza/db.rb'
+
+# Offense count: 1
+Style/CaseEquality:
+  Exclude:
+    - 'lib/baza/drivers/mysql/result.rb'
+
+# Offense count: 3
+Style/ClassVars:
+  Exclude:
+    - 'lib/baza/model.rb'
+    - 'lib/baza/model_custom.rb'
+
+# Offense count: 1
+Style/EndOfLine:
+  Exclude:
+    - 'lib/baza/drivers/mysql.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/FormatString:
+  Exclude:
+    - 'lib/baza/row.rb'
+
+# Offense count: 11
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'lib/baza/db.rb'
+    - 'lib/baza/model_custom.rb'
+    - 'lib/baza/row.rb'
+
+# Offense count: 16
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/baza/db.rb'
+    - 'lib/baza/drivers/mysql/result.rb'
+    - 'lib/baza/drivers/sqlite3/result.rb'
+    - 'lib/baza/drivers/sqlite3_java/unbuffered_result.rb'
+    - 'lib/baza/idquery.rb'
+    - 'lib/baza/model.rb'
+    - 'lib/baza/model_handler.rb'
+    - 'lib/baza/query_buffer.rb'
+    - 'lib/baza/row.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MethodName:
+  Enabled: false
+
+# Offense count: 9
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+Style/PredicateName:
+  Exclude:
+    - 'lib/baza/model.rb'
+    - 'lib/baza/model_custom.rb'
+    - 'lib/baza/row.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/RaiseArgs:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+Style/WordArray:
+  MinSize: 2

data/lib/baza/base_sql_driver.rb

@@ -2,7 +2,7 @@ class Baza::BaseSqlDriver
   attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val
   attr_accessor :tables, :cols, :indexes
 
-  def self.from_object(args)
+  def self.from_object(_args)
   end
 
   def initialize(baza)
@@ -14,40 +14,95 @@ class Baza::BaseSqlDriver
   end
 
   def escape(string)
-    return string.to_s.gsub(/([\0\n\r\032\'\"\\])/) do
-      case $1
-        when "\0" then "\\0"
-        when "\n" then "\\n"
-        when "\r" then "\\r"
-        when "\032" then "\\Z"
-        else "\\#{$1}"
+    string.to_s.gsub(/([\0\n\r\032\'\"\\])/) do
+      case Regexp.last_match(1)
+      when "\0" then "\\0"
+      when "\n" then "\\n"
+      when "\r" then "\\r"
+      when "\032" then "\\Z"
+      else "\\#{Regexp.last_match(1)}"
       end
     end
   end
 
-  alias esc escape
-  alias escape_alternative escape
+  alias_method :esc, :escape
+  alias_method :escape_alternative, :escape
 
-  #Escapes a string to be used as a column.
-  def esc_col(string)
+  # Escapes a string to be used as a column.
+  def escape_column(string)
     string = string.to_s
-    raise "Invalid column-string: #{string}" if string.index(@sep_col) != nil
-    return string
+    raise "Invalid column-string: #{string}" unless string.index(@sep_col).nil?
+    string
   end
-
-  alias esc_table esc_col
+  alias escape_table escape_column
+  alias escape_database escape_column
 
   def transaction
-    query("BEGIN TRANSACTION")
+    @baza.q("BEGIN TRANSACTION")
 
     begin
       yield @baza
-      query("COMMIT")
+      @baza.q("COMMIT")
     rescue => e
-      query("ROLLBACK")
+      @baza.q("ROLLBACK")
     end
   end
 
+  # Simply inserts data into a table.
+  #
+  #===Examples
+  # db.insert(:users, name: "John", lastname: "Doe")
+  # id = db.insert(:users, {name: "John", lastname: "Doe"}, return_id: true)
+  # sql = db.insert(:users, {name: "John", lastname: "Doe"}, return_sql: true) #=> "INSERT INTO `users` (`name`, `lastname`) VALUES ('John', 'Doe')"
+  def insert(tablename, arr_insert, args = nil)
+    sql = "INSERT INTO #{@sep_table}#{escape_table(tablename)}#{@sep_table}"
+
+    if !arr_insert || arr_insert.empty?
+      # This is the correct syntax for inserting a blank row in MySQL.
+      if @baza.opts.fetch(:type).to_s.include?("mysql")
+        sql << " VALUES ()"
+      elsif @baza.opts.fetch(:type).to_s.include?("sqlite3")
+        sql << " DEFAULT VALUES"
+      else
+        raise "Unknown database-type: '#{@baza.opts.fetch(:type)}'."
+      end
+    else
+      sql << " ("
+
+      first = true
+      arr_insert.each_key do |key|
+        if first
+          first = false
+        else
+          sql << ", "
+        end
+
+        sql << "#{@baza.sep_col}#{@baza.escape_column(key)}#{@baza.sep_col}"
+      end
+
+      sql << ") VALUES ("
+
+      first = true
+      arr_insert.each_value do |value|
+        if first
+          first = false
+        else
+          sql << ", "
+        end
+
+        sql << @baza.sqlval(value)
+      end
+
+      sql << ")"
+    end
+
+    return sql if args && args[:return_sql]
+
+    @baza.query(sql)
+    return @baza.last_id if args && args[:return_id]
+    nil
+  end
+
   def insert_multi(tablename, arr_hashes, args = nil)
     sql = [] if args && args[:return_sql]
 
@@ -59,6 +114,10 @@ class Baza::BaseSqlDriver
     end
 
     return sql if args && args[:return_sql]
-    return nil
+    nil
+  end
+
+  def supports_multiple_databases?
+    false
   end
 end

data/lib/baza/cloner.rb

@@ -1,6 +1,6 @@
 class Baza::Cloner
   def self.from_active_record_connection(connection)
-    if connection.class.name.include?('Mysql2Adapter')
+    if connection.class.name.include?("Mysql2Adapter")
       connection = connection.instance_variable_get(:@connection)
 
       config = connection.instance_variable_get(:@query_options)
@@ -15,7 +15,7 @@ class Baza::Cloner
       }
 
       Baza::Db.new(db_args)
-    elsif connection.class.name.include?('MysqlAdapter')
+    elsif connection.class.name.include?("MysqlAdapter")
       connection = connection.instance_variable_get(:@connection)
 
       db_args = {

data/lib/baza/column.rb

@@ -1,4 +1,6 @@
 class Baza::Column
+  include Baza::DatabaseModelFunctionality
+
   def to_s
     "#<#{self.class.name} name=\"#{name}\" type=\"#{type}\" maxlength=\"#{maxlength}\" autoincr=\"#{autoincr?}\" primarykey=\"#{primarykey?}\">"
   end
@@ -6,4 +8,8 @@ class Baza::Column
   def inspect
     to_s
   end
+
+  def to_param
+    name
+  end
 end

data/lib/baza/database.rb

@@ -0,0 +1,33 @@
+class Baza::Database
+  include Baza::DatabaseModelFunctionality
+
+  attr_reader :db, :driver, :name_was
+  attr_accessor :name
+
+  def initialize(args)
+    @db = args.fetch(:db)
+    @driver = args.fetch(:driver)
+    @name = args.fetch(:name)
+    @name_was = @name
+  end
+
+  def tables
+    ArrayEnumerator.new do |yielder|
+      @db.tables.list(database: name) do |table|
+        yielder << table
+      end
+    end
+  end
+
+  def table(name)
+    @db.tables[name]
+  end
+
+  def save!
+    raise Baza::Errors::NotImplemented
+  end
+
+  def to_param
+    name
+  end
+end

data/lib/baza/database_model.rb

@@ -0,0 +1,26 @@
+# Used for link-methods in Rails apps
+class Baza::DatabaseModel
+  def initialize(instance)
+    @instance = instance
+  end
+
+  def model_name
+    Baza::DatabaseModelName.new(@instance)
+  end
+
+  def persisted?
+    true
+  end
+
+  def to_param
+    if @instance.respond_to?(:to_param)
+      @instance.try(:to_param)
+    else
+      @instance.name
+    end
+  end
+
+  def id
+    @instance.name
+  end
+end

data/lib/baza/database_model_functionality.rb

@@ -0,0 +1,10 @@
+# Used for link-methods in Rails apps
+module Baza::DatabaseModelFunctionality
+  def to_model
+    Baza::DatabaseModel.new(self)
+  end
+
+  def model_name
+    to_model.model_name
+  end
+end

data/lib/baza/database_model_name.rb

@@ -0,0 +1,16 @@
+# Used for link-methods in Rails apps
+class Baza::DatabaseModelName
+  def initialize(instance)
+    @instance = instance
+  end
+
+  def singular_route_key
+    route_key = human.underscore
+    route_key = "indexes" if route_key == "indices"
+    route_key
+  end
+
+  def human
+    @instance.class.name.split("::").last
+  end
+end