amee-data-abstraction 2.2.0 → 2.2.1

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/amee-data-abstraction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-abstraction}
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   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-25}
   s.description = %q{Part of the AMEEappkit this gem provides a data abstraction layer, decreasing the amount and detail of development required}
   s.email = %q{help@amee.com}
   s.extra_rdoc_files = [
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/core-extensions/hash_spec.rb",
     "spec/core-extensions/ordered_hash_spec.rb",
     "spec/core-extensions/proc_spec.rb",
+    "spec/fixtures/config/calculations/autoloaded.rb",
     "spec/fixtures/config/calculations/electricity.rb",
     "spec/fixtures/config/calculations/electricity_and_transport.rb",
     "spec/fixtures/config/calculations/transport.rb",
@@ -72,7 +73,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/AMEE/amee-data-abstraction}
   s.licenses = ["BSD 3-Clause"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Calculation and form building tool hiding details of AMEEconnect}
 
   if s.respond_to? :specification_version then

data/lib/amee-data-abstraction/calculation_set.rb

@@ -65,10 +65,18 @@ module AMEE
         set.generate_lock_file(output_path)
       end
 
+      DEFAULT_RAILS_CONFIG_DIR = "config/calculations"
+
       # Find a specific prototype calculation instance without specifying the set
       # to which it belongs.
       #
       def self.find_prototype_calculation(label)
+        # Make sure all sets are loaded first
+        default_config_dir = defined?(::Rails) ? "#{::Rails.root}/#{DEFAULT_RAILS_CONFIG_DIR}" : DEFAULT_RAILS_CONFIG_DIR
+        Dir.glob(default_config_dir + "/*.rb").each do |name|
+          find(name)
+        end
+        # Then search them
         @@sets.each_pair do |name,set|
           set = find(name)
           return set[label] if set[label]
@@ -85,14 +93,12 @@ module AMEE
         end
       end
 
-      DEFFAULT_RAILS_CONFIG_DIR = "config/calculations"
-
       # Find the config file assocaited with <tt>name</tt>. The method first checks
       # the default Rails configuration location (config/calculations) then the
       # file path described by <tt>name</tt> relative to the Rails root and by
       # absolute path.
       def self.find_config_file(name)
-        default_config_dir = defined?(::Rails) ? "#{::Rails.root}/#{DEFFAULT_RAILS_CONFIG_DIR}" : nil
+        default_config_dir = defined?(::Rails) ? "#{::Rails.root}/#{DEFAULT_RAILS_CONFIG_DIR}" : nil
         if defined?(::Rails) && File.exists?("#{default_config_dir}/#{name.to_s}.rb")
           "#{default_config_dir}/#{name.to_s}.rb"
         elsif defined?(::Rails) && File.exists?("#{default_config_dir}/#{name.to_s}")

data/lib/amee-data-abstraction/input.rb

@@ -201,6 +201,10 @@ module AMEE
       def dirty?
         @dirty
       end
+      
+      def clean!
+        @dirty = false
+      end
 
       protected
       # Returns <tt>true</tt> if the value set for <tt>self</tt> is either blank

data/lib/amee-data-abstraction/ongoing_calculation.rb

@@ -79,6 +79,7 @@ module AMEE
       # for results to be valid.
       #
       def clean!
+        inputs.each{|i| i.clean!}
         @dirty=false
       end
 

data/spec/amee-data-abstraction/calculation_set_spec.rb

@@ -86,6 +86,16 @@ describe CalculationSet do
       set = CalculationSet.find('transport')
     end
 
+    it "should only call load_set once for the same set" do
+      CalculationSet.sets[:transport].should be_nil
+      CalculationSet.sets.count.should == 0
+      set_a = CalculationSet.find('transport')
+      CalculationSet.sets.count.should == 1
+      set_b = CalculationSet.find('transport')
+      CalculationSet.sets.count.should == 1
+      set_a.should be(set_b)
+    end
+
     it "should not call load_set if set exists in class hash" do
       CalculationSet.sets[:transport].should be_nil
       set = CalculationSet.find('transport')
@@ -248,6 +258,13 @@ describe CalculationSet do
     CalculationSet.find_prototype_calculation(:my_other_calc).should be_a PrototypeCalculation
   end
 
