active_hash 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/active_hash.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{active_hash}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros"]
-  s.date = %q{2009-10-13}
+  s.date = %q{2009-10-21}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -66,3 +66,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
   end
 end
+

data/lib/active_file/base.rb

@@ -1,23 +1,23 @@
 module ActiveFile
 
   class Base < ActiveHash::Base
-    class_inheritable_accessor :filename, :root_path, :cached_mtime, :reload_active_file, :data_has_been_set
+    class_inheritable_accessor :filename, :root_path, :data_loaded
 
     class << self
+
       def all
-        reload
+        reload unless data_loaded
         super
       end
 
-      def reload(force = false)
-        if force || should_reload?
-          self.data = load_file
-        end
+      def delete_all
+        self.data_loaded = true
+        super
       end
 
-      def data=(array_of_hashes)
-        write_inheritable_attribute :data_has_been_set, true
-        super
+      def reload(foo = true)
+        self.data_loaded = true
+        self.data = load_file
       end
 
       def set_filename(name)
@@ -38,16 +38,6 @@ module ActiveFile
         File.join(root_path, "#{filename}.#{extension}")
       end
 
-      def should_reload?
-        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
-        true
-      end
-
-      private :should_reload?
-
       def extension
         raise "Override Me"
       end
@@ -57,4 +47,4 @@ module ActiveFile
     end
   end
 
-end
+end

data/spec/active_file/base_spec.rb

@@ -10,14 +10,6 @@ describe ActiveFile::Base do
     Object.send :remove_const, :Country
   end
 
-  describe ".reload_active_file" do
-
-    it "returns false by default" do
-      Country.reload_active_file.should be_nil
-    end
-
-  end
-
   describe ".filename=" do
     before do
       Country.filename = "foo-izzle"
@@ -88,178 +80,4 @@ describe ActiveFile::Base do
     end
   end
 
-  describe ".all" do
-    before do
-      class MyClass
-      end
-    end
-
-    it "loads the data from the load_file method" do
-      class Country
-        class << self
-          def extension
-            "myfile"
-          end
-
-          def load_file
-            MyClass.load_file(full_path)
-          end
-        end
-      end
-
-      Country.reload_active_file = true
-      File.stub!(:mtime).and_return(1234)
-      MyClass.should_receive(:load_file).and_return([{:id => 1}, {:id => 2}, {:id => 3}])
-
-      records = Country.all
-      records.length.should == 3
-      records.should =~ [Country.new(:id => 1), Country.new(:id => 2), Country.new(:id => 3)]
-    end
-
-    context "with reload=true" do
-      it "does not re-fetch the data if the file's mtime has not changed" do
-        class Country < ActiveFile::Base
-          class << self
-            def extension
-              "myfile"
-            end
-
-            def load_file
-              MyClass.load_file(full_path)
-            end
-          end
-        end
-
-        Country.reload_active_file = true
-        File.stub!(:mtime).and_return(1234)
-        MyClass.should_receive(:load_file).once.and_return([{:foo => :bar}])
-        Country.all
-        Country.all
-      end
-
-      it "does re-fetch the data if the yaml file's mtime has changed" do
-        class Country < ActiveFile::Base
-          class << self
-            def extension
-              "myfile"
-            end
-
-            def load_file
-              MyClass.load_file(full_path)
-            end
-          end
-        end
-
-        Country.reload_active_file = true
-        MyClass.should_receive(:load_file).twice.and_return([{:foo => :bar}])
-
-        File.stub!(:mtime).and_return(1234)
-        Country.all
-
-        File.stub!(:mtime).and_return(3456)
-        Country.all
-      end
-    end
-
-    context "with reload=false" do
-      it "does not re-fetch the data after the first call to .all" do
-        class Country < ActiveFile::Base
-          class << self
-            def extension
-              "myfile"
-            end
-
-            def load_file
-              MyClass.load_file(full_path)
-            end
-          end
-        end
-
-        File.stub!(:mtime).once.and_return(1234)
-        MyClass.should_receive(:load_file).once.and_return([{:foo => :bar}])
-        Country.all
-
-        Country.all
-      end
-
-      it "does not re-fetch the data if the yaml file's mtime has changed" 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}])
-
-        File.stub!(:mtime).and_return(1234)
-        Country.all
-
-        File.stub!(:mtime).and_return(3456)
-        Country.all
-      end
-
-      it "does not fetch data if data has been set to non-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 = [{: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
-
-      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
-
 end

data/spec/active_yaml/base_spec.rb

@@ -21,6 +21,34 @@ describe ActiveYaml::Base do
     Object.send :remove_const, :State
   end
 
+  describe ".all" do
+
+    context "before the file is loaded" do
+      it "reads from the file" do
+        State.all.should_not be_empty
+        State.count.should > 0
+      end
+    end
+
+  end
+
+  describe ".delete_all" do
+    context "when called before .all" do
+      it "causes all to not load data" do
+        State.delete_all
+        State.all.should be_empty
+      end
+    end
+
+    context "when called after .all" do
+      it "clears out the data" do
+        State.all.should_not be_empty
+        State.delete_all
+        State.all.should be_empty
+      end
+    end
+  end
+
   describe ".raw_data" do
 
     it "returns the raw hash data loaded from yaml hash-formatted files" do
@@ -47,6 +75,7 @@ describe ActiveYaml::Base do
       it "returns an array of hashes" do
         City.load_file.should be_kind_of(Array)
         City.load_file.should include({"state" => :new_york, "name" => "Albany", "id" => 1})
+        City.reload
         City.all.should include( City.new(:id => 1) )
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_hash
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Jeff Dean
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 -04:00
+date: 2009-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency