flickr_fakr 0.1.1 → 0.1.2

data/.travis.yml

@@ -0,0 +1 @@
+rvm: 1.9.2

data/Gemfile

@@ -1,8 +1,13 @@
 source :rubygems
 
 gem 'sinatra', '~> 1.0'
-gem 'haml', '~> 3.0'
 
 group :development do
   gem 'jeweler', '~> 1.0'
 end
+
+group :test do
+  gem 'rspec'
+  gem 'flickraw', '= 0.8.4'
+  gem 'flickraw-cached'
+end

data/Gemfile.lock

@@ -1,16 +1,29 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.3)
+    flickraw (0.8.4)
+      json (>= 1.1.1)
+    flickraw-cached (20100707.1)
+      flickraw
     git (1.2.5)
-    haml (3.1.3)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.6.1)
     rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rake (0.8.7)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
     sinatra (1.3.1)
       rack (~> 1.3, >= 1.3.4)
       rack-protection (~> 1.1, >= 1.1.2)
@@ -21,6 +34,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  haml (~> 3.0)
+  flickraw (= 0.8.4)
+  flickraw-cached
   jeweler (~> 1.0)
+  rspec
   sinatra (~> 1.0)

data/README.markdown

@@ -0,0 +1 @@
+[![Build Status](https://secure.travis-ci.org/jamesottaway/flickr_fakr.png)](http://travis-ci.org/jamesottaway/flickr_fakr)

data/Rakefile

@@ -24,3 +24,46 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["James Ottaway"]
 end
 Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+require 'timeout'
+task :acceptance do
+  pid = Process.spawn 'rackup -p 9292'
+
+  trap("INT") {
+    Process.kill(9, pid) rescue Errno::ESRCH
+    exit 0
+  }
+  
+  until is_port_open?('localhost', '9292') do
+    puts "Waiting for FlickrFakr to start listening..."
+    sleep 1
+  end
+  
+  Rake::Task['spec'].invoke
+  
+  Process.kill 9, pid
+end
+
+private
+
+def is_port_open?(ip, port)
+  begin
+    Timeout::timeout(1) do
+      begin
+        s = TCPSocket.new(ip, port)
+        s.close
+        return true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        return false
+      end
+    end
+  rescue Timeout::Error
+  end
+
+  return false
+end
+
+task :default => :acceptance

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/flickr_fakr.gemspec

@@ -5,32 +5,38 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flickr_fakr}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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-07}
+  s.date = %q{2011-11-09}
   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}]
   s.extra_rdoc_files = [
-    "LICENSE.txt"
+    "LICENSE.txt",
+    "README.markdown"
   ]
   s.files = [
     ".rvmrc",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
+    "README.markdown",
     "Rakefile",
     "VERSION",
     "bin/flickr_fakr",
     "config.ru",
     "flickr_fakr.gemspec",
     "lib/flickr_fakr/flickr_fakr.rb",
-    "lib/flickr_fakr/views/flickr.auth.getFrob.json.haml",
-    "lib/flickr_fakr/views/flickr.auth.getToken.json.haml",
-    "lib/flickr_fakr/views/flickr.reflection.getMethods.json.haml",
-    "lib/flickr_fakr/views/flickr.test.login.json.haml"
+    "lib/flickr_fakr/views/flickr.auth.getFrob.json.erb",
+    "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/spec_helper.rb",
+    "spec/support/integrate-flickr-fakr.rb"
   ]
   s.homepage = %q{http://github.com/jamesottaway/flickr_fakr}
   s.licenses = [%q{MIT}]
@@ -43,16 +49,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<haml>, ["~> 3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.0"])
     else
       s.add_dependency(%q<sinatra>, ["~> 1.0"])
-      s.add_dependency(%q<haml>, ["~> 3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.0"])
     end
   else
     s.add_dependency(%q<sinatra>, ["~> 1.0"])
-    s.add_dependency(%q<haml>, ["~> 3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.0"])
   end
 end

data/lib/flickr_fakr/flickr_fakr.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'haml'
 
 class FlickrFakr < Sinatra::Base
   get '/' do
@@ -15,6 +14,6 @@ class FlickrFakr < Sinatra::Base
     request.body.rewind
     request.body.read.split('&').each { |arg| args[arg.split('=').first] = arg.split('=').last }
     view = "#{args['method']}.#{args['format']}"
-    haml view.to_sym
+    erb view.to_sym
   end
 end

data/spec/reflection/getMethods_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe 'flickr.reflection.getMethods' do
+	subject { flickr.reflection.getMethods }
+	its(:size) { should == 183 }
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'flickraw-cached'
+
+Dir[File.join(File.dirname(__FILE__),"../spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
+FlickRaw.api_key = 'api'
+FlickRaw.shared_secret = 'secret'
+
+def flickr
+  @flickr ||= FlickRaw::Flickr.new
+end

data/spec/support/integrate-flickr-fakr.rb

@@ -0,0 +1,23 @@
+require 'flickraw-cached'
+require 'net/http'
+require 'uri'
+
+class Net::HTTP
+  class << self
+    alias start_original start
+
+    def start address, *arg, &block
+      if address.is_a? URI
+  	    self.start_original address.host, address.port, *arg, &block
+  	  else
+  	    self.start_original address, *arg, &block
+  	  end
+    end
+  end
+end
+
+flickr_fakr = URI.parse 'http://localhost:9292/'
+FlickRaw.const_set :FLICKR_HOST, flickr_fakr
+
+flickr_fakr_auth_url = FlickRaw.const_get(:AUTH_PATH).gsub('http://flickr.com', "http://localhost:9292")
+FlickRaw.const_set :AUTH_PATH, flickr_fakr_auth_url

metadata

@@ -2,7 +2,7 @@
 name: flickr_fakr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Ottaway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -23,20 +23,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,7 +33,7 @@ dependencies:
         version: "1.0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id002
 description: Use flickr_fakr to help you write functional tests without having a dependency on Flickr
 email: james@ottaway.mp
 executables: 
@@ -53,21 +42,27 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
+- README.markdown
 files: 
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- README.markdown
 - Rakefile
 - VERSION
 - bin/flickr_fakr
 - config.ru
 - flickr_fakr.gemspec
 - lib/flickr_fakr/flickr_fakr.rb
-- lib/flickr_fakr/views/flickr.auth.getFrob.json.haml
-- lib/flickr_fakr/views/flickr.auth.getToken.json.haml
-- lib/flickr_fakr/views/flickr.reflection.getMethods.json.haml
-- lib/flickr_fakr/views/flickr.test.login.json.haml
+- lib/flickr_fakr/views/flickr.auth.getFrob.json.erb
+- 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/spec_helper.rb
+- spec/support/integrate-flickr-fakr.rb
 homepage: http://github.com/jamesottaway/flickr_fakr
 licenses: 
 - MIT
@@ -81,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3572082499673447201
+      hash: -4342559305998929771
       segments: 
       - 0
       version: "0"