kweerie 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1ca73e0c3e5890aa9805eed0b491c100be177b958fc9bab9592eaf4f2cdb0d0
-  data.tar.gz: b79729e675821e02c2ff02e3dfcdb8e5237230364790cc9e59e1d4a953ea8da6
+  metadata.gz: 8ee037d0d27c788d915bb3a17c5cdc9fb4dc00dd172ae8f32023df00fd70515d
+  data.tar.gz: '0950c053e7d14f261923f74c5987fa177fa6ffb1f9b2e8213e132f411722d877'
 SHA512:
-  metadata.gz: 511ea093375cca24abbb8514a98b26cfb662239b836c3da7140aac4ef06ba7a23bf40074e1d9a973ac56a1cd02d1dd5dac486409968bed8f40b39312b6a8ac6d
-  data.tar.gz: abd8e02e09a00f3d4dd683c5e9e179386c053ed0c390d2f09a8c227866e39ff6303400766f2ff173eaf5d379e3bcad84840621a2fdde5b593c76e8643c72741a
+  metadata.gz: 75e8dee13094014cefe169804ee050424fe0a946b8055d7f92423a819d578c375817bc580ae1b57b658d513786efc3fa731d3dad3fde3b022ec95cafa2701264
+  data.tar.gz: 8c7066bd2b2d1b2812889c116518d87be3b4868e57443fd54bc67b6980772999c4db8b853e98453331d364caf289ec8005c5ebf3d619ab2330d2b8dab781f7a0

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [Unreleased]
+## [0.3.0] - 2024-11-21
+
+- changed sql_paths to default_path.
+- fixed generate to handle defined path
+
 ## [0.2.0] - 2024-11-12
 
 - changed BaseObjects to BaseObject.

data/README.md

@@ -324,8 +324,8 @@ Kweerie.configure do |config|
   # Use a custom connection provider
   config.connection_provider = -> { MyCustomConnectionPool.connection }
   
