rails_age 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01018a3efe8d4cef46fce365b6fd442882d8bf4ff51e0ad3d3bdb235db80ebb7'
-  data.tar.gz: 69a20eb39f9609c6350463d6a391b7f08887079e51e56602a6357d914571ed8f
+  metadata.gz: '0856a8b6ebd00d824cb655f76712731b5f1034250520ddf90008099863ce70ff'
+  data.tar.gz: 38bfd628af67308dc59ec42eb3c7e89e6f2391c9bc4d84fd27fd24dfba89a4cd
 SHA512:
-  metadata.gz: cc2ea56dcb102213397ca5ffc19edc095341e51307b0500d0be7bc7595cb65f64e74c6490a678703f5faf903d0396010b63b8dd33e162ed218e038a4e95e05f5
-  data.tar.gz: 30e0472fb006bf883cb57a5c7406571d4fc4715a9d6d96e792dd5d3b4998e538eab74f809b5d384072d88e77ce2d6fb143cdb6a5c20fd044fd74673edd2bb13a
+  metadata.gz: c7f10fc55865bda5020d850470e103b1e8172e3b6fcf1be8a9fe7ecbac2b8617326cdbd3048bf241b5f5fe5a72a414d67f1f58bc2d6d06df4faa7d426ab49e86
+  data.tar.gz: ba30bcf0dabd7a66e68038d0314379663e1a6058f2b433947d961588cd593b3c318f3eec81ef7691d007029efbafa64d3cc2ba7fe8d92b56f9d51b31a7cf8d7b

data/CHANGELOG.md

