solidus_melhor_envio 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6708cbeb3642d4badecc81cf24b42297e7db6254f4492a4edfe92d057f9cc2
-  data.tar.gz: 8820b20d0e323555d53ffc3a81d01bd0fd6e01538b81238a8d7feb80d19c326a
+  metadata.gz: '0871a5d3a64d261d6c9fed40d8b3b1bb2ce8fdab2c1a6465d75dc073c47e94d5'
+  data.tar.gz: 37aa4497184d5e98e1e00ba2ee2a52082209ad74b47850ca00ba17da3be6e006
 SHA512:
-  metadata.gz: 4aa5fbdfaa69349510abf0cedc2a805c08bf90796f827c10fdfda8bede9a2c2d963bfeaeec28d11fcbea9d4d6559e434cf870fcb274505715f7674035a7400c6
-  data.tar.gz: 280368821229c67f4e57bbb4ed0534e90902a3a16513e4348db15d17b64a01363a6fab7e76d95bdca4bc3c86f8cbf6f4b996ae9ddc7088977c8133787cad3bfb
+  metadata.gz: ab880b0187ceda03cf865b7ab257398ac1c2cc23928a4b7a6d2905bcdcd2955eb25438ca71c1d0b9c7393387f3cc15b761f97cdaa33daeea2439733e8acc6424
+  data.tar.gz: 628f824b93dcf33ed1ba02d786b1c29de796dcda2e194a8e9d71dd08569e6c6370766545f896bd29b54066b5b147f109c8e5eb775a085e7e0a9e9d40f8fd91b8

data/README.md

@@ -11,7 +11,7 @@ Gem utilizada para integrar o MelhorEnvio (cotação de frete) no Solidus.
 Add solidus_melhor_envio to your Gemfile:
 
 ```ruby
-gem 'solidus_melhor_envio'
+gem "solidus_melhor_envio"
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -28,7 +28,7 @@ Adicionar no aquivo `/config/initializers/spree.rb` a linha abaixo, para configu
 Spree.config do |config|
 
 # +++
-  config.stock.estimator_class= 'SolidusMelhorEnvio::ShippingEstimator'
+  config.stock.estimator_class = "SolidusMelhorEnvio::ShippingEstimator"
 end
 ```
 No arquivo `/config/initializers/solidus_melhor_envio.rb` definir as variáveis `app_name` (nome do aplicativo cadastrado no MelhorEnvio), `postal_code_from` (Código Postal de origem) e `services` (id dos serviços de frete desejados que retorne na requisição)
@@ -36,9 +36,9 @@ No arquivo `/config/initializers/solidus_melhor_envio.rb` definir as variáveis
 ```ruby
 SolidusMelhorEnvio.configure do |config|
 
-  config.app_name = '' # ex. 'app_name'
-  config.postal_code_from = '' # ex.: '01555-000'
-  config.services = '' # ex.: '1,2,3,4' - valores separados por vírgula
+  config.app_name = "" # ex. 'app_name'
+  config.postal_code_from = "" # ex.: '01555-000'
+  config.services = "" # ex.: '1,2,3,4' - valores separados por vírgula
 end
 ```
 
@@ -46,12 +46,12 @@ Após, criar a `SolidusMelhorEnvio::Account`, onde ficarão registrados os dados
 
 ```ruby
 SolidusMelhorEnvio::Account.create!({
-  app_name: 'app_name',
-  api_base_url: 'https://www.melhorenvio.com.br',
-  client_id: '12345',
-  client_secret: '123456',
-  refresh_token: '1234',
-  user_agent: 'usuario@example.com'
+  app_name: "app_name",
+  api_base_url: "https://www.melhorenvio.com.br",
+  client_id: "12345",
+  client_secret: "123456",
+  refresh_token: "1234",
+  user_agent: "usuario@example.com"
 })
 ```
 

data/app/models/solidus_melhor_envio/account.rb

@@ -1,5 +1,4 @@
 module SolidusMelhorEnvio
   class Account < ApplicationRecord
-
   end
 end

data/app/models/solidus_melhor_envio/api.rb

@@ -32,14 +32,12 @@ module SolidusMelhorEnvio
     end
 
     def response_has_error? json
-      if json.include? "error"
-        error = json["error"]
-        raise "ERROR: #{json}"
-      end
+      raise "ERROR: #{json}" if json.include? "error"
     end
 
     def need_refresh_token?
       return true if @account.token_expires_in.nil?
+
       DateTime.now.utc > (@account.token_expires_in - 2.hours)
     end
 
@@ -47,4 +45,4 @@ module SolidusMelhorEnvio
       refresh_token if need_refresh_token?
     end
   end
-end
+end

data/app/models/solidus_melhor_envio/shipping_estimator.rb

@@ -1,34 +1,32 @@
 module SolidusMelhorEnvio
   class ShippingEstimator < SolidusMelhorEnvio::Api
-
     def initialize
       super(SolidusMelhorEnvio::Account.find_by(app_name: SolidusMelhorEnvio.config.app_name))
     end
 