+  it "can find a prototype calc without calc set" do
+    # Shouldn't be loaded
+    CalculationSet.sets[:autoloaded].should be_nil
+    # Should be autoloaded (along with the rest) when find_prototype_calculation is used
+    CalculationSet.find_prototype_calculation(:autocalc).should be_a PrototypeCalculation
+  end
+
   it "returns nil where no prototype calcualtion is found" do
     CalculationSet.find_prototype_calculation(:fuel).should be_nil
   end

data/spec/amee-data-abstraction/input_spec.rb

@@ -114,4 +114,10 @@ describe Input do
     i.dirty?.should eql true
   end
 
+  it "should be clean when the value is changed and then marked as clean" do
+    i=Input.new
+    i.value 5
+    i.clean!
+    i.dirty?.should be_false
+  end
 end

data/spec/amee-data-abstraction/ongoing_calculation_spec.rb

@@ -225,7 +225,7 @@ describe OngoingCalculation do
 
     mocker.existing={'distance'=>5}
     mocker.params={'distance'=>9}
-    mocker.update.get(true)
+    mocker.update.get(true, true)
 
     mycalc=@transport.begin_calculation
     mycalc.choose!('fuel'=>'diesel','size'=>'large','distance'=>5)

data/spec/fixtures/config/calculations/autoloaded.rb

@@ -0,0 +1,26 @@
+calculation {
+  name 'autocalc'
+  label :autocalc
+  path '/transport/car/generic'
+
+  drill {
+    path 'fuel'
+    label :fuel
+    name 'Fuel Type'
+  }
+  drill {
+    path 'size'
+    label :size
+    name 'Vehicle Size'
+  }
+  profile {
+    path 'distance'
+    label :distance
+    name 'Distance Driven'
+  }
+  output {
+    label :co2
+    path 'default'
+    name 'Carbon Dioxide'
+  }
+}

data/spec/spec_helper.rb

@@ -261,10 +261,16 @@ class AMEEMocker
           mock_di.should_receive(:value).with(k).and_return(v).once
         end
       end
-      test.flexmock(AMEE::Data::Item).should_receive(:get).
-        with(connection,dipath,{}).
-        at_least.once.
-        and_return(mock_di)
+      if once
+        test.flexmock(AMEE::Data::Item).should_receive(:get).
+          with(connection,dipath,{}).
+          at_least.once.
+          and_return(mock_di)
+      else
+        test.flexmock(AMEE::Data::Item).should_receive(:get).
+          with(connection,dipath,{}).
+          and_return(mock_di)
+      end
     end
     if once
       test.flexmock(AMEE::Profile::Item).should_receive(:get).
@@ -272,10 +278,9 @@ class AMEEMocker
       at_least.once.
       and_return(mock_pi)
     else
-    test.flexmock(AMEE::Profile::Item).should_receive(:get).
-      with(connection,pipath,{}).
-      at_least.once.
-      and_return(mock_pi)
+      test.flexmock(AMEE::Profile::Item).should_receive(:get).
+        with(connection,pipath,{}).
+        and_return(mock_pi)
     end
     return self
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-abstraction
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,12 +18,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +01:00
+date: 2011-10-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: amee
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,12 +35,12 @@ dependencies:
         - 1
         - 5
         version: 4.1.5
+  name: amee
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -50,12 +51,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
+  name: uuidtools
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: quantify
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +67,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  prerelease: false
-  type: :runtime
-  requirement: *id003
+  name: quantify
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,12 +83,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  name: bundler
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,12 +99,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  name: jeweler
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,12 +115,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  name: rspec
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: flexmock
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -130,12 +131,12 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
+  name: flexmock
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,12 +145,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rcov
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,9 +159,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id009
+  name: rdoc
+  version_requirements: *id009
 description: Part of the AMEEappkit this gem provides a data abstraction layer, decreasing the amount and detail of development required
 email: help@amee.com
 executables: []
@@ -216,6 +216,7 @@ files:
 - spec/core-extensions/hash_spec.rb
 - spec/core-extensions/ordered_hash_spec.rb
 - spec/core-extensions/proc_spec.rb
+- spec/fixtures/config/calculations/autoloaded.rb
 - spec/fixtures/config/calculations/electricity.rb
 - spec/fixtures/config/calculations/electricity_and_transport.rb
 - spec/fixtures/config/calculations/transport.rb
@@ -252,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Calculation and form building tool hiding details of AMEEconnect