framecurve 2.1.0 → 2.2.0

data/History.txt

@@ -1,3 +1,7 @@
+2.2.0
+
+* Let Parser add the filename to the curve when parsing
+
 2.1.0
 
 * Adds Validator#ok?

data/framecurve.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "framecurve"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik"]

data/lib/framecurve/parser.rb

@@ -11,9 +11,7 @@ class Framecurve::Parser
     # If the first argument is a path parse from the opened file, 
     # and record the filename in the curve as well
     unless path_or_io.respond_to?(:read)
-       curve = File.open(path_or_io, "r", &method(:parse))
-       curve.filename = File.basename(path_or_io)
-       return curve
+      return File.open(path_or_io, "r", &method(:parse))
     end
     
     @line_counter = 0 # IO#lineno is not exactly super-reliable
@@ -32,8 +30,12 @@ class Framecurve::Parser
       end
       elements.push(item)
     end
+    curve = Framecurve::Curve.new(elements) 
     
-    return Framecurve::Curve.new(elements)
+    # Pick the actual filename if it's available
+    curve.filename = File.basename(path_or_io.path) if path_or_io.respond_to?(:path)
+    
+    return curve
   end
   
   private

data/lib/framecurve.rb

@@ -1,5 +1,5 @@
 module Framecurve
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
   
   # Is raised when a malformed framecurve bit has occurred in the system
   class Malformed < RuntimeError

data/test/test_framecurve_parser.rb

@@ -47,6 +47,15 @@ class TestFramecurveParser < Test::Unit::TestCase
     end
   end
   
+  def test_should_pick_file_path_from_passed_file_object
+    v = Framecurve::Parser.new
+    path = File.dirname(__FILE__) + "/fixtures/framecurves/sample_framecurve1.framecurve.txt"
+    File.open(path) do | f |
+      curve = v.parse(f)
+      assert_equal "sample_framecurve1.framecurve.txt", curve.filename
+    end
+  end
+  
   def test_parser_fails_on_malformed_lines
     data = "Sachlich gesehen\nbambam"
     assert_raise(Framecurve::Malformed) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: framecurve
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &12017030 !ruby/object:Gem::Requirement
+  requirement: &11888320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12017030
+  version_requirements: *11888320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12016790 !ruby/object:Gem::Requirement
+  requirement: &11888080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *12016790
+  version_requirements: *11888080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12016550 !ruby/object:Gem::Requirement
+  requirement: &11887840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12016550
+  version_requirements: *11887840
 - !ruby/object:Gem::Dependency
   name: cli_test
-  requirement: &12016310 !ruby/object:Gem::Requirement
+  requirement: &11887600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12016310
+  version_requirements: *11887600
 description: ! ' Parser, validation and interpolation'
 email: me@julik.nl
 executables: