rightmove 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rightmove.rb

@@ -3,6 +3,8 @@ require 'blm'
 
 module Rightmove
 	class Archive		
+		attr_accessor :document, :zip_file, :branch_id, :timestamp
+		
 		def initialize(file = nil, options = {})
 			open(file) unless file.nil?
 		end
@@ -11,23 +13,15 @@ module Rightmove
 			self.zip_file = file
 			read(arguments)
 		end
-	
-		def document
-			@document
-		end
-		
-		def zip_file
-			@zip_file
-		end
 		
 		def zip_file=(file)
-			puts "derp"
 			if file.instance_of?(Zip::ZipFile)
 				@zip_file = file
 			else
 				return false unless File.exists?(file)
 				@zip_file = Zip::ZipFile.open(file)
 			end
+			parse_file_name
 		end
 	
 		private
@@ -35,6 +29,12 @@ module Rightmove
 			blm = self.zip_file.entries.select! {|v| v.to_s =~ /\.blm/i }.first
 			@document = BLM::Document.new( self.zip_file.read(blm) )
 		end
+		
+		def parse_file_name
+			branch_id, timestamp = @zip_file.to_s.split("_").pop(2)
+			@branch_id = branch_id.to_i
+			@timestamp = Time.new(timestamp)
+		end
 	end
 end
 
@@ -44,7 +44,7 @@ module BLM
 			unless @attributes[method].nil?
 				value = @attributes[method] 
 				if arguments[:instantiate_with]
-					return value unless value =~ /\.(jpg|png|gif)/i
+					return value unless value =~ /\.jpg/i
 					if arguments[:instantiate_with].instance_of?(Zip::ZipFile)
 						zip = arguments[:instantiate_with]
 					else

data/spec/rightmove_spec.rb

@@ -4,7 +4,7 @@ describe Rightmove do
 	context "manipulating the file" do
 		before :all do
 			@rm = Rightmove::Archive.new
-			@zip_file = Zip::ZipFile.open(File.dirname(__FILE__) + "/rightmove/example.zip")
+			@zip_file = Zip::ZipFile.open(File.dirname(__FILE__) + "/rightmove/rmc_2559_20050908161421.zip")
 		end
 	
 		it "should open the zip file and return useful data" do
@@ -16,5 +16,10 @@ describe Rightmove do
 			@rm.document.data.first.media_image_00(:instantiate_with => @zip_file).should be_a(StringIO)
 			@rm.document.data.first.media_image_00.should be_a(String)
 		end
+		
+		it "should provide the branch id and timestamp of the file" do
+			@rm.branch_id.should be_a(Integer)
+			@rm.timestamp.should be_a(Time)
+		end
 	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Robert May
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -108944433
+      hash: -611782865
       segments: 
       - 0
       version: "0"