jsmestad-stale_fish 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/stale_fish.rb

@@ -12,56 +12,51 @@ end
 
 module StaleFish
   # no one likes stale fish.
-  def self.use_fakeweb=(enabled)
-    @use_fakeweb = enabled
-  end
 
-  def self.use_fakeweb
-    @use_fakeweb
+  class << self
+    attr_accessor :use_fakeweb
+    attr_accessor :config_path
+    attr_accessor :yaml
+    attr_accessor :configuration
   end
 
   self.use_fakeweb = false
 
-  def self.config_path=(path)
-    @config_path = path
-  end
-
-  def self.config_path
-    @config_path
-  end
-
   def self.valid_path?
-    return false if @config_path.nil?
-    File.exist?(@config_path)
+    return false if config_path.nil?
+    File.exist?(config_path)
   end
 
   def self.update_stale(*args)
     # check each file for update
-    load_yaml if self.yaml.nil?
+    load_yaml #if self.yaml.nil?
     stale = flag_stale(args)
     process(stale)
     write_yaml
     return stale.size
   end
 
-  def self.yaml=(data)
-    @yaml = data
-  end
-
-  def self.yaml
-    !@yaml.nil? ? @yaml['stale'] : @yaml
-  end
-
   def self.register_uri(source_uri, response)
-    if self.use_fakeweb && !FakeWeb.registered_uri?(source_uri)
+    if use_fakeweb && !FakeWeb.registered_uri?(source_uri)
       FakeWeb.register_uri(:any, source_uri, :body => response)
     end
   end
 
   def self.load_yaml
     if valid_path?
-      @yaml = YAML.load_file(@config_path)
-      check_syntax
+      self.yaml = YAML.load_file(config_path)
+      raise YAML::Error, 'missing stale root element' unless self.yaml['stale']
+
+      # Grab Configuration from YAML
+      configuration = self.yaml['stale'].delete('configuration')
+      use_fakeweb = (@configuration['use_fakeweb'] || false) unless configuration.nil?
+
+      # Process remaining nodes as items
+      self.yaml['stale'].each do |key, value|
+        %w{ filepath frequency source }.each do |field|
+          raise YAML::Error, "missing #{field} node for #{key}" unless self.yaml['stale'][key][field]
+        end
+      end
     else
       raise Errno::ENOENT, 'invalid path, please set StaleFish.config_path than ensure StaleFish.valid_path? is true'
     end
@@ -69,24 +64,9 @@ module StaleFish
 
 protected
 
-  def self.check_syntax
-    raise YAML::Error, 'missing stale root element' unless @yaml['stale']
-
-    # Grab Configuration from YAML
-    @configuration = @yaml['stale'].delete('configuration')
-    self.use_fakeweb = (@configuration['use_fakeweb'] || false) unless @configuration.nil?
-
-    # Process remaining nodes as items
-    @yaml['stale'].each do |key, value|
-      %w{ filepath frequency source }.each do |field|
-        raise YAML::Error, "missing #{field} node for #{key}" unless @yaml['stale'][key][field]
-      end
-    end
-  end
-
   def self.flag_stale(args)
     force = args.pop[:force] if args.last.is_a?(Hash)
-    stale, scope = {}, self.yaml
+    stale, scope = {}, self.yaml['stale']
     scope.each do |key, value|
       if args.empty?
         if scope[key]['updated'].blank?
@@ -97,7 +77,7 @@ protected
           if last_modified > update_on
             stale.merge!({key => scope[key]})
           else
-            self.register_uri(scope[key]['source'], scope[key]['filepath'])
+            register_uri(scope[key]['source'], scope[key]['filepath'])
           end
         end
       else
@@ -109,7 +89,7 @@ protected
           if args.include?(key) && (scope[key]['updated'].blank? || last_modified > update_on)
             stale.merge!({key => scope[key]})
           else
-            self.register_uri(scope[key]['source'], scope[key]['filepath'])
+            register_uri(scope[key]['source'], scope[key]['filepath'])
           end
         end
       end
@@ -118,24 +98,24 @@ protected
   end
 
   def self.process(fixtures)
-    FakeWeb.allow_net_connect = true if self.use_fakeweb
+    FakeWeb.allow_net_connect = true if use_fakeweb
 
     fixtures.each do |key, value|
       rio(fixtures[key]['source']) > rio(fixtures[key]['filepath'])
-      self.register_uri(fixtures[key]['source'], fixtures[key]['filepath'])
+      register_uri(fixtures[key]['source'], fixtures[key]['filepath'])
       update_fixture(key)
     end
 
-    FakeWeb.allow_net_connect = false if self.use_fakeweb
+    FakeWeb.allow_net_connect = false if use_fakeweb
   end
 
   def self.update_fixture(key)
-    @yaml['stale'][key]['updated'] = DateTime.now
+    self.yaml['stale'][key]['updated'] = DateTime.now
   end
 
   def self.write_yaml
-    File.open(@config_path, "w+") do |f|
-      f.write(@yaml.to_yaml)
+    File.open(config_path, "w+") do |f|
+      f.write(self.yaml.to_yaml)
     end
   end
 

data/spec/stale_fish_spec.rb

@@ -46,6 +46,14 @@ describe "StaleFish" do
       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.yaml = nil           # this will force a reload of the YAML file.
+      StaleFish.yaml.should == nil   # ensure it was reset
+      StaleFish.load_yaml
+      StaleFish.update_stale.should == 0
+    end
+
     it "should notify user, and rollback, if source is no longer valid"
 
     after(:each) do

data/stale_fish.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stale_fish}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad"]
-  s.date = %q{2009-09-14}
+  s.date = %q{2009-09-15}
   s.email = %q{justin.smestad@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsmestad-stale_fish
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Justin Smestad
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency