flickrmocks 0.8.6 → 0.8.8

data/Rakefile

@@ -22,7 +22,6 @@ begin
     gem.homepage = "http://github.com/takaltoo/flickrmocks"
     gem.authors = ["Takaltoo"]
 
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 2.10"
     gem.add_development_dependency "rspec", ">=2.0.0.beta.22"
     gem.add_development_dependency "capybara"
     #gem.add_development_dependency 'ruby-debug19', :require => 'ruby-debug'

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.8

data/flickrmocks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flickrmocks}
-  s.version = "0.8.6"
+  s.version = "0.8.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takaltoo"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-11-18}
   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.
@@ -41,6 +41,8 @@ Gem::Specification.new do |s|
      "lib/flickr_mocks/flickraw/custom_marshal.rb",
      "lib/flickr_mocks/flickraw/flickraw.rb",
      "lib/flickr_mocks/helpers.rb",
+     "lib/flickr_mocks/models/commons_institution.rb",
+     "lib/flickr_mocks/models/commons_institutions.rb",
      "lib/flickr_mocks/models/helpers.rb",
      "lib/flickr_mocks/models/photo.rb",
      "lib/flickr_mocks/models/photo_details.rb",
@@ -65,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_institutions.marshal",
      "spec/fixtures/empty_photos.marshal",
      "spec/fixtures/expected_methods.marshal",
      "spec/fixtures/interesting_photos.marshal",
@@ -73,6 +76,8 @@ Gem::Specification.new do |s|
      "spec/fixtures/photo_size.marshal",
      "spec/fixtures/photo_sizes.marshal",
      "spec/fixtures/photos.marshal",
+     "spec/models/commons_institution_spec.rb",
+     "spec/models/commons_institutions_spec.rb",
      "spec/models/helpers_spec.rb",
      "spec/models/photo_details_spec.rb",
      "spec/models/photo_dimensions_spec.rb",
@@ -101,7 +106,9 @@ Gem::Specification.new do |s|
      "spec/models/helpers_spec.rb",
      "spec/models/photo_details_spec.rb",
      "spec/models/photo_size_spec.rb",
+     "spec/models/commons_institution_spec.rb",
      "spec/models/photo_sizes_spec.rb",
+     "spec/models/commons_institutions_spec.rb",
      "spec/models/photos_spec.rb",
      "spec/models/photo_dimensions_spec.rb",
      "spec/models/photo_spec.rb",
@@ -126,7 +133,6 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 2.10"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 1.0"])
@@ -134,7 +140,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<flickraw>, [">= 0.8.2"])
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10"])
       s.add_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 1.0"])
@@ -143,7 +148,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<chronic>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10"])
     s.add_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 1.0"])

data/lib/flickr_mocks/api/api.rb

@@ -38,5 +38,10 @@ module FlickrMocks
       PhotoSearch.new photos,Api.interesting_params(params)
     end
 
+    def self.commons_institutions(params)
+      institutions = Api.flickr_commons_institutions
+      CommonsInstitutions.new institutions,Api.commons_institutions_params(params)
+    end
+
   end
 end

data/lib/flickr_mocks/api/flickr.rb

@@ -21,6 +21,10 @@ module FlickrMocks
     def self.flickr_author(params)
       flickr.photos.search self.author_options(params)
     end
+    
+    def self.flickr_commons_institutions
+      flickr.commons.getInstitutions
+    end
   end
 end
   

data/lib/flickr_mocks/api/options.rb

@@ -49,6 +49,13 @@ module FlickrMocks
         :base_url => params[:base_url]
       }
     end
+
+    def self.commons_institutions_params(params)
+      return {
+        :per_page => params[:per_page] || params[:perpage],
+        :current_page => params[:current_page] || 1
+      }
+    end
   end
 
  

data/lib/flickr_mocks/fixtures.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 module FlickrMocks
   class Fixtures
     attr_accessor :photos,:interesting_photos,:author_photos,:photo,:photo_details,
-                      :photo_sizes,:photo_size,:expected_methods,:empty_photos
+                      :photo_sizes,:photo_size,:expected_methods,:empty_photos,:commons_institutions
 
     def initialize
       @photos = load_fixture(:photos)
@@ -15,10 +15,13 @@ module FlickrMocks
       
       @photo_sizes = load_fixture(:photo_sizes)
       @photo_size = load_fixture(:photo_size)
