magic_addresses 0.0.12 → 0.0.13

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

@@ -0,0 +1,45 @@
+# encoding: utf-8
+class UpdateMagicAddresses < ActiveRecord::Migration
+  def change
+    
+    create_table :mgca_addressibles do |t|
+      t.boolean       :default      # is default address ?
+      t.string        :name         # address name (home | office | ..)
+      t.references    :owner,       polymorphic: true
+      t.references    :address
+      t.timestamps    null: false
+    end
+    
+    add_index :mgca_addressibles, [:owner_type, :owner_id]
+    add_index :mgca_addressibles, :address_id
+    
+    add_column :mgca_addresses, :status, :string, default: "new"
+    
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+    
+    MagicAddresses::Address.all.each do |that|
+      if that.owner_type.present? && that.owner_id.present? && "#{that.owner_type}".constantize.find(that.owner_id.to_i)
+        MagicAddresses::Addressible.create!( address_id: that.id, owner_type: that.owner_type, owner_id: that.owner_id, default: that.default )
+      end
+      sames = MagicAddresses::Address.where(latitude: that.latitude, longitude: that.longitude, zipcode: that.postal_code, street_number: that.street_number )
+      sames.each do |this|
+        unless this == that
+          MagicAddresses::Addressible.create!( address_id: that.id, owner_type: this.owner_type, owner_id: this.owner_id, default: this.default )
+          this.destroy
+        end
+      end if sames.count > 1
+    end
+    
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+    
+    remove_index  :mgca_addresses,    [:owner_type, :owner_id]
+    
+    remove_column :mgca_addresses,    :owner_type,  :string
+    remove_column :mgca_addresses,    :owner_id,    :integer
+    remove_column :mgca_addresses,    :default,     :boolean
+    
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+    
+    
+  end
+end

data/lib/generators/magic_addresses/update_generator.rb

@@ -0,0 +1,25 @@
+require 'rails/generators/migration'
+
+module MagicAddresses
+  module Generators
+    class UpdateGenerator < ::Rails::Generators::Base
+      include Rails::Generators::Migration
+      source_root File.expand_path('../templates', __FILE__)
+      desc "add magic_addresses update migrations"
+
+      def self.next_migration_number(path)
+        unless @prev_migration_nr
+          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+        else
+          @prev_migration_nr += 1
+        end
+        @prev_migration_nr.to_s
+      end
+
+      def copy_migrations
+        migration_template( "update_address_migration.rb", "db/migrate/update_magic_addresses.rb" )
+      end
+
+    end
+  end
+end

data/lib/magic_addresses/configuration.rb

@@ -2,25 +2,37 @@ module MagicAddresses
   class Configuration
     OPTIONS = []
 
+    # Address Owners .. all models that use addresses (name + class_name => {users: "User", things: "Namespace::Thing"}) 
+    attr_accessor :address_owners
+
     # Enabled languages .. save address in each if different to default locale
     attr_accessor :active_locales
 
     # Addresses default locale
     attr_accessor :default_locale
 
+    # Addresses default country
     attr_accessor :default_country
+    # add default country in query ?
+    attr_accessor :query_defaults
+
+    # only save tranlations when differs from default?
+    attr_accessor :uniq_translations
 
-    # Job backend
+    # Job backend ( :sidekiq | :none )
     attr_accessor :job_backend
 
     attr_accessor :earthdistance
 
     def initialize
-      @active_locales = [:en, :de]
-      @default_locale = :en
-      @default_country = "Germany"
-      @job_backend = :none
-      @earthdistance = false
+      @address_owners     = {}
+      @active_locales     = [:en, :de]
+      @default_locale     = :en
+      @default_country    = "Germany"
+      @query_defaults     = true
+      @uniq_translations  = false
+      @job_backend        = :none
+      @earthdistance      = false
     end
 
     # Returns a hash of all configurable options

data/lib/magic_addresses/version.rb

@@ -1,3 +1,3 @@
 module MagicAddresses
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/magic_addresses.rb

@@ -26,6 +26,12 @@ module MagicAddresses
   autoload :District,                 "app/models/magic_addresses/district"
   autoload :Subdistrict,              "app/models/magic_addresses/subdistrict"
   
+  # connections
+  autoload :Addressible,              "app/models/magic_addresses/addressible"
+  
+  # owner proxie
+  autoload :OwnerProxy,               "app/models/magic_addresses/owner_proxy"
+  
   # services
   autoload :GeoCoder,                 "app/models/magic_addresses/geo_coder"
   

data/spec/dummy/app/models/company.rb

@@ -0,0 +1,5 @@
+class Company < ActiveRecord::Base
+  
+  has_addresses
+  
+end

data/spec/dummy/app/views/users/index.html.erb

@@ -11,8 +11,8 @@
       
       <div class="well">
         <p class="highlight"><%= usr.name %></p>
-        <p class="loud"><%= usr.address.presentation %></p>
-        <p><%= usr.address.district %> .. <%= usr.address.subdistrict %></p>
+        <p class="loud"><%=  usr.address ? usr.address.presentation : "- - -" %></p>
+        <p><%= usr.address ? usr.address.district : "- - -" %> .. <%= usr.address ? usr.address.subdistrict : "- - -" %></p>
       </div>
       
     <% end %>

