soql_builder 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d14dbf2824a0f8c671f65f401f7d906799b1002ebf6f2f0f9f052af1a5a6fd
-  data.tar.gz: b2e297cc77be7e55221fbc232f4ee7f4c9747c152e7270038d216cf6dfc75068
+  metadata.gz: a874d53ad1ef9faef114a669fabf4a4d56a024f3a56975941abbd548144f045f
+  data.tar.gz: 7e8d704b14e8915e97b89b296e92c43f878c09a309cf96f7449cf417ebfbc61e
 SHA512:
-  metadata.gz: 160a72383e1346bb941e4ccccef507f609adb6cd989ee36240c6ba493a90c75c0d4dfe383f97c25fd0a36ed55b76afaf0793ff2e3aee330423f17469dba72dbe
-  data.tar.gz: 356133212d1ada277a09af0415be24e8c280da12f3d6e214067a93502afcfcfd34b56a0cb45e97a822fc1d431e6d9a414a73e893a71b2b12c10c567b18bedf2e
+  metadata.gz: 2eac4f39dfab102d9e62a48d4ec4876a7bd94c4acb5a7d04179b5e1ff752c5144f9e04f39f8577996f29ba5c718e396620f4bf30852d6fc62d504e2ed8fc1ea3
+  data.tar.gz: 4d35f2d585305841f6649b97e5e2431806e6016bc4b13deba776e081fd3278d96d3df93cf0aa0d490c62576eb553692dfa73141b33047e6dc3ee6582f419993a

data/lib/soql_builder.rb

@@ -4,8 +4,8 @@ require 'soql_builder/interface'
 
 module SoqlBuilder
   class << self
-    def new(type:, query: nil)
-      @interface = Interface.new(type: type, query: query)
+    def new(type:)
+      @interface = Interface.new(type: type)
     end
 
     attr_reader :interface

data/lib/soql_builder/interface.rb

@@ -1,62 +1,55 @@
 # frozen_string_literal: true
 
-require 'soql_builder/query'
+require 'soql_builder/select_query'
 
 module SoqlBuilder
   class Interface
-    def initialize(type:, query: nil)
-      @query = query || SoqlBuilder::Query.new
-      @type = type
-      @fields = []
-      @subqueries = []
-      @subquery = { object_table: '', fields: [] }
-      @object_table = ''
-      @where = ''
-      @limit = ''
+    def initialize(type:)
+      @query_klass = Module.const_get("SoqlBuilder::#{type.capitalize}Query")
+      @query_params = {
+        fields: [],
+        subqueries: [],
+        object_table: '',
+        where: '',
+        limit: ''
+      }
     end
 
     def query
-      @query.structure_query(
-        type: @type,
-        fields: @fields,
-        subqueries: @subqueries,
-        object_table: @object_table,
-        where: @where,
-        limit: @limit
-      )
+      @query_klass.structure_query(@query_params)
     end
 
     def clean
-      @fields = []
-      @subqueries = []
-      @object_table = ''
-      @where = ''
-      @limit = ''
+      @query_params[:fields] = []
+      @query_params[:subqueries] = []
+      @query_params[:object_table] = ''
+      @query_params[:where] = ''
+      @query_params[:limit] = ''
     end
 
     def fields(fields = [])
-      @fields = fields
+      @query_params[:fields] = fields
       self
     end
 
     def add_subquery(table:, fields: [])
-      @subquery = { object_table: table, fields: fields }
-      @subqueries << @subquery
+      subquery = { object_table: table, fields: fields }
+      @query_params[:subqueries] << subquery
       self
     end
 
     def from(table)
-      @object_table = table
+      @query_params[:object_table] = table
       self
     end
 
     def where(where_condition)
-      @where = where_condition
+      @query_params[:where] = where_condition
       self
     end
 
     def limit(limit_number)
-      @limit = limit_number.to_s
+      @query_params[:limit] = limit_number.to_s
     end
   end
 end

data/lib/soql_builder/select_query.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module SoqlBuilder
+  class SelectQuery
+    class << self
+      def structure_query(args = {})
+        query  = 'select'.dup
+        query += " #{join_fields(args[:fields])}" unless args[:fields].empty?
+        query += join_subqueries(args[:subqueries]) unless args[:subqueries].empty?
+        query += " from #{args[:object_table]}" unless args[:object_table] == ''
+        query += " where #{args[:where]}" unless args[:where] == ''
+        query += " limit #{args[:limit]}" unless args[:limit] == ''
+        query
+      end
+
+      private
+
+      def join_fields(fields)
+        fields.join(', ')
+      end
+
+      def join_subqueries(subqueries)
+        subqueries.map do |subquery|
+          ", (select #{join_fields(subquery[:fields])} from #{subquery[:object_table]})"
+        end.join
+      end
+    end
+  end
+end

data/lib/soql_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SoqlBuilder
-  VERSION = '1.0.8'.freeze
+  VERSION = '1.0.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soql_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Alex Avlonitis
@@ -33,7 +33,7 @@ files:
 - README.md
 - lib/soql_builder.rb
 - lib/soql_builder/interface.rb
-- lib/soql_builder/query.rb
+- lib/soql_builder/select_query.rb
 - lib/soql_builder/version.rb
 homepage: https://github.com/AlexAvlonitis/soql-builder
 licenses:

data/lib/soql_builder/query.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module SoqlBuilder
-  class Query
-    TYPES = {
-      select: 'select'
-    }.freeze
-
-    def initialize
-      @query = ''
-    end
-
-    def structure_query(args = {})
-      @query  = TYPES[args[:type]]
-      @query += " #{join_fields(args[:fields])}" unless args[:fields].empty?
-      @query += join_subqueries(args[:subqueries]) unless args[:subqueries].empty?
-      @query += " from #{args[:object_table]}" unless args[:object_table] == ''
-      @query += " where #{args[:where]}" unless args[:where] == ''
-      @query += " limit #{args[:limit]}" unless args[:limit] == ''
-      @query
-    end
-
-    private
-
-    def join_fields(fields)
-      fields.join(', ')
-    end
-
-    def join_subqueries(subqueries)
-      subqueries.map do |subquery|
-        ", (select #{join_fields(subquery[:fields])} from #{subquery[:object_table]})"
-      end.join
-    end
-  end
-end