+
+      @commons_institutions = load_fixture(:commons_institutions)
       
       @empty_photos = load_fixture(:empty_photos)
 
       @expected_methods = load_fixture(:expected_methods)
+
     end
 
     def self.repository

data/lib/flickr_mocks/models/commons_institution.rb

@@ -0,0 +1,56 @@
+
+module FlickrMocks
+  class CommonsInstitution
+    def initialize(object)
+      self.delegated_to_object = object
+    end
+    
+    def launch_date
+      @delegated_to_object.date_launch
+    end
+
+    def owner_id
+      @delegated_to_object.nsid
+    end
+    alias :owner :owner_id
+
+    def owner_name
+      @delegated_to_object.name
+    end
+
+    def  flickr_url
+      get_url(:flickr)
+    end
+
+    def site_url
+      get_url(:site)
+    end
+    
+    def license_url
+      get_url(:license)
+    end
+
+    def ==(other)
+      @delegated_to_object == other.instance_eval('@delegated_to_object')
+    end
+
+    def initialize_copy(orig)
+      super
+      @delegated_to_object = @delegated_to_object.clone
+    end
+    
+    private
+      def delegated_to_object=(object)
+        raise ArgumentError, "Expected object of class FlickRaw::Response but received #{object.class}" unless object.class == FlickRaw::Response
+        @delegated_to_object = object
+      end
+
+      def get_url(type)
+        @delegated_to_object.urls[get_url_index(type)]['_content']
+      end
+
+      def get_url_index(type)
+        @delegated_to_object.urls.map do |url| url['type'].to_sym end.find_index(type.to_sym)
+      end
+  end
+end

data/lib/flickr_mocks/models/commons_institutions.rb

@@ -0,0 +1,93 @@
+
+module FlickrMocks
+  class CommonsInstitutions
+    attr_accessor :per_page,:current_page
+    
+    @defaults =  FlickrMocks::Models::Helpers.paging_defaults.clone
+
+    class << self
+      attr_accessor :defaults
+    end
+
+    def initialize(institutions,options={})
+      self.delegated_to_object = institutions
+      self.per_page = options[:per_page]
+      self.current_page = options[:current_page]
+    end
+
+    def default(value)
+      CommonsInstitutions.defaults[value.to_s.to_sym]
+    end
+
+    def ==(other)
+      per_page == other.per_page and
+      current_page == other.current_page and
+      @delegated_to_object == other.instance_eval('@delegated_to_object')
+    end
+
+    def initialize_copy(orig)
+      super
+      @delegated_to_object = @delegated_to_object.clone
+    end
+    
+    def delegated_instance_methods
+      FlickrMocks::Models::Helpers.array_accessor_methods
+    end
+
+    def method_missing(id,*args,&block)
+      return @delegated_to_object.send(id,*args,&block) if delegated_instance_methods.include?(id)
+      super
+    end
+
+    alias :old_respond_to? :respond_to?
+    def respond_to?(method,type=false)
+      return true if delegated_instance_methods.include?(method)
+      old_respond_to?(method,type)
+    end
+
+    alias :old_methods :methods
+    def methods
+      delegated_instance_methods + old_methods
+    end
+
+    # custom cloning methods
+    def initialize_copy(orig)
+      super
+      @delegated_to_object = @delegated_to_object.map do |institution|
+        institution.clone
+      end
+    end
+
+    def total_entries
+      @delegated_to_object.size
+    end
+
+    def institutions
+      @delegated_to_object
+    end
+
+    def collection
+      ::WillPaginate::Collection.create(current_page, per_page, total_entries) do |obj|
+        obj.replace(institutions)
+      end
+    end
+
+    private
+    def delegated_to_object=(object)
+      raise ArgumentError, "FlickRaw::ResponseList expected" unless object.class == FlickRaw::ResponseList
+      @delegated_to_object = object.institution
+    end
+
+    def per_page=(value)
+      @per_page = value.to_i == 0 ? default(:per_page) : value.to_i
+    end
+
+    def current_page=(value)
+      page = value.to_i < 1 ? 1 : value.to_i
+
+      max_page = total_entries  / @per_page
+      page = page > max_page ? max_page : page
+      @current_page = page
+    end
+  end
+end

data/lib/flickr_mocks/models/helpers.rb