-  # Configure where to look for SQL files
-  config.sql_paths = -> { ['db/queries', 'app/sql'] }
+  # Configure where to look for SQL files. Generator also uses this path
+  config.default_path = 'app/sql'
 end
 ```
 

data/lib/generators/kweerie/kweerie_generator.rb

@@ -25,10 +25,10 @@ class KweerieGenerator < Rails::Generators::NamedBase
     FileUtils.mkdir_p("app/queries")
 
     # Create the Ruby file
-    create_file "app/queries/#{file_name}.rb", template_content
+    create_file "#{default_path}/#{file_name}.rb", template_content
 
     # Create the SQL file
-    create_file "app/queries/#{file_name}.sql", <<~SQL
+    create_file "#{default_path}/#{file_name}.sql", <<~SQL
       -- Write your SQL query here
       -- Available parameters: #{parameters.map { |p| "$#{parameters.index(p) + 1} (#{p})" }.join(", ")}
 
@@ -50,4 +50,8 @@ class KweerieGenerator < Rails::Generators::NamedBase
   def class_name
     name.classify
   end
+
+  def default_path
+    Kweerie.configuration.default_path
+  end
 end

data/lib/kweerie/base.rb

@@ -172,15 +172,6 @@ module Kweerie
         ordered_params = bindings.transform_values { |position| params[bindings.key(position)] }
         ordered_params.values
       end
-
-      def root_path
-        defined?(Rails) ? Rails.root : Dir.pwd
-      end
-
-      def using_activerecord?
-        defined?(ActiveRecord::Base) &&
-          Kweerie.configuration.connection_provider == Kweerie::Configuration.new.connection_provider
-      end
     end
   end
 end

data/lib/kweerie/base_object.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/string"
-require "json"
+require_relative "object_methods/accessors"
+require_relative "object_methods/comparison"
+require_relative "object_methods/key_transformation"
+require_relative "object_methods/serialization"
+require_relative "object_methods/type_casting"
 
 module Kweerie
   class BaseObject < Base
@@ -11,8 +14,7 @@ module Kweerie
         return [] if results.empty?
 
         # Create a unique result class for this query
-        result_class = generate_result_class(results.first.keys)
-
+        result_class = generate(results.first.keys)
         # Map results to objects
         results.map { |row| result_class.new(row) }
       end
@@ -25,10 +27,43 @@ module Kweerie
         @cast_definitions ||= {}
       end
 
-      private
+      def generate(attribute_names)
+        cast_definitions = self.cast_definitions
+        Class.new(self) do
+          include Comparable
+          include ObjectMethods::Accessors
+          include ObjectMethods::Comparison
+          include ObjectMethods::KeyTransformation
+          include ObjectMethods::Serialization
+          include ObjectMethods::TypeCasting
+
+          # Define attr_readers for all columns
+          attribute_names.each { |name| attr_reader name }
+
+          define_method :initialize do |attrs|
+            # Store both raw and casted versions
+            @_raw_original_attributes = attrs.dup
+            @_original_attributes = attrs.each_with_object({}) do |(key, value), hash|
+              type_definition = cast_definitions[key.to_sym]
+              casted_value = type_cast_value(value, type_definition)
+              hash[key.to_s] = casted_value
+              instance_variable_set("@#{key}", casted_value)
+            end
+
+            super() if defined?(super)
+          end
+
+          # Nice inspect output
+          define_method :inspect do
+            attrs = attribute_names.map do |name|
+              "#{name}=#{instance_variable_get("@#{name}").inspect}"
+            end.join(" ")
+            "#<#{self.class.superclass.name} #{attrs}>"
+          end
 
-      def generate_result_class(attribute_names)
-        @generate_result_class ||= ResultClassGenerator.generate(self, attribute_names)
+          # Make attribute_names available to instance methods
+          define_method(:attribute_names) { attribute_names }
+        end
       end
     end
   end

data/lib/kweerie/configuration.rb

@@ -2,7 +2,7 @@
 
 module Kweerie
   class Configuration
-    attr_accessor :connection_provider, :sql_paths
+    attr_accessor :connection_provider, :sql_paths, :default_path
 
     def initialize
       # Default to using ActiveRecord's connection if available
@@ -20,6 +20,8 @@ module Kweerie
         paths.unshift("lib/queries") unless defined?(Rails)
         paths
       }
+
+      @default_path = defined?(Rails) ? "app/queries" : "lib/queries"
     end
   end
 end

data/lib/kweerie/{result_class_components → object_methods}/accessors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ResultClassComponents
+module ObjectMethods
   module Accessors
     def [](key)
       instance_variable_get("@#{key}")

data/lib/kweerie/{result_class_components → object_methods}/comparison.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ResultClassComponents
+module ObjectMethods
   module Comparison
     def <=>(other)
       return nil unless other.is_a?(self.class)

data/lib/kweerie/{result_class_components → object_methods}/key_transformation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ResultClassComponents
+module ObjectMethods
   module KeyTransformation
     def deep_stringify_keys(obj)
       case obj

data/lib/kweerie/{result_class_components → object_methods}/serialization.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ResultClassComponents
+module ObjectMethods
   module Serialization
     def to_h
       attribute_names.each_with_object({}) do |name, hash|

data/lib/kweerie/{result_class_components → object_methods}/type_casting.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ResultClassComponents
+module ObjectMethods
   module TypeCasting
     def type_cast_value(value, type_definition)
       return value if type_definition.nil?

data/lib/kweerie/sql_path_resolver.rb

@@ -51,14 +51,13 @@ class SQLPathResolver
   end
 
   def find_in_configured_paths(filename)
-    configured_paths.find do |path|
-      full_path = File.join(path, filename)
-      return full_path if File.exist?(full_path)
-    end
+    full_path = File.join(path, filename)
+
+    full_path if File.exist?(full_path)
   end
 
-  def configured_paths
-    Kweerie.configuration.sql_paths.call
+  def path
+    Kweerie.configuration.default_path
   end
 
   def validate_file_exists!(path)

data/lib/kweerie/version.rb

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

data/lib/kweerie.rb

@@ -28,7 +28,6 @@ require_relative "kweerie/configuration"
 require_relative "kweerie/base"
 require_relative "kweerie/base_object"
 require_relative "kweerie/sql_path_resolver"
-require_relative "kweerie/result_class_generator"
 require_relative "kweerie/types/boolean"
 require_relative "kweerie/types/pg_array"
 require_relative "kweerie/types/pg_jsonb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kweerie
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Toby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -70,12 +70,11 @@ files:
 - lib/kweerie/base.rb
 - lib/kweerie/base_object.rb
 - lib/kweerie/configuration.rb
-- lib/kweerie/result_class_components/accessors.rb
-- lib/kweerie/result_class_components/comparison.rb
-- lib/kweerie/result_class_components/key_transformation.rb
-- lib/kweerie/result_class_components/serialization.rb
-- lib/kweerie/result_class_components/type_casting.rb
-- lib/kweerie/result_class_generator.rb
+- lib/kweerie/object_methods/accessors.rb
+- lib/kweerie/object_methods/comparison.rb
+- lib/kweerie/object_methods/key_transformation.rb
+- lib/kweerie/object_methods/serialization.rb
+- lib/kweerie/object_methods/type_casting.rb
 - lib/kweerie/sql_path_resolver.rb
 - lib/kweerie/types/boolean.rb
 - lib/kweerie/types/pg_array.rb

data/lib/kweerie/result_class_generator.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "result_class_components/accessors"
-require_relative "result_class_components/comparison"
-require_relative "result_class_components/key_transformation"
-require_relative "result_class_components/serialization"
-require_relative "result_class_components/type_casting"
-
-module Kweerie
-  class ResultClassGenerator
-    def self.generate(parent_class, attribute_names)
-      Class.new(parent_class) do
-        include Comparable
-        include ResultClassComponents::Accessors
-        include ResultClassComponents::Comparison
-        include ResultClassComponents::KeyTransformation
-        include ResultClassComponents::Serialization
-        include ResultClassComponents::TypeCasting
-
-        # Define attr_readers for all columns
-        attribute_names.each { |name| attr_reader name }
-
-        define_method :initialize do |attrs|
-          # Store both raw and casted versions
-          cast_definitions = parent_class.cast_definitions
-
-          @_raw_original_attributes = attrs.dup
-          @_original_attributes = attrs.each_with_object({}) do |(key, value), hash|
-            type_definition = cast_definitions[key.to_sym]
-            casted_value = type_cast_value(value, type_definition)
-            hash[key.to_s] = casted_value
-            instance_variable_set("@#{key}", casted_value)
-          end
-
-          super() if defined?(super)
-        end
-
-        # Nice inspect output
-        define_method :inspect do
-          attrs = attribute_names.map do |name|
-            "#{name}=#{instance_variable_get("@#{name}").inspect}"
-          end.join(" ")
-          "#<#{self.class.superclass.name} #{attrs}>"
-        end
-
-        # Make attribute_names available to instance methods
-        define_method(:attribute_names) { attribute_names }
-      end
-    end
-  end
-end