flickr_fakr 0.1.2 → 0.1.3

data/Gemfile

@@ -10,4 +10,5 @@ group :test do
   gem 'rspec'
   gem 'flickraw', '= 0.8.4'
   gem 'flickraw-cached'
+  gem 'rest-client'
 end

data/Gemfile.lock

@@ -12,10 +12,13 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.6.1)
+    mime-types (1.17.2)
     rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rake (0.8.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -37,5 +40,6 @@ DEPENDENCIES
   flickraw (= 0.8.4)
   flickraw-cached
   jeweler (~> 1.0)
+  rest-client
   rspec
   sinatra (~> 1.0)

data/Rakefile

@@ -26,11 +26,16 @@ end
 Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+namespace :acceptance do
+  RSpec::Core::RakeTask.new do |c|
+    c.pattern = './spec/acceptance/**/*_spec.rb'
+  end
+end
 
 require 'timeout'
+desc 'Bootstrap and run the acceptance specs'
 task :acceptance do
-  pid = Process.spawn 'rackup -p 9292'
+  pid = Process.spawn 'rackup -p 9292 -D'
 
   trap("INT") {
     Process.kill(9, pid) rescue Errno::ESRCH
@@ -42,7 +47,7 @@ task :acceptance do
     sleep 1
   end
   
-  Rake::Task['spec'].invoke
+  Rake::Task['acceptance:spec'].invoke
   
   Process.kill 9, pid
 end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/flickr_fakr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flickr_fakr}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{James Ottaway}]
-  s.date = %q{2011-11-09}
+  s.date = %q{2011-12-04}
   s.description = %q{Use flickr_fakr to help you write functional tests without having a dependency on Flickr}
   s.email = %q{james@ottaway.mp}
   s.executables = [%q{flickr_fakr}]
@@ -34,7 +34,10 @@ Gem::Specification.new do |s|
     "lib/flickr_fakr/views/flickr.auth.getToken.json.erb",
     "lib/flickr_fakr/views/flickr.reflection.getMethods.json.erb",
     "lib/flickr_fakr/views/flickr.test.login.json.erb",
-    "spec/reflection/getMethods_spec.rb",
+    "spec/acceptance/auth_getFrob_spec.rb",
+    "spec/acceptance/auth_getToken_spec.rb",
+    "spec/acceptance/reflection_getMethods_spec.rb",
+    "spec/acceptance/test_login_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/integrate-flickr-fakr.rb"
   ]

data/lib/flickr_fakr/flickr_fakr.rb

@@ -1,6 +1,8 @@
 require 'sinatra/base'
 
 class FlickrFakr < Sinatra::Base
+  set :views, File.dirname(__FILE__)+'/views'
+
   get '/' do
     'Welcome to Flickr Fakr!'
   end
@@ -10,10 +12,7 @@ class FlickrFakr < Sinatra::Base
   end
 
   post '/services/rest/' do
-    args = {}
-    request.body.rewind
-    request.body.read.split('&').each { |arg| args[arg.split('=').first] = arg.split('=').last }
-    view = "#{args['method']}.#{args['format']}"
+    view = params[:method]+'.'+params[:format]
     erb view.to_sym
   end
 end

data/spec/acceptance/auth_getFrob_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe 'flickr.auth.getFrob' do
+	subject { flickr.auth.getFrob }
+	it { should == '72157628008826732-d18f7df9bfd670c3-31528' }
+end

data/spec/acceptance/auth_getToken_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'flickr.auth.getToken' do
+	subject { flickr.auth.getToken :frob => 'abc' }
+	its(:token) { should == '72197626744597143-36de57c6a59d1a8d' }
+	its(:perms) { should == 'write' }
+	context :user do
+		subject { flickr.auth.getToken(:frob => 'abc').user }
+		its(:nsid) { should == '13314999@N06' }
+		its(:username) { should == 'johnsmith' }
+		its(:fullname) { should == 'John Smith' }
+	end
+end

data/spec/acceptance/test_login_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'flickr.test.login' do
+	subject { flickr.test.login }
+	its(:id) { should == '13314999@N06' }
+	its(:username) { should == 'johnsmith' }
+end

metadata

@@ -2,7 +2,7 @@
 name: flickr_fakr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - James Ottaway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -60,7 +60,10 @@ files:
 - lib/flickr_fakr/views/flickr.auth.getToken.json.erb
 - lib/flickr_fakr/views/flickr.reflection.getMethods.json.erb
 - lib/flickr_fakr/views/flickr.test.login.json.erb
-- spec/reflection/getMethods_spec.rb
+- spec/acceptance/auth_getFrob_spec.rb
+- spec/acceptance/auth_getToken_spec.rb
+- spec/acceptance/reflection_getMethods_spec.rb
+- spec/acceptance/test_login_spec.rb
 - spec/spec_helper.rb
 - spec/support/integrate-flickr-fakr.rb
 homepage: http://github.com/jamesottaway/flickr_fakr
@@ -76,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4342559305998929771
+      hash: 3049751267208836109
       segments: 
       - 0
       version: "0"