-
-    def shipping_rates(package, _frontend_only = true)
+    def shipping_rates(package, _frontend_only: true)
       melhor_envio_rates = get_rates_from_melhor_envio(package)
       shipping_rates = melhor_envio_rates.map do |melhor_envio_rate|
         build_shipping_rate(melhor_envio_rate, package)
       end
-  
+
       unless shipping_rates.empty?
         default_shipping_rate = ::Spree::Config.shipping_rate_selector_class.new(shipping_rates).find_default
         default_shipping_rate.selected = true
       end
-  
+
       shipping_rates
     end
-  
+
     private
-  
+
     def get_rates_from_melhor_envio(package)
       postal_code_from = SolidusMelhorEnvio.config.postal_code_from
       services = SolidusMelhorEnvio.config.services
-      weight = package.contents.map {|content| content.weight }.sum
-      price = package.contents.map {|content| content.price }.sum
+      weight = package.contents.map(&:weight).sum
+      price = package.contents.map(&:price).sum
       zipcode = package.order.ship_address.zipcode
-  
+
       request_body = {
         "from" => {
             "postal_code" => postal_code_from
@@ -55,18 +53,18 @@ module SolidusMelhorEnvio
       res_json.select { |a| a["price"] }
     end
   
-    def build_shipping_rate(melhor_envio_rate, package)
-  
+    def build_shipping_rate(melhor_envio_rate, _package)
+
       shipping_method = ::Spree::ShippingMethod.find_or_create_by(
         carrier: melhor_envio_rate["company"]["name"],
-        service_level: melhor_envio_rate["name"],
-      ) do |shipping_method|
-        shipping_method.name = "#{melhor_envio_rate["company"]["name"]} #{melhor_envio_rate["name"]}"
-        shipping_method.calculator = ::Spree::Calculator::Shipping::FlatRate.create
-        shipping_method.shipping_categories = ::Spree::ShippingCategory.all
-        shipping_method.available_to_users = true
+        service_level: melhor_envio_rate["name"]
+      ) do |sm|
+        sm.name = "#{melhor_envio_rate["company"]["name"]} #{melhor_envio_rate["name"]}"
+        sm.calculator = ::Spree::Calculator::Shipping::FlatRate.create
+        sm.shipping_categories = ::Spree::ShippingCategory.all
+        sm.available_to_users = true
       end
-      
+
       ::Spree::ShippingRate.new(
         shipping_method: shipping_method,
         cost: melhor_envio_rate["price"],
@@ -75,4 +73,4 @@ module SolidusMelhorEnvio
       )
     end
   end
-end
+end

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

@@ -4,36 +4,26 @@ module SolidusMelhorEnvio
   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_melhor_envio.rb'
-      end
-
-      def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_melhor_envio\n"
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_melhor_envio\n"
-      end
-
-      def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_melhor_envio\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_melhor_envio\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
+        template "initializer.rb", "config/initializers/solidus_melhor_envio.rb"
       end
 
       def add_migrations
-        run 'bin/rails railties:install:migrations FROM=solidus_melhor_envio'
+        run "bin/rails railties:install:migrations FROM=solidus_melhor_envio"
       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_melhor_envio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMelhorEnvio
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_melhor_envio
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -90,10 +90,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/spree/backend/solidus_melhor_envio.js
-- app/assets/javascripts/spree/frontend/solidus_melhor_envio.js
-- app/assets/stylesheets/spree/backend/solidus_melhor_envio.css
-- app/assets/stylesheets/spree/frontend/solidus_melhor_envio.css
 - app/models/solidus_melhor_envio/account.rb
 - app/models/solidus_melhor_envio/api.rb
 - app/models/solidus_melhor_envio/shipping_estimator.rb
@@ -107,7 +103,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20230929133307_create_solidus_melhor_envio_accounts.rb
-- db/migrate/20230929180714_add_delivery_time_to_spree_shipping_rate.rb
+- db/migrate/20231020174403_add_delivery_time_to_spree_shipping_rate.rb
 - lib/generators/solidus_melhor_envio/install/install_generator.rb
 - lib/generators/solidus_melhor_envio/install/templates/initializer.rb
 - lib/solidus_melhor_envio.rb

data/app/assets/javascripts/spree/backend/solidus_melhor_envio.js

@@ -1,2 +0,0 @@
-// Placeholder manifest file.
-// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/backend/all.js'

data/app/assets/javascripts/spree/frontend/solidus_melhor_envio.js

@@ -1,2 +0,0 @@
-// Placeholder manifest file.
-// the installer will append this file to the app vendored assets here: vendor/assets/javascripts/spree/frontend/all.js'

data/app/assets/stylesheets/spree/backend/solidus_melhor_envio.css

@@ -1,4 +0,0 @@
-/*
-Placeholder manifest file.
-the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/backend/all.css'
-*/

data/app/assets/stylesheets/spree/frontend/solidus_melhor_envio.css

@@ -1,4 +0,0 @@
-/*
-Placeholder manifest file.
-the installer will append this file to the app vendored assets here: 'vendor/assets/stylesheets/spree/frontend/all.css'
-*/