twitter-vine 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzViYTE5ZjNiNzAyNDY4ZWNkZjg2NGZiODBlN2ZkNGU3YWEwNDgxNA==
+    ZmE5ZDI1OGM2Nzc5MmQ3NjQ0YjViZjk0NGUxOTIxYzgyZmI2ZjU0ZA==
   data.tar.gz: !binary |-
-    NDY5Mjc2ZDI1NGFmOWUwYjFjY2IxZTY5NjFhYTQ3MGU4YTJmYWU4Mg==
+    NTI3OWQ2MGY5Nzk5NWRhNmQ0MmQzMjBmMGM1MmRhZmU1NzBmMTI1OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDMxNjg4M2QxNzU0NzYyMTY4YTFkOGM2ZjViZGY3ZDc3OTc1NDg5ZDczMzA3
-    OWI2YmNkOTk2YzMxZmFjNTc1ZTNhZDVlNzdkY2NjOTkwYjNjNDk2Y2QwOTA1
-    Y2JiODFhZDlkMjRlNDgyZjU0NDMxZDdkNjFmYzdmYzNkMjY3ZjQ=
+    OTYyY2I3NjA0MDRiZDcyMTlhYmU0N2MxNGI1ODUxOGNkZjUxZTI2YjFlMDhm
+    MTY5YWNhYTU4OTBmZWZkM2Q1N2QyM2FlMGYxODBkODIyMmIzMTY3YThhYjhi
+    OTMwMDhkOWEzMzc1M2E1YzEyMmZhNzRkNmM3ZmRmZWIzNGE2YzY=
   data.tar.gz: !binary |-
-    ZGYwYjc0YTEzZmJmMDMyZGM4ZmZhN2JmZTQ4ZDE0OThjYmJiY2Y0YWRlZDNj
-    Mzg5MDM1ZTMzMTRlYWZlM2IwMjNmNjI2MmJkYjgzYjZkOGNjNWQxN2ZhMDQ1
-    ZjkxZTI3N2NmNzk5ZDg2NmNlMDlhNDZhNGQ0MGM3MjhkZjg2YmE=
+    ZGZiZmIzZGY0YjllNzE4ZDYwZjJlMDgxZGVmYWY4NWU4NjJlZGI5MzMxODll
+    YjljMjU5OWRlMzZiMTU1Y2JmNWY5YTljYmY3YjJmYjYzODBjNmExYmNkMGM1
+    YzBmM2FjNDE3NzU1YTA3ZWVmZmYxZmRjOTA1MWZmZDgyNTRlODg=

data/README.md

@@ -14,7 +14,13 @@ A ruby based API to get information about Vines and allow searching.
 ## Usage
 
 ```ruby
-TwitterVine.setup do |config|
+  # Simplest use case - give the link of a Vine
+  parts = TwitterVine.parse("https://vine.co/v/b2BPEL0Orbm")
+  
+```
+
+```ruby
+TwitterVine::Client.setup do |config|
   config.api_key        = "YOUR_API_KEY"
   config.api_secret     = "YOUR_API_SECRET"
   config.oauth_token    = "YOUR_OAUTH_TOKEN"
@@ -25,3 +31,4 @@ end
 ```ruby
 vines = TwitterVine::Client.search("Prank")
 ```
+

data/lib/twitter-vine/client.rb

@@ -2,6 +2,23 @@ require 'open-uri'
 
 module TwitterVine
   module Client
+    def self.api_key; @@api_key; end
+    def self.api_key=(val); @@api_key=val; end
+
+    def self.api_secret; @@api_secret; end
+    def self.api_secret=(val); @@api_secret=val; end
+
+    def self.oauth_token; @@oauth_token; end
+    def self.oauth_token=(val); @@oauth_token=val; end
+
+    def self.oauth_secret; @@oauth_secret; end
+    def self.oauth_secret=(val); @@oauth_secret=val; end
+
+
+    # Call setup to set global defaults for api_key, api_secret, oauth_token and oauth_secret
+    def self.setup
+      yield self
+    end
 
     #
     # OPTIONS:
@@ -15,10 +32,10 @@ module TwitterVine
     def self.search(q, opts={})
       # Always use a new client for Thread safety - is this necessary?
       tc = ::Twitter::REST::Client.new do |config|
-        config.consumer_key        = opts.delete(:api_key) || TwitterVine.api_key
-        config.consumer_secret     = opts.delete(:api_secret) || TwitterVine.api_secret
-        config.access_token        = opts.delete(:oauth_token) || TwitterVine.oauth_token
-        config.access_token_secret = opts.delete(:oauth_secret) || TwitterVine.oauth_secret
+        config.consumer_key        = opts.delete(:api_key) || api_key
+        config.consumer_secret     = opts.delete(:api_secret) || api_secret
+        config.access_token        = opts.delete(:oauth_token) || oauth_token
+        config.access_token_secret = opts.delete(:oauth_secret) || oauth_secret
       end
       opts[:include_entities] = true
       opts[:lang] ||= "en"
@@ -28,12 +45,11 @@ module TwitterVine
       _normalize(tc.search(vine_criteria, opts))
     end
 
-
     private
       # Does the processing inplace...
       def self._normalize(results) 
         results.entries.map do |r|
-          vine_map = TwitterVine.build_vine_map(r)
+          vine_map = build_vine_map(r)
           {
             time: r.created_at,
             id: r.id,
@@ -50,6 +66,16 @@ module TwitterVine
         end.compact 
       end
 
+      def self.build_vine_map(twitter_result)
+        vine_url = twitter_result.urls.map do |u| 
+            if u[:display_url] =~ /vine\.co\/v/
+              u[:expanded_url].to_s
+            end
+        end.compact.first
+        TwitterVine.parse(vine_url)
+      end
+
+
   end
 end
 

data/lib/twitter-vine/version.rb

@@ -1,3 +1,3 @@
 module TwitterVine
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/twitter-vine.rb

@@ -3,46 +3,22 @@ require 'twitter'
 require 'nokogiri'
 
 module TwitterVine
-    DEBUG = false
+  DEBUG = false
 
-    def self.api_key; @@api_key; end
-    def self.api_key=(val); @@api_key=val; end
-
-    def self.api_secret; @@api_secret; end
-    def self.api_secret=(val); @@api_secret=val; end
-
-    def self.oauth_token; @@oauth_token; end
-    def self.oauth_token=(val); @@oauth_token=val; end
-
-    def self.oauth_secret; @@oauth_secret; end
-    def self.oauth_secret=(val); @@oauth_secret=val; end
-
-
-    # Call setup to set global defaults
-  def self.setup
-    yield self
-  end
-
-  def self.build_vine_map(twitter_result)
-    vine_url = twitter_result.urls.map do |u| 
-        if u[:display_url] =~ /vine\.co\/v/
-          u[:expanded_url].to_s
-        end
-    end.compact.first
+  def self.parse(vine_url)
     vine_url.gsub!("http://", "https://")
+    vine_url.gsub!("/embed/simple", "")
     puts "Got vine_url [#{vine_url}]" if DEBUG
     doc = Nokogiri::HTML(open(vine_url))
     {
         vine_id: vine_url.match(/.*\/(.*)/)[1],
         vine_url: vine_url,
+        vine_thumbnail: doc.xpath("//meta[@property='og:image']").first[:content],
         vine_author_thumbnail: doc.css(".avatar-container img").first[:src],
         vine_author: doc.css("p.username").text,
         vine_description: doc.css("p.description").text.gsub(/\s+/," ").strip,
         vine_src: doc.css("video source").first[:src],
         vine_type: doc.css("video source").first[:type]
     }
-
   end
 end
-
-require 'twitter-vine/client'

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # Load support files
 require 'twitter-vine'
+require 'twitter-vine/client'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -13,7 +14,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
 end
 
-TwitterVine.setup do |c|
+TwitterVine::Client.setup do |c|
   c.api_key = ENV["BT_TWITTER_API_KEY"]
   c.api_secret = ENV["BT_TWITTER_API_SECRET"]
   c.oauth_token = ENV["BT_TWITTER_OAUTH_TOKEN"]
@@ -31,3 +32,17 @@ class MockTweetWithHttpVineUrl
   def urls;[{display_url:"vine.co/v/hF7WOEl76T1", expanded_url:"http://vine.co/v/hF7WOEl76T1"}];end  
 end
 
+shared_context "vine results" do
+
+  def expect_results(vine_map)
+    puts vine_map
+    vine_map[:vine_id].should_not be nil
+    vine_map[:vine_url].should_not be nil
+    vine_map[:vine_thumbnail].should_not be nil
+    vine_map[:vine_author_thumbnail].should_not be nil
+    vine_map[:vine_author].should_not be nil
+    vine_map[:vine_description].should_not be nil
+    vine_map[:vine_src].should_not be nil
+    vine_map[:vine_type].should_not be nil
+  end
+end

data/spec/twitter-vine_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 require 'twitter-vine'
+require 'twitter-vine/client'
 
-TwitterVine::Client::DEBUG=true
+TwitterVine::DEBUG=true
 
 describe TwitterVine do
+  include_context "vine results"
+
   it "should be valid" do
     TwitterVine.should be_a(Module)
+    TwitterVine::Client.should be_a(Module)
   end
 
   # Commented out until I set environment variables out on travis-ci
@@ -16,28 +20,29 @@ describe TwitterVine do
   #   expect(l.size).to be > 0 
   # end
 
-  it "should be able to scrape Vine metadata" do
-    vine_map = TwitterVine.build_vine_map(MockTweet.new)
-    puts vine_map
-    vine_map[:vine_id].should_not be nil
-    vine_map[:vine_url].should_not be nil
-    vine_map[:vine_author_thumbnail].should_not be nil
-    vine_map[:vine_author].should_not be nil
-    vine_map[:vine_description].should_not be nil
-    vine_map[:vine_src].should_not be nil
-    vine_map[:vine_type].should_not be nil
+  it "should be able to scrape Vine metadata from a Twitter API result" do
+    expect_results(TwitterVine::Client.send :build_vine_map, MockTweet.new)
+  end
+
+  it "should be able to scrape Vine metadata from a Twitter API result even if expanded_url is http instead of https" do
+    expect_results(TwitterVine::Client.send :build_vine_map, MockTweetWithHttpVineUrl.new)
+  end
+
+  it "can parse a direct vine url" do
+    expect_results(TwitterVine.parse("https://vine.co/v/b2BPEL0Orbm"))
   end
 
-  it "should be able to scrape Vine metadata when expanded_url is http instead of https" do
-    vine_map = TwitterVine.build_vine_map(MockTweetWithHttpVineUrl.new)
-    puts vine_map
-    vine_map[:vine_id].should_not be nil
-    vine_map[:vine_url].should_not be nil
-    vine_map[:vine_author_thumbnail].should_not be nil
-    vine_map[:vine_author].should_not be nil
-    vine_map[:vine_description].should_not be nil
-    vine_map[:vine_src].should_not be nil
-    vine_map[:vine_type].should_not be nil
+  it "can parse a direct vine url that is mistakenly http" do
+    expect_results(TwitterVine.parse("http://vine.co/v/b2BPEL0Orbm"))
   end
 
+  it "can parse an accidental embed/simple vine url" do
+    expect_results(TwitterVine.parse("https://vine.co/v/b2BPEL0Orbm/embed/simple"))
+  end
+
+  it "can parse an accidental embed/simple vine url that is double mistaken with http" do
+    expect_results(TwitterVine.parse("http://vine.co/v/b2BPEL0Orbm/embed/simple"))
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-vine
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Darren Hicks