active_hash 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+2010-05-04
+ - When calling ActiveFile::Base.reload do not actually perform the reload if nothing has been modified unless you call reload(true) to force (Michael Schubert)
+
 2010-04-25
  - When ActiveRecord model belongs_to an ActiveHash and the associated id is nil, returns nil instead of raising RecordNotFound (Jeremy Weiskotten)
  - Merged Nakajima's "add" alias for "create" - gotta save those ASCII characters :)

data/README.md

@@ -337,6 +337,7 @@ The field specified as the _enum_accessor_ must contain unique data values.
  * Brian Takita
  * Corey Innis
  * Peter Jaros
+ * Michael Schubert
 
 ## Copyright
 

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = %Q{An ActiveRecord-like model that uses a hash or file as a datasource}
     gem.email = "jeff@zilkey.com"
     gem.homepage = "http://github.com/zilkey/active_hash"
-    gem.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Jeremy Weiskotten"]
+    gem.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Michael Schubert", "Jeremy Weiskotten"]
     gem.add_dependency('activesupport', [">= 2.2.2"])
     gem.post_install_message = ""
   end

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/active_hash.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{active_hash}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   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", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Jeremy Weiskotten"]
-  s.date = %q{2010-04-25}
+  s.authors = ["Jeff Dean", "Mike Dalessio", "Corey Innis", "Peter Jaros", "Brandon Keene", "Brian Takita", "Pat Nakajima", "John Pignata", "Michael Schubert", "Jeremy Weiskotten"]
+  s.date = %q{2010-05-04}
   s.email = %q{jeff@zilkey.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -71,4 +71,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
   end
 end
-

data/lib/active_file/base.rb

@@ -15,9 +15,11 @@ module ActiveFile
         super
       end
 
-      def reload(foo = true)
+      def reload(force = false)
+        return if !self.dirty && !force && self.data_loaded
         self.data_loaded = true
         self.data = load_file
+        mark_clean
       end
 
       def set_filename(name)

data/lib/active_hash/base.rb

@@ -4,11 +4,12 @@ module ActiveHash
   end
 
   class Base
-    class_inheritable_accessor :data
+    class_inheritable_accessor :data, :dirty
     class << self
       attr_reader :field_names
 
       def data=(array_of_hashes)
+        mark_dirty
         @records = nil
         write_inheritable_attribute(:data, array_of_hashes)
         if array_of_hashes
@@ -22,6 +23,7 @@ module ActiveHash
       def insert(record)
         @records ||= []
         record.attributes[:id] ||= next_id
+        mark_dirty
         @records << record
       end
 
@@ -37,6 +39,7 @@ module ActiveHash
       def create(attributes = {})
         record = new(attributes)
         record.save
+        mark_dirty
         record
       end
       alias_method :add, :create
@@ -62,6 +65,7 @@ module ActiveHash
       end
 
       def delete_all
+        mark_dirty
         @records = []
       end
 
@@ -217,10 +221,23 @@ module ActiveHash
 
       def reload
         self.data = read_inheritable_attribute(:data)
+        mark_clean
       end
 
       private :reload
 
+      def mark_dirty
+        self.dirty = true
+      end
+
+      private :mark_dirty
+
+      def mark_clean
+        self.dirty = false
+      end
+
+      private :mark_clean
+
     end
 
     attr_reader :attributes

data/spec/active_file/base_spec.rb

@@ -80,4 +80,52 @@ describe ActiveFile::Base do
     end
   end
 
+  describe ".reload" do
+    before do
+      class Country
+        def self.load_file()
+          {"new_york"=>{"name"=>"New York", "id"=>1}}.values
+        end
+      end
+      Country.reload # initial load
+    end
+
+    context "when nothing has been modified" do
+      it "does not reload anything" do
+        class Country
+          def self.load_file()
+            raise "should not have been called"
+          end
+        end
+        Country.dirty.should be_false
+        Country.reload
+        Country.dirty.should be_false
+      end
+    end
+
+    context "when forced" do
+      it "reloads the data" do
+        class Country
+          def self.load_file()
+            {"new_york"=>{"name"=>"New York", "id"=>2}}.values
+          end
+        end
+        Country.dirty.should be_false
+        Country.find_by_id(2).should be_nil
+        Country.reload(true)
+        Country.dirty.should be_false
+        Country.find(2).name.should == "New York"
+      end
+    end
+
+    context "when the data has been modified" do
+      it "reloads the data" do
+        Country.create!
+        Country.dirty.should be_true
+        Country.reload
+        Country.dirty.should be_false
+      end
+    end
+  end
+
 end

data/spec/active_hash/base_spec.rb

@@ -66,6 +66,12 @@ describe ActiveHash, "Base" do
       Country.data.should == [{:name => "US", :id => 1}, {:name => "Canada", :id => 2}]
       Region.data.should == [{:description => "A big region", :id => 1}, {:description => "A remote region", :id => 2}]
     end
+
+    it "marks the class as dirty" do
+      Country.dirty.should be_false
+      Country.data = []
+      Country.dirty.should be_true
+    end
   end
 
   describe ".add" do
@@ -79,6 +85,12 @@ describe ActiveHash, "Base" do
       }.should change { Country.count }
     end
 
+    it "marks the class as dirty" do
+      Country.dirty.should be_false
+      Country.add :name => "Russia"
+      Country.dirty.should be_true
+    end
+
     it "returns the record" do
       record = Country.add :name => "Russia"
       record.name.should == "Russia"
@@ -620,6 +632,12 @@ describe ActiveHash, "Base" do
       Country.all.should == [country]
     end
 
+    it "marks the class as dirty" do
+      Country.dirty.should be_false
+      Country.new(:id => 1, :name => "foo").save
+      Country.dirty.should be_true
+    end
+
   end
 
   describe ".create" do
@@ -676,6 +694,12 @@ describe ActiveHash, "Base" do
       Country.all.should == [country]
     end
 
+    it "marks the class as dirty" do
+      Country.dirty.should be_false
+      Country.create! :id => 1, :name => "foo"
+      Country.dirty.should be_true
+    end
+
   end
 
   describe "#valid?" do
@@ -742,6 +766,12 @@ describe ActiveHash, "Base" do
       Country.all.should be_empty
     end
 
+    it "marks the class as dirty" do
+      Country.dirty.should be_false
+      Country.delete_all
+      Country.dirty.should be_true
+    end
+
   end
 
   describe "using with Fixjour" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jeff Dean
@@ -17,12 +17,13 @@ authors:
 - Brian Takita
 - Pat Nakajima
 - John Pignata
+- Michael Schubert
 - Jeremy Weiskotten
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -04:00
+date: 2010-05-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency