solidus_brazilian_adaptations 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf9b101cad24f96d6b95af4b1c1587666d279a7ec9c38cd6eadf80588c2de3a
-  data.tar.gz: cea1c5c853b54b8b10dc962476b05fe04f2f9819155e14cf3e3c5931919c055e
+  metadata.gz: a76efff4ad9d953e3b825eb176e237621450b260742c756eefa2d4f0af0619dd
+  data.tar.gz: a6b045f77cc4be284a6070fb9b65d02571f1511190b74b63bc9b0be64d62cb74
 SHA512:
-  metadata.gz: df1c8d4801d1a4c440c86ecdf94954145053cbbfd42ca61b365b4f93c22b6c38f0868645b73a0456bd9d0a07abc7b9c3bfb9038ed9998e1502e4a76e8dff15a2
-  data.tar.gz: 48da079873137eddebd6b0e1fdaf62605cd11446abaacff3641493429943395b3f187c2337382dad2f9be5c3921e7c0011a365ceefe6319283eab60732e0e5dc
+  metadata.gz: 959e7bb2737a3f8a90d93f5c30c0ca35195ec03876e3c2574f3a90998e651d006b9224eac771cb4cb4823203e871fa4f202209be81a0371662cbb940b8e0c783
+  data.tar.gz: 61fdc3b8035422d5379d84117aa6f372053e83d069108c4fcb75f36df1fd92c5ccba43c510967fff0f59b2077fca2e0626470fb3f1c79df83956e142047779eb

data/Gemfile

@@ -1,42 +1,41 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+branch = ENV.fetch("SOLIDUS_BRANCH", "main")
+gem "solidus", github: "solidusio/solidus", branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2
-if branch >= 'v3.2'
-  gem 'solidus_frontend'
-elsif branch == 'main'
-  gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend"
 else
-  gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
 end
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
-
+gem "rails", ">0.a"
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
+gem "solidus_auth_devise"
 
-case ENV.fetch('DB', nil)
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV.fetch("DB", nil)
+when "mysql"
+  gem "mysql2"
+when "postgresql"
+  gem "pg"
 else
-  gem 'sqlite3'
+  gem "sqlite3"
 end
 
 # While we still support Ruby < 3 we need to workaround a limitation in
 # the 'async' gem that relies on the latest ruby, since RubyGems doesn't
 # resolve gems based on the required ruby version.
-gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
+gem "async", "< 3" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")
 
 gemspec
 
@@ -45,4 +44,4 @@ gemspec
 #
 # We use `send` instead of calling `eval_gemfile` to work around an issue with
 # how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"

data/app/overrides/address_validations.rb

@@ -0,0 +1,19 @@
+module AddressValidations
+  extend ActiveSupport::Concern
+
+  prepended do
+    validates :number, presence: true, if: -> { country.iso == "BR" }
+    validates :district, presence: true, if: -> { country.iso == "BR" }
+    validate :compatible_zipcode_and_state
+
+    def compatible_zipcode_and_state
+      return if country.iso != "BR"
+      cep = CodigoPostal.new(zipcode)
+      unless cep.state_code == state.abbr
+        errors.add(:base, "CEP não corresponde ao Estado.")
+      end
+    end
+  end
+
+  ::Spree::Address.prepend self
+end

data/app/overrides/order_validations.rb

@@ -0,0 +1,27 @@
+module OrderValidations
+  extend ActiveSupport::Concern
+
+  prepended do
+    validate :check_tax_id, if: :email_required?
+    before_update :format_tax_id
+
+    def check_tax_id
+      cnpj_allowed = SolidusBrazilianAdaptations.config.allow_cnpj
+      document = TaxIdBr.new(tax_id)
+      if document.valid?
+        if document.document_type == :cnpj && cnpj_allowed == false
+          errors.add(:base, "Insira um CPF, não um CNPJ.")
+        end
+      else
+        errors.add(:base, "#{cnpj_allowed ? "CPF/CPNJ" : "CPF"} inválido.")
+      end
+    end
+
+    def format_tax_id
+      document = TaxIdBr.new(tax_id)
+      self.tax_id = document.formatted
+    end
+  end
+
+  ::Spree::Order.prepend self
+end

data/db/seeds.rb

@@ -1,4 +1,4 @@
-require 'thor'
+require "thor"
 shell = Thor::Base.shell.new
 
 %w[
@@ -15,4 +15,4 @@ shell = Thor::Base.shell.new
 ].each do |seed|
   shell.say_status :seed, seed
   require_relative "spree_br/#{seed}"
-end
+end

data/db/spree_br/countries.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'carmen'
+require "carmen"
 
 # Insert Countries into the spree_countries table, checking to ensure that no
 # duplicates are created, using as few SQL statements as possible (2)
@@ -8,11 +8,11 @@ require 'carmen'
 connection = Spree::Base.connection
 
 country_mapper = ->(country) do
-  name            = connection.quote country.name
-  iso3            = connection.quote country.alpha_3_code
-  iso             = connection.quote country.alpha_2_code
-  iso_name        = connection.quote country.name.upcase
-  numcode         = connection.quote country.numeric_code
+  name = connection.quote country.name
+  iso3 = connection.quote country.alpha_3_code
+  iso = connection.quote country.alpha_2_code
+  iso_name = connection.quote country.name.upcase
+  numcode = connection.quote country.numeric_code
   states_required = connection.quote country.subregions?
 
   [name, iso3, iso, iso_name, numcode, states_required].join(", ")
@@ -27,12 +27,12 @@ country_values = -> do
 
   # create VALUES statements for each country _not_ already in the database
   carmen_countries
-    .reject { |c| existing_country_isos.include?(c.alpha_2_code) || c.alpha_2_code != 'BR' }
+    .reject { |c| existing_country_isos.include?(c.alpha_2_code) || c.alpha_2_code != "BR" }
     .map(&country_mapper)
     .join("), (")
 end
 
-country_columns = %w(name iso3 iso iso_name numcode states_required).join(', ')
+country_columns = %w[name iso3 iso iso_name numcode states_required].join(", ")
 country_vals = country_values.call
 
 if country_vals.present?

data/db/spree_br/return_reasons.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-Spree::ReturnReason.find_or_create_by(name: 'Better price available')
-Spree::ReturnReason.find_or_create_by(name: 'Missed estimated delivery date')
-Spree::ReturnReason.find_or_create_by(name: 'Missing parts or accessories')
-Spree::ReturnReason.find_or_create_by(name: 'Damaged/Defective')
-Spree::ReturnReason.find_or_create_by(name: 'Different from what was ordered')
-Spree::ReturnReason.find_or_create_by(name: 'Different from description')
-Spree::ReturnReason.find_or_create_by(name: 'No longer needed/wanted')
-Spree::ReturnReason.find_or_create_by(name: 'Accidental order')
-Spree::ReturnReason.find_or_create_by(name: 'Unauthorized purchase')
+Spree::ReturnReason.find_or_create_by(name: "Better price available")
+Spree::ReturnReason.find_or_create_by(name: "Missed estimated delivery date")
+Spree::ReturnReason.find_or_create_by(name: "Missing parts or accessories")
+Spree::ReturnReason.find_or_create_by(name: "Damaged/Defective")
+Spree::ReturnReason.find_or_create_by(name: "Different from what was ordered")
+Spree::ReturnReason.find_or_create_by(name: "Different from description")
+Spree::ReturnReason.find_or_create_by(name: "No longer needed/wanted")
+Spree::ReturnReason.find_or_create_by(name: "Accidental order")
+Spree::ReturnReason.find_or_create_by(name: "Unauthorized purchase")

data/db/spree_br/stock_locations.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 Spree::StockLocation.create_with(backorderable_default: true)
-                    .find_or_create_by!(name: 'default')
+  .find_or_create_by!(name: "default")

data/db/spree_br/store_credit.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 Spree::PaymentMethod.create_with(
   name: "Store Credit",
   description: "Store credit",
@@ -14,10 +13,10 @@ Spree::PaymentMethod.create_with(
 Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: Spree::StoreCreditType::EXPIRING)
 Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: Spree::StoreCreditType::NON_EXPIRING)
 
-Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
-Spree::ReimbursementType.create_with(name: "Original").find_or_create_by!(type: 'Spree::ReimbursementType::OriginalPayment')
+Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: "Spree::ReimbursementType::StoreCredit")
+Spree::ReimbursementType.create_with(name: "Original").find_or_create_by!(type: "Spree::ReimbursementType::OriginalPayment")
 
 Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::GIFT_CARD)
 Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::REIMBURSEMENT)
 
-Spree::StoreCreditReason.find_or_create_by!(name: 'Credit Given In Error')
+Spree::StoreCreditReason.find_or_create_by!(name: "Credit Given In Error")

data/db/spree_br/stores.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-unless Spree::Store.where(code: 'sample-store').exists?
+unless Spree::Store.where(code: "sample-store").exists?
   Spree::Store.create!(
     name: "Sample Store",
     code: "sample-store",

data/lib/generators/solidus_brazilian_adaptations/install/install_generator.rb

@@ -4,26 +4,26 @@ module SolidusBrazilianAdaptations
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def self.exit_on_failure?
         true
       end
 
       def copy_initializer
-        template 'initializer.rb', 'config/initializers/solidus_brazilian_adaptations.rb'
+        template "initializer.rb", "config/initializers/solidus_brazilian_adaptations.rb"
       end
 
       def add_migrations
-        run 'bin/rails railties:install:migrations FROM=solidus_brazilian_adaptations'
+        run "bin/rails railties:install:migrations FROM=solidus_brazilian_adaptations"
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
+        run_migrations = options[:auto_run_migrations] || ["", "y", "Y"].include?(ask("Would you like to run the migrations now? [Y/n]")) # rubocop:disable Layout/LineLength
         if run_migrations
-          run 'bin/rails db:migrate'
+          run "bin/rails db:migrate"
         else
-          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          puts "Skipping bin/rails db:migrate, don't forget to run it!" # rubocop:disable Rails/Output
         end
       end
     end

data/lib/solidus_brazilian_adaptations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBrazilianAdaptations
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

data/lib/solidus_brazilian_adaptations.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "cpf_cnpj"
+require "codigo_postal"
 require "solidus_brazilian_adaptations/configuration"
 require "solidus_brazilian_adaptations/version"
 require "solidus_brazilian_adaptations/engine"

data/solidus_brazilian_adaptations.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "solidus_core", [">= 2.0.0", "< 5"]
   spec.add_dependency "solidus_support", "~> 0.5"
   spec.add_dependency "cpf_cnpj"
+  spec.add_dependency "codigo_postal"
 
   spec.add_development_dependency "solidus_dev_support", "~> 2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_brazilian_adaptations
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - ulysses-bull
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codigo_postal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -89,8 +103,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/decorators/models/solidus_brazilian_adaptations/spree/order_decorator.rb
-- app/modules/tax_id_br.rb
+- app/models/tax_id_br.rb
+- app/overrides/address_validations.rb
+- app/overrides/order_validations.rb
 - bin/console
 - bin/rails
 - bin/rails-engine

data/app/decorators/models/solidus_brazilian_adaptations/spree/order_decorator.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBrazilianAdaptations
-  module Spree
-    module OrderDecorator
-      def self.prepended(base)
-        base.class_eval do
-          validate :verify, if: :email_required?
-          before_update :format_tax_id
-
-          def verify
-            cnpj_allowed = SolidusBrazilianAdaptations.config.allow_cnpj
-            document = TaxIdBr.new(tax_id)
-            if document.valid?
-              if document.document_type == :cnpj && cnpj_allowed == false
-                errors.add(:base, "Insira um CPF, não um CNPJ.")
-              end
-            else
-              errors.add(:base, "#{cnpj_allowed ? "CPF/CPNJ" : "CPF"} inválido.")
-            end
-          end
-
-          def format_tax_id
-            document = TaxIdBr.new(tax_id)
-            self.tax_id = document.formatted
-          end
-        end
-      end
-
-      ::Spree::Order.prepend self
-    end
-  end
-end