benschwarz-flickr-rest 0.2.2 → 0.2.3

data/README.markdown

@@ -10,9 +10,14 @@ If you want a flickr api wrapper, use the flickr gem.
 
     require 'flickr-rest'
     Flickr::Query::CONFIG_PATH = '/path/to/flickr.yml'
-    flickr = Flickr::Query.new
+    flickr = Flickr::Query.new('flickr.test.echo')
 
-    flickr.request('flickr.test.echo') 
+    # Raw JSON response (String)
+    flickr.raw
+    => '{"api_key":{"_content":"2b60171843b346aa104e3a38d0129e5e"}, "format":{"_content":"json"}, "nojsoncallback":{"_content":"1"}, "method":{"_content":"flickr.test.echo"}, "stat":"ok"}'
 
+    # A clean, tidy ruby object
+    flickr.parsed
+    => {:api_key=>"2b60171843b346aa104e3a38d0129e5e", :format=>"json", :method=>"flickr.test.echo", :nojsoncallback=>"1"}
 
 

data/flickr-rest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "flickr-rest"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
   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

@@ -4,34 +4,41 @@ require 'open-uri'
 
 module Flickr
   class Query
-    VERSION       = "0.2.2".freeze
+    VERSION       = "0.2.3".freeze
     API_BASE      = "http://api.flickr.com/services/rest/".freeze
     
+    attr_reader :raw
+    
     class Failure < StandardError; end
 
     # @param api_method eg: flickr.test.echo
     # @param params={}  eg: :photo_id => 2929112139
-    def initialize
+    def initialize(method, params={})
       @@config ||= YAML::load(File.open(CONFIG_PATH))
+      @method, @params = method, params
+      request
     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
-    
-    def request(api_method, params = {})
-      response = JSON.parse(open(build_query(api_method, params)).read)
-      raise Failure, response["message"] if response.delete("stat") == "fail"      
-      r = mash(response)
-      unnest(r)
+        
+    def parsed
+      json = JSON.parse(@raw)
+      raise Failure, json["message"] if json.delete("stat") == "fail"
+      return unnest(mash(json))
     end
     
     private
-    def build_query(method, params={})
+    def request
+      @raw = open(build_query).read
+    end
+    
+    def build_query
       url = []
       opts = {
-        :method => method,
+        :method => @method,
         :nojsoncallback => 1,
         :format => "json"
-      }.merge(params).merge(@@config).each do |key, value|
+      }.merge(@params).merge(@@config).each do |key, value|
         url << "#{key}=#{value}" unless value.nil?
       end
 

metadata

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