wahlrecht_de 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cae48787b15853f85eb1bf49870fc2a93859bed
-  data.tar.gz: 46128ce6ed248633b91fd7f08aad510ac0357baf
+  metadata.gz: 56992d54595138ab2c8a23c2a3a2b218dd6bb533
+  data.tar.gz: 00e283c273b816dcf523e39a13feaebef14d72d8
 SHA512:
-  metadata.gz: c037d8c4073f8dc09ba555ce3c039377b3765f850bd36ea410465c21dfa6a9d60d857f5448a8f1e957e24e614abcd44a7f6b8986f5a4533d1dd09ffa03d75bbd
-  data.tar.gz: 4e4af7e8da61ef5c08c6bcaa4a56d66932d3ee8501946703cb6a1b7298e64eb205eccba3f94afb5c9488def349b2f3e190367c695cec439bf25c851d3ad790e2
+  metadata.gz: 5d1568b1375ac7862c409900d48ff2987fdfaac0eece9c4d65afd9da95cc25fee0ef46d7cdf8f03168a76b18e41743143832b4445b35d557eaa935e94463e6f4
+  data.tar.gz: 17e468ba2ec4bbe8cda087ccec3352225cb7459234d806e7578a9c916a489200453d3f169c0c1c88489812faa463dc24022853b6efb76c29896777643a7beceb

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/dataline.rb

@@ -1,21 +1,24 @@
+require_relative 'datapoint'
+
 module WahlrechtDe
 	class Dataline
 
-		def initialize name, prognosis
-			@name = name
-			@prognosis = format_prognosis prognosis
-		end
-
-		def format_prognosis prognosis
-			prognosis.pop
-			prognosis = prognosis - ["", "–"]
-			prognosis.each do |datapoint| format_datapoint datapoint end
+		def initialize row
+			@name = row.at_xpath("th/text()").to_s
+			@prognosis = parse_rowdata row
 		end
 
-		def format_datapoint datapoint
-			datapoint.sub! ",", "."
-			datapoint.chomp! " %"
-			datapoint.chomp! ".0"
+		def parse_rowdata row
+			row_data = []
+			datas = row.xpath("td")
+			datas.pop
+			datas.each do |data|
+				string_data = data.at_xpath("text()").to_s
+				unless (string_data == "" or string_data == "–")
+					row_data.push Datapoint.new string_data
+				end
+			end
+			row_data
 		end
 
 		def prognosis_range

data/lib/datapoint.rb

@@ -0,0 +1,26 @@
+module WahlrechtDe
+  class Datapoint
+  	include Comparable
+  	attr_reader :content
+
+  	def initialize data
+  		format_data data
+  		@content = data
+  	end
+
+		def format_data data
+			data.sub! ",", "."
+			data.chomp! " %"
+			data.chomp! ".0"
+		end
+
+		def <=> other
+			Float(self.content) <=> Float(other.content)
+		end
+
+		def to_s
+			"#{@content}"
+		end
+
+  end
+end

data/lib/survey.rb

@@ -15,17 +15,7 @@ module WahlrechtDe
 
 		def parse index
 			row = @rows[index]
-			row_data = parse_rowdata row
-			@datalines.push(Dataline.new(row.at_xpath("th/text()").to_s, row_data))
-		end
-
-		def parse_rowdata row
-			row_data = []
-			datas = row.xpath("td")
-			datas.each do |data|
-				row_data.push(data.at_xpath("text()").to_s)
-			end
-			row_data
+			@datalines.push Dataline.new row
 		end
 
 		def to_s

data/wahlrecht_de.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wahlrecht_de"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobi Fankh\u{e4}nel"]
-  s.date = "2013-08-28"
+  s.date = "2013-09-01"
   s.description = "= wahlrecht_de\n\nProvides summary analysis of current poll results from wahlrecht.de\n\n== Contributing to wahlrecht_de\n \n* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.\n* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.\n* Fork the project.\n* Start a feature/bugfix branch.\n* Commit and push until you are happy with your contribution.\n* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.\n* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.\n\n== Copyright\n\nCopyright (c) 2013 Tobi Fankh\u{e4}nel. See LICENSE.txt for\nfurther details.\n\n"
   s.email = "fank1@gmx.de"
   s.executables = ["wahlrecht_de"]
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
     "doc/rdoc.css",
     "doc/table_of_contents.html",
     "lib/dataline.rb",
+    "lib/datapoint.rb",
     "lib/runner.rb",
     "lib/survey.rb",
     "spec/dataline_spec.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wahlrecht_de
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tobi Fankhänel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -175,6 +175,7 @@ files:
 - doc/rdoc.css
 - doc/table_of_contents.html
 - lib/dataline.rb
+- lib/datapoint.rb
 - lib/runner.rb
 - lib/survey.rb
 - spec/dataline_spec.rb