urifetch 0.0.2.rc4 → 0.0.3.rc0

data/Gemfile

@@ -9,6 +9,7 @@ source "http://rubygems.org"
 gem 'addressable'
 gem 'hashie'
 gem 'nokogiri'
+gem 'imagesize'
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -6,6 +6,7 @@ GEM
     diff-lcs (1.1.3)
     git (1.2.5)
     hashie (1.2.0)
+    imagesize (0.1.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -43,6 +44,7 @@ DEPENDENCIES
   addressable
   bundler (= 1.1.rc)
   hashie
+  imagesize
   jeweler
   nokogiri
   pry

data/lib/urifetch/strategy.rb

@@ -2,6 +2,8 @@ module Urifetch
   
   require 'open-uri'
   require 'nokogiri'
+  require 'image_size'
+  require 'stringio'
   
   class Strategy
     
@@ -12,7 +14,7 @@ module Urifetch
       @@layouts
     end
     
-    attr_reader :layout, :match_data, :layout_key, :uri
+    attr_reader :layout, :match_data, :layout_key, :uri, :filehead
     
     def initialize(layout_key,match_data)
       @layout_key = layout_key
@@ -38,7 +40,7 @@ module Urifetch
       run_before!
       begin
         @uri = Addressable::URI.heuristic_parse(match_data.string)
-        request = open(@uri.to_s)
+        request = open(@uri.to_s,'rb')
         status  = request.status
         run_on_success!(request)
       rescue OpenURI::HTTPError => error

data/lib/urifetch/version.rb

@@ -4,8 +4,8 @@ module Urifetch
     
     MAJOR = 0
     MINOR = 0
-    PATCH = 2
-    BUILD = 'rc4'
+    PATCH = 3
+    BUILD = 'rc0'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     

data/lib/urifetch.rb

@@ -1,5 +1,6 @@
 require 'hashie/mash'
 require 'addressable/uri'
+require 'pry'
 
 module Urifetch
   
@@ -35,6 +36,7 @@ module Urifetch
 end
 
 Urifetch.register do
+  match /\.(PCX|PSD|XPM|TIFF|XBM|PGM|PBM|PPM|BMP|JPEG|JPG||PNG|GIF|SWF)$/i, :image
 end
 
 Urifetch::Strategy.layout(:test) do
@@ -76,4 +78,39 @@ Urifetch::Strategy.layout(:default) do
   after_failure do |error|
   end
   
+end
+
+Urifetch::Strategy.layout(:image) do
+  
+  before_request do
+  end
+  
+  after_success do |request|
+    # Works for ["PCX", "PSD", "XPM", "TIFF", "XBM", "PGM", "PBM", "PPM", "BMP", "JPEG", "PNG", "GIF", "SWF"]
+    
+    # Match ID
+    data.match_id = request.base_uri.to_s
+    
+    # Title
+    data.title = File.basename(request.base_uri.to_s)
+    
+    # File Type
+    data.mime_type = request.meta['content-type']
+    
+    # Image Size
+    data.image_size = [nil,nil]
+    3.times do |i|
+      data.image_size = ImageSize.new(request).get_size
+      break if data.image_size != [nil,nil]
+    end
+  end
+  
+  after_failure do |error|
+    # File Type
+    data.mime_type = 'unknown'
+    
+    # Image Size
+    data.image_size = [0,0]
+  end
+  
 end

data/spec/urifetch_spec.rb

@@ -40,6 +40,30 @@ describe Urifetch do
 
     end
     
+    describe 'image' do
+      
+      it 'should return image properties and file name for valid png file' do
+        @response = Urifetch.fetch_from("http://www.google.com/intl/en_com/images/srpr/logo3w.png")
+        
+        # Check Title
+        @response.data.should have_key(:title)
+        @response.data[:title].should == "logo3w.png"
+        
+        # Check Match ID
+        @response.data.should have_key(:match_id)
+        @response.data[:match_id].should == "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
+        
+        # Check FileType
+        @response.data.should have_key(:mime_type)
+        @response.data[:mime_type].should == "image/png"
+        
+        # Check ImageSize
+        @response.data.should have_key(:image_size)
+        @response.data[:image_size].should == [275, 95]
+      end
+      
+    end
+    
   end
   
 end

data/urifetch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "urifetch"
-  s.version = "0.0.2.rc4"
+  s.version = "0.0.3.rc0"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip Vieira"]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<imagesize>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["= 1.1.rc"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -64,6 +65,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<imagesize>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, ["= 1.1.rc"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -75,6 +77,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<imagesize>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, ["= 1.1.rc"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urifetch
 version: !ruby/object:Gem::Version
-  version: 0.0.2.rc4
+  version: 0.0.3.rc0
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70338919253800 !ruby/object:Gem::Requirement
+  requirement: &70260333964420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338919253800
+  version_requirements: *70260333964420
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70338919253040 !ruby/object:Gem::Requirement
+  requirement: &70260333963780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338919253040
+  version_requirements: *70260333963780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70338919252460 !ruby/object:Gem::Requirement
+  requirement: &70260333962960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70338919252460
+  version_requirements: *70260333962960
+- !ruby/object:Gem::Dependency
+  name: imagesize
+  requirement: &70260333962260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70260333962260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70338919251660 !ruby/object:Gem::Requirement
+  requirement: &70260333961500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338919251660
+  version_requirements: *70260333961500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70338919250980 !ruby/object:Gem::Requirement
+  requirement: &70260333960560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +76,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70338919250980
+  version_requirements: *70260333960560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70338919250280 !ruby/object:Gem::Requirement
+  requirement: &70260333959600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338919250280
+  version_requirements: *70260333959600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70338919249540 !ruby/object:Gem::Requirement
+  requirement: &70260333958880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338919249540
+  version_requirements: *70260333958880
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70338919248900 !ruby/object:Gem::Requirement
+  requirement: &70260333958040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338919248900
+  version_requirements: *70260333958040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70338919200180 !ruby/object:Gem::Requirement
+  requirement: &70260333957300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70338919200180
+  version_requirements: *70260333957300
 description: Urifetch allows you to fetch data from any URL using pattern matching.
   The library allows for dynamically adding match handlers as well as build your own
   strategies.
@@ -158,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1672277150540842790
+      hash: 219273389632171502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: