fossil 0.3.16 → 0.3.17

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]

data/lib/models/vendor_document.rb

@@ -1,7 +1,7 @@
 class VendorDocument < Sequel::Model(:'vendor documents')
   # helper accessors for creating vendor document
   # filename_prefix helps set up the path to the document
-  attr_accessor :doc_type_value, :doc_filename_prefix, :doc_type, :doc_filename
+  attr_accessor :doc_type_value, :file_name_prefix, :doc_type, :file_name
 
   ###### helper aliases for crewres to submit new vendor documents #########
   column_alias :trip_number, :number, :type => :integer
@@ -14,7 +14,7 @@ class VendorDocument < Sequel::Model(:'vendor documents')
   code_association :type, :document_type, :aircraft_document
 
   def validate
-    validates_presence [:doc_filename_prefix, :file_name, :trip_number, :doc_date, :document_type]
+    validates_presence [:document_type, :image_name, :number, :doc_date, :document_type]
   end
 
   def after_initialize
@@ -54,7 +54,7 @@ class VendorDocument < Sequel::Model(:'vendor documents')
     self.paid_date= 0
     self.paid= 0
     self.billed_date= 0
-    self.image_name= File.join(doc_filename_prefix, doc_filename) if doc_filename
+    self.image_name= File.join(file_name_prefix, file_name) if file_name 
     self.document_type= doc_type_value if Code.valid_value_for_group?(doc_type_value, :aircraft_document)
   end
 

data/spec/models/trip_spec.rb

@@ -8,15 +8,13 @@ describe "Trip" do
 
   it "creates a vendor document attachment" do
     trip = Trip.new(:kid_date=>1,:kid_time=>2,:kid_user=>3,:kid_mult=>4,:kid_comm=>5)
-    arr = []
-    mock(VendorDocument).get_all_types {arr}
-    mock(arr).find {OpenStruct.new(:value=>"fake_doc_type")}
-    doc = VendorDocument.new(:doc_filename_prefix=>"TRIP", :doc_filename=>"whatever", :doc_type_value=> 254, :trip_number=>111)
+    mock(Code).valid_value_for_group?(254, :aircraft_document) {true}
+    doc = VendorDocument.new(:file_name_prefix=>"TRIP", :file_name=>"whatever", :doc_type_value=> 254, :trip_number=>111)
     doc.save()
     trip.add_attachment(doc)
     doc.kid_user.should == "ADMN"
     doc.image_name.should == "TRIP/whatever"
-    doc.document_type.should == "fake_doc_type"
+    doc.document_type.should == 254
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol