db2_query 0.1.0 → 0.3.0

data/lib/db2_query/result.rb

@@ -1,95 +1,77 @@
 # frozen_string_literal: true
 
 module Db2Query
-  class Result
-    attr_reader :core, :klass, :rows, :columns, :column_metadatas, :attr_format
+  class Result < ActiveRecord::Result
+    attr_reader :formatters
 
-    def initialize(core, klass, columns, rows, attr_format = {})
-      @core = core
-      @klass = klass.to_s.camelize
-      @rows  = rows
-      @attr_format = attr_format
-      @columns = []
-      @column_metadatas = extract_metadatas(columns)
+    def initialize(columns, rows, formatters = {}, column_types = {})
+      @formatters = formatters
+      super(columns, rows, column_types)
     end
 
-    def to_a
-      core.const_set(klass, row_class) unless core.const_defined?(klass)
-
-      rows.map do |row|
-        (core.const_get klass).new(row, column_metadatas)
-      end
+    def includes_column?(name)
+      @columns.include? name
     end
 
-    def to_hash
-      rows.map do |row|
-        Hash[columns.zip(row)]
-      end
+    def record
+      @record ||= Record.new(rows[0], columns, formatters)
     end
 
-    def pluck(*column_names)
-      records.map do |record|
-        column_names.map { |column_name| record.send(column_name) }
+    def records
+      @records ||= rows.map do |row|
+        Record.new(row, columns, formatters)
       end
     end
 
-    def first
-      records.first
-    end
-
-    def last
-      records.last
-    end
-
-    def size
-      records.size
-    end
-    alias length size
-
-    def each(&block)
-      records.each(&block)
+    def to_h
+      rows.map do |row|
+        columns.zip(row).each_with_object({}) { |cr, h| h[cr[0].to_sym] = cr[1] }
+      end
     end
 
     def inspect
       entries = records.take(11).map!(&:inspect)
+
       entries[10] = "..." if entries.size == 11
-      "#<#{self.class} [#{entries.join(', ')}]>"
+
+      "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
-    private
-      def records
-        @records ||= to_a
-      end
+    class Record
+      attr_reader :formatters
 
-      def extract_metadatas(columns)
-        columns.map do |col|
-          @columns << column_name = col.name.downcase
-          Column.new(column_name, col.type, attr_format[column_name.to_sym])
+      def initialize(row, columns, formatters)
+        @formatters = formatters
+        columns.zip(row) do |col, val|
+          column, value = format(col, val)
+          singleton_class.class_eval { attr_accessor "#{column}" }
+          send("#{column}=", value)
         end
       end
 
-      def row_class
-        Class.new do
-          def initialize(row, columns_metadata)
-            columns_metadata.zip(row) do |column, val|
-              self.class.send(:attr_accessor, column.name.to_sym)
-              instance_variable_set("@#{column.name}", column.format(val))
-            end
-          end
+      def inspect
+        inspection = if defined?(instance_variables) && instance_variables
+          instance_variables.reject { |var| var == :@formatters }.map do |attr|
+            value = instance_variable_get(attr)
+            "#{attr[1..-1]}: #{(value.kind_of? String) ? %Q{"#{value}"} : value}"
+          end.compact.join(", ")
+        else
+          "not initialized"
+        end
 
-          def inspect
-            inspection = if defined?(instance_variables) && instance_variables
-              instance_variables.collect do |attr|
-                value = instance_variable_get(attr)
-                "#{attr[1..-1]}: #{(value.kind_of? String) ? %Q{"#{value}"} : value}"
-              end.compact.join(", ")
-            else
-              "not initialized"
-            end
+        "#<Record #{inspection}>"
+      end
 
-            "#<#{self.class} #{inspection}>"
+      private
+        def format(col, val)
+          column = col.downcase
+          format_name = formatters[column.to_sym]
+          unless format_name.nil?
+            formatter = Db2Query::Formatter.lookup(format_name)
+            val = formatter.format(val)
           end
+          [column, val]
         end
-      end
+    end
   end
 end

data/lib/db2_query/tasks/database.rake

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "db2_query"
+
+DB2_QUERY_DATABASE_TEMPLATE ||= <<-EOF
+# frozen_string_literal: true
+
+development:
+  dsn: TODO
+  pool: 5
+  timeout: 5
+
+test:
+  dsn: TODO
+  pool: 5
+  timeout: 5
+
+production:
+  dsn: TODO
+  pool: 5
+  timeout: 5
+EOF
+
+namespace :db2query do
+  desc "Create Database configuration file"
+  task :database do
+    database_path = "#{Rails.root}/config/db2query.yml"
+    if File.exist?(database_path)
+      raise Db2Query::Error, "Db2Query database config file exists, please check first"
+    else
+      puts "  Creating database config file ..."
+      File.open(database_path, "w") do |file|
+        file.puts DB2_QUERY_DATABASE_TEMPLATE
+      end
+      puts "  File '#{database_path}' created."
+    end
+  end
+end

data/lib/{tasks → db2_query/tasks}/initializer.rake

@@ -1,14 +1,20 @@
 # frozen_string_literal: true
 
+require "db2_query"
+
 DB2_QUERY_INITIALIZER_TEMPLATE ||= <<-EOF
 # frozen_string_literal: true
-
-# Example
+require "db2_query"
 require "db2_query/formatter"
 
+Db2Query::Base.initiation do |base|
+  base.establish_connection
+end
+
+# Example
 class FirstNameFormatter < Db2Query::AbstractFormatter
   def format(value)
-    "First Name: " + value
+    "Dr." + value
   end
 end
 
@@ -23,7 +29,7 @@ namespace :db2query do
     # Create initializer file
     initializer_path = "#{Rails.root}/config/initializers/db2query.rb"
     if File.exist?(initializer_path)
-      raise ArgumentError, "File exists."
+      raise Db2Query::Error, "Db2Query initializer file exists, please check first"
     else
       puts "  Creating initializer file ..."
       File.open(initializer_path, "w") do |file|

data/lib/db2_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Db2Query
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,51 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: db2_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yohanes_l
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
-- !ruby/object:Gem::Dependency
-  name: ruby-odbc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.99999'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.99999'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,50 +81,62 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.3.2
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.2.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: ruby-odbc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails query plugin to fetch data from Db2 database by using ODBC connection.
+description: A Rails Db2 ODBC adapter
 email:
-- yohanes.lumentut@yahoo.com
+- yohanes.lumentut@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -154,29 +146,25 @@ files:
 - Rakefile
 - lib/db2_query.rb
 - lib/db2_query/base.rb
-- lib/db2_query/column.rb
+- lib/db2_query/config.rb
 - lib/db2_query/connection.rb
-- lib/db2_query/connection_handling.rb
-- lib/db2_query/database_configurations.rb
-- lib/db2_query/database_statements.rb
+- lib/db2_query/core.rb
 - lib/db2_query/error.rb
 - lib/db2_query/formatter.rb
-- lib/db2_query/log_subscriber.rb
-- lib/db2_query/odbc_connector.rb
-- lib/db2_query/path.rb
+- lib/db2_query/logger.rb
 - lib/db2_query/railtie.rb
 - lib/db2_query/result.rb
-- lib/db2_query/schema.rb
-- lib/db2_query/sql_validator.rb
+- lib/db2_query/tasks/database.rake
+- lib/db2_query/tasks/init.rake
+- lib/db2_query/tasks/initializer.rake
 - lib/db2_query/version.rb
-- lib/tasks/database.rake
-- lib/tasks/init.rake
-- lib/tasks/initializer.rake
-homepage: https://github.com/yohaneslumentut/db2_query
+homepage: https://github.com/yohaneslumentut
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/yohaneslumentut
+  source_code_uri: https://github.com/yohaneslumentut/db2_query
+  changelog_uri: https://github.com/yohaneslumentut/db2_query
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -192,8 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Db2Query
+summary: Db2 ODBC adapter
 test_files: []

data/lib/db2_query/column.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  class Column
-    attr_reader :name, :type, :formatter
-
-    FLOAT_TYPES = [ODBC::SQL_FLOAT, ODBC::SQL_DOUBLE, ODBC::SQL_DECIMAL, ODBC::SQL_REAL]
-    INTEGER_TYPES = [ODBC::SQL_TINYINT, ODBC::SQL_SMALLINT, ODBC::SQL_INTEGER, ODBC::SQL_BIGINT, ODBC::SQL_NUMERIC]
-
-    def initialize(name, type, format = nil)
-      @name = name
-      @type = type.to_i
-
-      @formatter = if custom_format?(format)
-        Formatter.lookup(format)
-      elsif float_type?
-        FloatFormatter.new
-      elsif integer_type?
-        IntegerFormatter.new
-      else
-        BareFormatter.new
-      end
-    end
-
-    def format(value)
-      formatter.format(value)
-    end
-
-    private
-      def custom_format?(format)
-        Formatter.registry.key?(format)
-      end
-
-      def float_type?
-        FLOAT_TYPES.include?(type)
-      end
-
-      def integer_type?
-        INTEGER_TYPES.include?(type)
-      end
-  end
-end