magic_addresses 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb2e21a6fbf9f4f598bd5d134e5600904a727fe
-  data.tar.gz: c80f9082f1680764ba4f7261f833ea5a89c24736
+  metadata.gz: afae17ac192fd28b6715937a4a9d213298b208a1
+  data.tar.gz: 884a80a98cc530e7d53f128d9c0d96b22d269536
 SHA512:
-  metadata.gz: 1a7776f89b502f208b03171daa36c34e5287f5ae37868538ee2dc769fe776023f9a214c064105ff6e8399cf8ebe4ec2097b7e1cecfc332f70f044b8d6569dae8
-  data.tar.gz: f6b7297fb37c484df43177548c36689b235b95b4aaf292903ca34f6365ee6f15022b0f01ebd78d4bfa4b05baebce694a17e2422a78ef0b818b19ec572a80ce64
+  metadata.gz: 5c6854f10dedc764d2a539bbdff5dbb03c5cc56c95a3f0b0e0db40984926653b5f514a9982743ae86775560cf433b681b408603197ee6d1943012a49c68407f9
+  data.tar.gz: 943f8b826fbedb192e86d60a34195142fa17a966f39b6fd6ea4d25157eb381aedf8781d7631bc2aa7466289208a6f9bc5091fd134ecbe84e1398e73441821def

data/README.md

@@ -25,12 +25,47 @@ rails g magic_addresses:install
 #   You can use `has_one_address` and `has_addresses` on the same model 
 #   `has_one_address` sets the default flag so could be major address.
 
-
-  # in Progress
   has_nested_address  # => Has one directly nested addresses. (ie: User.street, User.city)
 
 ```
 
+#### View Mehtods
+
+```ruby
+  
+  <%= country_flag( :de, "small" ) %>
+  # flag helper for all default countries ( "small" | "medium" | "large")
+  
+  <%= render "magic_addresses/addresses/fields/address", f: f %>
+  # form helper for 'has_one_address'
+  
+```
+
+#### in your Controllers:
+
+```ruby
+  
+  private
+  
+    # Never trust parameters from the scary internet! ... has_one_address
+    def instance_params
+      params.require(:instance).permit( .. :address_attributes => [:id, :street, :number, :postalcode, :city, :country, :_destroy] .. )
+    end
+    
+    
+    # Never trust parameters from the scary internet! ... has_addresses
+    def instance_params
+      params.require(:instance).permit( .. :addresses_attributes => [:id, :street, :number, :postalcode, :city, :country, :_destroy] .. )
+    end
+  
+  - or -
+  
+  :address_attributes => MagicAddresses::Address::PARAMS      # has_one_address
+  :addresses_attributes => MagicAddresses::Address::PARAMS    # has_addresses
+  
+```
+
+
 
 #### Structure
 

data/app/models/magic_addresses/address.rb

@@ -6,6 +6,8 @@ class MagicAddresses::Address < ActiveRecord::Base
   
   
   # =====> C O N S T A N T S <=============================================================== #
+  PARAMS = [ :id, :street, :street_additional, :number, :postalcode, :city, :country, :owner, :_destroy ]
+  
   
   # =====> A S S O Z I A T I O N S <========================================================= #
   belongs_to :owner,              polymorphic: true
@@ -28,15 +30,9 @@ class MagicAddresses::Address < ActiveRecord::Base
   
   
   # =====> A T T R I B U T E S <============================================================= #
-  if MagicAddresses.configuration.hstore
-    # setup hstore
-    store_accessor  :fetch_address # , :fetch_street, :fetch_number, :fetch_city, :fetch_zipcode, :fetch_country
-  else
-    serialize       :fetch_address, Hash
-  end
+  serialize       :fetch_address, Hash
   
   %w[fetch_street fetch_number fetch_city fetch_zipcode fetch_country].each do |key|
-    # attr_accessor key
     define_method(key) do
       fetch_address && fetch_address[key]
     end
@@ -44,7 +40,6 @@ class MagicAddresses::Address < ActiveRecord::Base
       self.fetch_address = (fetch_address || {}).merge(key => value)
     end
   end
-  
   # attr_accessor :street
   def street
     fetch_address && fetch_address["fetch_street"] || street_name
@@ -53,7 +48,6 @@ class MagicAddresses::Address < ActiveRecord::Base
     self.street_name = value
     self.fetch_address = (fetch_address || {}).merge("fetch_street" => value)
   end
-  
   # attr_accessor :number (:street_number)
   def number
     fetch_address && fetch_address["fetch_number"] || street_number
@@ -61,7 +55,6 @@ class MagicAddresses::Address < ActiveRecord::Base
   def number=(value)
     self.fetch_address = (fetch_address || {}).merge("fetch_number" => value)
   end
-  
   # attr_accessor :postalcode (:zipcode)
   def postalcode
     fetch_address && fetch_address["fetch_zipcode"] || zipcode
@@ -70,7 +63,6 @@ class MagicAddresses::Address < ActiveRecord::Base
     self.fetch_address = (fetch_address || {}).merge("fetch_zipcode" => value)
   end
   
-  
   %w[country state city district subdistrict].each do |key|
     # attr_accessor key
     define_method(key) do

data/app/models/magic_addresses/association.rb

@@ -8,32 +8,52 @@ module MagicAddresses
   
     ##   C L A S S - M E T H O D S   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
     module ClassMethods
-    
+      
+      
       def has_addresses
-        # => send :include, InstanceMethods
-        has_many :addresses, as: :owner, class_name: "MagicAddresses::Address", dependent: :destroy
+        has_many    :addresses, 
+                    as: :owner, 
+                    class_name: "MagicAddresses::Address", 
+                    dependent: :destroy
         accepts_nested_attributes_for :addresses, allow_destroy: true, reject_if: :all_blank
       end
       
+      
       def has_one_address
         has_one     :address, -> { where(default: true) },
-                    :as => :owner,
-                    :class_name => "MagicAddresses::Address",
-                    :autosave => true,
-                    :dependent => :destroy
-        # => delegate    :street, :street_number, :zipcode, :city, :district, :subdistrict, :state, :country, 
-        # =>             to: :address, allow_nil: true
-        accepts_nested_attributes_for :address, allow_destroy: true # => , reject_if: :all_blank
+                    as: :owner,
+                    class_name: "MagicAddresses::Address",
+                    autosave: true,
+                    dependent: :destroy
+        accepts_nested_attributes_for :address, allow_destroy: true, reject_if: :all_blank
+      end
+      
+      
+      def has_nested_address
+        send :include, InstanceMethods
+        has_one     :address,
+                    as: :owner,
+                    class_name: "MagicAddresses::Address",
+                    autosave: true,
+                    dependent: :destroy
+        delegate    :street, :number, :postalcode, :city, :district, :subdistrict, :state, :country,
+                    :street=, :number=, :postalcode=, :city=, :country=, 
+                    to: :address, allow_nil: true
+        accepts_nested_attributes_for :address, allow_destroy: true, reject_if: :all_blank
+        alias_method_chain :address, :build
       end
-    
-    
+      
+      
     end #> ClassMethods
   
     ##   I N S T A N C E - M E T H O D S   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
     module InstanceMethods
-    
-      # ...
-    
+      
+      # http://stackoverflow.com/a/4033761
+      def address_with_build
+        self.address_without_build || self.build_address
+      end
+      
     end #> InstanceMethods
   
   end

data/app/models/magic_addresses/country.rb

@@ -4,6 +4,11 @@ class MagicAddresses::Country < ActiveRecord::Base
   # =====> A S S O Z I A T I O N S <========================================================= #
   has_many :addresses,    class_name: "MagicAddresses::Address",  foreign_key: :country_id
   
+  has_many :states,       class_name: "MagicAddresses::State",    foreign_key: :country_id
+  has_many :cities,       through: :states,                       source: :cities
+  has_many :districts,    through: :cities,                       source: :districts
+  has_many :subdistricts, through: :districts,                    source: :subdistricts
+  
   
   # =====> A T T R I B U T E S <============================================================= #
   mgca_translate :name

data/app/models/magic_addresses/district.rb

@@ -6,6 +6,10 @@ class MagicAddresses::District < ActiveRecord::Base
   
   belongs_to :city,       class_name: "MagicAddresses::City",     foreign_key: :city_id
   
+  has_one   :state,       through: :city,                         source: :state
+  has_one   :country,     through: :state,                        source: :country
+  
+  has_many :subdistricts, class_name: "MagicAddresses::District", foreign_key: :district_id
   
   # =====> A T T R I B U T E S <============================================================= #
   mgca_translate :name

data/app/models/magic_addresses/state.rb

@@ -6,6 +6,10 @@ class MagicAddresses::State < ActiveRecord::Base
   
   belongs_to :country,    class_name: "MagicAddresses::Country",  foreign_key: :country_id
   
+  has_many :cities,       class_name: "MagicAddresses::City",     foreign_key: :state_id
+  has_many :districts,    through: :cities,                       source: :districts
+  has_many :subdistricts, through: :districts,                    source: :subdistricts
+  
   
   # =====> A T T R I B U T E S <============================================================= #
   mgca_translate :name

data/app/models/magic_addresses/subdistrict.rb

@@ -7,6 +7,8 @@ class MagicAddresses::Subdistrict < ActiveRecord::Base
   belongs_to :city,       class_name: "MagicAddresses::City",     foreign_key: :city_id
   belongs_to :district,   class_name: "MagicAddresses::District", foreign_key: :district_id
   
+  has_one   :state,       through: :city,                         source: :state
+  has_one   :country,     through: :state,                        source: :country
   
   # =====> A T T R I B U T E S <============================================================= #
   mgca_translate :name

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

@@ -3,8 +3,6 @@ class AddMagicAddresses < ActiveRecord::Migration
   def up
     
     # if using with postgresql
-    # => # add hstore extensions
-    # => enable_extension "hstore"
     # => # add extensions for distance calculation
     # => enable_extension "cube"
     # => enable_extension "earthdistance"
@@ -16,12 +14,7 @@ class AddMagicAddresses < ActiveRecord::Migration
       
       t.string        :name                     # => name (if needed)
       
-      # if not empty fetch and translate that address
-      if MagicAddresses.configuration.hstore
-        t.hstore        :fetch_address            # => hstore method
-      else
-        t.text          :fetch_address            # => default serialize field
-      end
+      t.text          :fetch_address            # => default serialize field
       
       # t.string        :street
       t.string        :street_default
@@ -199,8 +192,6 @@ class AddMagicAddresses < ActiveRecord::Migration
     # => # disable extensions for distance calculation
     # => disable_extension "earthdistance"
     # => disable_extension "cube"
-    # => # disable hstore extension
-    # => disable_extension "hstore"
     
   end
 end

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

@@ -9,6 +9,4 @@ MagicAddresses.configure do |config|
   config.job_backend = :none
   # use a postgres earthdistance for distance calculation
   config.earthdistance = false
-  # use a postgres hstore or serializer
-  config.hstore = false
 end

data/lib/helpers/mgca_helper.rb

@@ -2,18 +2,11 @@ require "action_view/helpers/asset_tag_helper"
 
 # encoding: utf-8
 module MgcaHelper
-      
-      def address_fields_for( fff, options = {} )
-        options.merge({f: fff})
-        return render partial: "magic_addresses/addresses/fields/address", locals: options
-      end
-      
-      
-      def country_flag( lcl = I18n.locale.to_s, format = "small" )
-        format = "medium" unless %w(small medium large).include?(format)
-        lcl = "xx" unless %w(at by be ba bg ca hr cy cz dk fi fr de gr hu ie it lv li lt lu nl no pl pt ro ru rs sk si es se ch ua gb us).include?( lcl.to_s.downcase )
-        raw( image_tag( "flags/countries/#{format}/flag-#{lcl.to_s.downcase}.png", class: "flag" ) )
-      end
-    
+  
+  def country_flag( lcl = I18n.locale.to_s, format = "small" )
+    format = "medium" unless %w(small medium large).include?(format)
+    lcl = "xx" unless %w(at by be ba bg ca hr cy cz dk fi fr de gr hu ie it lv li lt lu nl no pl pt ro ru rs sk si es se ch ua gb us).include?( lcl.to_s.downcase )
+    raw( image_tag( "flags/countries/#{format}/flag-#{lcl.to_s.downcase}.png", class: "flag" ) )
+  end
   
 end

data/lib/magic_addresses/configuration.rb

@@ -14,7 +14,6 @@ module MagicAddresses
     attr_accessor :job_backend
 
     attr_accessor :earthdistance
-    attr_accessor :hstore
 
     def initialize
       @active_locales = [:en, :de]
@@ -22,7 +21,6 @@ module MagicAddresses
       @default_country = "Germany"
       @job_backend = :none
       @earthdistance = false
-      @hstore = false
     end
 
     # Returns a hash of all configurable options

data/lib/magic_addresses/version.rb

@@ -1,3 +1,3 @@
 module MagicAddresses
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

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

@@ -9,6 +9,4 @@ MagicAddresses.configure do |config|
   config.job_backend = :none
   # use a postgres earthdistance for distance calculation
   config.earthdistance = false
-  # use a postgres hstore or serializer
-  config.hstore = false
 end

data/spec/dummy/db/migrate/{20150223223200_add_magic_addresses.rb → 20150225220219_add_magic_addresses.rb}

@@ -3,8 +3,6 @@ class AddMagicAddresses < ActiveRecord::Migration
   def up
     
     # if using with postgresql
-    # => # add hstore extensions
-    # => enable_extension "hstore"
     # => # add extensions for distance calculation
     # => enable_extension "cube"
     # => enable_extension "earthdistance"
@@ -16,12 +14,7 @@ class AddMagicAddresses < ActiveRecord::Migration
       
       t.string        :name                     # => name (if needed)
       
-      # if not empty fetch and translate that address
-      if MagicAddresses.configuration.hstore
-        t.hstore        :fetch_address            # => hstore method
-      else
-        t.text          :fetch_address            # => default serialize field
-      end
+      t.text          :fetch_address            # => default serialize field
       
       # t.string        :street
       t.string        :street_default
@@ -199,8 +192,6 @@ class AddMagicAddresses < ActiveRecord::Migration
     # => # disable extensions for distance calculation
     # => disable_extension "earthdistance"
     # => disable_extension "cube"
-    # => # disable hstore extension
-    # => disable_extension "hstore"
     
   end
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150223223200) do
+ActiveRecord::Schema.define(version: 20150225220219) do
 
   create_table "mgca_address_translations", force: :cascade do |t|
     t.integer  "mgca_address_id", null: false