magic_addresses 0.0.14 → 0.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/app/models/magic_addresses/address.rb +1 -1
- data/lib/app/models/magic_addresses/addressible.rb +0 -6
- data/lib/app/workers/magic_addresses/address_worker.rb +18 -0
- data/lib/magic_addresses/version.rb +1 -1
- data/lib/magic_addresses.rb +3 -0
- data/spec/models/magic_addresses/address_spec.rb +8 -8
- metadata +4 -4
- data/lib/app/workers/address_worker.rb +0 -46
- /data/spec/workers/{address_worker_spec.rb → magic_addresses/address_worker_spec.rb} +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bfb79f2139b137d41b7f78f69cc21e38f7955fe4
|
4
|
+
data.tar.gz: 35b0f8a56ae484e97972ed1ad31d4c6faf810cee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1af96fcc99be2e14ed3166c12763e4d29ed9c527dcc6293495fc44f31d117a0d8ff4717229c254b8a140ccd0c8b1254a3c58bf4b299c9de78064dd5748bed64c
|
7
|
+
data.tar.gz: dea92094e76527f8655ae0a58d3b53e115141e5be33d799e5476756b61ca54f161cc98c233b73fff41ae174acff9249c1b061f9bbf1fbe154a617d1e83362949
|
@@ -203,7 +203,7 @@ private
|
|
203
203
|
# translate other languages
|
204
204
|
|
205
205
|
if MagicAddresses.configuration.job_backend == :sidekiq
|
206
|
-
AddressWorker.perform_async( self.id )
|
206
|
+
MagicAddresses::AddressWorker.perform_async( self.id )
|
207
207
|
else
|
208
208
|
complete_translated_attributes()
|
209
209
|
end
|
@@ -9,13 +9,7 @@ class MagicAddresses::Addressible < ActiveRecord::Base
|
|
9
9
|
private
|
10
10
|
|
11
11
|
def log_some_stuff
|
12
|
-
Rails.logger.info "==="
|
13
|
-
Rails.logger.info "=== #{self.inspect}"
|
14
|
-
Rails.logger.info "==="
|
15
12
|
self.address ? self.address.trigger_build_address_associations : true
|
16
|
-
Rails.logger.info "==="
|
17
|
-
Rails.logger.info "=== #{self.inspect}"
|
18
|
-
Rails.logger.info "==="
|
19
13
|
end
|
20
14
|
|
21
15
|
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
class MagicAddresses::AddressWorker
|
3
|
+
include Sidekiq::Worker
|
4
|
+
|
5
|
+
def perform( address_id = nil )
|
6
|
+
if address_id && address = ::Location::Address.find( address_id )
|
7
|
+
|
8
|
+
if address.fetch_address.present?
|
9
|
+
puts "###"
|
10
|
+
puts "### AddressWorker:[#{address_id}]: #{address.fetch_address}"
|
11
|
+
puts "###"
|
12
|
+
address.build_association_translations
|
13
|
+
end
|
14
|
+
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
end
|
data/lib/magic_addresses.rb
CHANGED
@@ -43,6 +43,9 @@ module MagicAddresses
|
|
43
43
|
autoload :DistrictsController, "app/controllers/magic_addresses/districts_controller"
|
44
44
|
autoload :SubdistrictsController, "app/controllers/magic_addresses/subdistricts_controller"
|
45
45
|
|
46
|
+
# worker (sidekiq)
|
47
|
+
autoload :AddressWorker, "app/workers/magic_addresses/addresses_worker" if MagicAddresses.configuration.job_backend == :sidekiq
|
48
|
+
|
46
49
|
# serializer
|
47
50
|
autoload :AddressSerializer, "app/serializers/magic_addresses/address_serializer" if defined?(ActiveModel::Serializer)
|
48
51
|
|
@@ -311,18 +311,18 @@ describe MagicAddresses::Address do
|
|
311
311
|
# => # => @address.city = "Berlin"
|
312
312
|
# => # => @address.postalcode = "10407"
|
313
313
|
# => # => @address.country = "Deutschland"
|
314
|
-
# => # => expect( AddressWorker.jobs.size ).to eq 0
|
314
|
+
# => # => expect( MagicAddresses::AddressWorker.jobs.size ).to eq 0
|
315
315
|
# => # => # => expect {
|
316
316
|
# => # => # => @address.save
|
317
317
|
# => # => # => sleep 1
|
318
|
-
# => # => # => }.to change(AddressWorker.jobs, :size).by(1)
|
319
|
-
# => # => expect( AddressWorker ).to receive(:perform_async).with( 1 )
|
318
|
+
# => # => # => }.to change(MagicAddresses::AddressWorker.jobs, :size).by(1)
|
319
|
+
# => # => expect( MagicAddresses::AddressWorker ).to receive(:perform_async).with( 1 )
|
320
320
|
# => # => @address.save
|
321
|
-
# => # => # expect( AddressWorker.jobs.size ).to eq 1
|
322
|
-
# => # => # AddressWorker.should have_queued_job(1)
|
323
|
-
# => # => # => expect(AddressWorker).to have_enqueued_job( @address.id )
|
324
|
-
# => # => #expect(AddressWorker).to have_enqueued_job( @address.id, true )
|
325
|
-
# => # => # AddressWorker.should_receive(:perform_async).with( @address.id )
|
321
|
+
# => # => # expect( MagicAddresses::AddressWorker.jobs.size ).to eq 1
|
322
|
+
# => # => # MagicAddresses::AddressWorker.should have_queued_job(1)
|
323
|
+
# => # => # => expect(MagicAddresses::AddressWorker).to have_enqueued_job( @address.id )
|
324
|
+
# => # => #expect(MagicAddresses::AddressWorker).to have_enqueued_job( @address.id, true )
|
325
|
+
# => # => # MagicAddresses::AddressWorker.should_receive(:perform_async).with( @address.id )
|
326
326
|
# => # => expect( @address.fetch_address ).to eq ("Heinz-Kapelle-Str. 6 Berlin 10407 Deutschland")
|
327
327
|
# => # => # trigger background task
|
328
328
|
# => # => @address.build_association_translations
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: magic_addresses
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Torsten Wetzel
|
@@ -148,7 +148,7 @@ files:
|
|
148
148
|
- lib/app/models/magic_addresses/subdistrict.rb
|
149
149
|
- lib/app/models/magic_addresses/translator.rb
|
150
150
|
- lib/app/serializers/magic_addresses/address_serializer.rb
|
151
|
-
- lib/app/workers/address_worker.rb
|
151
|
+
- lib/app/workers/magic_addresses/address_worker.rb
|
152
152
|
- lib/generators/magic_addresses/add_earthdistance_generator.rb
|
153
153
|
- lib/generators/magic_addresses/install_generator.rb
|
154
154
|
- lib/generators/magic_addresses/templates/country_seeds.rb
|
@@ -736,7 +736,7 @@ files:
|
|
736
736
|
- spec/models/user_spec.rb
|
737
737
|
- spec/rails_helper.rb
|
738
738
|
- spec/spec_helper.rb
|
739
|
-
- spec/workers/address_worker_spec.rb
|
739
|
+
- spec/workers/magic_addresses/address_worker_spec.rb
|
740
740
|
- vendor/assets/images/flags/countries/large/flag-at.png
|
741
741
|
- vendor/assets/images/flags/countries/large/flag-ba.png
|
742
742
|
- vendor/assets/images/flags/countries/large/flag-be.png
|
@@ -1681,4 +1681,4 @@ test_files:
|
|
1681
1681
|
- spec/models/user_spec.rb
|
1682
1682
|
- spec/rails_helper.rb
|
1683
1683
|
- spec/spec_helper.rb
|
1684
|
-
- spec/workers/address_worker_spec.rb
|
1684
|
+
- spec/workers/magic_addresses/address_worker_spec.rb
|
@@ -1,46 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
class AddressWorker
|
3
|
-
include Sidekiq::Worker
|
4
|
-
|
5
|
-
def perform( address_id = nil )
|
6
|
-
if address_id && address = ::Location::Address.find( address_id )
|
7
|
-
|
8
|
-
if address.fetch_address.present?
|
9
|
-
puts "###"
|
10
|
-
puts "### AddressWorker:[#{address_id}]: #{address.fetch_address}"
|
11
|
-
puts "###"
|
12
|
-
address.build_association_translations
|
13
|
-
end
|
14
|
-
|
15
|
-
# => if address.fetch_address.present?
|
16
|
-
# =>
|
17
|
-
# => puts "AddressWorker:: '#{address.fetch_address}'"
|
18
|
-
# => geo_data = {}
|
19
|
-
# => ::Wizard::Locale.where(locale_state: ["active","live"]).each do |lc|
|
20
|
-
# => puts "AddressWorker:: - #{lc.name} (#{ lc.iso_code })"
|
21
|
-
# => sleep 1.5
|
22
|
-
# => gd = Geocoder.search( address.fetch_address, params: { language: lc.iso_code })
|
23
|
-
# => geo_data[lc.iso_code] = gd.first if gd.first
|
24
|
-
# => end
|
25
|
-
# =>
|
26
|
-
# => puts "AddressWorker:: Build Associations"
|
27
|
-
# => address.build_association_translations( geo_data )
|
28
|
-
# =>
|
29
|
-
# => address.address = nil
|
30
|
-
# => address.fetch_address = nil
|
31
|
-
# => address.save
|
32
|
-
# =>
|
33
|
-
# => puts "AddressWorker:: Remove empty translations"
|
34
|
-
# => # => self.translations.where("street is NULL").map { |t| t.delete }
|
35
|
-
# => address.translations.where( street: [ "", nil ] ).delete_all
|
36
|
-
# => address.country.translations.where( name: [ "", nil ] ).delete_all if address.country
|
37
|
-
# => address.state.translations.where( name: [ "", nil ] ).delete_all if address.state
|
38
|
-
# => address.city.translations.where( name: [ "", nil ] ).delete_all if address.city
|
39
|
-
# => address.district.translations.where( name: [ "", nil ] ).delete_all if address.district
|
40
|
-
# => address.subdistrict.translations.where( name: [ "", nil ] ).delete_all if address.subdistrict
|
41
|
-
# =>
|
42
|
-
# => end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
end
|
File without changes
|