tech(spec): bump to rspec 3.2.3. Start fixing types_spec: User, Recen…

…tPhotos, Album, Search

Rakefile

@@ -2,12 +2,11 @@
 
 require 'rubygems'
 require './lib/ruby_picasa.rb'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc "Run all specifications"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs = ['lib', 'spec']
-  t.spec_opts = ['--colour', '--format', 'specdoc']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--colour', '--format', 'documentation']
 end
 
 task :default => [:spec]

lib/ruby_picasa.rb

@@ -1,3 +1,4 @@
+require 'active_support/inflector'
 require 'objectify_xml'
 require 'objectify_xml/atom'
 require 'cgi'

lib/ruby_picasa/types.rb

@@ -226,10 +226,10 @@ def private?
 
     # The current page of photos in the album.
     def photos(options = {})
-      if entries.blank? and !@photos_requested
+      if entries.empty? and !@photos_requested
         @photos_requested = true
         if session and data = feed
-          self.entries = data.entries 
+          self.entries = data.entries
         else
           []
         end
@@ -324,14 +324,14 @@ class License < Objectify::ElementParser
     attribute :exif_make, 'exif:make'
     attribute :exif_model, 'exif:model'
     attribute :exif_time, 'exif:time'
-    
+
     attribute :user, 'gphoto:user'
     attribute :nickname, 'gphoto:nickname'
     attribute :location, 'gphoto:location'
     attribute :timestamp, 'gphoto:timestamp'
 
     flatten 'georss:where'
-    
+
     has_one :point, RubyPicasa::Photo::Point, 'gml:Point'
     has_one :author, Author, 'author'
     has_one :license, RubyPicasa::Photo::License, 'gphoto:license'

ruby-picasa.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |s|
   s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["pangloss", "darrick@innatesoftware.com", "fjg@happycoders.org"]
-  s.date = %q{2010-11-11}
+  s.authors = ["pangloss", "darrick@innatesoftware.com", "fjg@happycoders.org", 'fourcade.m+ruby_picasa@gmail.com']
+  s.date = %q{2015-12-05}
   s.description = %q{Provides a super easy to use object layer for authenticating and accessing Picasa through their API.}
-  s.email = %q{fjg@happycoders.org}
+  s.email = %q{fourcade.m+ruby_picasa@gmail.com}
   s.extra_rdoc_files = [
     "README.txt"
   ]
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/fjg/ruby_picasa}
+  s.homepage = %q{http://github.com/mfo/ruby_picasa}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}

spec/ruby_picasa/types_spec.rb

@@ -2,7 +2,7 @@
 
 include RubyPicasa
 
-describe 'a RubyPicasa document', :shared => true do
+shared_examples_for 'a RubyPicasa document' do
   it 'should have a feed_id' do
     @object.feed_id.should_not be_nil
   end
@@ -59,15 +59,14 @@
   end
 end
 
-
 describe User do
   it_should_behave_like 'a RubyPicasa document'
 
-  before :all do
+  before(:all) do
     @xml = open_file('user.atom').read
   end
 
-  before do
+  before(:each) do
     @parent = mock('parent')
     @object = @user = User.new(@xml, @parent)
     @user.session = mock('session')
@@ -77,13 +76,13 @@
     @user.albums.length.should == 1
     @user.albums.first.should be_an_instance_of(Album)
   end
-  
+
   it 'should have a user' do
-    @user.user.should_not be_blank
+    @user.user.should_not be_empty
   end
-  
+
   it 'should have a nickname' do
-    @user.nickname.should_not be_blank
+    @user.nickname.should_not be_empty
   end
 end
 
@@ -146,7 +145,7 @@
   describe 'photos' do
     it 'should use entries if available' do
       @album.expects(:session).never
-      @album.photos.should == @album.entries
+      @album.photos.should eq(@album.entries)
     end
 
     it 'should request photos if needed' do
@@ -173,11 +172,11 @@
   end
 
   it 'should be public' do
-    @album.public?.should be_true
+    @album.public?.should be(true)
   end
 
   it 'should not be private' do
-    @album.private?.should be_false
+    @album.private?.should be(false)
   end
 
   describe 'first Photo' do
@@ -197,7 +196,7 @@
     it 'should have a content' do
       @photo.content.should be_an_instance_of(PhotoUrl)
     end
-    
+
     it 'should have a license' do
       @photo.license.should be_an_instance_of(Photo::License)
       @photo.license.id.should == 0
@@ -270,9 +269,9 @@
                                       {:thumbsize => '32c'}).returns(nil)
       @photo.thumbnail('32c').should be_nil
     end
-    
+
     it 'should have a timestamp' do
-      @photo.timestamp.should_not be_blank
+      @photo.timestamp.should_not be_nil
     end
   end
 end
@@ -355,7 +354,7 @@
     @search.entries.first.point.lat.should_not eql(0)
     @search.entries.first.point.lng.should be_an_instance_of Float
     @search.entries.first.point.lng.should_not eql(0)
-    @search.entries.first.location.should_not be_blank
+    @search.entries.first.location.should_not be_empty
   end
 end
 

spec/spec.opts

@@ -1,2 +1,2 @@
 --colour
---format specdoc
+--format documentation

spec/spec_helper.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/ruby_picasa'))
-require 'spec'
+
 require 'mocha'
 require 'pp'
 
 def open_file(name)
   open(File.join(File.dirname(__FILE__), File.join('sample', name)))
 end
 
-Spec::Runner.configure do |config|
-  config.mock_with :mocha
+RSpec.configure do |config|
+  config.mock_framework = :mocha
 end