@@ -35,21 +35,21 @@ breaking change?: namespaces (by default) will use their own schema? (add to dat
 - **Age Path** - nodes and edges combined
   * add `rails generate apache_age:path_scaffold HasJob employee_role start_node:person end_node:company`
 
+## VERSION 0.6.4 - 2024-10-30
 
-## VERSION 0.6.3 - 2024-xx-xx
+- **Query Sanitize**:
+  * allow and sanitize query strings with multiple attributes, ie: `Person.where("find.first_name = ? AND find.last_name = ?", 'John', 'Doe')`
+
+## VERSION 0.6.3 - 2024-10-27
 
 - **Query Sanitize**:
-  * reject attributes not defined in model
   * sanitize strings using: id(find) = ?, 23 & find.first_name = ?, 'John'
+    NOTE: this sanitization only works (so far) for strings containing ONE attribute. ie: `Person.where("find.first_name = ?", 'John')` or `Person.where("first_name = ?", 'John')` works but `Person.where("find.first_name = ? AND find.last_name = ?", 'John', 'Doe')` does not yet work
 
 ## VERSION 0.6.2 - 2024-09-30
 
 - **Query Sanitize**
-  * hashes sanitized
-
-- **TODO**:
-  * reject attributes not defined in model
-  * sanitize strings using: id(find) = ?, 23 & find.first_name = ?, 'John'
+  * hash queries sanitized
 
 ## VERSION 0.6.1 - 2024-09-29
 

data/lib/apache_age/entities/class_methods.rb

@@ -8,9 +8,9 @@ module ApacheAge
         instance
       end
 
-      def where(attributes)
+      def where(*attributes)
         query_builder = QueryBuilder.new(self)
-        query_builder.where(attributes)
+        query_builder.where(*attributes)
       end
 
       def all = QueryBuilder.new(self).all

data/lib/apache_age/entities/query_builder.rb

@@ -29,6 +29,7 @@ module ApacheAge
         @graph_name = graph_name || model_class.age_graph
       end
 
+      # TODO: allow for multiple graphs
       # def cypher(graph_name = 'age_schema')
       #   return self if graph_name.blank?
 
@@ -41,27 +42,37 @@ module ApacheAge
         self
       end
 
-      # TODO: need to handle string inputs too: instead of: \
-      # "id(find) = #{id}" & "find.name = #{name}"
-      # we can have: "id(find) = ?", id & "find.name = ?", name
-      # ActiveRecord::Base.sanitize_sql([query_string, v])
-      def where(attributes)
-        return self if attributes.blank?
+      def where(*args)
+        return self if args.blank?
 
         @where_clauses <<
-          if attributes.is_a?(String)
-            if attributes.include?('id(') || attributes.include?('find.')
-              attributes
-            else
-              "find.#{attributes}"
-            end
-          else
+          # not able to sanitize the query string in this case: `["first_name = 'Barney'"]`
+          if args.length == 1 && args.first.is_a?(String)
+            raw_query_string = args.first
+            transform_cypher_sql(raw_query_string)
+
+          # Handling & sanitizing parameterized string queries
+          elsif args.length > 1 && args.first.is_a?(String)
+            raw_query_string = args.first
+            # Replace `id = ?` with `id(find) = ?` and `first_name = ?` with `find.first_name = ?`
+            query_string = transform_cypher_sql(raw_query_string)
+            values = args[1..-1]
+            # sanitize sql input values
+            ActiveRecord::Base.sanitize_sql_array([query_string, *values])
+
+          # Hashes are sanitized in the model class
+          # [{:first_name=>"Barney", :last_name=>"Rubble", :gender=>"male"}]
+          elsif args.first.is_a?(Hash)
+            attributes = args.first
             edge_keys = [:start_id, :start_node, :end_id, :end_node]
             if edge_keys.any? { |key| attributes.include?(key) }
-              model_class.send(:where_edge_clause, attributes)
+              model_class.send(:where_edge_clause, **attributes)
             else
-              model_class.send(:where_node_clause, attributes)
+              model_class.send(:where_node_clause, **attributes)
             end
+
+          else
+            raise ArgumentError, "Invalid arguments for `where` method"
           end
 
         self
@@ -72,8 +83,6 @@ module ApacheAge
         return self if variables.blank?
 
         @return_variables = variables
-        # @return_names = variables.empty? ? ['find'] : variables
-        # @return_clause = variables.empty? ? 'find' : "find.#{variables.join(', find.')}"
         self
       end
 
@@ -159,22 +168,47 @@ module ApacheAge
           $$) AS (#{return_names.join(' agtype, ')} agtype);
         SQL
       end
-      # def build_query(_extra_clause = nil)
-      #   sanitized_where_sql = where_clauses.any? ? "WHERE #{where_clauses.map { |clause| ActiveRecord::Base.sanitize_sql_like(clause) }.join(' AND ')}" : ''
-      #   sanitized_order_by = order_clause.present? ? ActiveRecord::Base.sanitize_sql_like(order_clause) : ''
-      #   sanitized_limit_clause = limit_clause.present? ? ActiveRecord::Base.sanitize_sql_like(limit_clause) : ''
-
-      #   <<-SQL.squish
-      #     SELECT *
-      #     FROM cypher('#{graph_name}', $$
-      #         MATCH #{ActiveRecord::Base.sanitize_sql_like(match_clause)}
-      #         #{sanitized_where_sql}
-      #         RETURN #{ActiveRecord::Base.sanitize_sql_like(return_clause)}
-      #         #{sanitized_order_by}
-      #         #{sanitized_limit_clause}
-      #     $$) AS (#{return_names.map { |name| "#{ActiveRecord::Base.sanitize_sql_like(name)} agtype" }.join(', ')});
-      #   SQL
-      # end
+
+      def transform_cypher_sql(raw_sql_string)
+        # Define the logical operators and order multi-word operators first to avoid partial splits
+        operators = ['=', '>', '<', '<>', '>=', '<=', '=~', 'ENDS WITH', 'CONTAINS', 'STARTS WITH', 'IN', 'IS NULL', 'IS NOT NULL']
+        separators = ["AND NOT", "OR NOT", "AND", "OR", "NOT"]
+
+        # Combine the operators and separators into a regex pattern
+        pattern = /(#{(operators + separators).map { |s| Regexp.escape(s) }.join('|')})/
+
+        # Split the raw_sql_string string based on the pattern for operators and separators
+        parts = raw_sql_string.split(pattern)
+
+        # Process each part to identify and transform the attributes
+        transformed_parts = parts.map do |part|
+          # Skip transformation if part is one of the logical operators or separators
+          next part if operators.include?(part.strip) || separators.include?(part.strip)
+
+          if part.include?(".")
+            part # Keep parts with prefixes as they are
+          elsif part =~ /\s*(\w+)\s*$/
+            attribute = $1
+            if attribute == 'end_id'
+              "id(end_node)"
+            elsif attribute == 'start_id'
+              "id(start_node)"
+            elsif attribute == 'id'
+              "id(find)"
+            # attributes must start with a letter
+            elsif attribute =~ /^[a-z]\w*$/
+              "find.#{attribute}"
+            else
+              attribute
+            end
+          else
+            part
+          end
+        end
+
+        # Reassemble the string with the transformed parts
+        transformed_parts.join(" ").gsub(/\s+/, ' ').strip
+      end
     end
   end
 end

data/lib/rails_age/version.rb

@@ -1,3 +1,3 @@
 module RailsAge
-  VERSION = '0.6.2'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_age
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Bill Tihen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails