zilkey-active_hash 0.3.0 → 0.4.0

data/CHANGELOG

@@ -5,4 +5,5 @@
 
 2009-07-24
   - ActiveFile no longer reloads files by default
-  - Added ActiveFile.reload_active_file= so you can cause ActiveFile to reload
+  - Added ActiveFile.reload_active_file= so you can cause ActiveFile to reload
+  - Setting data to nil correctly causes .all to return an empty array

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/active_hash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.3.0"
+  s.version = "0.4.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

@@ -1,7 +1,7 @@
 module ActiveFile
 
   class Base < ActiveHash::Base
-    class_inheritable_accessor :filename, :root_path, :cached_mtime, :reload_active_file
+    class_inheritable_accessor :filename, :root_path, :cached_mtime, :reload_active_file, :data_has_been_set
 
     class << self
       def all
@@ -15,6 +15,11 @@ module ActiveFile
         end
       end
 
+      def data=(array_of_hashes)
+        write_inheritable_attribute :data_has_been_set, true
+        super
+      end
+
       protected :reload
 
       def set_filename(name)
@@ -36,7 +41,7 @@ module ActiveFile
       end
 
       def should_reload?
-        return false if read_inheritable_attribute(:data) && ! read_inheritable_attribute(:reload_active_file)
+        return false if read_inheritable_attribute(:data_has_been_set) && ! read_inheritable_attribute(:reload_active_file)
         return false if (mtime = File.mtime(full_path)) == read_inheritable_attribute(:cached_mtime)
 
         write_inheritable_attribute :cached_mtime, mtime

data/lib/active_hash/base.rb

@@ -10,7 +10,7 @@ module ActiveHash
 
       def all
         unless @records
-          records = read_inheritable_attribute(:data)
+          records = read_inheritable_attribute(:data) || []
           @records = records.collect {|hash| new(hash)}
           auto_assign_fields( records )
         end

data/spec/active_file/base_spec.rb

@@ -204,7 +204,7 @@ describe ActiveFile::Base do
         Country.all
       end
 
-      it "does not fetch data if data has been set" do
+      it "does not fetch data if data has been set to non-nil" do
         class Country < ActiveFile::Base
           class << self
             def extension
@@ -221,6 +221,24 @@ describe ActiveFile::Base do
         Country.data = [{:foo => :bar}]
         Country.all
       end
+
+      it "does not fetch data if data has been set to nil" do
+        class Country < ActiveFile::Base
+          class << self
+            def extension
+              "myfile"
+            end
+
+            def load_file
+              MyClass.load_file(full_path)
+            end
+          end
+        end
+
+        MyClass.should_not_receive(:load_file)
+        Country.data = nil
+        Country.all
+      end
     end
   end
 

data/spec/active_hash/base_spec.rb

@@ -67,6 +67,11 @@ describe ActiveHash, "Base" do
       ]
     end
 
+    it "returns an empty array if data is nil" do
+      Country.data = nil
+      Country.all.should be_empty
+    end
+
     it "returns all data as inflated objects" do
       Country.all.all?{|country| country.should be_kind_of(Country)}
     end

metadata

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