rightmove 0.1.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    blm (0.1.4)
+    blm (0.1.5)
     diff-lcs (1.1.2)
     git (1.2.5)
     jeweler (1.5.2)

data/Rakefile

@@ -11,7 +11,6 @@ require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "rightmove"
   gem.homepage = "http://github.com/robertmay/rightmove"
   gem.license = "MIT"
@@ -19,10 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{This library is used to parse a Rightmove format zip file}
   gem.email = "robotmay@gmail.com"
   gem.authors = ["Robert May"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.files.exclude 'spec'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/rightmove.rb

@@ -2,49 +2,64 @@ require 'zip/zipfilesystem'
 require 'blm'
 
 module Rightmove
-	class Archive
-		@@configuration = {
-			:tmp_dir => "/tmp/rightmove/"
-		}
-		
+	class Archive		
 		def initialize(file = nil, options = {})
 			open(file) unless file.nil?
-			@@configuration.update(options)
 		end
 	
-		def open(file, arguments)
-			return false unless File.exists?(file)
-			@file = file
+		def open(file, arguments = {})
+			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
+		end
 	
 		private
 		def read(arguments)
-			Zip::ZipFile.open(@file) do |zip|
-				@zip_file = zip
-				blm = @zip_file.entries.select! {|v| v.to_s =~ /\.blm/i }.first
-				@document = BLM::Document.new( zip.read(blm) )
-				instantiate_files if arguments[:instantiate_files]
-			end
-			@document
+			blm = self.zip_file.entries.select! {|v| v.to_s =~ /\.blm/i }.first
+			@document = BLM::Document.new( self.zip_file.read(blm) )
 		end
-		
-		def instantiate_files
-			@document.data.each_with_index do |row, index|
-				row.attributes.each do |key, value|
-					next unless value =~ /\.jpg/i
-					matching_files = @zip_file.entries.select! {|v| v.to_s =~ /#{value}/ }
+	end
+end
+
+module BLM	
+	class Row
+		def method_missing(method, arguments = {}, &block)
+			unless @attributes[method].nil?
+				value = @attributes[method] 
+				if arguments[:instantiate_with]
+					return value unless value =~ /\.(jpg|png|gif)/i
+					if arguments[:instantiate_with].instance_of?(Zip::ZipFile)
+						zip = arguments[:instantiate_with]
+					else
+						zip = Zip::ZipFile.open(arguments[:instantiate_with])
+					end
+					matching_files = zip.entries.select! {|v| v.to_s =~ /#{value}/ }
 					unless matching_files.empty?
-						file = StringIO.new( @zip_file.read(matching_files.first) )
+						file = StringIO.new( zip.read(matching_files.first) )
 						file.class.class_eval { attr_accessor :original_filename, :content_type }
 						file.original_filename = matching_files.first.to_s
 						file.content_type = "image/jpg"
-						@document.data[index].attributes[key] = file
+						return file
 					end
+				else
+					value
 				end
 			end
 		end

data/spec/rightmove_spec.rb

@@ -4,15 +4,17 @@ 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")
 		end
 	
 		it "should open the zip file and return useful data" do
 		  @rm.should respond_to(:open)
-		  @rm.open(File.dirname(__FILE__) + "/rightmove/example.zip", :instantiate_files => true).should be_a(BLM::Document)
+		  @rm.open(@zip_file).should be_a(BLM::Document)
 		end
 		
-		it "should return images as StringIO objects" do
-			@rm.document.data.first.media_image_00.should be_a(StringIO)
+		it "should return images as StringIO objects if passed :instantiate_with" 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
 	end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Robert May
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +00:00
+date: 2011-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,6 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .document
-- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -120,8 +119,6 @@ files:
 - Rakefile
 - VERSION
 - lib/rightmove.rb
-- rightmove.gemspec
-- spec/rightmove/example.zip
 - spec/rightmove_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -138,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -249771699
+      hash: -108944433
       segments: 
       - 0
       version: "0"

data/.rspec

@@ -1 +0,0 @@
---color

data/rightmove.gemspec

@@ -1,72 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rightmove}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Robert May"]
-  s.date = %q{2011-01-26}
-  s.description = %q{This library is used to parse a Rightmove format zip file}
-  s.email = %q{robotmay@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.textile"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "lib/rightmove.rb",
-    "rightmove.gemspec",
-    "spec/rightmove/example.zip",
-    "spec/rightmove_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/robertmay/rightmove}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A library for parsing a Rightmove format zip file}
-  s.test_files = [
-    "spec/rightmove_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<blm>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<blm>, [">= 0"])
-      s.add_dependency(%q<rubyzip>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<blm>, [">= 0"])
-    s.add_dependency(%q<rubyzip>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
-end
-