revepast 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjY2NWZhOTQ3ZmRiYWYyMDkyNTllZjRmNTU3ZWE2ZjhkYjgwOWU2Zg==
+    YTBiM2I4NjdiNjIzZThjOGQ1ODc1Njc0MDJkZDRlYTcwZjA3YWI4Zg==
   data.tar.gz: !binary |-
-    NWFmZGFiN2VlZWRhNmNlZTIyZjM2MmQ5ZmNhZjg5ZDMwYjVhNjFlYg==
+    OTA3N2FhMmNkOGVlZGI4MDQzZDYyNmRmZThmOGM2YmMxMDJiMTZkNw==
 SHA512:
   metadata.gz: !binary |-
-    M2MzM2IxMzFlYjA1MTE1ODdmYjMwODBhMTlmY2UyMDYxMmMwZTVmOGE3ZDY5
-    ZGM1NmNlYzgzODRmMmY4MWRlOTkyZTFlNTg0NjE3MzY5MTE1MzlmN2RiOTlk
-    M2Q2ZTk0MWFkMDhjNjE4YzQ2NjQ5MDAwZmQyNGNiOTRkMmQ1YjA=
+    MWQ0OWMwMGZlYjk0OTdjYjVkMWMzNGQ4NGVkZmEyNTgyYTAzNDc0Y2RjN2Vh
+    MDA3ZDAwYjM0ZGZkYjBmZGNjN2U5MGM2ZmQyYTNjZmQ5MTJlOTQxMzI5ZWVm
+    NDc2MTA5OTE0NDI3MzMxNGYzZDVlNTJhZDQyZWRhMTUzMzFkMWY=
   data.tar.gz: !binary |-
-    Mzc0MGVkNTcyOTRjNDcyNzBhYjlmMjVkY2FlNzcwNjA2OGQ4NWZiMWY3MWFm
-    OTE3MDU5MzMyYWQyZmQ5OTA5NTJmZWJmN2VjZTZiZGExNzE2MWZkMDhiNTM5
-    M2RiMTUwNDUwMTNlYWQxYzFjNmRkNWUwNTE5ZTJjYmYyNDlhY2Y=
+    NTQzOTIyNzA5ZmQ0ZDUzMWIyNzc3ZjYwNTYwMGJmOTJiYzIzZDVmNGRiOWVj
+    YWIzMzBiNzc1NjdmMGIzNWFiN2ExYmY2NmRjMTkzOTA4OTA2NGEzNzk0YWU1
+    ZTIxYWJlYTEzZWY3YTljNzhiOWNlYTgyODk2MWYzM2QyYzhiYzI=

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rake'
 group :development do
 	gem 'pry'
 	gem 'awesome_print'
+	gem 'json'
 end
 
 group :test do

data/README.md

@@ -1,9 +1,11 @@
+[![Gem Version](https://badge.fury.io/rb/revepast.png)](http://badge.fury.io/rb/revepast)
 [![Coverage Status](https://coveralls.io/repos/Mekaret/revepast/badge.svg?branch=master&service=github)](https://coveralls.io/github/Mekaret/revepast?branch=master)
 [![Build Status](https://travis-ci.org/Mekaret/revepast.svg?branch=master)](https://travis-ci.org/Mekaret/revepast)
 
 # Revepast
 
 A ruby library to help parse various things that are copy/pastable from the Eve Online UI.
+Largely inspired from [Evepaste](https://github.com/evepraisal/evepaste).
 
 This is currently a **work in progress**. 
 

data/lib/revepast/exceptions.rb

@@ -0,0 +1,9 @@
+module Revepast
+	class Unparsable < StandardError
+		attr_reader :object
+
+		def initialize(object)
+			@object = object			
+		end
+	end
+end

data/lib/revepast/parser/cargo_scan.rb

@@ -1,14 +1,21 @@
 module Revepast
 	module Parser
 		class CargoScan
-			def initialize(str)
-			@Utils = Utils.new
-			@str = @Utils.sanitize(str)
-			parse
+			autoload :Utils, 'revepast/parser'
+			include Revepast::Parser
+
+			attr_reader :result, :bad_lines
+
+			def initialize
+				@Utils = Utils.new
+				@result = {}
+				@bad_lines = []
+				result = parse
 			end
 
 			def parse
-				p "wa are in CargoScan"
+                lines = @Utils.sanitize(Revepast.str)			
+				@result, @bad_lines = @Utils.parse_listing(lines)
 			end
 		end
 	end

data/lib/revepast/parser/eft.rb

@@ -6,14 +6,14 @@ module Revepast
 
 			attr_reader :result, :bad_lines
 
-			def initialize(str)
+			def initialize
 				@Utils = Utils.new
 				@result = {}
 				@bad_lines = []
-				result = parse(@Utils.sanitize(str))
+				result = parse
 			end
 
-			def parse(str)
+			def parse
 		    	ammo_pattern = /^([\S ]+), ?([\S ]+)$/
 				blacklist = ['[empty high slot]',
                  			 '[empty low slot]',
@@ -21,13 +21,22 @@ module Revepast
                 			 '[empty rig slot]',
                  			 '[empty subsystem slot]']
 
-				if str.lines.first =~ /^(\[).*(\])$/
-					ship = str.lines.first.match(ammo_pattern)[1].tr('[]', '')
-				 	fit_name = str.lines.first.match(ammo_pattern)[2].tr('[]', '')
-				else
-					puts "Invalid EFT title line"
+                 sanitize = @Utils.sanitize(Revepast.str)
+                 lines = []
+                 sanitize.each do |line|
+                 	unless blacklist.include? line.downcase
+                 		lines << line
+                 	end
+                 end
+
+				begin 
+					lines.first =~ /^(\[).*(\])$/
+					ship = lines.first.match(ammo_pattern)[1].tr('[]', '')
+				 	fit_name = lines.first.match(ammo_pattern)[2].tr('[]', '')
+				rescue
+					raise Unparsable.new("Invalid EFT title line")
 				end
-				matches, bad_lines = @Utils.regex_match_lines(ammo_pattern, str.lines[1..-1])
+				matches, bad_lines = @Utils.regex_match_lines(ammo_pattern, lines[1..-1])
 				matches2, bad_lines2 = @Utils.parse_listing(bad_lines)
 				
 				@bad_lines = bad_lines2

data/lib/revepast/parser.rb

@@ -1,8 +1,17 @@
 module Revepast
 	module Parser
+		require "revepast/parser/eft"
+		require "revepast/parser/cargo_scan"
 		class Utils
 			def sanitize(str)
-				return str.gsub /^$\n/, ''
+				result = []
+				str.each_line do |line|
+					line = line.chomp.gsub /^$\n/, ''
+					unless line.nil? || line == ""
+						result << line
+					end
+				end
+				return result
 			end
 
 			def regex_match_lines(regex, lines)
@@ -10,10 +19,8 @@ module Revepast
 				bad_lines = Array.new
 				lines.each do |line|
 					if line.match(regex)
-						# p "--#{line.chomp}"
 						a = line.match(regex)
 						matches.push(a.captures)
-						# p matches
 					else
 						bad_lines.push(line.chomp)
 					end
@@ -34,7 +41,7 @@ module Revepast
 				matches3, bad_lines3 = regex_match_lines(listing_re3, bad_lines2)
 
 				items = Hash.new { |h, k| h[k] = 0 }
-				matches.each do |name, count|
+				matches.each do |count, name|
 					items[name.strip] += count.to_i
 				end
 				matches2.each do |name, count|

data/lib/revepast/version.rb

@@ -1,3 +1,3 @@
 module Revepast
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/revepast.rb

@@ -1,32 +1,29 @@
 require "revepast/version"
+require "revepast/exceptions"
+require "revepast/parser"
 
 module Revepast
-	class Error < StandardError
-	end
-
-	module Parser
-		autoload :Parser, 'revepast/parser'
-	end
-
-	class Sort
-		autoload :EFT, 'revepast/parser/eft'
-		include Revepast::Parser
-
-		attr_reader :result, :bad_lines
-
-		def initialize(str)
-			eft_parse = EFT.new(str)
-			@result = eft_parse.result
-			@bad_lines = eft_parse.bad_lines
-		end
-	end
+	class << self; attr_accessor :str; end
 
 	class Parse
 		attr_reader :result
 		def initialize (str)
-			@result = Revepast::Sort.new(str)
-			p result.result
-			p result.bad_lines
+			Revepast.str = str
+			parser_table = [ "EFT", "CargoScan" ]
+			parser_table.each do |classname|
+				begin
+					parse =  Object.const_get("Revepast::Parser").const_get(classname).new
+					if parse then
+						result = parse.result
+						bad_lines = parse.bad_lines
+						@result = [classname, result, bad_lines]
+						return
+					end
+				rescue Unparsable
+					
+				end
+			end
+			raise Unparsable.new("No valid parser found for the givin text.")
 		end
 	end
 

data/revepast.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "A Ruby library to help parse various things that are copy/pastable from the Eve Online"
   spec.description   = "Ruby library to help parse various things that are copy/pastable from the Eve Online"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/Mekaret/revepast"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revepast
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mekaret Eriker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies: []
 description: Ruby library to help parse various things that are copy/pastable from
   the Eve Online
@@ -25,13 +25,13 @@ files:
 - README.md
 - Rakefile
 - lib/revepast.rb
+- lib/revepast/exceptions.rb
 - lib/revepast/parser.rb
 - lib/revepast/parser/cargo_scan.rb
 - lib/revepast/parser/eft.rb
-- lib/revepast/parser/test.rb
 - lib/revepast/version.rb
 - revepast.gemspec
-homepage: ''
+homepage: https://github.com/Mekaret/revepast
 licenses:
 - MIT
 metadata:

data/lib/revepast/parser/test.rb

@@ -1,21 +0,0 @@
-# /usr/bin/ruby
-
-input = {
-"425mm AutoCannon II, Republic Fleet EMP M" => 3
-}
-
-expected_output = [
-{
-name: "425mm AutoCannon II",
-ammo: "Republic Fleet EMP M",
-quantity: 3
-}
-]
-
-output = input.inject([]) do |memo, (key, quantity)|
-name, ammo = key.split(",")
-memo << { name: name.strip, ammo: ammo.strip, quantity: quantity }
-p memo
-end
-
-raise "don't match" if output != expected_output