@@ -1,11 +1,21 @@
 module FlickrMocks
   module Models
     module Helpers
+
       def self.array_accessor_methods
         [:[], :first, :last,:empty?,:length,:size,:each,:each_index,
-         :map, :select, :keep_if,:at,:fetch, :reverse_each,
+         :each_with_index,:map, :select, :keep_if,:at,:fetch, :reverse_each,
          :find_index, :index,:rindex, :collect,:values_at]
       end
+
+      def self.paging_defaults
+        {
+          :max_entries => 4000,
+          :per_page => 50,
+          :current_page => 1
+        }
+      end
+
       def self.possible_sizes
         [:square, :thumbnail, :small, :medium, :medium_640, :large, :original]
       end

data/lib/flickr_mocks/models/photos.rb

@@ -3,10 +3,7 @@ module FlickrMocks
     attr_reader :current_page,:per_page,:total_entries,:total_pages,:photos
     alias :perpage :per_page
 
-    @defaults =  {
-      :max_entries => 4000,
-      :per_page => 50
-    }
+    @defaults =  FlickrMocks::Models::Helpers.paging_defaults.clone
 
 
     class << self

data/lib/flickr_mocks/stubs.rb

@@ -2,7 +2,7 @@ module FlickrMocks
   module Stubs
 
     def self.stub_flickr
-      [:stub_search,:stub_getInfo,:stub_getSizes,:stub_interestingness].each do |method|
+      [:stub_search,:stub_getInfo,:stub_getSizes,:stub_interestingness,:stub_commons_institutions].each do |method|
         self.send(method)
       end
     end
@@ -90,6 +90,14 @@ module FlickrMocks
       }.call
     end
 
+    def self.stub_commons_institutions
+      Proc.new {
+        flickr.commons.stub(:getInstitutions) do
+            Fixtures.new.commons_institutions
+        end
+      }.call
+    end
+
   end
 end
 

data/lib/flickrmocks.rb

@@ -26,28 +26,31 @@ end
 #  end
 # end
 
-require 'flickr_mocks/version.rb'
-require 'flickr_mocks/stubs.rb'
-require 'flickr_mocks/helpers.rb'
-require 'flickr_mocks/fixtures.rb'
-
-require 'flickr_mocks/models/helpers.rb'
-require 'flickr_mocks/models/photo_sizes.rb'
-require 'flickr_mocks/models/photo_dimensions.rb'
-require 'flickr_mocks/models/photo_size.rb'
-require 'flickr_mocks/models/photos.rb'
-require 'flickr_mocks/models/photo.rb'
-require 'flickr_mocks/models/photo_search.rb'
-require 'flickr_mocks/models/photo_details.rb'
-
-require 'flickr_mocks/api/helpers.rb'
-require 'flickr_mocks/api/options.rb'
-require 'flickr_mocks/api/flickr.rb'
-require 'flickr_mocks/api/sanitize.rb'
-require 'flickr_mocks/api/api.rb'
-
-require 'flickr_mocks/flickraw/custom_clone.rb'
-require 'flickr_mocks/flickraw/custom_compare.rb'
-require 'flickr_mocks/flickraw/custom_marshal.rb'
-require 'flickr_mocks/flickraw/flickraw.rb'
+[
+ 'flickr_mocks/version.rb',
+ 'flickr_mocks/stubs.rb',
+ 'flickr_mocks/helpers.rb',
+ 'flickr_mocks/fixtures.rb',
+ 'flickr_mocks/models/helpers.rb',
+ 'flickr_mocks/models/photo_sizes.rb',
+ 'flickr_mocks/models/photo_dimensions.rb',
+ 'flickr_mocks/models/photo_size.rb',
+ 'flickr_mocks/models/photos.rb',
+ 'flickr_mocks/models/photo.rb',
+ 'flickr_mocks/models/photo_search.rb',
+ 'flickr_mocks/models/photo_details.rb',
+ 'flickr_mocks/models/commons_institutions.rb',
+ 'flickr_mocks/models/commons_institution.rb',
+ 'flickr_mocks/api/helpers.rb',
+ 'flickr_mocks/api/options.rb',
+ 'flickr_mocks/api/flickr.rb',
+ 'flickr_mocks/api/sanitize.rb',
+ 'flickr_mocks/api/api.rb',
+ 'flickr_mocks/flickraw/custom_clone.rb',
+ 'flickr_mocks/flickraw/custom_compare.rb',
+ 'flickr_mocks/flickraw/custom_marshal.rb',
+ 'flickr_mocks/flickraw/flickraw.rb'
+].each do |file|
+ require File.expand_path(File.dirname(__FILE__)) + '/' + file
+end
 

