souls 0.28.4 → 0.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9720aa65c9827862e45cafc511e8607c430767aa62f18172adfd18e05ad7ef49
-  data.tar.gz: f707c017b93e52827444e880aa3365f8897796f189d788e5c570b88cd3f13415
+  metadata.gz: 0e9786dc0b6c9ac9f0c21e01a7d6046a32c2669eab48bcfe8cf5f8c49724ab63
+  data.tar.gz: 765d4f4e9d7c8e598792ea4315d80f1160656aeb74c796010c77abcf39e6bfe4
 SHA512:
-  metadata.gz: 3035bb95a8e121cf2ef107fe468e3feb73bc6bb5a8b17206559c863770c65cd1887c46c4c1a053e705de26c6e9de27da33a573926e4cd4afa5141b3cca4774ea
-  data.tar.gz: ca66f342d077f0b28dc48a7459ec448a0c7436e08adf8dee0f186096f98260831cf507bec0ed7f19b34652d3335b778c763c75dc3c938f654467c81ff855c090
+  metadata.gz: 285bad5aacaf63b860d0454e9265999554a3417668b15ae69883cec4bde592f1c5dc90d757c017506407accf8947c0846504e787af6d29cbfc3757564caa85c3
+  data.tar.gz: 93235aa1f7ad3deece6088a556dee0401f7458ea5563ea2861265fe3ab69ca5d94c9fca5d9570bb8077eeb6b13a6e4f627449191f985c6875ee496c093ddddc8

data/lib/souls/generate/resolver.rb

@@ -30,11 +30,12 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              break if line.include?("end") || line.include?("t.index")
+              break if line.include?("t.index") || line.strip == "end"
 
               field = "[String]" if line.include?("array: true")
               type, name = get_type_and_name(line)
               field ||= type_check(type)
+              puts(line)
               case name
               when "user_id"
                 @user_exist = true
@@ -57,21 +58,21 @@ module Souls
       file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
       File.open(file_path, "a") do |f|
         f.write(<<-TEXT)
-    argument :start_date, String, required: false
-    argument :end_date, String, required: false
-  end
+      argument :start_date, String, required: false
+      argument :end_date, String, required: false
+    end
 
-  option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
-  option :first, type: types.Int, with: :apply_first
-  option :skip, type: types.Int, with: :apply_skip
+    option :filter, type: #{class_name.camelize}Filter, with: :apply_filter
+    option :first, type: types.Int, with: :apply_first
+    option :skip, type: types.Int, with: :apply_skip
 
-  def apply_filter(scope, value)
-    branches = normalize_filters(value).inject { |a, b| a.or(b) }
-    scope.merge branches
-  end
+    def apply_filter(scope, value)
+      branches = normalize_filters(value).inject { |a, b| a.or(b) }
+      scope.merge branches
+    end
 
-  def normalize_filters(value, branches = [])
-    scope = ::#{class_name.camelize}.all
+    def normalize_filters(value, branches = [])
+      scope = ::#{class_name.camelize}.all
         TEXT
       end
     end
@@ -86,7 +87,7 @@ module Souls
         File.open(path, "r") do |f|
           f.each_line.with_index do |line, _i|
             if @on
-              break if line.include?("end") || line.include?("t.index")
+              break if line.include?("t.index") || line.strip == "end"
 
               type, name = get_type_and_name(line)
               if line.include?("array: true")

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.28.4".freeze
+  VERSION = "0.28.5".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.7.4
+0.7.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.28.5
 platform: ruby
 authors:
 - POPPIN-FUMI