benschwarz-flickr-rest 0.1.1 → 0.2

data/README.markdown

@@ -8,16 +8,11 @@ If you want a flickr api wrapper, use the flickr gem.
 
 # Usage
 
-  require 'flickr-rest'
+    require 'flickr-rest'
+    Flickr::Query::CONFIG_PATH = '/path/to/flickr.yml'
+    flickr = Flickr::Query.new
 
-# My API key has been set as the default. Flickr probably won't like that.
+    flickr.request('flickr.test.echo') 
 
-  Flickr::Query::API_KEY = 'your-api-key-here'
-  flickr = Flickr::Query.new 'your-user-id-here'
 
-  flickr.execute('flickr.test.echo') 
-
-=> #<Hpricot::Doc{} *snip*
-
-Then use simple Hpricot selectors to traverse through the tree. 
 

data/flickr-rest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "flickr-rest"
-  s.version = "0.1.1"
+  s.version = "0.2"
   s.date = "2008-11-17"
   s.summary = "A light interface to call flickr 'restful' api methods"
   s.email = "ben@germanforblack.com"

data/lib/flickr-rest.rb

@@ -1,37 +1,24 @@
-begin
-  require 'minigems'
-rescue LoadError
-  require 'rubygems'
-end
-
-require 'hpricot'
+require 'json'
 require 'open-uri'
 
 module Flickr
   class Query
-    VERSION = '0.1.1'
-    API_BASE = "http://api.flickr.com/services/rest/"
+    VERSION       = "0.2.0".freeze
+    API_BASE      = "http://api.flickr.com/services/rest/".freeze
     
     class Failure < StandardError; end
-    class ApiKeyRequired < StandardError; end
-    
-    # @param user_id - Your flickr user id
-    def initialize(user_id)
-      @user_id = user_id
-    end
-    
+
     # @param api_method eg: flickr.test.echo
     # @param params={}  eg: :photo_id => 2929112139
-    def execute(api_method, params={})
-      raise ApiKeyRequired, "set your flickr API key using Flickr::Query.API_KEY = ''" if API_KEY.nil?
-      
-      dispatch(build_query(api_method, params)) 
+    def initialize
+      @@config ||= YAML::load(File.open(CONFIG_PATH))
+    rescue NameError
+      raise Failure, "set your flickr API key and shared secret with a YAML file and point it to Flickr::Query.CONFIG_PATH = 'my-config.yml'"
     end
-
-    private
-    def dispatch(query)
-      response = Hpricot.XML(open(query).read)
-      raise Failure, response.at(:err)['msg'] unless response.search(:err).empty?
+    
+    def request(api_method, params = {})
+      response = JSON.parse(open(build_query(api_method, params)).read)
+      raise Failure, response["message"] if response["stat"] == "fail"
       return response
     end
   
@@ -39,10 +26,10 @@ module Flickr
       url = []
       opts = {
         :method => method,
-        :api_key => API_KEY,
-        :user_id => @user_id
-      }.merge(params).each do |key, value|
-        url << "#{key}=#{value}" unless value.empty?
+        :nojsoncallback => 1,
+        :format => "json"
+      }.merge(params).merge(@@config).each do |key, value|
+        url << "#{key}=#{value}" unless value.nil?
       end
 
       return API_BASE + "?" + url.join("&")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-flickr-rest
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: "0.2"
 platform: ruby
 authors: 
 - Ben Schwarz