scaffold_plus 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07be1c74af7be1b70d689173591c67a9f207eb96
-  data.tar.gz: a3170fff4e3a8eb3d6c47afb0a573c97126f96be
+  metadata.gz: 804c22bdff1126e023c334e10af6d849a2255a3e
+  data.tar.gz: 25e6941d686cde90c0d9ecbe902798d816c11abd
 SHA512:
-  metadata.gz: 1addc25650114a13fc8b06e29115af6bf36453bab28a3de82ab52eca4f355bbba1aad7c9fff9a2fda7f06a4a5a607f6fbcbced58c5e35bf17d06cee186518ec5
-  data.tar.gz: fd4d3c6cc759505aa1797b2a94340a40e81b6aa61592c375f4693c94bebcae8fd6993d16832ef4900dbda40dcadc381acbd4fc6b7a984d6344fd67e7c1c80296
+  metadata.gz: 7902a9eeaa8d8e034be882a85acd16dda6d49face995a20ab7f94240ac30e40a6b0253c3e47a8569d13ca814d6f9b297dcf64af0b8de54020127d4fbff5bfe50
+  data.tar.gz: 6ef826a6a918e540433cb976045f20f156f5b6ecf2a966bd9cbbbbc3ca0e803e59b8de873d8fa4dbac789cf448e57d84f252fe307e65bdffa99a299c86d399a6

data/lib/generators/scaffold_plus/geocoder/geocoder_generator.rb

@@ -32,8 +32,10 @@ module ScaffoldPlus
             "      if geo.country_code.upcase == 'DE'",
             "        obj.country = 'DE'",
             "        obj.address = geo.address.gsub(/, Deutschland/, '')",
-            "        obj.#{options.latitude} = geo.latitude",
-            "        obj.#{options.longitude} = geo.longitude",
+            "        if obj.#{options.latitude}.blank? and obj.#{options.longitude}.blank?",
+            "          obj.#{options.latitude} = geo.latitude",
+            "          obj.#{options.longitude} = geo.longitude",
+            "        end",
             "      end",
             "    end",
             "  end"
@@ -41,7 +43,7 @@ module ScaffoldPlus
         else
           country = []
         end
-        lines = options.before? ? [ "\n" ] : []
+        lines = options.before? ? [ "" ] : []
         lines << [
           geocoded,
           country,
@@ -50,7 +52,7 @@ module ScaffoldPlus
             " and obj.#{options.address}_changed? }",
           ""
         ]
-        lines << "\n" if options.after?
+        lines << "" if options.after?
         inject_into_class "app/models/#{name}.rb", class_name do
           lines.flatten.join("\n")
         end

data/lib/generators/scaffold_plus/geodesic/geodesic_generator.rb

@@ -13,31 +13,29 @@ module ScaffoldPlus
 
       def update_model
         lat = options.latitude
-        lon = options.longitude
+        lng = options.longitude
         file = "app/models/#{name}.rb"
         prepend_to_file file, "require 'geodesic_wgs84'\n\n"
         lines = [
           "  def to_ary",
-          "    [#{lat}, #{lon}]",
+          "    [#{lat}, #{lng}]",
           "  end",
           "",
-          "  after_validation :update_coordinates, on: [:create, :update]",
-          "",
-          "  protected",
+          "  def as_dms(value)",
+          "    return '' if value.blank?",
+          "    wgs84 = Wgs84.new",
+          "    wgs84.as_dms(value)",
+          "  end",
           "",
-          "  def update_coordinates",
+          "  before_save on: [:create, :update] do",
+          "    # Normalize geo information",
           "    wgs84 = Wgs84.new",
-          "    if self.#{lat}.blank? and self.#{lon}.blank?",
-          "      if self.#{lat}_dms.present? and self.#{lon}_dms.present?",
-          "        self.#{lat}, self.#{lon} = wgs84.lat_lon(self.#{lat}_dms, self.#{lon}_dms)",
-          "      end",
+          "    if self.#{lat}.present?",
+          "      self.#{lat} = wgs84.as_deg(self.#{lat})",
           "    end",
-          "    if self.#{lat}_dms.blank? and self.#{lon}_dms.blank?",
-          "      if self.#{lat}.present? and self.#{lon}.present?",
-          "        self.#{lat}_dms, self.#{lon}_dms = wgs84.lat_lon_dms(self.#{lat}, self.#{lon})",
-          "      end",
+          "    if self.#{lng}.present?",
+          "      self.#{lng} = wgs84.as_deg(self.#{lng})",
           "    end",
-          "    true",
           "  end",
           ""
         ]

data/lib/generators/scaffold_plus/has_one/has_one_generator.rb

@@ -39,7 +39,7 @@ module ScaffoldPlus
           text << ", dependent: :#{dependent}" if options.dependent
           text << "\n"
           if options.nested
-            text << "  accepts_nested_attributes_for :#{child}\n"
+            text << "  accepts_nested_attributes_for :#{child}, allow_destroy: true\n"
           end
           text << "\n" if after_array.include?(name)
           text
@@ -61,7 +61,7 @@ module ScaffoldPlus
       def add_to_permit
         return unless options.nested
         list = options.nested.map{|n| ":#{n}"}.join(', ')
-        text = "#{child}_attributes: [ #{list} ]"
+        text = ":#{child}, #{child}_attributes: [ #{list} ]"
         file = "app/controllers/#{table_name}_controller.rb"
         gsub_file file, /(permit\(.*)\)/, "\\1, #{text})"
         # Special case: no previous permit

data/lib/scaffold_plus/version.rb

@@ -1,3 +1,3 @@
 module ScaffoldPlus
-  VERSION = "1.7.1"
+  VERSION = "1.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_plus
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord