one_inch_punch 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.2 2008-06-01
+
+* 1 tiny bugfix enhancement:
+  * sub-projects now truly restricting to the naming form of 'parent/child',
+    not 'parent_child' or even simply 'parentseriouslythisisnotachild'
+
 == 0.3.1 2008-04-06
 
 * 1 tiny bugfix enhancement:

data/lib/punch/version.rb

@@ -2,7 +2,7 @@ class Punch
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/punch.rb

@@ -169,7 +169,7 @@ class Punch
     end
     
     def child_projects(project)
-      projects.select { |proj|  proj.match(/^#{Regexp.escape(project)}/) } - [project]
+      projects.select { |proj|  proj.match(/^#{Regexp.escape(project)}\//) } - [project]
     end
     
     def in_child(project)

data/spec/punch_spec.rb

@@ -350,6 +350,15 @@ describe Punch do
         Punch.data = @data
         Punch.status(@projects['parent'], :full => true).should == { :status => 'out', :time => @now - 5 }
       end
+      
+      it 'should only see projects having the specific parent/child naming as sub-projects' do
+        @data[@projects['parent']] = []
+        non_child = @projects['parent'] + '_other'
+        @data[non_child] = [ { 'in' => @now - 45 } ]
+        Punch.data = @data
+        
+        Punch.status(@projects['parent']).should.be.nil
+      end
     end
   end
   
@@ -821,6 +830,16 @@ describe Punch do
         Punch.out(@projects['parent'])
         Punch.data[@projects['parent']].should == []
       end
+      
+      it 'should only see projects having the specific parent/child naming as sub-projects' do
+        @data[@projects['parent']] = [ { 'in' => @now - 20 } ]
+        non_child = @projects['parent'] + '_other'
+        @data[non_child] = [ { 'in' => @now - 45 } ]
+        Punch.data = @data
+        
+        Punch.out(@projects['parent'])
+        Punch.data[non_child].should == [ { 'in' => @now - 45 } ]
+      end
     end
   end
 
@@ -994,12 +1013,21 @@ describe Punch do
         Punch.list(@projects['parent']).should == list_data
       end
       
+      it 'should only see projects having the specific parent/child naming as sub-projects' do
+        non_child = @projects['parent'] + '_other'
+        @data[non_child] = [ { 'in' => @now - 45 } ]
+        Punch.data = @data
+        
+        list_data = { @projects['parent'] => @data[@projects['parent']], @projects['child'] => @data[@projects['child']] }
+        Punch.list(@projects['parent']).should == list_data
+      end
+      
       it 'should respect options' do
         list_data = { @projects['parent'] => [], @projects['child'] => @data[@projects['child']] }
         Punch.list(@projects['parent'], :after => @now - 21).should == list_data
       end
       
-      describe 'when do project is given' do
+      describe 'when no project is given' do
         before do
           @projects = ['test project', 'out project', 'other project']
           @data[@projects[0]] = [ {'in' => @now - 50, 'out' => @now - 25} ]
@@ -1167,6 +1195,15 @@ describe Punch do
         Punch.total(@projects['parent']).should == total_data
       end
       
+      it 'should only see projects having the specific parent/child naming as sub-projects' do
+        non_child = @projects['parent'] + '_other'
+        @data[non_child] = [ { 'in' => @now - 45, 'out' => @now - 20 } ]
+        Punch.data = @data
+        
+        total_data = { @projects['parent'] => 50, @projects['child'] => 10 }
+        Punch.total(@projects['parent']).should == total_data
+      end
+      
       describe 'when no project is given' do
         before do
           @extra_projects = ['test project', 'out project', 'other project']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one_inch_punch
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -05:00
+date: 2009-06-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,8 @@ files:
 - tasks/website.rake
 has_rdoc: true
 homepage: http://yomendel.rubyforge.org
+licenses: []
+
 post_install_message: ""
 rdoc_options: 
 - --main
@@ -103,9 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yomendel
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: a simple time-tracking tool
 test_files: []