urifetch 0.0.3.rc1 → 0.0.4.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/urifetch/version.rb +2 -2
  2. data/lib/urifetch.rb +25 -1
  3. data/spec/urifetch_spec.rb +46 -6
  4. data/urifetch.gemspec +2 -2
  5. metadata +23 -23
data/lib/urifetch/version.rb CHANGED
@@ -4,8 +4,8 @@ module Urifetch
4
4
 
5
5
  MAJOR = 0
6
6
  MINOR = 0
7
- PATCH = 3
8
- BUILD = 'rc1'
7
+ PATCH = 4
8
+ BUILD = 'rc2'
9
9
 
10
10
  STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
11
11
 
data/lib/urifetch.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'hashie/mash'
2
2
  require 'addressable/uri'
3
+ #require 'pry'
3
4
 
4
5
  module Urifetch
5
6
 
@@ -96,12 +97,35 @@ Urifetch::Strategy.layout(:image) do
96
97
  # File Type
97
98
  data.mime_type = request.meta['content-type']
98
99
 
100
+ # Preview File Source
101
+ data.preview_image = request.base_uri.to_s
102
+
103
+ unless data.mime_type.match(/text\/html/i).nil?
104
+ doc = Nokogiri::HTML(request)
105
+ t = data.title.sub(/^.*\:/i,'')
106
+ t2 = t.sub(/\./i,"\\.")
107
+ src = doc.search('img').map(&:attributes).map{|h|h["src"].to_s}.reject{|u|u.match(/#{t2}/i).nil?}.first
108
+ src.sub!(/^\/\//i,'http://')
109
+ if src
110
+ data.title = t
111
+ @uri = Addressable::URI.heuristic_parse(src)
112
+ data.match_id = @uri.to_s
113
+ request = open(@uri.to_s,'rb')
114
+ data.mime_type = request.meta['content-type']
115
+ end
116
+ end
117
+
99
118
  # Image Size
100
119
  data.image_size = [nil,nil]
101
120
  3.times do |i|
102
- data.image_size = ImageSize.new(request).get_size
121
+ begin
122
+ data.image_size = ImageSize.new(request).get_size
123
+ rescue NoMethodError => e
124
+ data.image_size = ImageSize.new(request.read).get_size# unless e.message.match(/undefined method `type' for/).nil?
125
+ end
103
126
  break if data.image_size != [nil,nil]
104
127
  end
128
+
105
129
  end
106
130
 
107
131
  after_failure do |error|
data/spec/urifetch_spec.rb CHANGED
@@ -43,23 +43,63 @@ describe Urifetch do
43
43
  describe 'image' do
44
44
 
45
45
  it 'should return image properties and file name for valid png file' do
46
- @response = Urifetch.fetch_from("http://www.google.com/intl/en_com/images/srpr/logo3w.png")
47
-
46
+ @url = "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
47
+ @title = "logo3w.png"
48
+ @match_id = "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
49
+ @mime_type = "image/png"
50
+ @image_size = [275, 95]
51
+ end
52
+
53
+ it 'should return image properties and file name for valid jpg file' do
54
+ @url = "http://i.imgur.com/ab9Gd.jpg"
55
+ @title = "ab9Gd.jpg"
56
+ @match_id = "http://i.imgur.com/ab9Gd.jpg"
57
+ @mime_type = "image/jpeg"
58
+ @image_size = [492, 362]
59
+ end
60
+
61
+ it 'should return image properties and file name for valid gif file' do
62
+ @url = "http://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif"
63
+ @title = "Rotating_earth_%28large%29.gif"
64
+ @match_id = "http://upload.wikimedia.org/wikipedia/commons/2/2c/Rotating_earth_%28large%29.gif"
65
+ @mime_type = "image/gif"
66
+ @image_size = [400, 400]
67
+ end
68
+
69
+ it 'should return image properties and file name for valid bmp file' do
70
+ @url = "http://www.gonmad.co.uk/satnav/bmp_blank.bmp"
71
+ @title = "bmp_blank.bmp"
72
+ @match_id = "http://www.gonmad.co.uk/satnav/bmp_blank.bmp"
73
+ @mime_type = "image/bmp"
74
+ @image_size = [16, 16]
75
+ end
76
+
77
+ it 'should return image properties and file name for valid gif file even though the initial minetype is html' do
78
+ @url = "http://en.wikipedia.org/wiki/File:Sunflower_as_gif_small.gif"
79
+ @title = "Sunflower_as_gif_small.gif"
80
+ @match_id = "http://upload.wikimedia.org/wikipedia/commons/e/e2/Sunflower_as_gif_small.gif"
81
+ @mime_type = "image/gif"
82
+ @image_size = [250, 297]
83
+ end
84
+
85
+ after(:each) do
86
+ @response = Urifetch.fetch_from(@url)
87
+
48
88
  # Check Title
49
89
  @response.data.should have_key(:title)
50
- @response.data[:title].should == "logo3w.png"
90
+ @response.data[:title].should == @title
51
91
 
52
92
  # Check Match ID
53
93
  @response.data.should have_key(:match_id)
54
- @response.data[:match_id].should == "http://www.google.com/intl/en_com/images/srpr/logo3w.png"
94
+ @response.data[:match_id].should == @match_id
55
95
 
56
96
  # Check FileType
57
97
  @response.data.should have_key(:mime_type)
58
- @response.data[:mime_type].should == "image/png"
98
+ @response.data[:mime_type].should == @mime_type
59
99
 
60
100
  # Check ImageSize
61
101
  @response.data.should have_key(:image_size)
62
- @response.data[:image_size].should == [275, 95]
102
+ @response.data[:image_size].should == @image_size
63
103
  end
64
104
 
65
105
  end
data/urifetch.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "urifetch"
8
- s.version = "0.0.3.rc1"
8
+ s.version = "0.0.4.rc2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Philip Vieira"]
12
- s.date = "2012-01-19"
12
+ s.date = "2012-01-22"
13
13
  s.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."
14
14
  s.email = "philip@vallin.se"
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: urifetch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3.rc1
4
+ version: 0.0.4.rc2
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-19 00:00:00.000000000Z
12
+ date: 2012-01-22 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: addressable
16
- requirement: &70225291639480 !ruby/object:Gem::Requirement
16
+ requirement: &70339250090360 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70225291639480
24
+ version_requirements: *70339250090360
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: hashie
27
- requirement: &70225291638840 !ruby/object:Gem::Requirement
27
+ requirement: &70339250080700 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70225291638840
35
+ version_requirements: *70339250080700
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: nokogiri
38
- requirement: &70225291638140 !ruby/object:Gem::Requirement
38
+ requirement: &70339250080200 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70225291638140
46
+ version_requirements: *70339250080200
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: imagesize
49
- requirement: &70225291637540 !ruby/object:Gem::Requirement
49
+ requirement: &70339250079660 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70225291637540
57
+ version_requirements: *70339250079660
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &70225291636900 !ruby/object:Gem::Requirement
60
+ requirement: &70339250079000 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70225291636900
68
+ version_requirements: *70339250079000
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bundler
71
- requirement: &70225291636060 !ruby/object:Gem::Requirement
71
+ requirement: &70339250078000 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - =
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.1.rc
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70225291636060
79
+ version_requirements: *70339250078000
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: jeweler
82
- requirement: &70225291635340 !ruby/object:Gem::Requirement
82
+ requirement: &70339250077180 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70225291635340
90
+ version_requirements: *70339250077180
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rcov
93
- requirement: &70225291634580 !ruby/object:Gem::Requirement
93
+ requirement: &70339250076360 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70225291634580
101
+ version_requirements: *70339250076360
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: pry
104
- requirement: &70225291633720 !ruby/object:Gem::Requirement
104
+ requirement: &70339250075400 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70225291633720
112
+ version_requirements: *70339250075400
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rdoc
115
- requirement: &70225291631680 !ruby/object:Gem::Requirement
115
+ requirement: &70339250074520 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70225291631680
123
+ version_requirements: *70339250074520
124
124
  description: Urifetch allows you to fetch data from any URL using pattern matching.
125
125
  The library allows for dynamically adding match handlers as well as build your own
126
126
  strategies.
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
169
169
  version: '0'
170
170
  segments:
171
171
  - 0
172
- hash: -406607527783626718
172
+ hash: 2130309360991595227
173
173
  required_rubygems_version: !ruby/object:Gem::Requirement
174
174
  none: false
175
175
  requirements: