Merge pull request #1 from bad6e/refactor_names_2

Refactor names 2

Author: bad6e

app/controllers/application_controller.rb

@@ -5,4 +5,5 @@ class ApplicationController < ActionController::Base
 
   require 'nokogiri'
   require 'open-uri'
+
 end

app/controllers/welcome_controller.rb

@@ -1,37 +1,6 @@
 class WelcomeController < ApplicationController
 
   def index
-    urls = ["https://github.com/bad6e",
-            "https://github.com/roseak",
-            "https://github.com/mcschatz",
-            "https://github.com/travishaby",
-            "https://github.com/Jpease1020",
-            "https://github.com/jphoenix86",
-            "https://github.com/HoffsMH",
-            "https://github.com/MowAlon",
-            "https://github.com/russelleh",
-            "https://github.com/jbrr",
-            "https://github.com/rasensio1",
-            "https://github.com/selfup",
-            "https://github.com/dastinnette",
-            "https://github.com/mbburch",
-            "https://github.com/Kealii",
-            "https://github.com/Unsafepond",
-            "https://github.com/ChrisCenatie",
-            "https://github.com/adamki",
-            "https://github.com/plato721",
-            "https://github.com/Egogre"
-          ]
-
-    text = urls.map do |url|
-      Nokogiri::HTML(open(url)).at_css(".vcard-fullname").text.strip
-    end
-
-    text1 = urls.map do |url|
-      Nokogiri::HTML(open(url)).at_css(".contrib-number").text.gsub("total","").to_i
-    end
-
-    join = text.zip(text1)
-    @group = join.sort{|a,b| b[1] <=> a[1]}
+    @group = Welcome.new.sort
   end
 end

app/helpers/application_helper.rb

@@ -1,2 +1,2 @@
 module ApplicationHelper
-end
+end

app/models/welcome.rb

@@ -1,7 +1,7 @@
 class Welcome
 
-  def self.open_pages
-    urls = ["https://github.com/bad6e",
+  def initialize
+    @urls =["https://github.com/bad6e",
             "https://github.com/roseak",
             "https://github.com/mcschatz",
             "https://github.com/travishaby",
@@ -13,22 +13,34 @@ def self.open_pages
             "https://github.com/jbrr",
             "https://github.com/rasensio1",
             "https://github.com/selfup",
-            "https://github.com/dastinnette"
-          ]
-
-    text = urls.map do |url|
-      Nokogiri::HTML(open(url)).at_css
-    end
-
+            "https://github.com/dastinnette",
+            "https://github.com/mbburch",
+            "https://github.com/Kealii",
+            "https://github.com/Unsafepond",
+            "https://github.com/ChrisCenatie",
+            "https://github.com/adamki",
+            "https://github.com/plato721",
+            "https://github.com/Egogre"]
+  end
 
+  def sort
+    join_arrays = get_names.zip(get_count)
+    join_arrays.sort{|a,b| b[1] <=> a[1]}
   end
 
-  def self.name
-    @data.at_css(".vcard-fullname").text.strip
+  def get_names
+    @urls.map do |url|
+      open_url(url).at_css(".vcard-fullname").text.strip
+    end
   end
 
-  def counter
-    @data.at_css(".contrib-number").text.strip
+  def get_count
+    @urls.map do |url|
+      open_url(url).at_css(".contrib-number").text.gsub("total","").to_i
+    end
   end
 
+  def open_url(url)
+    Nokogiri::HTML(open(url))
+  end
 end