Merge tool-collections into staging

app/controllers/rule_countries_controller.rb

@@ -21,15 +21,15 @@ def destroy
   private
 
   def create_rule_country
-    created = RuleCountry.create!(permit_params(:tool_group_id, :negative_rule, :countries => []))
+    created = RuleCountry.create!(permit_params(:tool_group_id, :negative_rule, countries: []))
     response.headers["Location"] = "tool_groups/#{created.id}"
     render json: created, status: :created
   end
 
   def update_rule_country
     tool_group = ToolGroup.find(params[:tool_group_id])
     existing = tool_group.rule_countries.find(params[:id])
-    existing.update!(permit_params(:negative_rule, :countries => []))
+    existing.update!(permit_params(:negative_rule, countries: []))
     render json: existing, status: :accepted
   end
 end

app/controllers/rule_languages_controller.rb

@@ -21,15 +21,15 @@ def destroy
   private
 
   def create_rule_language
-    created = RuleLanguage.create!(permit_params(:tool_group_id, :negative_rule, :languages => []))
+    created = RuleLanguage.create!(permit_params(:tool_group_id, :negative_rule, languages: []))
     response.headers["Location"] = "tool_groups/#{created.id}"
     render json: created, status: :created
   end
 
   def update_rule_language
     tool_group = ToolGroup.find(params[:tool_group_id])
     existing = tool_group.rule_languages.find(params[:id])
-    existing.update!(permit_params(:negative_rule, :languages => []))
+    existing.update!(permit_params(:negative_rule, languages: []))
     render json: existing, status: :accepted
   end
 end

app/controllers/rule_praxis_controller.rb

@@ -21,15 +21,15 @@ def destroy
   private
 
   def create_rule_praxis
-    created = RulePraxi.create!(permit_params(:tool_group_id, :negative_rule, :openness => [], :confidence => []))
+    created = RulePraxi.create!(permit_params(:tool_group_id, :negative_rule, openness: [], confidence: []))
     response.headers["Location"] = "tool_groups/#{created.id}"
     render json: created, status: :created
   end
 
   def update_rule_praxis
     tool_group = ToolGroup.find(params[:tool_group_id])
     existing = tool_group.rule_praxis.find(params[:id])
-    existing.update!(permit_params(:negative_rule, :openness => [], :confidence => []))
+    existing.update!(permit_params(:negative_rule, openness: [], confidence: []))
     render json: existing, status: :accepted
   end
 end

app/models/rule_country.rb

@@ -1,7 +1,7 @@
 class RuleCountry < ApplicationRecord
   belongs_to :tool_group
-  
-  validates :tool_group_id, uniqueness: { scope: [:countries, :negative_rule], message: "combination already exists" }
+
+  validates :tool_group_id, uniqueness: {scope: [:countries, :negative_rule], message: "combination already exists"}
   validate :validate_countries
 
   private

app/models/rule_language.rb

@@ -1,5 +1,5 @@
 class RuleLanguage < ApplicationRecord
   belongs_to :tool_group
 
-  validates :tool_group_id, uniqueness: { scope: [:languages, :negative_rule], message: "combination already exists" }
+  validates :tool_group_id, uniqueness: {scope: [:languages, :negative_rule], message: "combination already exists"}
 end

app/models/rule_praxi.rb

@@ -1,8 +1,8 @@
 class RulePraxi < ApplicationRecord
   belongs_to :tool_group
-  
-  validates :tool_group_id, uniqueness: { scope: [:openness, :confidence], message: "combination already exists" }
-  
+
+  validates :tool_group_id, uniqueness: {scope: [:openness, :confidence], message: "combination already exists"}
+
   # IMPLEMENT NEXT VALIDATIONS
   #   openness: Array<Int> (int values 1-5, can have multiple values set)
   #   confidence: Array<Int> (int values 1-5, can have multiple values set)

spec/acceptance/rule_countries_controller_spec.rb

@@ -76,7 +76,7 @@
 
     it "update rule country" do
       do_request data: {type: "tool-group-rule-countries", attributes: attrs}
-      
+
       expect(status).to be(202)
       expect(JSON.parse(response_body)["data"]["attributes"]["countries"]).to eql countries
       expect(JSON.parse(response_body)["data"]["attributes"]["negative-rule"]).to eql false

spec/acceptance/rule_languages_controller_spec.rb

@@ -55,7 +55,7 @@
 
     it "update rule language" do
       do_request data: {type: "tool-group-rule-languages", attributes: attrs}
-      
+
       expect(status).to be(202)
       expect(JSON.parse(response_body)["data"]["attributes"]["languages"]).to eql languages
       expect(JSON.parse(response_body)["data"]["attributes"]["negative-rule"]).to eql false

spec/acceptance/rule_praxis_controller_spec.rb

@@ -35,7 +35,7 @@
 
     it "create rule praxis" do
       do_request data: {type: "tool-group-rule-praxis", attributes: attrs}
-      
+
       expect(status).to eq(201)
       expect(JSON.parse(response_body)["data"]).not_to be_nil
     end

spec/factories/rule_countries.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :rule_country do
     tool_group_id { 1 }
-    negative_rule { true } 
+    negative_rule { true }
     countries { ["BR"] }
   end
 end

spec/factories/rule_languages.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :rule_language do
     tool_group_id { 1 }
-    negative_rule { true } 
+    negative_rule { true }
     languages { ["en"] }
   end
 end

spec/factories/rule_praxi.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :rule_praxi do
     tool_group_id { 1 }
-    negative_rule { true } 
+    negative_rule { true }
     openness { [1, 2, 3] }
     confidence { [4, 5, 6] }
   end