magic_addresses 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8735fd4ae4de78e2439288776253de6119c03987
-  data.tar.gz: 0ff658497d0649f3304daedc45be6a5f8813bf56
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmU1Yjc5ZGJiNWUzYjlkMWFlZmFmN2RhYTYyYTJkNGIyYWRiZjEyZQ==
+  data.tar.gz: !binary |-
+    MGUxODAxNDFkMGRhNzczY2M2ZGU5MjljZGNjYzk2YzQ3MjRlYjQzYw==
 SHA512:
-  metadata.gz: 05db027c18081cc99d48070336e6e4d128d0d74b9b9dd994b1969c2a8933b88251e77a7ef48430d5fbe626af341561f0eb8f3c040429bd18ad288aeebae12fd3
-  data.tar.gz: 5286851a43b31cb85798f64d1630b349bf58ec10ec2f1dab23add2938ec5b3856a532b09cd5747b9a240d512de0376e8ed05d6ef8504cd2d3da3ae0ffa1fb225
+  metadata.gz: !binary |-
+    NGZjNTQ1ZjQxZWE0MzE4OGYxZmFlMGFkYWQ1NGY3NGNlZjVjOTljNDk0Mjdk
+    ODA1OTg0YTUwMGI4MTkwOGM3MjBjNzBkZDVlN2M2N2E3OTQxYzRjMDA3Mjlk
+    MDhkZDlhNmMyMzQxODExMGM2ZDZhZGU1NjhlYzFlNzkwZWE3ZjM=
+  data.tar.gz: !binary |-
+    OTU1OGFkYTQxMDM1M2M4N2NkOWVkZDFhZTY4ODU5ZmZkOGU3NzhjY2M1NzQ3
+    YjlhMWRkMTQwMTUyODFiZTQyMzg0N2IwZjVkYzkwMzFkY2U5Yjk4N2ZjZjhl
+    NzI4OTUxMDRlZWRjNTQyMGQ3YWUzMzA2MWYyZjNiMjY0MjViZmM=

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

@@ -106,11 +106,11 @@ class MagicAddresses::Address < ActiveRecord::Base
   
   # =====> I N S T A N C E - M E T H O D S <================================================= #
   
-  def presentation( type = "inline" )
+  def presentation( style = "full", type = "inline" )
     adr = []
     adr << "#{street} #{number}".strip if street.present?
     adr << "#{postalcode} #{city}" if zipcode.present? || city.present?
-    adr << country if country.present?
+    adr << country if country.present? if style == "full"
     if adr.count == 0
       I18n.t("addresses.no_address_given")
     else
@@ -203,7 +203,7 @@ private
         # translate other languages
         
         if MagicAddresses.configuration.job_backend == :sidekiq
-          MagicAddresses::AddressWorker.perform_async( self.id )
+          ::MagicAddresses::AddressWorker.perform_async( self.id )
         else
           complete_translated_attributes()
         end

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

@@ -2,8 +2,8 @@
 class MagicAddresses::AddressWorker
   include Sidekiq::Worker
 
-  def perform( address_id = nil )
-    if address_id && address = ::MagicAddresses::Address.find( address_id )
+  def perform( address_id = nil, counter = 1 )
+    if address_id && address = ::MagicAddresses::Address.find( address_id.to_i )
       
       if address.fetch_address.present?
         puts "###"
@@ -12,6 +12,17 @@ class MagicAddresses::AddressWorker
         address.trigger_complete_translated_attributes
       end
       
+    else
+      
+      counter = counter.to_i
+      puts "###"
+      puts "### AddressWorker  =>  NO Address with ID: #{id} ...try ##{counter}"
+      puts "###"
+      if counter <= 3
+        counter += 1
+        ::MagicAddresses::AddressWorker.perform_in( 1.minute, id, counter )
+      end
+      
     end
   end
 

data/lib/generators/magic_addresses/templates/earthdistance_migration.rb

@@ -1,4 +1,12 @@
 class AddEarthdistance < ActiveRecord::Migration
+  def get_indexes_for_table( table = 'mgca_addresses' )
+    ## ActiveRecord indexes .. doesnt include earthdistance, because its build directly in postgres!
+    # => ActiveRecord::Base.connection.indexes(:mgca_addresses).map{ |x| x.name }
+    # => index_exists?(:mgca_addresses, :earthdistance, name: "mgca_addresses_earthdistance_ix")
+    ## Postgres-Indexes .. thanks to: http://www.alberton.info/postgresql_meta_info.html#p13
+    execute( "SELECT c.relname AS index_name FROM pg_class AS a JOIN pg_index AS b ON (a.oid = b.indrelid) JOIN pg_class AS c ON (c.oid = b.indexrelid) WHERE a.relname = '#{table}';").map{ |that| that["index_name"] }
+  end
+  
   def self.up
     
     # comented out to avoid PG::InsufficientPrivilege-ERROR
