stale_fish 1.3.0.pre1 → 1.3.0.pre2

data/VERSION

@@ -1 +1 @@
-1.3.0.pre1
+1.3.0.pre2

data/lib/stale_fish.rb

@@ -12,7 +12,6 @@ module StaleFish
     def setup(config_location=nil)
       self.configuration = config_location
       load
-      register_fixtures
       block_requests
     end
 
@@ -21,14 +20,14 @@ module StaleFish
     end
 
     def configuration
-      @configuration || if defined?(Rails)
-                          File.join(Rails.root, 'spec', 'stale_fish.yml')
-                        else
+      @configuration || #if defined?(Rails)
+                        #  File.join(Rails.root, 'spec', 'stale_fish.yml')
+                        #else
                           'stale_fish.yml'
-                        end
+                        #end
     end
 
-    def update_stale(options={})
+    def update_stale(options = :all)
       reset_fixtures = false
       
       allow_requests
@@ -38,17 +37,17 @@ module StaleFish
           reset_fixtures = true
         end
       end
-      register_fixtures if reset_fixtures
+      drop_locks if reset_fixtures
       block_requests
       write
     end
 
-    def update_stale!(options={})
+    def update_stale!(options = :all)
       allow_requests
       fixtures(options).each do |fixture|
         fixture.update!
       end
-      register_fixtures
+      drop_locks
       block_requests
       write
     end
@@ -78,27 +77,28 @@ module StaleFish
       end
 
       def write
-        updated_yaml = []
+        updated_yaml = "stale:\n"
         fixtures.each do |fixture|
           updated_yaml << fixture.to_yaml
         end
-        updated_yaml = { :stale => updated_yaml }
-        File.open(configuration, 'w') { |file| updated_yaml.to_yaml }
+        @full_yaml = updated_yaml
+        File.open(configuration, 'w') { |file| file.write(@full_yaml.to_s) }
       end
 
       def allow_requests
+        drop_locks
         FakeWeb.allow_net_connect = true
       end
 
       def block_requests
-        FakeWeb.allow_net_connect = false
-      end
-
-      def register_fixtures
-        FakeWeb.clean_registry
         fixtures.each do |fixture|
           fixture.register_lock!
         end
+        FakeWeb.allow_net_connect = false
+      end
+      
+      def drop_locks
+        FakeWeb.clean_registry
       end
   end
 end

data/lib/stale_fish/fixture.rb

@@ -1,3 +1,5 @@
+require 'activesupport'
+
 module StaleFish
   class Fixture
     attr_accessor :name, :file, :last_updated_at
@@ -10,7 +12,7 @@ module StaleFish
     end
 
     def is_stale?
-      if last_updated_at.nil? || (last_updated_at + update_interval) < Time.now
+      if last_updated_at.nil? || (last_updated_at + eval(update_interval)) < DateTime.now
         return true
       else
         return false
@@ -28,12 +30,12 @@ module StaleFish
         write_response_to_file(response.body)
       end
 
-      self.last_updated_at = Time.now
+      self.last_updated_at = DateTime.now
     end
 
     def register_lock!
       uri, type = build_uri, request_type.downcase.to_sym
-      FakeWeb.register_uri(type, uri, :body => file)
+      FakeWeb.register_uri(type, uri, :body => 'hey dude')
 
       return FakeWeb.registered_uri?(type, uri)
     end
@@ -41,15 +43,23 @@ module StaleFish
     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}
+  #{name}:
+    file: '#{file}'
+    update_interval: #{update_interval.inspect.gsub(/ /, '.').gsub(/"/, '')}
+    check_against: #{check_against}
+    request_type: #{request_type}
+    last_updated_at: #{last_updated_at}
 EOF
       return yaml
     end
+    
+    def last_updated_at
+      if @last_updated_at.nil? || @last_updated_at.is_a?(DateTime)
+        @last_updated_at
+      else
+        DateTime.parse(@last_updated_at.to_s)
+      end
+    end
 
     protected
 
@@ -62,7 +72,7 @@ EOF
       end
 
       def write_response_to_file(body)
-        File.open(file, "w") { |file| file.write(body) }
+        File.open(File.join(File.dirname(StaleFish.configuration), file), "w") { |file| file.write(body) }
       end
   end
 end

data/spec/unit/fixture_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), *%w[.. spec_helper])
 
 describe StaleFish::Fixture do
   before do
-    @time = Time.now
+    @time = DateTime.now
     @args = {
       :name => 'commits',
       :file => 'commit.json',
@@ -25,9 +25,9 @@ describe StaleFish::Fixture do
   context "#is_stale?" do
     before do
       @stale_fixture = StaleFish::Fixture.new(:last_updated_at => 1.week.ago,
-                                              :update_interval => 1.day)
+                                              :update_interval => '1.day')
       @fresh_fixture = StaleFish::Fixture.new(:last_updated_at => 1.day.from_now,
-                                              :update_interval => 1.day)
+                                              :update_interval => '1.day')
     end
 
     it "should return true when stale" do
@@ -54,7 +54,7 @@ describe StaleFish::Fixture do
     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)
+      @fixture.last_updated_at.should be_a(DateTime)
     end
 
     it "should use Net::HTTP#get with a GET request_type"
@@ -76,19 +76,19 @@ describe StaleFish::Fixture do
   context "#to_yaml" do
     before do
       @fixture = StaleFish::Fixture.new(:name => 'google',
-                                        :update_interval => 1.day,
+                                        :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}
+  google:
+    file: 'index.html'
+    update_interval: 1.day
+    check_against: http://google.com/index.html
+    request_type: GET
+    last_updated_at: #{@time}
 EOF
     end
 

data/spec/unit/stale_fish_spec.rb

@@ -2,12 +2,12 @@ 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,
+    @stale_fixture = StaleFish::Fixture.new(:last_updated_at => 1.week.ago.to_datetime,
+                                            :update_interval => '1.day',
                                             :request_type => 'GET',
                                             :check_against => 'http://google.com/index.html')
-    @fresh_fixture = StaleFish::Fixture.new(:last_updated_at => 1.day.from_now,
-                                            :update_interval => 1.day,
+    @fresh_fixture = StaleFish::Fixture.new(:last_updated_at => 1.day.from_now.to_datetime,
+                                            :update_interval => '1.day',
                                             :request_type => 'GET',
                                             :check_against => 'http://google.com/index.html')
   end
@@ -15,7 +15,6 @@ describe StaleFish do
   context ".setup" do
     it "should call appropriate functions" do
       StaleFish.should_receive(:load)
-      StaleFish.should_receive(:register_fixtures)
       StaleFish.should_receive(:block_requests)
       StaleFish.setup
     end
@@ -134,8 +133,4 @@ describe StaleFish do
       StaleFish.send(:block_requests).should == false
     end
   end
-  
-  context ".register_fixtures" do
-    
-  end
 end

data/stale_fish.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stale_fish}
-  s.version = "1.3.0.pre1"
+  s.version = "1.3.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stale_fish
 version: !ruby/object:Gem::Version 
-  version: 1.3.0.pre1
+  version: 1.3.0.pre2
 platform: ruby
 authors: 
 - Justin Smestad