mini_sql 0.2.3 → 1.0.1

data/lib/mini_sql/result.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Result
+    # AM serializer support
+    alias :read_attribute_for_serialization :send
+
+    def to_h
+      r = {}
+      instance_variables.each do |f|
+        r[f.to_s.delete_prefix('@').to_sym] = instance_variable_get(f)
+      end
+      r
+    end
+
+    def values
+      instance_variables.map { |f| instance_variable_get(f) }
+    end
+  end
+end

data/lib/mini_sql/serializer.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Serializer
+    MAX_CACHE_SIZE = 500
+
+    def self.to_json(result)
+      wrapper =
+        if result.length == 0
+          {}
+        else
+          {
+            "decorator" => result[0].class.decorator.to_s,
+            "fields" => result[0].to_h.keys,
+            "data" => result.map(&:values),
+          }
+        end
+
+      JSON.generate(wrapper)
+    end
+
+    def self.from_json(json)
+      wrapper = JSON.parse(json)
+      if !wrapper["data"]
+        []
+      else
+        materializer = cached_materializer(wrapper['fields'], wrapper['decorator'])
+        wrapper["data"].map do |row|
+          materializer.materialize(row)
+        end
+      end
+    end
+
+    def self.cached_materializer(fields, decorator_module = nil)
+      @cache ||= {}
+      key = fields
+      m = @cache.delete(key)
+      if m
+        @cache[key] = m
+      else
+        m = @cache[key] = materializer(fields)
+        @cache.shift if @cache.length > MAX_CACHE_SIZE
+      end
+
+      if decorator_module && decorator_module.length > 0
+        decorator = Kernel.const_get(decorator_module)
+        m = m.decorated(decorator)
+      end
+
+      m
+    end
+
+    def self.materializer(fields)
+      Class.new do
+        extend MiniSql::Decoratable
+        include MiniSql::Result
+
+        attr_accessor(*fields)
+
+        instance_eval <<~RUBY
+          def materialize(values)
+            r = self.new
+            #{col = -1; fields.map { |f| "r.#{f} = values[#{col += 1}]" }.join("; ")}
+            r
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/mini_sql/sqlite/connection.rb

@@ -26,6 +26,10 @@ module MiniSql
         r
       end
 
+      def query_array(sql, *params)
+        run(sql, *params)
+      end
+
       def exec(sql, *params)
 
         start = raw_connection.total_changes
@@ -46,8 +50,14 @@ module MiniSql
         end
       end
 
+      def query_decorator(decorator, sql, *params)
+        run(sql, *params) do |set|
+          deserializer_cache.materialize(set, decorator)
+        end
+      end
+
       def escape_string(str)
-        str.gsub("'","''")
+        str.gsub("'", "''")
       end
 
       private

data/lib/mini_sql/sqlite/deserializer_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Sqlite
     class DeserializerCache
@@ -9,7 +11,7 @@ module MiniSql
         @max_size = max_size || DEFAULT_MAX_SIZE
       end
 
-      def materialize(result)
+      def materialize(result, decorator_module = nil)
 
         key = result.columns
 
@@ -22,6 +24,10 @@ module MiniSql
           @cache.shift if @cache.length > @max_size
         end
 
+        if decorator_module
+          materializer = materializer.decorated(decorator_module)
+        end
+
         r = []
         # quicker loop
         while !result.eof?
@@ -39,23 +45,15 @@ module MiniSql
         fields = result.columns
 
         Class.new do
-          attr_accessor(*fields)
+          extend MiniSql::Decoratable
+          include MiniSql::Result
 
-          # AM serializer support
-          alias :read_attribute_for_serialization :send
-
-          def to_h
-            r = {}
-            instance_variables.each do |f|
-              r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
-            end
-            r
-          end
+          attr_accessor(*fields)
 
           instance_eval <<~RUBY
             def materialize(data)
               r = self.new
-              #{col=-1; fields.map{|f| "r.#{f} = data[#{col+=1}]"}.join("; ")}
+              #{col = -1; fields.map { |f| "r.#{f} = data[#{col += 1}]" }.join("; ")}
               r
             end
           RUBY

data/lib/mini_sql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MiniSql
-  VERSION = "0.2.3"
+  VERSION = "1.0.1"
 end

data/mini_sql.gemspec

@@ -12,24 +12,35 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A fast, safe, simple direct SQL executor}
   spec.description   = %q{A fast, safe, simple direct SQL executor for PG}
-  spec.homepage      = "https://discourse.org"
+  spec.homepage      = "https://github.com/discourse/mini_sql"
   spec.license       = "MIT"
 
+  spec.metadata = {
+    "bug_tracker_uri" => "https://github.com/discourse/mini_sql/issues",
+    "source_code_uri" => "https://github.com/discourse/mini_sql",
+    "changelog_uri" => "https://github.com/discourse/mini_sql/blob/master/CHANGELOG"
+  }
+
   spec.platform = 'java' if RUBY_ENGINE == 'jruby'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  # rubocop:disable Discourse/NoChdir
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+  # rubocop:enable Discourse/NoChdir
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "> 10"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
   spec.add_development_dependency "activesupport", "~> 5.2"
+  spec.add_development_dependency 'rubocop', '~> 1.4.0'
+  spec.add_development_dependency 'rubocop-discourse', '~> 2.4.1'
+  spec.add_development_dependency 'm', '~> 1.5.1'
 
   if RUBY_ENGINE == 'jruby'
     spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 52.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +185,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml"
+- ".rubocop.yml"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -160,6 +204,7 @@ files:
 - lib/mini_sql.rb
 - lib/mini_sql/builder.rb
 - lib/mini_sql/connection.rb
+- lib/mini_sql/decoratable.rb
 - lib/mini_sql/deserializer_cache.rb
 - lib/mini_sql/inline_param_encoder.rb
 - lib/mini_sql/mysql/connection.rb
@@ -169,15 +214,20 @@ files:
 - lib/mini_sql/postgres/deserializer_cache.rb
 - lib/mini_sql/postgres_jdbc/connection.rb
 - lib/mini_sql/postgres_jdbc/deserializer_cache.rb
+- lib/mini_sql/result.rb
+- lib/mini_sql/serializer.rb
 - lib/mini_sql/sqlite/connection.rb
 - lib/mini_sql/sqlite/deserializer_cache.rb
 - lib/mini_sql/version.rb
 - mini_sql.gemspec
-homepage: https://discourse.org
+homepage: https://github.com/discourse/mini_sql
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/discourse/mini_sql/issues
+  source_code_uri: https://github.com/discourse/mini_sql
+  changelog_uri: https://github.com/discourse/mini_sql/blob/master/CHANGELOG
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: A fast, safe, simple direct SQL executor
 test_files: []

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-rvm:
-  - 2.5.1
-  - ruby-head
-
-before_install:
-  - gem install bundler
-
-cache: bundler
-sudo: false
-
-services:
-  - mysql
-
-addons:
-  postgresql: 9.6
-  mysql: 5.7
-
-install:
-  - createdb test_mini_sql
-  - mysql -e 'CREATE DATABASE test_mini_sql;'
-  - bundle install
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head