rasti-db 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59398cc3e6f63febe047699d750790d24b276ee3
-  data.tar.gz: 6aead8231e6f12a2827f7a5227f4f9ce9dfe8084
+  metadata.gz: 8d134f095bd5c09bb827c9a1b51b2a1a10dc333b
+  data.tar.gz: 9e70fd2c3b67c5039530ce14f391f6fd572c26fa
 SHA512:
-  metadata.gz: cb1c73d96614154a238f944504d48d3d533662c5adab2aad2d050a18c8cbf971ab71be59cdad9e893646d7c68c3bd6487184d456feba0933e20fcc6cf61f7c25
-  data.tar.gz: b5595081dc1fbe8d0ee1ab465baa1231fa5cbf60f04c53a4d71a30379669f1349725821aac7db6ef248ac41c80e3b946dd4e9f740718ba9f0c6b969de1b235dd
+  metadata.gz: 68982576814409051789fef84204e31acebb4c21c2a1b52e9c3de30870cb738eaa70e5f03c7661ea46994a73ff2f9303da956c5bf693bde82f028592ee2fc3d3
+  data.tar.gz: 9dd4ac963e7cfaed91684a26981484941f25f06dba345c656dda600bc95254f75dbe248f43e571f4309ce6b810580493cc2e496ab6a771251abd4981bd21cc5a

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.4.5

data/README.md

@@ -175,6 +175,14 @@ posts.where(id: [1,2]).pluck(:id, :title) # => [[1, ...], [2, ...]]
 posts.join(:user).where(name: 'User 4') # => [Post, ...]
 ```
 
+## Development
+
+Rasti::DB uses treetop to perform queries using natural language. To recompile the syntax, simply run the following command in `lib/rasti/db/nql`:
+
+```
+tt syntax.treetop -o syntax.rb
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/gabynaiman/rasti-db.

data/lib/rasti/db.rb

@@ -2,31 +2,22 @@ require 'sequel'
 require 'consty'
 require 'time'
 require 'timing'
+require 'treetop'
 require 'class_config'
-
-require_relative 'db/version'
-require_relative 'db/helpers'
-require_relative 'db/query'
-require_relative 'db/relations/graph_builder'
-require_relative 'db/relations/base'
-require_relative 'db/relations/one_to_many'
-require_relative 'db/relations/one_to_one'
-require_relative 'db/relations/many_to_one'
-require_relative 'db/relations/many_to_many'
-require_relative 'db/collection'
-require_relative 'db/model'
-require_relative 'db/type_converters/time_in_zone'
-require_relative 'db/type_converters/postgres_types/array'
-require_relative 'db/type_converters/postgres_types/hstore'
-require_relative 'db/type_converters/postgres_types/json'
-require_relative 'db/type_converters/postgres_types/jsonb'
-require_relative 'db/type_converters/postgres'
+require 'multi_require'
 
 module Rasti
   module DB
     
+    extend MultiRequire
     extend ClassConfig
 
+    require_relative 'db/helpers'
+    require_relative 'db/query'
+    require_relative_pattern  'db/relations/*'
+    require_relative_pattern  'db/type_converters/postgres_types/*'
+    require_relative_pattern  'db/**/*'
+
     attr_config :type_converters, []
 
     def self.to_db(db, collection_name, attribute_name, value)

data/lib/rasti/db/collection.rb

@@ -2,7 +2,7 @@ module Rasti
   module DB
     class Collection
 
-      QUERY_METHODS = (Query::DATASET_CHAINED_METHODS + [:graph, :join, :count, :all, :each, :first, :pluck, :primary_keys, :any?, :empty?, :raw]).freeze
+      QUERY_METHODS = (Query::DATASET_CHAINED_METHODS + [:graph, :join, :count, :all, :each, :first, :pluck, :primary_keys, :any?, :empty?, :raw, :nql]).freeze
 
       include Enumerable
       include Helpers::WithSchema

data/lib/rasti/db/nql/invalid_expression_error.rb

@@ -0,0 +1,19 @@
+module Rasti
+  module DB
+    module NQL
+      class InvalidExpressionError < StandardError
+
+        attr_reader :expression
+
+        def initialize(expression)
+          @expression = expression
+        end
+
+        def message
+          "Invalid filter expression: #{expression}"
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/binary_node.rb

@@ -0,0 +1,25 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        class BinaryNode < Treetop::Runtime::SyntaxNode
+          
+          def dependency_tables
+            values.flat_map(&:dependency_tables)
+          end
+
+          def values
+            @values ||= values_for(left) + values_for(right)
+          end
+
+          private
+
+          def values_for(node)
+            node.class == self.class ? node.values : [node]
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/base.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class Base < Treetop::Runtime::SyntaxNode
+
+            def dependency_tables
+              field.tables.empty? ? [] : [field.tables.join('.')]
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/equal.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class Equal < Base
+
+            def filter_condition
+              { field.identifier => argument.value }
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/greater_than.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class GreaterThan < Base
+
+            def filter_condition
+              field.identifier > argument.value
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/greater_than_or_equal.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class GreaterThanOrEqual < Base
+
+            def filter_condition
+              field.identifier >= argument.value
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/include.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class Include < Base
+
+            def filter_condition
+              Sequel.ilike(field.identifier, "%#{argument.value}%")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/less_than.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class LessThan < Base
+
+            def filter_condition
+              field.identifier < argument.value
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/less_than_or_equal.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class LessThanOrEqual < Base
+
+            def filter_condition
+              field.identifier <= argument.value
+            end
+            
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/like.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class Like < Base
+
+            def filter_condition
+              Sequel.ilike(field.identifier, argument.value)
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/not_equal.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class NotEqual < Base
+
+            def filter_condition
+              Sequel.negate(field.identifier => argument.value)
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/comparisons/not_include.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Comparisons
+          class NotInclude < Base
+
+            def filter_condition
+              ~ Sequel.ilike(field.identifier, "%#{argument.value}%")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/conjunction.rb

@@ -0,0 +1,15 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        class Conjunction < BinaryNode
+
+          def filter_condition
+            Sequel.&(*values.map(&:filter_condition))
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/false.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class False < Treetop::Runtime::SyntaxNode
+
+            def value
+              false
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/float.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class Float < Treetop::Runtime::SyntaxNode
+
+            def value
+              text_value.to_f
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/integer.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class Integer < Treetop::Runtime::SyntaxNode
+
+            def value
+              text_value.to_i
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/literal_string.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class LiteralString < Treetop::Runtime::SyntaxNode
+
+            def value
+              string.text_value
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/string.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class String < Treetop::Runtime::SyntaxNode
+
+            def value
+              text_value.strip
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rasti/db/nql/nodes/constants/time.rb

@@ -0,0 +1,23 @@
+module Rasti
+  module DB
+    module NQL
+      module Nodes
+        module Constants
+          class Time < Treetop::Runtime::SyntaxNode
+
+            def value
+              time.to_s
+            end
+
+            private
+
+            def time
+              @time ||= Timing::TimeInZone.parse text_value
+            end
+
+          end
+        end
+      end
+    end
+  end
+end