data/spec/api/api_spec.rb

@@ -9,6 +9,7 @@ describe APP::Api do
   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
@@ -80,5 +81,14 @@ describe APP::Api do
       end
     end
 
+    specify {klass.should respond_to(:commons_institutions)}
+    describe "commons_institutions" do
+      it "returns expected CommonsInstitutions object" do
+        flickr.commons.stub(:getInstitutions).and_return(commons_institutions)
+        klass.commons_institutions({}).should ==
+          APP::CommonsInstitutions.new(commons_institutions)
+      end
+    end
+
   end
 end

data/spec/api/flickr_spec.rb

@@ -44,5 +44,11 @@ describe APP::Api do
         klass.flickr_author({}).should == fixtures.author_photos
       end
     end
+
+    specify {klass.should respond_to(:flickr_commons_institutions)}
+    it "retuns list of commons institutions" do
+      flickr.commons.stub(:getInstitutions).and_return(fixtures.commons_institutions)
+      klass.flickr_commons_institutions.should == fixtures.commons_institutions
+    end
   end
 end

data/spec/api/options_spec.rb

@@ -24,7 +24,7 @@ describe APP::Api do
   }
   
 
-  describe "search_options" do
+  context "search_options" do
     it "should give correct options when all options are specified except :author_id" do
       subject.search_options(options.clone.merge(:per_page =>'400')).should == expected
     end
@@ -60,7 +60,7 @@ describe APP::Api do
     end
   end
 
