zilkey-active_hash 0.4.0 → 0.5.0

data/CHANGELOG

@@ -6,4 +6,5 @@
 2009-07-24
   - ActiveFile no longer reloads files by default
   - Added ActiveFile.reload_active_file= so you can cause ActiveFile to reload
-  - Setting data to nil correctly causes .all to return an empty array
+  - Setting data to nil correctly causes .all to return an empty array
+  - Added reload(force) method, so that you can force a reload from files in ActiveFile, useful for tests

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/active_hash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Dean", "Mike Dalessio"]

data/lib/active_file/base.rb

@@ -9,8 +9,8 @@ module ActiveFile
         super
       end
 
-      def reload
-        if should_reload?
+      def reload(force = false)
+        if force || should_reload?
           self.data = load_file
         end
       end
@@ -20,8 +20,6 @@ module ActiveFile
         super
       end
 
-      protected :reload
-
       def set_filename(name)
         write_inheritable_attribute :filename, name
       end

data/spec/active_file/base_spec.rb

@@ -239,6 +239,26 @@ describe ActiveFile::Base do
         Country.data = nil
         Country.all
       end
+
+      it "does re-fetch data if force is true" do
+        class Country < ActiveFile::Base
+          class << self
+            def extension
+              "myfile"
+            end
+
+            def load_file
+              MyClass.load_file(full_path)
+            end
+          end
+        end
+
+        MyClass.should_receive(:load_file).once.and_return([{:foo => :bar}])
+        Country.data = nil
+        Country.reload(true)
+        Country.all.first.foo.should == :bar
+      end
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zilkey-active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeff Dean