data/spec/dummy/config/environments/test.rb

@@ -39,4 +39,9 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+  
+  
+  config.logger = Logger.new(STDOUT)
+  config.log_level = :info
+  
 end

data/spec/dummy/config/initializers/magic_addresses.rb

@@ -1,12 +1,20 @@
 MagicAddresses.configure do |config|
+  
+  # Address Owners .. all models that use addresses (name + class_name => {users: "User", things: "Namespace::Thing"}) 
+  config.address_owners = { users: "User", companies: "Company" }
   # in which locales addresses should be saved
   config.active_locales = [:en, :de]
   # what is the default language (should be :en, except you don't need english at all)
   config.default_locale = :en
-  # what is the default language (should be :en, except you don't need english at all)
+  # what is the default country for query
   config.default_country = "Germany"
-  # use a background-process for the lookups
+  # add default country in each query ?
+  config.query_defaults = true
+  # only save tranlations when differs from default-locale?
+  config.uniq_translations = true
+  # use a background-process for the lookups ( :none | :sidekiq )
   config.job_backend = :none
   # use a postgres earthdistance for distance calculation
   config.earthdistance = false
-end
+  
+end

data/spec/dummy/db/migrate/20151111133333_create_companies.rb

@@ -0,0 +1,10 @@
+class CreateCompanies < ActiveRecord::Migration
+  def change
+    create_table :companies do |t|
+
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20151118102658_update_magic_addresses.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+class UpdateMagicAddresses < ActiveRecord::Migration
+  def change
+    
+    create_table :mgca_addressibles do |t|
+      t.boolean       :default      # is default address ?
+      t.string        :name         # address name (home | office | ..)
+      t.references    :owner,       polymorphic: true
+      t.references    :address
+      t.timestamps    null: false
+    end
+    
+    add_index :mgca_addressibles, [:owner_type, :owner_id]
+    add_index :mgca_addressibles, :address_id
+    
+    add_column :mgca_addresses, :status, :string, default: "new"
+    
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+    
+    MagicAddresses::Address.all.each do |that|
+      if that.owner_type.present? && that.owner_id.present? && "#{that.owner_type}".constantize.find(that.owner_id.to_i)
+        MagicAddresses::Addressible.create!( address_id: that.id, owner_type: that.owner_type, owner_id: that.owner_id, default: that.default )
+      end
+      sames = MagicAddresses::Address.where(latitude: that.latitude, longitude: that.longitude, zipcode: that.postal_code, street_number: that.street_number )
+      sames.each do |this|
+        unless this == that
+          MagicAddresses::Addressible.create!( address_id: that.id, owner_type: this.owner_type, owner_id: this.owner_id, default: this.default )
+          this.destroy
+        end
+      end if sames.count > 1
+    end
+    
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+    
+    remove_index  :mgca_addresses,    [:owner_type, :owner_id]
+    
+    remove_column :mgca_addresses,    :owner_type,  :string
+    remove_column :mgca_addresses,    :owner_id,    :integer
+    remove_column :mgca_addresses,    :default,     :boolean
+    
+    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+    
+    
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150225220219) do
+ActiveRecord::Schema.define(version: 20151118102658) do
+
+  create_table "companies", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
 
   create_table "mgca_address_translations", force: :cascade do |t|
     t.integer  "mgca_address_id", null: false
@@ -31,7 +37,6 @@ ActiveRecord::Schema.define(version: 20150225220219) do
     t.string   "street_number"
     t.string   "street_additional"
     t.integer  "zipcode"
-    t.boolean  "default"
     t.float    "longitude"
     t.float    "latitude"
     t.integer  "subdistrict_id"
@@ -39,19 +44,30 @@ ActiveRecord::Schema.define(version: 20150225220219) do
     t.integer  "city_id"
     t.integer  "state_id"
     t.integer  "country_id"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-    t.datetime "created_at",        null: false
-    t.datetime "updated_at",        null: false
+    t.datetime "created_at",                        null: false
+    t.datetime "updated_at",                        null: false
+    t.string   "status",            default: "new"
   end
 
   add_index "mgca_addresses", ["city_id"], name: "index_mgca_addresses_on_city_id"
   add_index "mgca_addresses", ["country_id"], name: "index_mgca_addresses_on_country_id"
   add_index "mgca_addresses", ["district_id"], name: "index_mgca_addresses_on_district_id"
-  add_index "mgca_addresses", ["owner_type", "owner_id"], name: "index_mgca_addresses_on_owner_type_and_owner_id"
   add_index "mgca_addresses", ["state_id"], name: "index_mgca_addresses_on_state_id"
   add_index "mgca_addresses", ["subdistrict_id"], name: "index_mgca_addresses_on_subdistrict_id"
 
+  create_table "mgca_addressibles", force: :cascade do |t|
+    t.boolean  "default"
+    t.string   "name"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+    t.integer  "address_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "mgca_addressibles", ["address_id"], name: "index_mgca_addressibles_on_address_id"
+  add_index "mgca_addressibles", ["owner_type", "owner_id"], name: "index_mgca_addressibles_on_owner_type_and_owner_id"
+
   create_table "mgca_cities", force: :cascade do |t|
     t.string   "default_name"
     t.string   "short_name"