twitter-vine 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjU3OWZiM2E1ZWY4YzNkNzFmY2I1YjNkMjEwMTkwNDA4ZDZhZGJiMQ==
+    NDAwNWM1Yjg4MmRlMzMxMzYwN2FmYjI4ZDlkMjc1ODRiMGY1NzUxMw==
   data.tar.gz: !binary |-
-    N2MzMjFiNTBkMzU1ZDBiZjFlNTQzODhjMTE5MmRjN2E0MzUxZTk3YQ==
+    NzJiOThlNjNiZWQwYjQxMzFiOTY0ZDFlMDM1ZjQ3YTRmYzVhMWFkMA==
 SHA512:
   metadata.gz: !binary |-
-    MzI4MjhjZDNhZmJkMzNiNWM5OGRmMmE5NDUzZDEzMzBhMDdmZjMzZWEzOWZk
-    OTA5M2U4NDZjZmQ5NDQzNTlkZWMwNjA1NzBiNmRlN2Y2YjkxZjkwYWY0M2I1
-    ZmI2NDVlNDIwNjJjNjg4MmY0ZGNhZDE1NWJhNWQ0YTIxZWZmM2M=
+    OWNmNjZhOTI2ZTMwM2RkMjhkN2MxOTcxYTIyNzg4ODllYTUxMDE2YTViMjI3
+    ZjlhOTBiZTNmZDVjMWE0NWNiOWUwNmIwZDE5ZmIwMTViODBlY2ZmOWI0NjZl
+    NjRhNGRhNjg0ODEzOTU0MDJlNTdmZjExNThhY2VhMDJlM2NhN2M=
   data.tar.gz: !binary |-
-    NTA0ZTY2YmZiNzE3NzU0NDczZTMxYzM2YjBiYTc0MmJhZTg2ZDlkY2UyNzY4
-    OTc2MWFjNzRkYzBmYWQyYjRmYzc3YWE5NWQ2NmMyMGY4MWJiYWZjODgxNTM0
-    NzM5Y2U5ZjM4NzIwZDIzNzViMzljMWExYTIyMDFmMjFhNTZjYWM=
+    MWE4MzI5YjA2NTI0ZTFlYzBiNGVjNDRkM2QxOThlMjYxYjYzNjUyOTNkODkz
+    N2Y4ZjhlMjJiYTk3NmYzYzczYWZlMjM5NmFmNGE2YjU4MjllY2Q2NDk3MDc5
+    ZDRmMjRkNmNkYTJlNGFkY2I3NzYxMzdjZjk2NTc3NDc4NjRiZWM=

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    twitter-vine (0.1.6)
+    twitter-vine (0.1.7)
+      faraday (~> 0.8.9)
       nokogiri (>= 1.6.0)
-      twitter (>= 5.5.1)
+      twitter (~> 5.1.1)
 
 GEM
   remote: http://rubygems.org/
@@ -14,16 +15,16 @@ GEM
     descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
     equalizer (0.0.9)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
     http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.5.3)
     json (1.8.1)
-    memoizable (0.4.0)
+    memoizable (0.2.0)
       thread_safe (~> 0.1.3)
     mini_portile (0.5.2)
-    multipart-post (2.0.0)
+    multipart-post (1.2.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     rake (10.1.1)
@@ -38,16 +39,16 @@ GEM
     simple_oauth (0.2.0)
     thread_safe (0.1.3)
       atomic
-    twitter (5.5.1)
+    twitter (5.1.1)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
-      descendants_tracker (~> 0.0.3)
-      equalizer (~> 0.0.9)
+      descendants_tracker (~> 0.0.1)
+      equalizer (~> 0.0.7)
       faraday (>= 0.8, < 0.10)
       http (~> 0.5.0)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0.5.0)
       json (~> 1.8)
-      memoizable (~> 0.4.0)
+      memoizable (~> 0.2.0)
       simple_oauth (~> 0.2.0)
 
 PLATFORMS

data/lib/twitter-vine/client.rb

@@ -48,26 +48,31 @@ module TwitterVine
     private
       # Does the processing inplace...
       def self._normalize(results) 
-        results.entries.map do |r|
+        results.to_h[:statuses].map do |r|
+          puts r
           vine_map = build_vine_map(r)
+          #puts "...mapping...#{r[:entities][:media]}"
           {
-            time: r.created_at,
-            id: r.id,
-            url: r.url.to_s,
-            author_id: r.user.id,
-            author: r.user.name,
-            screenname: r.user.screen_name,
-            author_thumbnail: r.user.profile_image_url.to_s.gsub("normal","bigger"),
-            text: r.text, 
-            friends_count: r.user.friends_count,
-            followers_count: r.user.followers_count,
-            # media: r.media.map{|m| m.media_uri.to_s},
+            time: (Time.parse(r[:created_at]) rescue Time.now),
+            id: r[:id],
+            url: "https://twitter.com/#{r[:user][:screen_name]}/status/#{r[:id]}",
+            author_id: r[:user][:id],
+            author: r[:user][:name],
+            screenname: r[:user][:screen_name],
+            author_thumbnail: r[:user][:profile_image_url].gsub("normal","bigger"),
+            bg_color: r[:user][:profile_background_color],
+            text_color: r[:user][:profile_text_color],
+            text: r[:text], 
+            friends_count: r[:user][:friends_count],
+            followers_count: r[:user][:followers_count],
+            #media: r.media.map{|m| m.media_uri.to_s}
+            #media: (r[:entities][:media].map{|m| m[:media_url]} rescue [])
           }.merge(vine_map)
-        end.compact 
+        end.compact
       end
 
       def self.build_vine_map(twitter_result)
-        vine_url = twitter_result.urls.map do |u| 
+        vine_url = twitter_result[:entities][:urls].map do |u| 
             if u[:display_url] =~ /vine\.co\/v/
               u[:expanded_url].to_s
             end
@@ -75,7 +80,6 @@ module TwitterVine
         TwitterVine.parse(vine_url)
       end
 
-
   end
 end
 

data/lib/twitter-vine/version.rb

@@ -1,3 +1,3 @@
 module TwitterVine
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/spec_helper.rb

@@ -22,16 +22,22 @@ TwitterVine::Client.setup do |c|
 end
 
 class MockTweet
-  def url;"https://twitter.com/DesliParra/status/407413145792413696";end
-  def urls;[{display_url:"vine.co/v/hF7WOEl76T1", expanded_url:"https://vine.co/v/hF7WOEl76T1"}];end  
-end
-
+  def self.normal
+    { entities: { url:"https://twitter.com/DesliParra/status/407413145792413696",
+                  urls:[{display_url:"vine.co/v/hF7WOEl76T1", expanded_url:"https://vine.co/v/hF7WOEl76T1"}]
+                }
+    }
+  end
 
-class MockTweetWithHttpVineUrl
-  def url;"https://twitter.com/DesliParra/status/407413145792413696";end
-  def urls;[{display_url:"vine.co/v/hF7WOEl76T1", expanded_url:"http://vine.co/v/hF7WOEl76T1"}];end  
+  def self.withHttpVineUrl
+    { entities: { url:"https://twitter.com/DesliParra/status/407413145792413696",
+                  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)

data/spec/twitter-vine_spec.rb

@@ -16,16 +16,18 @@ describe TwitterVine do
   #
   # it "should return results" do 
   #   l = TwitterVine::Client.search("Prank")
+  #   puts "-------------------------------------------"
   #   puts l
+  #   puts "-------------------------------------------"
   #   expect(l.size).to be > 0 
   # end
 
   it "should be able to scrape Vine metadata from a Twitter API result" do
-    expect_results(TwitterVine::Client.send :build_vine_map, MockTweet.new)
+    expect_results(TwitterVine::Client.send :build_vine_map, MockTweet.normal)
   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)
+    expect_results(TwitterVine::Client.send :build_vine_map, MockTweet.withHttpVineUrl)
   end
 
   it "can parse a direct vine url" do

data/twitter-vine.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   #
-  s.add_runtime_dependency('twitter', '>=5.5.1')
+  s.add_runtime_dependency('twitter', '~>5.1.1')
+  s.add_runtime_dependency('faraday', '~>0.8.9')
   s.add_runtime_dependency('nokogiri', '>= 1.6.0')
 
   # Specs

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: twitter-vine
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Darren Hicks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.1.1
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement