myflickr 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.2 2008-01-15
+
+* Removed inbuilt memcached cache mechanism and replaced with my new gem `openuri_memcached`
+* Cleaned manifest
+
+== 0.1.1 2008-01-07
+
+* Forgot to add cache.rb to the Manifest so the 0.1.0 gem was broken!
+
 == 0.1.0 2008-01-06
 
 * Added support for memcached so as to reduce the amount of queries actually sent to flickr
@@ -25,4 +34,4 @@
   
 == 0.0.1 2007-12-15
 
-* Initial release
+* Initial release

data/Manifest.txt

@@ -6,7 +6,6 @@ Rakefile
 config/hoe.rb
 config/requirements.rb
 lib/myflickr.rb
-lib/myflickr/cache.rb
 lib/myflickr/machine_tag.rb
 lib/myflickr/photo.rb
 lib/myflickr/query.rb
@@ -15,7 +14,6 @@ lib/myflickr/size.rb
 lib/myflickr/tag.rb
 lib/myflickr/version.rb
 lib/vendor/parallel/parallel.rb
-setup.rb
 spec/machine_tag_spec.rb
 spec/photo_spec.rb
 spec/query_spec.rb

data/config/hoe.rb

@@ -59,7 +59,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['hpricot', '>= 0.6']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [['hpricot', '>= 0.6'], ['openuri_memcached']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/myflickr/query.rb

@@ -1,54 +1,11 @@
-# All memcached references have been stolen straight
-# from the implementation in the `rubyweather` gem.
-# It just seemed too simple to roll in.
-
 module Myflickr
   class Query #:nodoc:
     def self.api_call(method, resource_uri='') #:nodoc:
       resource = "#{API_BASE}/?method=#{method}&api_key=#{API_KEY}&user_id=#{USER_ID}"
       resource += "&#{resource_uri}" unless resource_uri.empty?
       
-      if cache?
-        begin
-          document = cache.get "#{USER_ID}:#{method}:#{resource_uri}"
-        rescue
-          puts "Querying: #{resource} [CACHE MISS]"
-          document = false
-        end
-      end
-      
-      # No cached version exists
-      unless document
-        puts "Querying: #{resource}"
-        
-        # Query the resource
-        document = open(resource).read
-        
-        # Write a new cache if available
-        cache.set("#{USER_ID}:#{method}:#{resource_uri}", document, cache_validity) if cache?
-        puts "[CACHING...]" if cache?
-      end
-      
       # Create a Hpricot object
-      Hpricot.XML(document)
-    end
-    
-    @cache = false
-    
-    # Turns on query caching.
-    # See Myflickr::Query::Cache
-    def self.enable_cache(enable = true)
-      if enable
-        extend Cache
-        @cache = true
-      else
-        @cache = false
-      end
-    end
-    
-    # True if caching is enabled and at least one memcached server is alive, false otherwise.
-    def self.cache?
-      @cache and cache.active? and servers = cache.instance_variable_get(:@servers) and servers.collect{|s| s.alive?}.include?(true)
+      Hpricot.XML(open(resource).read)
     end
   end
 end

data/lib/myflickr/version.rb

@@ -2,7 +2,7 @@ module Myflickr
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/myflickr.rb

@@ -1,13 +1,15 @@
 require 'rubygems'
 require 'hpricot'
-require 'open-uri'
+require 'openuri_memcached'
 require 'vendor/parallel/parallel'
 
+OpenURI::Cache.enable!
+
 module Myflickr
   API_BASE = "http://api.flickr.com/services/rest"
   MAX_THREADS = 100
 end
 
-%w(query photo tag size set machine_tag cache version).each do |r|
+%w(query photo tag size set machine_tag version).each do |r|
   require File.join(File.dirname(__FILE__), './myflickr/' + r)
 end

data/spec/query_spec.rb

@@ -4,13 +4,4 @@ describe Query, "class" do
   it "should return a Hpricot Document object response" do
     Query.api_call('flickr.test.echo').should be_an_instance_of Hpricot::Doc
   end
-end
-
-describe Query, "with memcached caching for queries" do
-  it "should return a Hpricot Document object response" do
-    Query.enable_cache true
-    Query.cache.servers = ["127.0.0.1:11211"]
-    Query.api_call('flickr.test.echo').should be_an_instance_of Hpricot::Doc
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myflickr
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-07 00:00:00 +11:00
+date: 2008-01-17 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.6"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: openuri_memcached
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A flickr wrapper that removes all community aspects, only your data is returned
 email: ben@germanforblack.com
 executables: []
@@ -41,7 +50,6 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/myflickr.rb
-- lib/myflickr/cache.rb
 - lib/myflickr/machine_tag.rb
 - lib/myflickr/photo.rb
 - lib/myflickr/query.rb
@@ -50,7 +58,6 @@ files:
 - lib/myflickr/tag.rb
 - lib/myflickr/version.rb
 - lib/vendor/parallel/parallel.rb
-- setup.rb
 - spec/machine_tag_spec.rb
 - spec/photo_spec.rb
 - spec/query_spec.rb

data/lib/myflickr/cache.rb

@@ -1,35 +0,0 @@
-# All memcached references have been stolen straight
-# from the implementation in the `rubyweather` gem.
-# It just seemed too simple to roll in.
-
-module Myflickr
-  class Query
-    module Cache
-      attr_writer :cache_validity
-      def cache
-        @memcache ||= MemCache.new :namespace => "Myflickr"
-      end
-      
-      def cache_validity
-        # Default of 10 minutes
-        @cache_validity || 60 * 10
-      end
-          
-      private
-      def self.extend_object(o)
-        begin 
-          require 'memcache'
-        rescue LoadError
-          require 'rubygems'
-          begin
-            gem 'memcache-client', '~> 1.2.1'
-          rescue Gem::LoadError
-            gem 'Ruby-MemCache'
-          end          
-          require 'memcache'
-        end
-        super
-      end  
-    end
-  end
-end