@@ -11,17 +19,31 @@ class AddEarthdistance < ActiveRecord::Migration
       enable_extension "earthdistance"
     end
     
-    ## ActiveRecord indexes .. doesnt include earthdistance, because its build directly in postgres!
-    # => address_indexes = ActiveRecord::Base.connection.indexes(:mgca_addresses).map{ |x| x.name }
-    # => index_exists?(:mgca_addresses, :earthdistance, name: "mgca_addresses_earthdistance_ix")
-    
-    ## Postgres-Indexes .. thanks to: http://www.alberton.info/postgresql_meta_info.html#p13
-    address_indexes = execute( "SELECT c.relname AS index_name FROM pg_class AS a JOIN pg_index AS b ON (a.oid = b.indrelid) JOIN pg_class AS c ON (c.oid = b.indexrelid) WHERE a.relname = 'mgca_addresses';").map{ |that| that["index_name"] }
-    
-    unless address_indexes.include?("mgca_addresses_earthdistance_ix")
+    unless get_indexes_for_table('mgca_addresses').include?("mgca_addresses_earthdistance_ix")
       add_earthdistance_index :mgca_addresses, lat: 'latitude', lng: 'longitude'
     end
     
+    
+    ## Want to add indexes to other models?
+    ## -- Model needs this mehtod
+    ##       acts_as_geolocated lat: 'latitude', lng: 'longitude')
+    ## 
+    ## i.e.: Job-model:
+    ## 
+    # => add_column :jobs,   :latitude,      :float
+    # => add_column :jobs,   :longitude,     :float
+    # => Job.all.each do |that|
+    # =>   if that.address && that.address.latitude && that.address.longitude
+    # =>     that.latitude   = that.address.latitude
+    # =>     that.longitude  = that.address.longitude
+    # =>     that.save(:validate => false)
+    # =>   end
+    # => end
+    # => unless get_indexes_for_table('jobs').include?("jobs_earthdistance_ix")
+    # =>   add_earthdistance_index :jobs, lat: 'latitude', lng: 'longitude'
+    # => end
+    
+    
   end
 
   def self.down
@@ -33,13 +55,18 @@ class AddEarthdistance < ActiveRecord::Migration
       disable_extension "cube"
     end
     
-    ## Postgres-Indexes
-    address_indexes = execute( "SELECT c.relname AS index_name FROM pg_class AS a JOIN pg_index AS b ON (a.oid = b.indrelid) JOIN pg_class AS c ON (c.oid = b.indexrelid) WHERE a.relname = 'mgca_addresses';").map{ |that| that["index_name"] }
     
-    if address_indexes.include?("mgca_addresses_earthdistance_ix")
+    if get_indexes_for_table('mgca_addresses').include?("mgca_addresses_earthdistance_ix")
       remove_earthdistance_index :mgca_addresses
     end
     
+    ## remove from Job
+    # => if get_indexes_for_table('jobs').include?("jobs_earthdistance_ix")
+    # =>   remove_earthdistance_index :jobs
+    # => end
+    # => remove_column :jobs,      :latitude,    :float
+    # => remove_column :jobs,      :longitude,   :float
+    
     
   end
 end

data/lib/magic_addresses/version.rb

@@ -1,3 +1,3 @@
 module MagicAddresses
-  VERSION = "0.0.40"
+  VERSION = "0.0.41"
 end

data/spec/dummy/config/database.yml

@@ -4,22 +4,33 @@
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
 #
+# default: &default
+#   adapter: sqlite3
+#   pool: 5
+#   timeout: 5000
+
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
   pool: 5
-  timeout: 5000
+  host: localhost
+  username: austin
+  password:
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  # database: db/development.sqlite3
+  database: mgca_addresses_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  # database: db/test.sqlite3
+  database: mgca_addresses_test
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  # database: db/production.sqlite3
+  database: mgca_addresses_production

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: magic_addresses
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activerecord-postgres-earthdistance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Easy sortable and translated addresses uses google-api with nominatim
@@ -1101,17 +1101,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A really nice address plugin we offten use.