flickrmocks 0.8.13 → 0.8.14

data/VERSION

@@ -1 +1 @@
-0.8.13
+0.8.14

data/flickrmocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flickrmocks}
-  s.version = "0.8.13"
+  s.version = "0.8.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takaltoo"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2010-12-08}
   s.description = %q{FlickrMocks makes it possible to Marshal responses 
 			 generated from the FLickRaw gem. This is useful for 
 			 Mocking/Stubbing the Flickr interface for testing purposes.
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
      "spec/base/stubs_spec.rb",
      "spec/base/version_spec.rb",
      "spec/fixtures/author_photos.marshal",
+     "spec/fixtures/commons_institution_photos.marshal",
      "spec/fixtures/commons_institutions.marshal",
      "spec/fixtures/empty_photos.marshal",
      "spec/fixtures/expected_methods.marshal",

data/lib/flickr_mocks/fixtures.rb

@@ -1,9 +1,12 @@
 require 'ostruct'
+require 'singleton'
 
 module FlickrMocks
   class Fixtures
+    include Singleton
     attr_accessor :photos,:interesting_photos,:author_photos,:photo,:photo_details,
-                      :photo_sizes,:photo_size,:expected_methods,:empty_photos,:commons_institutions
+                      :photo_sizes,:photo_size,:expected_methods,:empty_photos,
+                      :commons_institutions,:commons_institution_photos
 
     def initialize
       @photos = load_fixture(:photos)
@@ -17,7 +20,8 @@ module FlickrMocks
       @photo_size = load_fixture(:photo_size)
 
       @commons_institutions = load_fixture(:commons_institutions)
-      
+      @commons_institution_photos = load_fixture(:commons_institution_photos)
+
       @empty_photos = load_fixture(:empty_photos)
 
       @expected_methods = load_fixture(:expected_methods)

data/lib/flickr_mocks/stubs.rb

@@ -9,7 +9,7 @@ module FlickrMocks
 
 
     def self.stub_search
-      fixtures = Fixtures.new
+      fixtures = Fixtures.instance
       Proc.new { flickr.photos.stub(:search) do |params|
           if !params.is_a?(Hash)
             raise FlickRaw::FailedResponse.new('Parameterless searches have been disabled. Please use flickr.photos.getRecent instead.',
@@ -45,7 +45,7 @@ module FlickrMocks
             raise FlickRaw::FailedResponse.new('Photo "%s" not found (invalid ID)' % params[:photo_id],
             'code','flickr.photos.getInfo')
           else
-            Fixtures.new.photo_details
+            Fixtures.instance.photo_details
           end
         end
       }.call
@@ -64,7 +64,7 @@ module FlickrMocks
             raise FlickRaw::FailedResponse.new('Photo not found',
               'code','flickr.photos.getSizes')
           else
-            Fixtures.new.photo_sizes
+            Fixtures.instance.photo_sizes
           end
         end
       }.call
@@ -74,17 +74,17 @@ module FlickrMocks
       Proc.new { 
         flickr.interestingness.stub(:getList) do |params|
           if !params.is_a?(Hash)
-            Fixtures.new.interesting_photos
+            Fixtures.instance.interesting_photos
           elsif !params.has_key?(:date)
-            Fixtures.new.interesting_photos
+            Fixtures.instance.interesting_photos
           elsif params[:date] == 'garbage'
             raise FlickRaw::FailedResponse.new('Not a valid date string',
             'code','flickr.interestingness.getList'
             )
           elsif params[:date] == '2000-01-01'
-            Fixtures.new.empty_photos
+            Fixtures.instance.empty_photos
           else
-            Fixtures.new.interesting_photos
+            Fixtures.instance.interesting_photos
           end
         end
       }.call
@@ -93,7 +93,7 @@ module FlickrMocks
     def self.stub_commons_institutions
       Proc.new {
         flickr.commons.stub(:getInstitutions) do
-            Fixtures.new.commons_institutions
+            Fixtures.instance.commons_institutions
         end
       }.call
     end

data/spec/api/api_spec.rb

@@ -3,13 +3,13 @@ require 'ruby-debug'
 describe APP::Api do
   let(:klass) { APP::Api }
 
-  let(:fixtures) { APP::Fixtures.new }
-  let(:photo)  {fixtures.photo}
-  let(:photos) {fixtures.photos}
-  let(:sizes) {fixtures.photo_sizes}
-  let(:photo_details) {fixtures.photo_details}
-  let(:interesting_photos) {fixtures.interesting_photos}
-  let(:commons_institutions) {fixtures.commons_institutions}
+  let(:fixtures){APP::Fixtures.instance}
+  let(:photo){fixtures.photo}
+  let(:photos){fixtures.photos}
+  let(:sizes){fixtures.photo_sizes}
+  let(:photo_details){fixtures.photo_details}
+  let(:interesting_photos){fixtures.interesting_photos}
+  let(:commons_institutions){fixtures.commons_institutions}
 
 
   context "class instance variables" do
@@ -91,4 +91,4 @@ describe APP::Api do
     end
 
   end
-end
+end

data/spec/api/flickr_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::Api do
   let(:klass){APP::Api}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   
   context "class methods" do
     specify {klass.should respond_to(:flickr_photos)}

data/spec/base/fixtures_spec.rb

@@ -4,9 +4,18 @@ require 'ruby-debug'
 describe APP::Fixtures do
 
   let(:klass) {APP::Fixtures}
-  let(:fixtures) {APP::Fixtures.new}
+  let(:fixtures) {klass.instance}
   let(:subject) {fixtures}
-  
+
+  context "singleton behavior" do
+    specify {klass.should respond_to(:instance)}
+    it "returns an instance of the fixtures class" do
+      klass.instance.should == fixtures
+    end
+    it "raises an error when new called" do
+      expect {klass.new}.to raise_error(NoMethodError)
+    end
+  end
   context "class methods" do
     specify {klass.should respond_to(:repository)}
     context "repository" do
@@ -84,6 +93,12 @@ describe APP::Fixtures do
       let(:fixture){:commons_institutions}
       it_behaves_like "a flickraw fixture"
     end
+
+    specify {subject.should respond_to(:commons_institution_photos)}
+    context "commons_institutions_photos" do
+      let(:fixture){:commons_institution_photos}
+      it_behaves_like "a flickraw fixture"
+    end
   end
 
 end

data/spec/base/flickraw/custom_clone_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe APP::CustomClone do
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
 
   let(:photo){fixtures.photo}
   let(:photos){fixtures.photos}

data/spec/base/flickraw/custom_compare_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe APP::CustomCompare do
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
 
   let(:photo){fixtures.photo}
   let(:photos){fixtures.photos}
@@ -45,7 +45,7 @@ describe APP::CustomCompare do
       context "photos flickraw responselist" do
         let(:subject){photos}
         let(:other){photo_details}
-    
+
         it_behaves_like "flickraw response for =="
 
         it "returns false when object is compared with object that is slightly different" do
@@ -62,9 +62,9 @@ describe APP::CustomCompare do
         it_behaves_like "flickraw response for =="
 
         it "returns false when object is compared with object that is slightly different" do
-          other = subject.clone
-          subject.stub(:farm).and_return(123421)
-          subject.should_not == other
+            other = subject.clone
+            other.stub(:farm).and_return(123421)
+            subject.should_not == other
         end
       end
 

data/spec/base/flickraw/custom_marshal_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe APP::CustomMarshal do
   let(:klass) {APP::CustomMarshal}
   let(:helpers) {APP::Helpers}
-  let(:fixtures) {APP::Fixtures.new}
+  let(:fixtures) {APP::Fixtures.instance}
 
   shared_examples_for "marshalling and unmarshalling flickraw objects" do
     it "should properly marshal/unmarshal Photos object" do

data/spec/base/helpers_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::Helpers do
   let(:klass) {APP::Helpers}
-  let(:fixtures) {APP::Fixtures.new}
+  let(:fixtures) {APP::Fixtures.instance}
 
   context "class methods" do
 

data/spec/base/stubs_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::Stubs do
   let(:klass) {APP::Stubs}
-  let(:fixtures) {APP::Fixtures.new}
+  let(:fixtures) {APP::Fixtures.instance}
 
   context "class methods" do
     
@@ -27,6 +27,7 @@ describe APP::Stubs do
       it "stubs flickr.commons.getInstitutions" do
         flickr.commons.getInstitutions.should == fixtures.commons_institutions
       end
+      
     end
 
     specify {klass.should respond_to(:stub_search)}

data/spec/fixtures/expected_methods.marshal

@@ -1,4 +1,4 @@
-U:OpenStruct{:photos[:	page:
+U:OpenStruct{:photos[:	page:
 pages:perpage:
 total:
 photo:flickr_type:empty_photos[;;;	;
@@ -14,4 +14,5 @@ notes:	tags:
 media;:photo_sizes[
 :canblog:
 label:
-width:height:source:url;-;:commons_institutions[:institution;
+width:height:source:url;-;:commons_institutions[:institution;:commons_institution_photos[;;;	;
+;;

data/spec/models/commons_institution_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe APP::CommonsInstitution do
   let(:api) {APP::Api}
   let(:klass) {APP::CommonsInstitution}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   let(:fixture){fixtures.commons_institutions[0]}
   subject {klass.new(fixture)}
 

data/spec/models/commons_institutions_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe APP::CommonsInstitutions do
   let(:api) {APP::Api}
   let(:klass) {APP::CommonsInstitutions}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   let(:fixture){fixtures.commons_institutions}
   subject {klass.new(fixture)}
 

data/spec/models/photo_details_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::PhotoDetails do  
   let(:klass){APP::PhotoDetails}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
 
   let(:basic_photo) { APP::Photo.new fixtures.photo }
   let(:extended_photo) { APP::Photo.new fixtures.photo_details }

data/spec/models/photo_search_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe APP::PhotoSearch do
   let(:api) {APP::Api}
   let(:klass) {APP::PhotoSearch}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   let(:options) {{:search_terms => 'iran', :page => '20', :date => '2010-10-03'}}
 
   subject { klass.new fixtures.photos,options }

data/spec/models/photo_size_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::PhotoSize do
   let(:klass){APP::PhotoSize}
-  let(:fixtures){ APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   let(:size_fixture){fixtures.photo_size}
 
   subject {klass.new size_fixture}

data/spec/models/photo_sizes_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::PhotoSizes do
   let(:klass){APP::PhotoSizes}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
 
   subject {APP::PhotoSizes.new fixtures.photo_sizes}
 

data/spec/models/photo_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe APP::Photo do
   let(:klass){APP::Photo}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   let(:basic_photo){klass.new fixtures.photo}
   let(:extended_photo){klass.new fixtures.photo_details}
 

data/spec/models/photos_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-
 describe APP::Photos do
   let(:api) {APP::Api}
   let(:klass) {APP::Photos}
-  let(:fixtures){APP::Fixtures.new}
+  let(:fixtures){APP::Fixtures.instance}
   let(:photos_fixture) {fixtures.photos}
   let(:interesting_photos_fixture){fixtures.interesting_photos}
 

data/spec/spec_helper.rb

@@ -15,10 +15,8 @@ require 'shared_examples/collection'
 require 'flickrmocks'
 
 Rspec.configure do |c|
-#  c.mock_with :mocha
-
+  #  c.mock_with :mocha
   APP = FlickrMocks
-  FlickrFixtures = APP::Fixtures.new
 end
 
 

data/tasks/fixtures.rb

@@ -6,8 +6,9 @@ require 'ruby-debug'
 # used for providing fixtures to users of the gem
 namespace :fixtures do
   desc 'generate all fixtures for USERS of the GEM'
-  task :all => [:photos,:empty_photos,:interesting_photos,:author_photos,:photo,:photo_details,
-                   :photo_sizes,:photo_size,:expected_methods, :commons_institutions]
+  task :all => [:photos,:empty_photos,:interesting_photos,:author_photos,
+                    :photo,:photo_details,:photo_sizes,:photo_size,:expected_methods,
+                    :commons_institutions,:commons_institution_photos]
   
   desc 'generate fixture for flickr.photos.search'
   task :photos => :repository do
@@ -64,6 +65,13 @@ namespace :fixtures do
     dump default_commons_institutions, :commons_institutions
   end
 
+  desc 'generate fixture for commons institution photos'
+  task :commons_institution_photos => :repository do
+    config_flickr
+    dump default_commons_institution_photos, :commons_institution_photos
+  end
+  
+
   desc 'expected methods'
   task :expected_methods => :repository do
     data = OpenStruct.new
@@ -77,6 +85,7 @@ namespace :fixtures do
     data.photo_sizes = default_methods(default_photo_sizes)
     data.photo_size = default_methods(default_photo_size)
     data.commons_institutions = default_methods(default_commons_institutions)
+    data.commons_institution_photos = default_methods(default_commons_institution_photos)
     dump data,:expected_methods
   end
 
@@ -166,11 +175,14 @@ namespace :fixtures do
     @default_commons_institutions ||= flickr.commons.getInstitutions
     @default_commons_institutions
   end
+
+  def default_commons_institution_photos
+    @default_commons_institution_photos ||= flickr.photos.search :user_id  => '35532303@N08', :per_page => '200', :extras=>'license'
+    @default_commons_institution_photos
+  end
   
   def default_methods(obj)
-    obj.methods(false).push(:flickr_type)
+    obj.methods.include?(:flickr_type) ? obj.methods(false).push(:flickr_type) : obj.methods(false)
   end
-
-
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 13
-  version: 0.8.13
+  - 14
+  version: 0.8.14
 platform: ruby
 authors: 
 - Takaltoo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
+date: 2010-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,6 +165,7 @@ files:
 - spec/base/stubs_spec.rb
 - spec/base/version_spec.rb
 - spec/fixtures/author_photos.marshal
+- spec/fixtures/commons_institution_photos.marshal
 - spec/fixtures/commons_institutions.marshal
 - spec/fixtures/empty_photos.marshal
 - spec/fixtures/expected_methods.marshal