crm_formatter 2.61 → 2.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3146117f9aa6701a02a859e3d698617fb6e822c663ed55498874cffbe1cf96bc
-  data.tar.gz: ccf3f965f9f8aa153cf915e4c4165346ba2852dd97d222a78b55557937940f6d
+  metadata.gz: cdd79a5c7dd057ad862d974f30170f67f3b066536388c0941d878d2343eb3321
+  data.tar.gz: e6e0be7cb05c90d46d384291d66639e29291654227e373b2e77c7605a9eaf0bd
 SHA512:
-  metadata.gz: 12a8b0c88c6c7e6f9b3083cee24ea29fb2888d1acf68cf7bfb38e1678fc859bccc974fe6545b3237b98498a7d7294285c04f348ba6f70441ea5a6cbb3c8442ec
-  data.tar.gz: 7d340995b9ca0248542dc4dc712b9e3a55082d4de7e9846967c30cf2932d3f18f18285db474eaffed4a0fb4d1196281abf0a1d2e014a6f4a4637e40403713fc8
+  metadata.gz: 9793768c46817902f330fb40d48349a57e86f8b76bc815d425277579eb1ee59a031e2b0c9237877ffeb1e472dec960aa497afaefa306777a79c2900826bbe9d0
+  data.tar.gz: c7ae813cbff69cb95cad6985c401e3f5adde702ab5034010a448b3f5bb0f579bc2c727eb18f0a94f2dad7dc6613febf154f790be9fab69c39f6581d6cbaadf12

data/Rakefile

@@ -18,8 +18,8 @@ task :console do
 
   # formatted_data = format_with_report
   # formatted_phones = format_phones
-  # formatted_urls = format_urls
-  formatted_propers = format_propers
+  formatted_urls = format_urls
+  # formatted_propers = format_propers
   # formatted_addresses = format_addresses
   # binding.pry
   IRB.start
@@ -89,7 +89,8 @@ def format_urls
     www.www.sample10.com
   ]
 
-  array_of_urls = %w[sample01.com/staff www.sample02.net.com http://www.sample3.net www.sample04.net/contact_us http://sample05.net www.sample06.sofake www.sample07.com.sofake example08.not.real www.sample09.net/staff/management www.www.sample10.com]
+  # array_of_urls = %w[texarkana.mercedesdealer.com.notreal minooka.subaru.com http://www.mccrea.subaru.com blackwellford.com www.bobilya.com https://www.century1chevy.com hammondautoplex.com www.harbinfordscottsboro.net http://www.lancaster.subaru.com loufusz.subaru.com www.mastro.subaru.com www.muller.subaru.com reinekefamilydealerships.com]
+
   formatted_urls = CrmFormatter.format_urls(array_of_urls)
 end
 

data/lib/crm_formatter.rb

@@ -9,7 +9,7 @@ require 'crm_formatter/web'
 require 'crm_formatter/wrap'
 
 require 'utf8_sanitizer'
-# require 'pry'
+require 'pry'
 
 # require 'crm_formatter/tools'
 # require 'crm_formatter/seed_criteria'
@@ -58,9 +58,10 @@ module CrmFormatter
       crmf_url_hsh.merge!(web_obj.format_url(url))
       crmf_url_hsh
     end
-    formatted_url_hashes
   end
 
+
+
   def self.format_with_report(args={})
     formatted_data = self::Wrap.new.run(args)
     formatted_data

data/lib/crm_formatter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: false
 
 module CrmFormatter
-  VERSION = "2.61"
+  VERSION = "2.62"
 end

data/lib/crm_formatter/web.rb

@@ -15,6 +15,7 @@ module CrmFormatter
       if url&.present?
         url = normalize_url(url)
         ext_result = validate_extension(url_hash, url)
+
         url_hash = ext_result[:url_hash]
         url = ext_result[:url]
         (url = nil if errors?(url_hash)) if url.present?
@@ -24,7 +25,6 @@ module CrmFormatter
       url_hash[:url_f] = url
       url_hash = extract_path(url_hash) if url.present?
       url_hash = check_web_status(url_hash)
-      url_hash
     end
 
     ### COMPARE ORIGINAL AND FORMATTED URL ###
@@ -127,8 +127,11 @@ module CrmFormatter
       ### Only Non-Errors Get Here ###
       ## Has one valid ext, but need to check if original url exts were > 1.  Replace if so.
       if url_exts.count > matched_exts.count
-        inv_ext = (url_exts - matched_exts).join
-        url = url.gsub(".#{inv_ext}", '')
+        matched_ext = matched_exts.first
+        u1 = url.split(matched_ext).first
+        url = "#{u1}#{matched_ext}"
+        # inv_ext = (url_exts - matched_exts).join
+        # url = url.gsub(".#{inv_ext}", '')
       end
 
       ext_result = { url_hash: url_hash, url: url }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crm_formatter
 version: !ruby/object:Gem::Version
-  version: '2.61'
+  version: '2.62'
 platform: ruby
 authors:
 - Adam Booth
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport