magic_addresses 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 538e746ba0ba80f848ed94583b01386b48dc0bb7
-  data.tar.gz: b297ed07967a01269f7ccefc1af94779980baaa7
+  metadata.gz: bfb79f2139b137d41b7f78f69cc21e38f7955fe4
+  data.tar.gz: 35b0f8a56ae484e97972ed1ad31d4c6faf810cee
 SHA512:
-  metadata.gz: 45656f66df6411d2c79f43efa01ba1fd9654005aba811690660b89e6fbf1fec12e02a6e3453cd685c980b35a06aa02b39f378ac2ef050e53fd49e4f82d43bea9
-  data.tar.gz: 8b195413d73f980401beeb910ba8587c80878fc1304bf86ace34e67f921bfc0b4106825fbeef80ad3e541f27b37e1dfd8f95a4d12497a9a0533c0f7c700e0f51
+  metadata.gz: 1af96fcc99be2e14ed3166c12763e4d29ed9c527dcc6293495fc44f31d117a0d8ff4717229c254b8a140ccd0c8b1254a3c58bf4b299c9de78064dd5748bed64c
+  data.tar.gz: dea92094e76527f8655ae0a58d3b53e115141e5be33d799e5476756b61ca54f161cc98c233b73fff41ae174acff9249c1b061f9bbf1fbe154a617d1e83362949

data/lib/app/models/magic_addresses/address.rb

@@ -203,7 +203,7 @@ private
         # translate other languages
         
         if MagicAddresses.configuration.job_backend == :sidekiq
-          AddressWorker.perform_async( self.id )
+          MagicAddresses::AddressWorker.perform_async( self.id )
         else
           complete_translated_attributes()
         end

data/lib/app/models/magic_addresses/addressible.rb

@@ -9,13 +9,7 @@ class MagicAddresses::Addressible < ActiveRecord::Base
 private
   
   def log_some_stuff
-    Rails.logger.info "==="
-    Rails.logger.info "===  #{self.inspect}"
-    Rails.logger.info "==="
     self.address ? self.address.trigger_build_address_associations : true
-    Rails.logger.info "==="
-    Rails.logger.info "===  #{self.inspect}"
-    Rails.logger.info "==="
   end
   
 end

data/lib/app/workers/magic_addresses/address_worker.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+class MagicAddresses::AddressWorker
+  include Sidekiq::Worker
+
+  def perform( address_id = nil )
+    if address_id && address = ::Location::Address.find( address_id )
+      
+      if address.fetch_address.present?
+        puts "###"
+        puts "### AddressWorker:[#{address_id}]:   #{address.fetch_address}"
+        puts "###"
+        address.build_association_translations
+      end
+      
+    end
+  end
+
+end

data/lib/magic_addresses/version.rb

@@ -1,3 +1,3 @@
 module MagicAddresses
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/magic_addresses.rb

@@ -43,6 +43,9 @@ module MagicAddresses
   autoload :DistrictsController,      "app/controllers/magic_addresses/districts_controller"
   autoload :SubdistrictsController,   "app/controllers/magic_addresses/subdistricts_controller"
   
+  # worker (sidekiq)
+  autoload :AddressWorker,            "app/workers/magic_addresses/addresses_worker" if MagicAddresses.configuration.job_backend == :sidekiq
+  
   # serializer
   autoload :AddressSerializer,        "app/serializers/magic_addresses/address_serializer" if defined?(ActiveModel::Serializer)
   

data/spec/models/magic_addresses/address_spec.rb

@@ -311,18 +311,18 @@ describe MagicAddresses::Address do
   # =>   # =>   @address.city = "Berlin"
   # =>   # =>   @address.postalcode = "10407"
   # =>   # =>   @address.country = "Deutschland"
-  # =>   # =>   expect( AddressWorker.jobs.size ).to eq 0
+  # =>   # =>   expect( MagicAddresses::AddressWorker.jobs.size ).to eq 0
   # =>   # =>   # => expect {
   # =>   # =>   # =>   @address.save
   # =>   # =>   # =>   sleep 1
-  # =>   # =>   # => }.to change(AddressWorker.jobs, :size).by(1)
-  # =>   # =>   expect( AddressWorker ).to receive(:perform_async).with( 1 )
+  # =>   # =>   # => }.to change(MagicAddresses::AddressWorker.jobs, :size).by(1)
+  # =>   # =>   expect( MagicAddresses::AddressWorker ).to receive(:perform_async).with( 1 )
   # =>   # =>   @address.save
-  # =>   # =>   # expect( AddressWorker.jobs.size ).to eq 1
-  # =>   # =>   # AddressWorker.should have_queued_job(1)
-  # =>   # =>   # => expect(AddressWorker).to have_enqueued_job( @address.id )
-  # =>   # =>   #expect(AddressWorker).to have_enqueued_job( @address.id, true )
-  # =>   # =>   # AddressWorker.should_receive(:perform_async).with( @address.id )
+  # =>   # =>   # expect( MagicAddresses::AddressWorker.jobs.size ).to eq 1
+  # =>   # =>   # MagicAddresses::AddressWorker.should have_queued_job(1)
+  # =>   # =>   # => expect(MagicAddresses::AddressWorker).to have_enqueued_job( @address.id )
+  # =>   # =>   #expect(MagicAddresses::AddressWorker).to have_enqueued_job( @address.id, true )
+  # =>   # =>   # MagicAddresses::AddressWorker.should_receive(:perform_async).with( @address.id )
   # =>   # =>   expect( @address.fetch_address ).to eq ("Heinz-Kapelle-Str. 6 Berlin 10407 Deutschland")
   # =>   # =>   # trigger background task
   # =>   # =>   @address.build_association_translations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_addresses
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Torsten Wetzel
@@ -148,7 +148,7 @@ files:
 - lib/app/models/magic_addresses/subdistrict.rb
 - lib/app/models/magic_addresses/translator.rb
 - lib/app/serializers/magic_addresses/address_serializer.rb
-- lib/app/workers/address_worker.rb
+- lib/app/workers/magic_addresses/address_worker.rb
 - lib/generators/magic_addresses/add_earthdistance_generator.rb
 - lib/generators/magic_addresses/install_generator.rb
 - lib/generators/magic_addresses/templates/country_seeds.rb
@@ -736,7 +736,7 @@ files:
 - spec/models/user_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/workers/address_worker_spec.rb
+- spec/workers/magic_addresses/address_worker_spec.rb
 - vendor/assets/images/flags/countries/large/flag-at.png
 - vendor/assets/images/flags/countries/large/flag-ba.png
 - vendor/assets/images/flags/countries/large/flag-be.png
@@ -1681,4 +1681,4 @@ test_files:
 - spec/models/user_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/workers/address_worker_spec.rb
+- spec/workers/magic_addresses/address_worker_spec.rb

data/lib/app/workers/address_worker.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-class AddressWorker
-  include Sidekiq::Worker
-
-  def perform( address_id = nil )
-    if address_id && address = ::Location::Address.find( address_id )
-      
-      if address.fetch_address.present?
-        puts "###"
-        puts "### AddressWorker:[#{address_id}]:   #{address.fetch_address}"
-        puts "###"
-        address.build_association_translations
-      end
-      
-      # => if address.fetch_address.present?
-      # =>   
-      # =>   puts "AddressWorker::   '#{address.fetch_address}'"
-      # =>   geo_data = {}
-      # =>   ::Wizard::Locale.where(locale_state: ["active","live"]).each do |lc|
-      # =>     puts "AddressWorker::   - #{lc.name} (#{ lc.iso_code })"
-      # =>     sleep 1.5
-      # =>     gd = Geocoder.search( address.fetch_address, params: { language: lc.iso_code })
-      # =>     geo_data[lc.iso_code] =  gd.first if gd.first
-      # =>   end
-      # =>   
-      # =>   puts "AddressWorker::   Build Associations"
-      # =>   address.build_association_translations( geo_data )
-      # =>   
-      # =>   address.address = nil
-      # =>   address.fetch_address = nil
-      # =>   address.save
-      # =>   
-      # =>   puts "AddressWorker::   Remove empty translations"
-      # =>   # => self.translations.where("street is NULL").map { |t| t.delete }
-      # =>   address.translations.where( street: [ "", nil ] ).delete_all
-      # =>   address.country.translations.where( name: [ "", nil ] ).delete_all    if address.country
-      # =>   address.state.translations.where( name: [ "", nil ] ).delete_all      if address.state
-      # =>   address.city.translations.where( name: [ "", nil ] ).delete_all       if address.city
-      # =>   address.district.translations.where( name: [ "", nil ] ).delete_all    if address.district
-      # =>   address.subdistrict.translations.where( name: [ "", nil ] ).delete_all if address.subdistrict
-      # =>   
-      # => end
-    end
-  end
-
-end