-  describe "interesting_options" do
+  context "interesting_options" do
     let(:expected){
       { :date => '2010-02-14',
         :per_page => '2',
@@ -81,7 +81,7 @@ describe APP::Api do
     end
   end
 
-  describe "photo_options" do
+  context "photo_options" do
     let(:expected) {
       {:photo_id => '20030', :secret => 'abcdef'}
     }
@@ -102,7 +102,7 @@ describe APP::Api do
     end
   end
 
-  describe "search_params" do
+  context "search_params" do
     let(:expected){
       {
         :search_terms => 'iran,shiraz',
@@ -126,8 +126,7 @@ describe APP::Api do
     end
   end
 
-  describe "interesting_params" do
-    
+  context "interesting_params" do
     let(:expected) {
       {
         :date => 'iran,shiraz',
@@ -146,6 +145,28 @@ describe APP::Api do
         expected.clone.merge(:base_url => expected[:base_url])
     end
   end
+
+  context "institution_params" do
+    it "returns :per_page and :current_page if specified" do
+      expected = {:per_page => 2, :current_page => 3}
+      subject.commons_institutions_params(expected).should == expected
+    end
+    it "returns :per_page is prefereed over :perpage is specified" do
+      expected = {:per_page => 2, :current_page => 1}
+      subject.commons_institutions_params(:per_page => 3, :perpage => 20, :current_page => 1).should ==
+        {:per_page => 3, :current_page => 1}
+    end
+    it "returns :perpage if :per_page is not specified" do
+      expected = {:perpage => 3}
+      subject.commons_institutions_params(:perpage => 20, :current_page => 1).should ==
+        {:per_page => 20, :current_page => 1}
+    end
+    it "returns :current_page of 1 if not specified" do
+      subject.commons_institutions_params(:per_page => 20).should ==
+        {:per_page => 20, :current_page => 1}
+    end
+  end
+  
   
 end
 

data/spec/base/fixtures_spec.rb

@@ -78,6 +78,12 @@ describe APP::Fixtures do
       let(:fixture) {:photo_sizes}
       it_behaves_like "a flickraw fixture"
     end
+
+    specify {subject.should respond_to(:commons_institutions)}
+    context "commons_institutions" do
+      let(:fixture){:commons_institutions}
+      it_behaves_like "a flickraw fixture"
+    end
   end
 
 end

data/spec/base/stubs_spec.rb

@@ -23,6 +23,10 @@ describe APP::Stubs do
       it "stubs flickr.interestingness.getList" do
         flickr.interestingness.getList.should == fixtures.interesting_photos
       end
+
+      it "stubs flickr.commons.getInstitutions" do
+        flickr.commons.getInstitutions.should == fixtures.commons_institutions
+      end
     end
 
     specify {klass.should respond_to(:stub_search)}
@@ -176,5 +180,15 @@ describe APP::Stubs do
       end
     end
 
+    specify {klass.should respond_to(:stub_commons_institutions)}
+    context "stub_commons_institutions" do
+      before(:each) do
+        klass.stub_commons_institutions
+      end
+      it "returns commons_institutions fixture" do
+        flickr.commons.getInstitutions.should == fixtures.commons_institutions
+      end
+    end
+
   end
 end

data/spec/fixtures/expected_methods.marshal

@@ -1,4 +1,4 @@
-U:OpenStruct{
+U:OpenStruct{:photos[:	page:
 pages:perpage:
 total:
 photo:flickr_type:empty_photos[;;;	;
@@ -6,12 +6,12 @@ photo:flickr_type:empty_photos[;;;	;
 ;;:author_photos[;;;	;
 ;;;[:id:
 owner:secret:server:	farm:
-title:
+title:
 dates:
-views:editability:
+views:editability:publiceditability:
 usage:
 notes:	tags:
 media;:photo_sizes[
 :canblog:
 label:
-width:height:source:url;,;
+width:height:source:url;-;:commons_institutions[:institution;

data/spec/models/commons_institution_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe APP::CommonsInstitution do
+  let(:api) {APP::Api}
+  let(:klass) {APP::CommonsInstitution}
+  let(:fixtures){APP::Fixtures.new}
+  let(:fixture){fixtures.commons_institutions[0]}
+  subject {klass.new(fixture)}
+
+  context "initialization" do
+    it "returns object of proper class when supplied FlickRaw::Response" do
+      klass.new(fixture).class.should == klass
+    end
+    it "raises an error when FlickRaw::ResponseList is provided" do
+      expect { klass.new(fixtures.photos)}.to raise_error
+    end
+    it "raises an Error when an Array is specified" do
+      expect { klass.new([1,2,3,4])}.to raise_error
+    end
+  end
+  
+  context "instance methods" do
+
+    specify {subject.should respond_to(:launch_date)}
+    context "#launch_date" do
+      it "returns expected launch date" do
+        subject.launch_date.should == fixture.date_launch
+      end
+    end
+    
+    specify {subject.should respond_to(:owner_id)}
+    context "#owner_id" do
+      it "returns expected id for owner of photo" do
+        subject.owner_id.should == fixture.nsid
+      end
+    end
+
+    context "#owner" do
+      it "returns expected id for owner of photo" do
+        subject.owner.should == fixture.nsid
+      end
+    end
+
+    specify {subject.should respond_to(:owner_name)}
+    context "#owner_name" do
+      it "returns expected owner_name" do
+        subject.owner_name.should == fixture.name
+      end
+    end
+
+    specify {subject.should respond_to(:site_url)}
+    context "#site_url" do
+      it "returns expected url for site owner" do
+        subject.site_url.should == fixture.urls[0]['_content']
+      end
+    end
+
+    specify {subject.should respond_to(:license_url)}
+    context "#license_url" do
+      it "returns expected url for license of photos" do
+        subject.license_url.should == fixture.urls[1]['_content']
+      end
+    end
+
+    specify {subject.should respond_to(:flickr_url)}
+    context "#flickr_url" do
+      it "returns expected url for institution on flickr" do
+        subject.flickr_url.should == fixture.urls[2]['_content']
+      end
+    end
+
+    specify {subject.should respond_to(:==)}
+    context "#==" do
+      it "returns true when object is compared to itself" do
+        subject.should == subject
+      end
+      it "returns true when object is compared to clone of itself" do
+        subject.should == subject.clone
+      end
+      it "returns flase when object is compared to identical object EXCEPT with one element" do
+        subject.should_not == subject.clone.instance_eval('@delegated_to_object').instance_eval('@h["urls"][0].instance_eval("@h")["type"]="garbage"')
+      end
+      it "returns false when object is compared to random object" do
+        subject.should_not == [1,2,3,4]
+      end
+      it "returns false when object is compared to another object of same calss" do
+        subject.should_not == klass.new(fixtures.commons_institutions[1])
+      end
+    end
+  end
+
+  
+  context "custom cloning" do
+    context "#initialize_copy" do
+      it "returns institution objects that have distinct ids from the cloned object" do
+        other = subject.clone
+        subject.instance_eval('@delegated_to_object').__id__.should_not == other.instance_eval('@delegated_to_object').__id__
+      end
+    end
+  end
+
+end

data/spec/models/commons_institutions_spec.rb

@@ -0,0 +1,167 @@
+require 'spec_helper'
+
+describe APP::CommonsInstitutions do
+  let(:api) {APP::Api}
+  let(:klass) {APP::CommonsInstitutions}
+  let(:fixtures){APP::Fixtures.new}
+  let(:fixture){fixtures.commons_institutions}
+  subject {klass.new(fixture)}
+
+
+  context "class methods" do
+    specify { klass.should respond_to(:defaults)}
+    it "returns expected set of defaults" do
+      klass.defaults.should == FlickrMocks::Models::Helpers.paging_defaults
+    end
+  end
+
+  context "initialization" do
+    it "returns object of a proper class when photos FlickRaw::ResponseList provided" do
+      klass.new(fixture).class.should == klass
+    end
+    it "raises an error when FlickRaw::Response provided" do
+      expect {klass.new(fixtures.photo)}.to raise_error(ArgumentError)
+    end
+    it "raises an error when an Array class specified" do
+      expect {klass.new([1,3,4])}.to raise_error(ArgumentError)
+    end
+  end
+
+  context "instance methods" do
+    specify {subject.should respond_to(:default)}
+    context "#default" do
+      it "should return default when proper symbol provided" do
+        klass.defaults.keys.each do |symbol|
+          subject.default(symbol).should == klass.defaults[symbol]
+        end
+      end
+      it "should return default when proper string provided" do
+        klass.defaults.keys.each do |symbol|
+          subject.default(symbol.to_s).should == klass.defaults[symbol]
+        end
+      end
+      it "should return nil when 'garbage' provided" do
+        subject.default(:garbage).should == nil
+      end
+    end
+
+    context "paging methods" do
+      specify {subject.should respond_to(:current_page)}
+      context "#current_page" do
+        it "should return 1 when no current_page given at initialization" do
+          klass.new(fixture,:per_page => 20).current_page.should == 1
+        end
+        it "should return specified current_page is valid" do
+          klass.new(fixture,:per_page => 20, :current_page => 2).current_page.should == 2
+        end
+        it "should return 1 when current page is 0" do
+          klass.new(fixture,:per_page => 20, :current_page => 0).current_page.should == 1
+        end
+        it "should return max page when current_page is greater than max_page" do
+          max_page = (fixture.size / 20)
+          klass.new(fixture,:per_page => 20,
+                                  :current_page => max_page+1).current_page.should == max_page
+        end
+      end
+
+      specify {subject.should respond_to(:per_page)}
+      context "#per_page" do
+        it "returns default per_page when none specified at initialization" do
+          klass.new(fixture,:current_page => 1).per_page.should ==
+            FlickrMocks::Models::Helpers.paging_defaults[:per_page]
+        end
+        it "returns per_page value that was specified during initialization" do
+          klass.new(fixture,:per_page => 33, :current_page => 1).per_page.should == 33
+        end
+        it "returns 1 when per_page is set to 0" do
+          klass.new(fixture,:per_page => 0, :current_page => 1).per_page.should ==
+                             FlickrMocks::Models::Helpers.paging_defaults[:per_page]
+        end
+      end
+
+      specify {subject.should respond_to(:total_entries)}
+      context "#total_entries" do
+        it "returns expected number of photos" do
+          subject.total_entries.should == fixtures.commons_institutions.size
+        end
+      end
+
+      specify {subject.should respond_to(:==)}
+      context "#==" do
+        subject{klass.new(fixture,:per_page => 20, :current_page => 1)}
+        it "returns true when object compared to itself" do
+          subject.should == subject
+        end
+        it "returns true when object compared to clone of itself" do
+          subject.should == subject.clone
+        end
+        it "returns false when object is compared to object with different :per_page" do
+          subject.should_not == klass.new(fixture, :per_page => subject.per_page + 1,
+                                                    :current_page => subject.current_page)
+        end
+        it "returns false when object is compared to object with different :current_page" do
+          subject.should_not == klass.new(fixture,:per_page => subject.per_page,
+            :current_page => subject.current_page + 1)
+        end
+      end
+    end
+  end
+
+  context "metaprogramming methods" do
+    specify{ subject.should respond_to(:delegated_instance_methods)}
+    context "#delegated_instance_methods" do
+      it "returns expected list of methods that are delegated to other objects" do
+        subject.delegated_instance_methods.sort.should == (FlickrMocks::Models::Helpers.array_accessor_methods).sort
+      end
+    end
+
+    specify { subject.should respond_to(:methods)}
+    context "#methods" do
+      it "should return all methods as well as array iteration methods" do
+        subject.methods.sort.should == (subject.old_methods + subject.delegated_instance_methods).sort
+      end
+    end
+
+    specify{ subject.should respond_to(:respond_to?)}
+    context "#respond_to?" do
+      it "recognizes all methods returned by #methods" do
+        subject.methods.each do |method|
+          subject.should respond_to(method)
+        end
+      end
+    end
+
+    context "iteratable methods" do
+      let(:reference) {subject.instance_eval('@delegated_to_object')}
+      it_behaves_like "object with delegated Array accessor helpers"
+    end
+
+    specify {subject.should respond_to(:collection)}
+    context "#collection" do
+      context "usable argument set to nil" do
+        let(:subject){
+          klass.new(fixture,:per_page => 20, :current_page => 1)
+        }
+        let(:reference){
+          OpenStruct.new :current_page => 1,
+          :per_page => 20,
+          :total_entries => fixture.size,
+          :collection => subject.institutions
+        }
+        it_behaves_like "object that responds to collection"
+      end
+    end
+  end
+
+    context "custom cloning methods" do
+      context "#initialize_copy" do
+        it "returns institution objects that have distinct ids from the cloned object" do
+          other = subject.clone
+          subject.each_index do |index|
+            subject[index].__id__.should_not == other[index].__id__
+          end
+        end
+      end
+    end
+end
+

data/spec/models/helpers_spec.rb

@@ -8,9 +8,9 @@ describe APP::Models::Helpers do
     context "array_accessor_methods" do
       it "returns expected array methods" do
         klass.array_accessor_methods.sort.should ==  [:[], :at,:fetch, :first, :last,:each,
-                                                                    :each_index, :reverse_each,:length, :size,
-                                                                    :empty?, :find_index, :index,:rindex, :collect,
-                                                                    :map, :select, :keep_if, :values_at].sort
+          :each_index, :reverse_each,:length, :size,
+          :empty?, :find_index, :index, :each_with_index,:rindex, :collect,
+          :map, :select, :keep_if, :values_at].sort
       end
     end
 
@@ -18,8 +18,20 @@ describe APP::Models::Helpers do
     context "possible_sizes" do
       it "returns expected array of possible image sizes" do
         klass.possible_sizes.should == [:square, :thumbnail, :small, :medium,
-                                                              :medium_640, :large, :original]
+          :medium_640, :large, :original]
       end
     end
+    
+    specify {klass.should respond_to(:paging_defaults)}
+    context "paging_defaults" do
+      it "returns expected hash of paging defaults" do
+        klass.paging_defaults.should == {
+          :max_entries => 4000,
+          :per_page => 50,
+          :current_page => 1
+        }
+      end
+    end
+    
   end
 end

data/spec/models/photos_spec.rb

@@ -12,8 +12,7 @@ describe APP::Photos do
   let(:max_pages){subject.default(:max_entries)/subject.default(:per_page)}
 
   context "class methods" do 
-    specify { klass.should respond_to(:defaults)}
-    
+    specify { klass.should respond_to(:defaults)}   
     context "defaults" do
       before(:each) do
         @defaults = klass.defaults.clone

data/spec/shared_examples/array_accessor.rb

@@ -9,6 +9,7 @@ shared_examples_for "object with delegated Array accessor helpers" do
   specify{subject.should respond_to(:last)}
   specify{subject.should respond_to(:each)}
   specify{subject.should respond_to(:each_index)}
+  specify{subject.should respond_to(:each_with_index)}
   specify{subject.should respond_to(:reverse_each)}
   specify{subject.should respond_to(:length)}
   specify{subject.should respond_to(:size)}
@@ -101,6 +102,17 @@ shared_examples_for "object with delegated Array accessor helpers" do
     end
   end
 
+  context "#each_with_index" do
+    it "returns value and index" do
+      subject.each_with_index do |value,index|
+        value.should == reference[index]
+      end
+      reference.each_with_index do |value,index|
+        value.should == subject[index]
+      end
+    end
+  end
+
 
   context "#each_index" do
     it "returns same list as reference" do

data/tasks/fixtures.rb

@@ -1,12 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../lib/flickrmocks')
 require 'fileutils'
+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]
+                   :photo_sizes,:photo_size,:expected_methods, :commons_institutions]
   
   desc 'generate fixture for flickr.photos.search'
   task :photos => :repository do
@@ -51,12 +52,17 @@ namespace :fixtures do
     dump default_photo_sizes,:photo_sizes
   end
 
-  desc 'generated fixture for single size'
+  desc 'generate fixture for single size'
   task :photo_size => :repository do
     config_flickr
     dump default_photo_sizes[0],:photo_size
   end
 
+  desc 'generate fixture for commons institutions'
+  task :commons_institutions => :repository do
+    config_flickr
+    dump default_commons_institutions, :commons_institutions
+  end
 
   desc 'expected methods'
   task :expected_methods => :repository do
@@ -70,6 +76,7 @@ namespace :fixtures do
     data.photo_details = default_methods(default_photo_details)
     data.photo_sizes = default_methods(default_photo_sizes)
     data.photo_size = default_methods(default_photo_size)
+    data.commons_institutions = default_methods(default_commons_institutions)
     dump data,:expected_methods
   end
 
@@ -106,7 +113,7 @@ namespace :fixtures do
   end
 
   def repo_dir
-    FlickrMocks::Fixtures.repository
+    config_dir + '/spec/fixtures/'
   end
 
   def dump(data,fname)
@@ -155,6 +162,11 @@ namespace :fixtures do
     @default_empty_photos
   end
 
+  def default_commons_institutions
+    @default_commons_institutions ||= flickr.commons.getInstitutions
+    @default_commons_institutions
+  end
+  
   def default_methods(obj)
     obj.methods(false).push(:flickr_type)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Takaltoo
@@ -14,27 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        version: "2.10"
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +33,11 @@ dependencies:
         - 22
         version: 2.0.0.beta.22
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,11 +46,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: factory_girl_rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,11 +60,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: faker
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,11 +75,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: flickraw
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,11 +90,11 @@ dependencies:
         - 2
         version: 0.8.2
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: chronic
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,7 +103,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 description: |-
   FlickrMocks makes it possible to Marshal responses 
   			 generated from the FLickRaw gem. This is useful for 
@@ -153,6 +139,8 @@ files:
 - lib/flickr_mocks/flickraw/custom_marshal.rb
 - lib/flickr_mocks/flickraw/flickraw.rb
 - lib/flickr_mocks/helpers.rb
+- lib/flickr_mocks/models/commons_institution.rb
+- lib/flickr_mocks/models/commons_institutions.rb
 - lib/flickr_mocks/models/helpers.rb
 - lib/flickr_mocks/models/photo.rb
 - lib/flickr_mocks/models/photo_details.rb
@@ -177,6 +165,7 @@ files:
 - spec/base/stubs_spec.rb
 - spec/base/version_spec.rb
 - spec/fixtures/author_photos.marshal
+- spec/fixtures/commons_institutions.marshal
 - spec/fixtures/empty_photos.marshal
 - spec/fixtures/expected_methods.marshal
 - spec/fixtures/interesting_photos.marshal
@@ -185,6 +174,8 @@ files:
 - spec/fixtures/photo_size.marshal
 - spec/fixtures/photo_sizes.marshal
 - spec/fixtures/photos.marshal
+- spec/models/commons_institution_spec.rb
+- spec/models/commons_institutions_spec.rb
 - spec/models/helpers_spec.rb
 - spec/models/photo_details_spec.rb
 - spec/models/photo_dimensions_spec.rb
@@ -239,7 +230,9 @@ test_files:
 - spec/models/helpers_spec.rb
 - spec/models/photo_details_spec.rb
 - spec/models/photo_size_spec.rb
+- spec/models/commons_institution_spec.rb
 - spec/models/photo_sizes_spec.rb
+- spec/models/commons_institutions_spec.rb
 - spec/models/photos_spec.rb
 - spec/models/photo_dimensions_spec.rb
 - spec/models/photo_spec.rb