time_tree 2.2.1 → 2.3.1

data/BUGS.txt

@@ -0,0 +1 @@
+Pending When filter is used activities using & are ignored even if the ywould have matched

data/fixtures/time/jun2.txt

@@ -1,3 +1,4 @@
 1975/06/02
 1100 jun2stuff jun2
-1102 -
+1101 & more jun2 stuff
+1102 -

data/fixtures/time/jun3.txt

@@ -1,3 +1,3 @@
 1975/06/03
 1000 jun3stuff jun3
-1003 -
+1003 -

data/lib/time_tree/file_parser.rb

@@ -29,7 +29,8 @@ module TimeTree
     def set_date(date)
       @date = date
       @prev_mins = nil
-      @prev_activities = nil
+      @prev_activity = nil
+      @prev_context = nil
       @prev_comment = nil
     end
     
@@ -66,12 +67,12 @@ module TimeTree
         set_date($1)
         true
 
-      when /^(\d\d\d\d) +([-\w\/]+) *(.*)$/
+      when /^(\d\d\d\d) +([-&\w\/]+) *(.*)$/
         if minutes = mins($1)
           unless @prev_mins.nil?
             if minutes > @prev_mins
-              if @prev_activities != '-' && selected?(@date, @prev_activities)
-                process_line(minutes, @prev_activities, @prev_comment) 
+              if @prev_activity != '-' && selected?(@date, @prev_context)
+                process_line(minutes, @prev_context, @prev_comment) 
               end
             else
               add_error(line, 'time does not advance')
@@ -80,7 +81,8 @@ module TimeTree
           end
            
           @prev_mins = minutes
-          @prev_activities = $2.strip
+          @prev_activity = $2
+          @prev_context = $2 unless %w{- &}.include?($2)
           @prev_comment = $3.size > 0 ? $3 : nil
           true
         else
@@ -142,4 +144,4 @@ module TimeTree
       end
     end
   end
-end
+end

data/lib/time_tree/version.rb

@@ -1,3 +1,3 @@
 module TimeTree
-  VERSION = "2.2.1"
+  VERSION = "2.3.1"
 end

data/spec/file_parser_spec.rb

@@ -126,9 +126,7 @@ module TimeTree
       end
 
       context "time lines" do
-        before do
-          parser.set_date('2013/01/02')
-        end
+        before { parser.set_date('2013/01/02') }
 
         context "normal activities" do
           it "returns true and remains valid" do
@@ -180,6 +178,34 @@ module TimeTree
         end
       end
 
+      context "ampersand for activity (ditto last activity)" do
+        before { parser.set_date('2013/01/02') }
+
+        it "returns true and remains valid" do
+          parser.parse_line("1634 &").should be_true
+          parser.valid?.should be_true
+        end
+
+        context "Previous activity immediately before" do
+          it "calls ActivityTree#load with previous activity" do
+            tree.should_receive(:load).with(%w{foo}, 1, nil).twice
+            parser.parse_line("1634 foo")
+            parser.parse_line("1635 &")
+            parser.parse_line("1636 bar")
+          end
+        end
+
+        context "Previous activity separated by -" do
+          it "calls ActivityTree#load with previous activity" do
+            tree.should_receive(:load).with(%w{foo}, 1, nil).twice
+            parser.parse_line("1633 foo")
+            parser.parse_line("1634 -")
+            parser.parse_line("1635 &")
+            parser.parse_line("1636 bar")
+          end
+        end
+      end
+
       context "comment lines" do
         it "should return true" do
           parser.parse_line("# a comment").should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_tree
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,6 +37,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- BUGS.txt
 - Gemfile
 - LICENSE.txt
 - README.md