posifile 0.2.2 → 0.2.3

data/lib/posifile.rb

@@ -16,44 +16,44 @@ class Posifile
 		check_specification_hash
 		file_content.each do |line|
 			if file_content.length == 1
-				build_attributes_from_hash(@@specifications[self.class][0], line, nil)
+				build_attributes_from_hash(@@specifications[class_name][0], line, nil)
 			else
 				specification_index(line) do |line_,index|
-					build_attributes_from_hash(@@specifications[self.class][index], line_,@@attr_names[self.class][index])
+					build_attributes_from_hash(@@specifications[class_name][index], line_,@@attr_names[class_name][index])
 				end
 			end
 		end
 	end
 
 	def self.set_specification(hash)
-		@@attr_names[self] ||= []
+		@@attr_names[class_name] ||= []
 		if valid_names?(hash)
-			@@specifications[self] ||= []
-			@@specifications[self] << hash
+			@@specifications[class_name] ||= []
+			@@specifications[class_name] << hash
 		else
 			raise InvalidFieldName, "Fields names contain invalid characteres for method names."
 		end
 	end
 
 	def self.lines_where(range,value,&block)
-		@@attr_names[self] ||= []
-		length_before = @@attr_names[self].length
-		@@conditions[self] ||= []
-		@@conditions[self] << {range,value}
+		@@attr_names[class_name] ||= []
+		length_before = @@attr_names[class_name].length
+		@@conditions[class_name] ||= []
+		@@conditions[class_name] << {range,value}
 		yield
-		length_after = @@attr_names[self].length
+		length_after = @@attr_names[class_name].length
 		if length_before == length_after
-			@@attr_names[self] << nil
+			@@attr_names[class_name] << nil
 		end
 		section_code_hash = {"section_code"=>range}
-		if @@specifications[self]
-			@@specifications[self].last.merge!(section_code_hash)
+		if @@specifications[class_name]
+			@@specifications[class_name].last.merge!(section_code_hash)
 		end
 	end
 
 	def self.set_attr_name(attr_name)
-		@@attr_names[self] ||= []
-		@@attr_names[self] << attr_name
+		@@attr_names[class_name] ||= []
+		@@attr_names[class_name] << attr_name
 	end
 
 	def self.valid_names?(hash)
@@ -73,7 +73,7 @@ class Posifile
 	end
 
 	def self.valid_specification?
-		if gap_in_specification?(@@specifications[self]) || overlap_in_specification?(@@specifications[self])
+		if gap_in_specification?(@@specifications[class_name]) || overlap_in_specification?(@@specifications[class_name])
 			false
 		else
 			true
@@ -122,7 +122,7 @@ class Posifile
 
 	def self.higher
 		higher_number = 0
-		@@specifications[self][0].each_value do |range|
+		@@specifications[class_name][0].each_value do |range|
 			if range.max > higher_number
 					higher_number = range.max
 			end
@@ -130,16 +130,35 @@ class Posifile
 		higher_number
 	end
 
+	def self.class_name
+		name = self
+		while name.superclass != Posifile
+			name = name.superclass
+		end
+	
+		name
+
+	end
+
+	def class_name
+		name = self.class
+		while name.superclass != Posifile
+			name = name.superclass
+		end
+	
+		name
+	end
+
 	def check_specification_hash
-		if @@specifications[self.class].nil?
+		if @@specifications[class_name].nil?
 			raise FieldsNotSpecified, "You should call set_specifications in you model, so we can build the object with the corresponding attribuites. Check documentation on how to do so."
 		end
 	end
 
 	def specification_index(line)
 		i = 0
-		unless @@conditions[self.class].nil?
-			@@conditions[self.class].each_with_index do |hash, num|
+		unless @@conditions[class_name].nil?
+			@@conditions[class_name].each_with_index do |hash, num|
 				if check_condition(hash,line)
 					yield line, num
 				end
@@ -190,13 +209,13 @@ class Posifile
 	end
 
 	def pos_attributes
-		@@pos_attr[self.class]
+		@@pos_attr[class_name]
 	end
 
 	def add_method_to_pos_attr(field)
-		@@pos_attr[self.class] ||= []
-		unless @@pos_attr[self.class].include? field
-			@@pos_attr[self.class] << field
+		@@pos_attr[class_name] ||= []
+		unless @@pos_attr[class_name].include? field
+			@@pos_attr[class_name] << field
 		end
 	end
 

data/posifile.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = 'posifile'
-	s.version = '0.2.2'
+	s.version = '0.2.3'
 	s.summary = 'Ruby library to make it easier to read position files. '
 	s.description = 'Ruby library to make it easier to read position files.'
 	s.files = `git ls-files`.split("\n")

data/tests/tests_inheritances.rb

@@ -0,0 +1,27 @@
+require 'posifile'
+require 'test/unit'
+require 'test_helpers'
+require 'client'
+
+class MyClass < Client
+end
+
+class OtherClass < MyClass
+end
+
+class TestInheritance < Test::Unit::TestCase
+	# Here we test how deep in subclasses the library is gonna work (beacase there are self and self.class references in the code)
+
+	include TestHelpers
+
+	def test_inheritance_one
+		car = MyClass.new("samples/sample.txt")
+		assert_equal "jose", car.name
+	end
+
+	def test_inheritance_one
+		car = OtherClass.new("samples/sample.txt")
+		assert_equal "jose", car.name
+	end
+	
+end

data/tests/validations/tests_validations.rb

@@ -15,6 +15,10 @@ class BothGapAndOverlap < Posifile
 	set_specification("name"=>0..8, "address" => 10..20, "job" => 16..30)
 end
 
+class ValidClass < Posifile
+	set_specification("name"=>0..8, "address" => 10..20, "job" => 16..30, "number"=>31..31)
+end
+
 class TestValidations < Test::Unit::TestCase
 
 	include TestHelpers
@@ -51,4 +55,12 @@ class TestValidations < Test::Unit::TestCase
 	def test_gap_in_specification_true
 		assert !Client.gap_in_specification?([{"name"=>0..10, "city"=>11..31,"country"=>32..42}])
 	end
+
+	def test_valid_class1
+		assert !ValidClass.gap_in_specification?([{"name"=>0..10, "address" => 11..20, "job" => 21..30,"number"=>31..31}])
+	end
+
+	def test_valid_class2
+		assert !ValidClass.gap_in_specification?([{"name"=>0..10, "address" => 11..20, "job" => 21..30,"number"=>31..31}])
+	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: posifile
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Marco Antonio Foga\xC3\xA7a Nogueira"
@@ -44,6 +44,7 @@ files:
 - tests/test_helpers.rb
 - tests/tests_change_name.rb
 - tests/tests_check_condition.rb
+- tests/tests_inheritances.rb
 - tests/tests_pos_attributes.rb
 - tests/tests_posifile.rb
 - tests/tests_set_spec_with_uppercase.rb