uri-meta 0.9.4 → 0.11.0

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.11.0

data/lib/uri/meta.rb

@@ -4,10 +4,11 @@ require 'yaml'
 require 'moneta'
 require 'moneta/memory'
 require 'digest/sha1'
+require 'zlib'
 
 module URI
   class Meta
-    attr_accessor :headers, :uri, :title, :feed, :last_modified, :content_type, :charset, :last_effective_uri, :status, :errors
+    attr_accessor :headers, :uri, :title, :feed, :last_modified, :content_type, :charset, :last_effective_uri, :status, :errors, :primary_image, :primary_image_caption, :primary_image_thumbnail
     @@service_host = 'www.metauri.com'
     @@user_agent   = 'uri-meta rubygem'
 
@@ -32,7 +33,7 @@ module URI
     def initialize(options = {})
       self.errors = []
       options.each do |k, v|
-        case k
+        case k.to_sym
           when :last_effective_uri, :uri, :feed then send("#{k}=", v.to_s == '' ? nil : (URI.parse(v.to_s) rescue nil))
           when :error, :errors                  then self.errors.push(*[v].flatten)
           else send("#{k}=", v) if respond_to?("#{k}=")
@@ -73,8 +74,8 @@ module URI
           block.call(meta) if block
         else
           easy = curl(uri, options)
-          easy.on_complete do |curl|
-            args = YAML.load(curl.body_str) rescue {:errors => "YAML Error, #{$!.message}"}
+          easy.on_complete do |req|
+            args = YAML.load(self.decode_content(req)) rescue {:errors => "YAML Error, #{$!.message}"}
             args = {:errors => "YAML Error, server returned unknown format."} unless args.is_a?(Hash)
 
             metas << meta = URI::Meta.new({:uri => uri}.update(args))
@@ -96,10 +97,26 @@ module URI
         options = options.update(:uri => uri)
         options = options.map{|k, v| "#{k}=" + URI.escape(v.to_s, UNSAFE)}.join('&')
         c = Curl::Easy.new("http://#{service_host}/show.yaml?#{options}")
-        c.headers['User-Agent'] = user_agent
+        c.headers['User-Agent']      = user_agent
+        c.headers['Accept-encoding'] = 'gzip,deflate'
         c
       end
 
+      def self.decode_content(request)
+        if request.header_str.match(/Content-Encoding: gzip/)
+          begin
+            gz = Zlib::GzipReader.new(StringIO.new(request.body_str))
+            yaml = gz.read
+            gz.close
+          rescue Zlib::GzipFile::Error => e
+            yaml = request.body_str
+          end
+        else
+          yaml = request.body_str
+        end
+        yaml
+      end
+
     module Mixin
       def meta(options = {})
         @meta ||= URI::Meta.get(self, options)

data/test/uri-meta_test.rb

@@ -12,6 +12,7 @@ class UriMetaTest < Test::Unit::TestCase
     'http://bit.ly/rvQhW',
     'http://digg.com/educational/Can_you_teach_men_who_pick_up_prostitutes_not_to_buy_sex',
     'http://img11.yfrog.com/i/vaix.jpg/',
+    'http://imgur.com/GTgb4',
     'http://rss.slashdot.org/Slashdot/slashdot',
     'http://slashdot.org/',
     'http://taptaptap.com/+MqN',
@@ -419,8 +420,19 @@ class UriMetaTest < Test::Unit::TestCase
 
     context '.charset' do
       should 'be UTF-8' do
-        assert_equal 'UTF-8', @meta.charset
+        assert @meta.charset.match(/^utf-8$/i)
       end
     end
   end
+
+  context %Q(URI.parse('http://imgur.com/GTgb4').meta) do
+    setup do
+      @meta = URI.parse('http://imgur.com/GTgb4').meta
+    end
+
+    should 'be a redirect' do
+      assert @meta.redirect?
+      assert_not_equal 'http://imgur.com/GTgb4', @meta.last_effective_uri
+    end
+  end
 end

data/uri-meta.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uri-meta}
-  s.version = "0.9.4"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stateless Systems"]
-  s.date = %q{2009-10-17}
+  s.date = %q{2011-06-23}
   s.description = %q{Retrieves meta information for a URI from the meturi.com service.}
   s.email = %q{production@statelesssystems.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.metauri.com/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Meta information for a URI}
   s.test_files = [
     "test/test_helper.rb",

metadata

@@ -1,67 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uri-meta
-version: !ruby/object:Gem::Version 
-  version: 0.9.4
+version: !ruby/object:Gem::Version
+  version: 0.11.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stateless Systems
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-10-17 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: curb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: &11542860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: moneta
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *11542860
+- !ruby/object:Gem::Dependency
+  name: moneta
+  requirement: &11542380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
-    version: 
-- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  version_requirements: *11542380
+- !ruby/object:Gem::Dependency
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: &11541900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.10.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: *11541900
+- !ruby/object:Gem::Dependency
+  name: gemcutter
+  requirement: &11541420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.5
-    version: 
+  type: :development
+  prerelease: false
+  version_requirements: *11541420
 description: Retrieves meta information for a URI from the meturi.com service.
 email: production@statelesssystems.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - .document
 - .gitignore
 - LICENSE
@@ -73,34 +74,31 @@ files:
 - test/test_helper.rb
 - test/uri-meta_test.rb
 - uri-meta.gemspec
-has_rdoc: true
 homepage: http://www.metauri.com/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Meta information for a URI
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/uri-meta_test.rb