instagram 0.3.1 → 0.3.2

data/lib/instagram.rb

@@ -10,6 +10,8 @@ module Instagram
   Popular = Addressable::URI.parse 'http://instagr.am/api/v1/feed/popular/'
   UserFeed = Addressable::Template.new 'http://instagr.am/api/v1/feed/user/{user_id}/'
   UserInfo = Addressable::Template.new 'http://instagr.am/api/v1/users/{user_id}/info/'
+  SearchTags = Addressable::URI.parse 'http://instagr.am/api/v1/tags/search/'
+  TagFeed = Addressable::Template.new 'http://instagr.am/api/v1/feed/tag/{tag}/'
   
   def popular(params = {}, options = {})
     parse_response(Popular.dup, params, options.fetch(:parse_with, Timeline))
@@ -25,6 +27,16 @@ module Instagram
     parse_response(url, params, options.fetch(:parse_with, UserWrap))
   end
   
+  def search_tags(query, params = {}, options = {})
+    params = {:q => query}.merge(params)
+    parse_response(SearchTags.dup, params, options.fetch(:parse_with, SearchTagsResults))
+  end
+  
+  def by_tag(tag, params = {}, options = {})
+    url = TagFeed.expand :tag => tag
+    parse_response(url, params, options.fetch(:parse_with, Timeline))
+  end
+  
   private
   
   def parse_response(url, params, parser = nil)

data/lib/instagram/models.rb

@@ -47,6 +47,8 @@ module Instagram
     element :user, :with => User
     
     # array of people who liked this media
+    elements :likers, :with => User
+    # user IDs of people who liked this (only if "likers" are not present)
     element :liker_ids
     
     elements :comments, :with => NibblerJSON do
@@ -130,6 +132,28 @@ module Instagram
     end
   end
   
+  class Tag < String
+    attr_reader :media_count
+    
+    def initialize(str, count)
+      super(str)
+      @media_count = count
+    end
+    
+    def self.parse(hash)
+      new hash['name'], hash['media_count']
+    end
+    
+    def inspect
+      "#{super} (#{media_count})"
+    end
+  end
+  
+  class SearchTagsResults < NibblerJSON
+    elements :results, :with => Tag
+    def parse() super.results end
+  end
+  
   class Timeline < NibblerJSON
     elements :items, :with => Media
     # return items instead of self when done

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: instagram
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -78,7 +74,7 @@ files:
 - lib/instagram.rb
 - README.md
 - MIT-LICENSE
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mislav/instagram
 licenses: []
 
@@ -92,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -101,14 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Instagram API client