stale_fish 1.2.4 → 1.3.0.pre

data/Gemfile

@@ -0,0 +1,14 @@
+source :gemcutter
+
+group :runtime do
+  gem 'fakeweb'
+  gem 'activesupport', :require => "active_support/core_ext/numeric/time"
+end
+
+group :test do
+  gem 'rspec', :require => 'spec'
+  gem 'rake'
+  gem 'bundler', '~> 0.9.5'
+  gem 'jeweler'
+end
+

data/README.rdoc

@@ -2,6 +2,12 @@
 
 This gem provides a method for keeping your fixtures in sync with their sources. This will prevent the scenario where your build is broken in production, but CI has a green build to do outdated fixture data. StaleFish also allows for FakeWeb integration and URI management.
 
+== NOTICE
+
+1.3.x is a complete rewrite of the StaleFish utility. The API is based on: http://gist.github.com/308260
+
+The information below has not been corrected or updated.
+
 == Features
 
 * Fixture update frequency uses the ActiveSupport relative time DSL

data/Rakefile

@@ -1,21 +1,22 @@
-require 'rubygems'
 require 'rake'
+require 'bundler'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "stale_fish"
-    gem.summary = %Q{ keeps fixtures synchronized with sources to prevent outdated fixtures going undetected. }
+    gem.summary = "keeps fixtures synchronized with sources to prevent outdated fixtures going undetected."
     gem.email = "justin.smestad@gmail.com"
     gem.homepage = "http://github.com/jsmestad/stale_fish"
     gem.authors = ["Justin Smestad"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_dependency "facets"
-    gem.add_dependency "fakeweb", ">= 1.2.4"
-    gem.add_dependency "resourceful", "~> 0.6.1"
-    gem.add_dependency "activesupport", ">= 2.1.2"
+    bundle = Bundler::Definition.from_gemfile('Gemfile')
+    bundle.dependencies.each do |dep|
+      next unless dep.groups.include?(:runtime)
+      gem.add_dependency(dep.name, dep.version_requirements.to_s)
+    end
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0.pre

data/lib/stale_fish/fixture.rb

@@ -0,0 +1,68 @@
+module StaleFish
+  class Fixture
+    attr_accessor :name, :file, :last_updated_at
+    attr_accessor :update_interval, :update_string, :check_against, :request_type
+
+    def initialize(attributes={})
+      attributes.each do |key, value|
+        self.send("#{key}=", value)
+      end
+    end
+
+    def is_stale?
+      if (last_updated_at + update_interval) < Time.now
+        return true
+      else
+        return false
+      end
+    end
+
+    def update!
+      uri, type = URI.parse(check_against), request_type.downcase.to_sym
+      Net::HTTP.start(uri.host) { |http|
+        response = if type == :post
+                 http.post(uri.path, uri.query)
+               else
+                 http.get(uri.path)
+               end
+        write_response_to_file(response.body)
+      }
+
+      self.last_updated_at = Time.now
+    end
+
+    def register_lock!
+      uri, type = build_uri, request_type.downcase.to_sym
+      FakeWeb.register_uri(type, uri, :body => file)
+
+      return FakeWeb.registered_uri?(type, uri)
+    end
+
+    def to_yaml
+      # update_interval.inspect trick is to prevent Fixnum being written
+      yaml = <<-EOF
+#{name}:
+  file: '#{file}'
+  update_interval: #{update_interval.inspect.gsub(/ /, '.')}
+  check_against: #{check_against}
+  request_type: #{request_type}
+  last_updated_at: #{last_updated_at}
+EOF
+      return yaml
+    end
+
+    protected
+
+      def build_uri
+        if check_against =~ /:\d+/
+          Regexp.new(check_against, true)
+        else
+          check_against
+        end
+      end
+
+      def write_response_to_file(body)
+        File.open(file, "w") { |file| file.write(body) }
+      end
+  end
+end

data/lib/stale_fish.rb

@@ -1,54 +1,85 @@
-require 'singleton'
-require 'ftools'
+#Rails 3: require 'active_support/core_ext/numeric/time'
+require 'active_support'
+require 'fakeweb'
 require 'yaml'
-require 'rubygems'
-require 'activesupport' # only used for time helpers
-require 'resourceful'
 
-require 'stale_fish/utility'
-require 'stale_fish/fixture_definition'
-
-begin
-  require 'fakeweb'
-  require 'stale_fish/fakeweb'
-rescue LoadError; end
+require File.join(File.dirname(__FILE__), 'stale_fish', 'fixture')
 
 module StaleFish
   # no one likes stale fish.
-
-  class FixtureUpdateFailure < StandardError; end
-  class MalformedSourceURL < StandardError;  end
-
   class << self
-    attr_accessor :configuration
-    attr_accessor :http
-    attr_accessor :fixtures
-    attr_accessor :force_flag
-  end
 
-  self.fixtures = []
-  Utility.config_path = 'stale_fish.yml'
-  self.http = Resourceful::HttpAccessor.new
+    def configuration=(config)
+      @configuration = config
+    end
 
-  def self.update_stale(*args)
-    # TODO move this to its own spot
-    Utility.loader if self.fixtures.empty?
-    self.force_flag = args.pop[:force] if args.last.is_a?(Hash)
+    def configuration
+      @configuration || if defined?(Rails)
+                          File.join(Rails.root, 'spec', 'stale_fish.yml')
+                        else
+                          'stale_fish.yml'
+                        end
+    end
 
-    stale = if args.empty?
-              fixtures.select { |f| f.is_stale? }
-            else
-              fixtures.select { |f| f.is_stale? && args.include?(f.tag) }
-            end
+    def update_stale(options={})
+      allow_requests
+      fixtures(options).each do |fixture|
+        if fixture.is_stale?
+          fixture.update!
+        end
+      end
+      block_requests
+      write
+    end
 
-    stale.each do |fixture|
-      fixture.update!
+    def update_stale!(options={})
+      allow_requests
+      fixtures(options).each do |fixture|
+        fixture.update!
+      end
+      block_requests
+      write
     end
 
-    fixtures.each { |fixture| fixture.register_uri if StaleFish.use_fakeweb }
+    def fixtures(params=nil)
+      @fixtures ||= []
+      if params.is_a?(Hash)
+        if params[:only]
+          @fixtures.select { |f| params[:only].include?(f.name.to_sym) }
+        elsif params[:except]
+          @fixtures.select { |f| !params[:except].include?(f.name.to_sym) }
+        end
+      else
+        @fixtures
+      end
+    end
 
-    Utility.writer
-    return stale.size
-  end
+    protected
+
+      def load
+        @fixtures = []
+        definitions = YAML::load(File.open(configuration))['stale'].symbolize_keys!
+        definitions.each do |key, definition|
+          self.fixtures << StaleFish::Fixture.new(definition.merge({:name => key.to_s}))
+        end
+        return fixtures
+      end
 
+      def write
+        updated_yaml = []
+        fixtures.each do |fixture|
+          updated_yaml << fixture.to_yaml
+        end
+        updated_yaml = { :stale => updated_yaml }
+        File.open(configuration, 'w') { |file| updated_yaml.to_yaml }
+      end
+
+      def allow_requests
+        FakeWeb.allow_net_connect = true
+      end
+
+      def block_requests
+        FakeWeb.allow_net_connect = false
+      end
+  end
 end

data/spec/fixtures/stale_fish_fakeweb.yml

@@ -5,9 +5,9 @@ stale:
     file_path: ./tmp/yahoo.html
     source_url: http://www.yahoo.com/
     update_frequency: 1.day
-    last_updated_at: 2009-09-25T17:31:11-06:00
+    last_updated_at: 2009-11-30T18:26:20-07:00
   google:
     file_path: ./tmp/google.html
     source_url: http://www.google.com/
     update_frequency: 2.weeks
-    last_updated_at: 2009-09-25T17:31:11-06:00
+    last_updated_at: 2009-11-30T18:26:20-07:00

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
-require 'spec'
-
+Bundler.require(:default, :runtime, :test)
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'stale_fish'
+require 'spec'
+require 'spec/autorun'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 Spec::Runner.configure do |config|
-  
+
+  config.before :all do
+    StaleFish.configuration = nil
+  end
+
 end

data/spec/support/test.yml

@@ -0,0 +1,14 @@
+stale:
+  twitter:
+    file: 'timeline.json'
+    update_interval: 30.days
+    check_against: http://twitter.com/api/timeline
+    request_type: POST
+    last_updated_at:
+  gh_commits:
+    file: 'commits.xml'
+    update_interval: 3.days
+    check_against: http://api.github.com/commits.xml
+    request_type: GET
+    last_updated_at:
+    

data/spec/unit/fixture_spec.rb

@@ -0,0 +1,123 @@
+require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
+
+describe StaleFish::Fixture do
+  before do
+    @time = Time.now
+    @args = {
+      :name => 'commits',
+      :file => 'commit.json',
+      :last_updated_at => @time,
+      :update_interval => 2.days,
+      :check_against => 'http://google.com',
+      :request_type => 'GET'
+    }
+  end
+
+  context "#initialize" do
+    it "set the proper arguements" do
+      fixture = StaleFish::Fixture.new(@args)
+      @args.each do |key, value|
+        fixture.send(key).should == value
+      end
+    end
+  end
+
+  context "#is_stale?" do
+    before do
+      @stale_fixture = StaleFish::Fixture.new(:last_updated_at => 1.week.ago,
+                                              :update_interval => 1.day)
+      @fresh_fixture = StaleFish::Fixture.new(:last_updated_at => 1.day.from_now,
+                                              :update_interval => 1.day)
+    end
+
+    it "should return true when stale" do
+      @stale_fixture.is_stale?.should == true
+    end
+
+    it "should return false when fresh" do
+      @fresh_fixture.is_stale?.should == false
+    end
+  end
+
+  context "#update!" do
+    before do
+      @fixture = StaleFish::Fixture.new(:request_type => 'GET',
+                                        :check_against => 'http://google.com/index.html',
+                                        :file => 'index.html')
+    end
+
+    it "should update the fixture data" do
+      @fixture.should_receive(:write_response_to_file).once.and_return(true)
+      @fixture.update!
+      @fixture.last_updated_at.should be_a(Time)
+    end
+
+    it "should use Net::HTTP#get with a GET request_type"
+    it "should use Net::HTTP#post with a POST request_type"
+  end
+
+  context "#register_lock!" do
+    before do
+      @fixture = StaleFish::Fixture.new(:request_type => 'GET',
+                                        :check_against => 'http://google.com/index.html',
+                                        :file => 'index.html')
+    end
+
+    it "should add fakeweb register_uri" do
+      @fixture.register_lock!.should == true
+    end
+  end
+
+  context "#to_yaml" do
+    before do
+      @fixture = StaleFish::Fixture.new(:name => 'google',
+                                        :update_interval => 1.day,
+                                        :request_type => 'GET',
+                                        :check_against => 'http://google.com/index.html',
+                                        :file => 'index.html',
+                                        :last_updated_at => @time)
+      @proper_yaml =
+<<-EOF
+google:
+  file: 'index.html'
+  update_interval: 1.day
+  check_against: http://google.com/index.html
+  request_type: GET
+  last_updated_at: #{@time}
+EOF
+    end
+
+    it "should have the proper schema" do
+      @fixture.to_yaml.should == @proper_yaml
+    end
+  end
+
+  context "#build_uri" do
+    before do
+      @fixture = StaleFish::Fixture.new(@args)
+    end
+
+    it "should parse anything with a port as a regular expression" do
+      @fixture.check_against = 'http://www.google.com:443/index.html'
+      @fixture.send(:build_uri).should be_a(Regexp)
+    end
+
+    it "should parse anything without a port as a string" do
+      @fixture.check_against = 'http://www.google.com/index.html'
+      @fixture.send(:build_uri).should be_a(String)
+    end
+  end
+
+  context "#write_response_to_file" do
+    before do
+      @fixture = StaleFish::Fixture.new(@args)
+    end
+
+    it "should update the passed in file" do
+      File.should_receive(:open).and_return(true)
+      @fixture.send(:write_response_to_file, 'this is a response')
+    end
+
+    it "should have failover with a bad response"
+  end
+end

data/spec/unit/stale_fish_spec.rb

@@ -0,0 +1,124 @@
+require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
+
+describe StaleFish do
+  before do
+    @stale_fixture = StaleFish::Fixture.new(:last_updated_at => 1.week.ago,
+                                            :update_interval => 1.day)
+    @fresh_fixture = StaleFish::Fixture.new(:last_updated_at => 1.day.from_now,
+                                            :update_interval => 1.day)
+  end
+
+  context ".configuration" do
+    it "should return a default path" do
+      StaleFish.configuration.should == 'stale_fish.yml'
+    end
+  end
+
+  context ".configuration=" do
+    it "should assign the path to the config file" do
+      StaleFish.configuration = '/someplace/stale_fish.yml'
+      StaleFish.configuration.should == '/someplace/stale_fish.yml'
+    end
+  end
+
+  context ".load" do
+    before do
+      test_yaml = File.join(File.dirname(__FILE__), '..', 'support', 'test.yml')
+      StaleFish.stub!(:configuration).and_return(test_yaml)
+    end
+
+    it "should build fixtures" do
+      StaleFish.send(:load).size.should == 2
+      StaleFish.fixtures.size.should == 2
+    end
+
+  end
+
+  context ".update_stale" do
+    before do
+      StaleFish.stub!(:fixtures).and_return([@stale_fixture,@fresh_fixture])
+      @stale_fixture.stub!(:update!).and_return(true)
+      @fresh_fixture.stub!(:update!).and_return(true)
+      StaleFish.should_receive(:write)
+    end
+
+    it "should only call update! on stale fixtures" do
+      @stale_fixture.should_receive(:update!).once
+      @fresh_fixture.should_not_receive(:update!)
+      StaleFish.update_stale
+    end
+
+    it "should block requests after completion" do
+      StaleFish.should_receive(:allow_requests)
+      StaleFish.should_receive(:block_requests)
+      StaleFish.update_stale
+    end
+  end
+
+  context ".update_stale!" do
+    before do
+      StaleFish.stub!(:fixtures).and_return([@stale_fixture,@fresh_fixture])
+      @stale_fixture.stub!(:update!).and_return(true)
+      @fresh_fixture.stub!(:update!).and_return(true)
+      StaleFish.should_receive(:write)
+    end
+
+    it "should only call update! on all fixtures" do
+      @stale_fixture.should_receive(:update!).once
+      @fresh_fixture.should_receive(:update!).once
+      StaleFish.update_stale!
+    end
+
+    it "should block requests after completion" do
+      StaleFish.should_receive(:allow_requests)
+      StaleFish.should_receive(:block_requests)
+      StaleFish.update_stale!
+    end
+  end
+
+  context ".fixtures" do
+    before do
+      StaleFish.fixtures.size.should == 2
+    end
+
+    it "should accept the :all parameter" do
+      StaleFish.fixtures(:all).size == 2
+    end
+
+    it "should accept the :only parameter with an array of symbols" do
+      response = StaleFish.fixtures(:only => [:twitter])
+      response.size.should == 1
+      response.first.name.should == 'twitter'
+    end
+
+    it "should accept the :except parameter with an array of symbols" do
+      response = StaleFish.fixtures(:except => [:twitter])
+      response.size.should == 1
+      response.first.name.should_not == 'twitter'
+    end
+
+  end
+
+  context ".write" do
+    before do
+      StaleFish.stub!(:fixtures).and_return([@stale_fixture,@fresh_fixture])
+      File.should_receive(:open).and_return(true)
+    end
+
+    it "should overwrite the contents of the YAML file" do
+      StaleFish.send(:write)
+    end
+  end
+
+  context ".allow_requests" do
+    it "should disable FakeWeb" do
+      StaleFish.send(:allow_requests).should == true
+    end
+  end
+
+  context ".block_requests" do
+    it "should disable FakeWeb" do
+      StaleFish.send(:block_requests).should == false
+    end
+  end
+end

data/stale_fish.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{stale_fish}
-  s.version = "1.2.4"
+  s.version = "1.3.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad"]
-  s.date = %q{2009-10-03}
+  s.date = %q{2010-02-22}
   s.email = %q{justin.smestad@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -17,25 +17,26 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
      "lib/stale_fish.rb",
-     "lib/stale_fish/fakeweb.rb",
-     "lib/stale_fish/fixture_definition.rb",
-     "lib/stale_fish/utility.rb",
-     "spec/deprecation_spec.rb",
+     "lib/stale_fish/fixture.rb",
      "spec/fixtures/deprecated_yaml.yml",
      "spec/fixtures/google.html",
      "spec/fixtures/malformed_stale_fish.yml",
      "spec/fixtures/stale_fish.yml",
      "spec/fixtures/stale_fish_fakeweb.yml",
      "spec/fixtures/yahoo.html",
+     "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/stale_fish_spec.rb",
-     "stale_fish.gemspec",
-     "tmp/.gitignore"
+     "spec/support/stale_fish.yml",
+     "spec/support/test.yml",
+     "spec/unit/fixture_spec.rb",
+     "spec/unit/stale_fish_spec.rb",
+     "stale_fish.gemspec"
   ]
   s.homepage = %q{http://github.com/jsmestad/stale_fish}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -43,9 +44,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{keeps fixtures synchronized with sources to prevent outdated fixtures going undetected.}
   s.test_files = [
-    "spec/deprecation_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/stale_fish_spec.rb"
+    "spec/spec_helper.rb",
+     "spec/unit/fixture_spec.rb",
+     "spec/unit/stale_fish_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -53,20 +54,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<facets>, [">= 0"])
-      s.add_runtime_dependency(%q<fakeweb>, [">= 1.2.4"])
-      s.add_runtime_dependency(%q<resourceful>, ["~> 0.6.1"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.1.2"])
+      s.add_runtime_dependency(%q<fakeweb>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else
-      s.add_dependency(%q<facets>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 1.2.4"])
-      s.add_dependency(%q<resourceful>, ["~> 0.6.1"])
-      s.add_dependency(%q<activesupport>, [">= 2.1.2"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
     end
   else
-    s.add_dependency(%q<facets>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 1.2.4"])
-    s.add_dependency(%q<resourceful>, ["~> 0.6.1"])
-    s.add_dependency(%q<activesupport>, [">= 2.1.2"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stale_fish
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.3.0.pre
 platform: ruby
 authors: 
 - Justin Smestad
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -06:00
+date: 2010-02-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   type: :runtime
@@ -30,17 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: resourceful
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -50,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: "0"
     version: 
 description: 
 email: justin.smestad@gmail.com
@@ -63,25 +43,26 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/stale_fish.rb
-- lib/stale_fish/fakeweb.rb
-- lib/stale_fish/fixture_definition.rb
-- lib/stale_fish/utility.rb
-- spec/deprecation_spec.rb
+- lib/stale_fish/fixture.rb
 - spec/fixtures/deprecated_yaml.yml
 - spec/fixtures/google.html
 - spec/fixtures/malformed_stale_fish.yml
 - spec/fixtures/stale_fish.yml
 - spec/fixtures/stale_fish_fakeweb.yml
 - spec/fixtures/yahoo.html
+- spec/spec.opts
 - spec/spec_helper.rb
-- spec/stale_fish_spec.rb
+- spec/support/stale_fish.yml
+- spec/support/test.yml
+- spec/unit/fixture_spec.rb
+- spec/unit/stale_fish_spec.rb
 - stale_fish.gemspec
-- tmp/.gitignore
 has_rdoc: true
 homepage: http://github.com/jsmestad/stale_fish
 licenses: []
@@ -99,9 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -111,6 +92,6 @@ signing_key:
 specification_version: 3
 summary: keeps fixtures synchronized with sources to prevent outdated fixtures going undetected.
 test_files: 
-- spec/deprecation_spec.rb
 - spec/spec_helper.rb
-- spec/stale_fish_spec.rb
+- spec/unit/fixture_spec.rb
+- spec/unit/stale_fish_spec.rb

data/lib/stale_fish/fakeweb.rb

@@ -1,26 +0,0 @@
-module StaleFish
-
-  class << self
-    attr_accessor :use_fakeweb
-  end
-
-  self.use_fakeweb = true
-
-  class FixtureDefinition
-    alias_method :update_without_fakeweb, :update!
-
-    def update!
-      FakeWeb.allow_net_connect = true
-      update_without_fakeweb
-      FakeWeb.allow_net_connect = false
-    end
-
-    def register_uri
-      if StaleFish.use_fakeweb && !FakeWeb.registered_uri?(:any, source_url)
-        FakeWeb.register_uri(:any, source_url, :body => file_path)
-      end
-    end
-
-  end
-
-end

data/lib/stale_fish/fixture_definition.rb

@@ -1,34 +0,0 @@
-module StaleFish
-
-  class FixtureDefinition
-    attr_accessor :tag, :file_path, :source_url, :last_updated_at, :response
-    attr_accessor :update_frequency
-
-    def is_stale?
-      StaleFish.force_flag || last_updated_at.nil? || ((DateTime.now + eval(update_frequency)) < last_updated_at)
-    end
-
-    def update!
-      begin
-        self.response = StaleFish.http.resource(source_url).get
-        File.open(eval(file_path), 'w') { |file| file.write(response.body.to_s) }
-        self.last_updated_at = DateTime.now
-      rescue Resourceful::UnsuccessfulHttpRequestError
-        raise StaleFish::FixtureUpdateFailure, "#{key}'s source: #{value['source']} returned unsuccessfully."
-      rescue ArgumentError
-        raise StaleFish::MalformedSourceURL, "#{key}'s source: #{value['source']} is not a valid URL path. Most likely it's missing a trailing slash."
-      end
-    end
-
-    def output_hash
-<<-EOF
-  #{tag}:
-    file_path: #{file_path}
-    source_url: #{source_url}
-    update_frequency: #{update_frequency}
-    last_updated_at: #{last_updated_at}
-EOF
-    end
-  end
-
-end

data/lib/stale_fish/utility.rb

@@ -1,67 +0,0 @@
-require 'singleton'
-
-module StaleFish
-  module Utility
-    class << self
-      attr_accessor :config_path
-    end
-
-    def self.valid_path?
-      !config_path.nil? ? File.exist?(config_path) : false
-    end
-
-    def self.loader
-      raise Errno::ENOENT, 'invalid config path: #{Utility.config_path}; ensure StaleFish::Utility.valid_path? is true' unless Utility.valid_path?
-
-      data = YAML.load_file(config_path)
-
-      config = data['stale'].delete('configuration')
-      StaleFish.use_fakeweb = (config['use_fakeweb'] || false) unless config.nil?
-
-      raise YAML::Error, 'missing root element' unless data['stale']
-
-      # Reset these
-      StaleFish.fixtures = []
-      StaleFish.force_flag = false
-
-      deprecated_var_names = {
-        'file_path' => 'filepath',
-        'update_frequency' => 'frequency',
-        'source_url' => 'source',
-        'last_updated_at' => 'updated'
-      }
-
-      data['stale'].each do |key, value|
-        definition = FixtureDefinition.new
-        definition.tag = key
-        %w{ file_path update_frequency source_url }.each do |field|
-          if value[deprecated_var_names[field]]
-            $stderr.puts "Deprecation warning: #{field} has been replaced with #{deprecated_var_names[field]}. Please update #{Utility.config_path}."
-            definition.send((field + '=').to_sym, value[deprecated_var_names[field]])
-          else
-            raise YAML::Error, "missing #{field} node for #{key} in #{Utility.config_path}" unless value[field]
-            definition.send((field + '=').to_sym, value[field])
-          end
-        end
-
-        $stderr.puts "Deprecation warning: updated has been changed to last_updated_at; this change is automatic." if value.has_key?('updated')
-        definition.last_updated_at = value['last_updated_at'] || value[deprecated_var_names['last_updated_at']] || nil
-
-        StaleFish.fixtures << definition
-      end
-    end
-
-    def self.writer
-      string = <<-EOF
-stale:
-  configuration:
-    use_fakeweb: #{StaleFish.use_fakeweb}
-EOF
-      StaleFish.fixtures.each do |fix|
-        string << fix.output_hash
-      end
-
-      File.open(config_path, "w+") { |f| f.write(string) }
-    end
-  end
-end

data/spec/deprecation_spec.rb

@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe StaleFish do
-
-  before do
-    @deprecated_yaml = File.dirname(__FILE__) + "/fixtures/deprecated_yaml.yml"
-  end
-
-  it "should assign the config file" do
-    StaleFish::Utility.config_path = @deprecated_yaml
-    StaleFish::Utility.config_path.should == @deprecated_yaml
-    StaleFish::Utility.valid_path?.should == true
-  end
-
-  it "should map to valid attributes" do
-    pending
-    StaleFish::Utility.loader
-  end
-
-end

data/spec/stale_fish_spec.rb

@@ -1,104 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "StaleFish" do
-
-  before do
-    @valid_yaml = File.dirname(__FILE__) + "/fixtures/stale_fish.yml"
-  end
-
-  it "should assign the config file" do
-    StaleFish::Utility.config_path = @valid_yaml
-    StaleFish::Utility.config_path.should == @valid_yaml
-    StaleFish::Utility.valid_path?.should == true
-  end
-
-  context "when loading the yaml file" do
-
-    it "should raise errors on malformed yaml" do
-      StaleFish::Utility.config_path = File.dirname(__FILE__) + "/fixtures/malformed_stale_fish.yml"
-      lambda { StaleFish::Utility.loader }.should_not raise_error(Errno::ENOENT)
-      lambda { StaleFish::Utility.loader }.should raise_error(YAML::Error)
-    end
-
-    it "shouldn't fail on valid yaml" do
-      StaleFish::Utility.config_path = @valid_yaml
-      lambda { StaleFish::Utility.loader }.should_not raise_error(YAML::Error)
-    end
-
-    it "should establish the fixture definitions" do
-      StaleFish::Utility.config_path = @valid_yaml
-      lambda { StaleFish::Utility.loader }
-    end
-
-  end
-
-  context "after loading the config" do
-
-    before(:each) do
-      FileUtils.cp(@valid_yaml, File.dirname(__FILE__) + "/fixtures/stale_fish.orig.yml")
-      StaleFish::Utility.config_path = @valid_yaml
-      StaleFish::Utility.valid_path?.should == true
-      StaleFish::Utility.loader
-    end
-
-    it "should update all stale fixtures" do
-      StaleFish.update_stale.should == 2
-    end
-
-    it "should update only the passed fixtures, if stale" do
-      StaleFish.update_stale('google').should == 1
-    end
-
-    it "should update all passed fixtures, when passed the :force flag" do
-      StaleFish.update_stale('google').should == 1
-      StaleFish.update_stale('google', :force => true).should == 1
-    end
-
-    it "should not have any remaining fixtures to update" do
-      StaleFish.update_stale.should == 2
-      StaleFish.fixtures = []           # this will force a reload of the YAML file.
-      StaleFish.fixtures.should == []   # ensure it was reset
-      StaleFish::Utility.loader
-      StaleFish.update_stale.should == 0
-    end
-
-    it "should notify user, and rollback, if source is no longer valid"
-
-    after(:each) do
-      FileUtils.mv(@valid_yaml, File.dirname(__FILE__)+"/../tmp/stale_fish.test.yml")
-      FileUtils.mv(File.dirname(__FILE__)+"/fixtures/stale_fish.orig.yml", @valid_yaml)
-      StaleFish.fixtures = []
-    end
-
-  end
-
-  context "with FakeWeb" do
-
-    before(:each) do
-      @fakeweb_yaml = File.dirname(__FILE__) + '/fixtures/stale_fish_fakeweb.yml'
-      StaleFish::Utility.config_path = @fakeweb_yaml
-      StaleFish::Utility.valid_path?.should == true
-      StaleFish::Utility.loader
-      StaleFish.use_fakeweb = true
-      StaleFish.use_fakeweb.should == true
-    end
-
-    it "should register any FakeWeb URI's" do
-      definition = StaleFish.fixtures.first
-      definition.register_uri
-      FakeWeb.registered_uri?(definition.source_url).should == true
-    end
-
-    it "should turn off FakeWeb.allow_net_connect to process stale fixtures" do
-      FakeWeb.allow_net_connect = false
-      lambda { StaleFish.update_stale(:force => true) }.should_not raise_error
-      lambda { StaleFish.update_stale(:force => true) }.should_not change { FakeWeb.allow_net_connect? }
-    end
-
-    after(:each) do
-      StaleFish.fixtures = []
-    end
-
-  end
-
-end