amee-data-persistence 2.1.0 → 2.2.0

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/amee-data-persistence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-persistence}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hetherington", "Andrew Berkeley", "James Smith", "George Palmer"]
-  s.date = %q{2011-10-18}
+  s.date = %q{2011-10-20}
   s.description = %q{Part of the AMEEappkit, this gem provides storage and retrival of data provided by the amee-data-abstraction gem}
   s.email = %q{help@amee.com}
   s.extra_rdoc_files = [
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/AMEE/amee-data-persistence}
   s.licenses = ["BSD 3-Clause"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Persistent storage of calculations performed against the AMEE API}
 
   if s.respond_to? :specification_version then

data/lib/amee/data_abstraction/ongoing_calculation_persistence_support.rb

@@ -34,9 +34,13 @@ module AMEE
 
       # Same as <i>save</i> but raises an exception on error
       def save!
-        validate!
-        record = db_calculation || get_db_calculation
-        record.update_calculation!(to_hash)
+        if dirty?
+          validate!
+          record = db_calculation || get_db_calculation
+          record.update_calculation!(to_hash)
+        else
+          true
+        end
       end
 
       # Saves a representation of <tt>self<tt> to the database. Returns

data/lib/amee/db/config.rb

@@ -39,7 +39,7 @@ module AMEE
       private
       
       def load_storage_method
-        m = YAML.load_file("#{::Rails.root}/config/persistence.yml")['method'].to_sym rescue nil
+        m = YAML.load_file("#{::Rails.root}/config/persistence.yml")['method'].to_sym
         raise "amee-data-persistence: Invalid storage method" unless [:metadata, :outputs, :everything].include? m
         m
       end

data/spec/amee/db/ongoing_calculation_persistence_support_spec.rb

@@ -197,7 +197,14 @@ describe AMEE::DataAbstraction::OngoingCalculation do
       record.to_hash[:co2][:value].should == 1200
       record.to_hash[:usage][:value].should == 6000
     end
-  
+    
+    it "should only save if the calculation is dirty" do
+      @ongoing_calculation.save.should be_true
+      mock = flexmock(@ongoing_calculation)
+      
+      mock.should_receive(:update_calculation!).times(0)
+      @ongoing_calculation.save.should be_true
+    end
   end
   
   describe "when storage method is :metadata" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-persistence
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,11 +18,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +01:00
+date: 2011-10-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: amee-data-abstraction
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +36,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  prerelease: false
-  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: activerecord
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +52,11 @@ dependencies:
         - 0
         - 10
         version: 3.0.10
-  prerelease: false
-  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: bundler
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,11 +68,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: jeweler
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,11 +84,11 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rspec
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,11 +100,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  prerelease: false
-  type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: flexmock
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -114,11 +116,11 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
-  prerelease: false
-  type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rcov
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +130,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rdoc
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +144,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: sqlite3
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -156,8 +158,6 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
   requirement: *id009
 description: Part of the AMEEappkit, this gem provides storage and retrival of data provided by the amee-data-abstraction gem
 email: help@amee.com
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Persistent storage of calculations performed against the AMEE API