amee-data-abstraction 2.2.1 → 2.2.2

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/amee-data-abstraction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-abstraction}
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   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-25}
+  s.date = %q{2011-11-03}
   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 = [
@@ -73,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.6.2}
+  s.rubygems_version = %q{1.5.3}
   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

@@ -61,7 +61,7 @@ module AMEE
       # filename will be based upon the master file with the extension .lock.rb.
       #
       def self.regenerate_lock_file(name,output_path=nil)
-        set = CalculationSet.find(name)
+        set = load_set(name, :lock => false)
         set.generate_lock_file(output_path)
       end
 
@@ -86,11 +86,15 @@ module AMEE
 
       protected
 
-      # Load a calculation set based on a filename or full path.
-      def self.load_set(name)
-        CalculationSet.new(name,:file => name) do
-          instance_eval(File.open(self.config_path).read)
+      # Load a calculation set based on a filename or full path. Set
+      # <tt>:lock => false</tt> to specify loading directly from master
+      # configuration file.
+      #
+      def self.load_set(name,options={})
+        set = CalculationSet.new(name,:file => name) do
+          instance_eval(File.open(self.config_path(options)).read)
         end
+        set
       end
 
       # Find the config file assocaited with <tt>name</tt>. The method first checks
@@ -177,10 +181,12 @@ module AMEE
 
       # Returns the path to the configuration file for <tt>self</tt>. If a .lock
       # file exists, this takes precedence, otherwise the master config file
-      # described by the <tt>#file</tt> attribute is returned.
+      # described by the <tt>#file</tt> attribute is returned. This arrangement
+      # can be overridden by passing <tt>:lock => false</tt>
       #
-      def config_path
-        lock_file_exists? ? lock_file_path : @file
+      def config_path(options={})
+        options[:lock] = true unless options[:lock] == false
+        lock_file_exists? && options[:lock] ? lock_file_path : @file
       end
 
       # Returns the path to the configuration lock file

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

@@ -369,7 +369,11 @@ module AMEE
       #  averaging, etc. Otherwise, returns <tt>false</tt>.
       #
       def has_numeric_value?
-        set? and Float(value) rescue false
+        is_numeric? && set? && Float(value) rescue false
+      end
+
+      def is_numeric?
+        ![:string, :text, :datetime, :time, :date ].include?(type)
       end
 
       # Returns a pretty print string representation of <tt>self</tt>
@@ -424,23 +428,26 @@ module AMEE
       #   my_term.convert_unit(:unit => <Quantify::Unit::SI ... >)
       #
       # If <tt>self</tt> does not hold a numeric value or either a unit or per
-      # unit attribute, <tt.self</tt> is returned.
+      # unit attribute, <tt>self</tt> is returned.
       #
       def convert_unit(options={})
-        return self unless has_numeric_value? and (unit or per_unit)
+        return self unless is_numeric? && (unit || per_unit)
+
         new = clone
-        if options[:unit] and unit
-          new_unit = Unit.for(options[:unit])
-          Term.validate_dimensional_equivalence?(unit,new_unit)
-          new.value Quantity.new(new.value,new.unit).to(new_unit).value
-          new.unit options[:unit]
-        end
-        if options[:per_unit] and per_unit
-          new_per_unit = Unit.for(options[:per_unit])
-          Term.validate_dimensional_equivalence?(per_unit,new_per_unit)
-          new.value Quantity.new(new.value,(1/new.per_unit)).to(Unit.for(new_per_unit)).value
-          new.per_unit options[:per_unit]
+        if has_numeric_value?
+          if options[:unit] && unit
+            new_unit = Unit.for(options[:unit])
+            Term.validate_dimensional_equivalence?(unit,new_unit)
+            new.value Quantity.new(new.value,new.unit).to(new_unit).value
+          end
+          if options[:per_unit] && per_unit
+            new_per_unit = Unit.for(options[:per_unit])
+            Term.validate_dimensional_equivalence?(per_unit,new_per_unit)
+            new.value Quantity.new(new.value,(1/new.per_unit)).to(Unit.for(new_per_unit)).value
+          end
         end
+        new.unit options[:unit] if options[:unit]
+        new.per_unit options[:per_unit] if options[:per_unit]
         return new
       end
 

data/lib/config/amee_units.rb

@@ -67,7 +67,8 @@ Quantify::Unit.configure do
                      "BTU_FiftyNineF",
                      "ton_us",
                      "ton_uk",
-                     "d" ]
+                     "d",
+                     "lbmol"]
 
   uneeded_units = []
 

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

@@ -106,6 +106,30 @@ describe CalculationSet do
       set = CalculationSet.find('transport')
     end
 
+    it "should load set from master file" do
+      CalculationSet.load_set('transport')
+      CalculationSet.sets[:transport].should be_a CalculationSet
+    end
+
+    it "should use lock file if exists" do
+      set = CalculationSet.load_set('transport')
+      set.should be_a CalculationSet
+      set.generate_lock_file
+      set.lock_file_exists?.should be_true
+      set.file.should eql "#{Rails.root}/config/calculations/transport.rb"
+      set.config_path.should eql "#{Rails.root}/config/calculations/transport.lock.rb"
+    end
+
+    it "should use master config file if instructed" do
+      set = CalculationSet.load_set('transport')
+      set.should be_a CalculationSet
+      set.generate_lock_file
+      set.lock_file_exists?.should be_true
+      set.file.should eql "#{Rails.root}/config/calculations/transport.rb"
+      set.config_path.should eql "#{Rails.root}/config/calculations/transport.lock.rb"
+      set.config_path(:lock => false).should eql "#{Rails.root}/config/calculations/transport.rb"
+    end
+
    it "should generate set from file name using find method" do
       CalculationSet.sets[:transport].should be_nil
       set = CalculationSet.find('transport')

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

@@ -239,9 +239,17 @@ describe Term do
     Term.new {path :hello; value 12; default_unit :kg}.has_numeric_value?.should be_true
   end
 
+  it "string should be recognised as numeric if type not explicitly declared" do
+    Term.new {path :hello; value "12"; default_unit :kg}.has_numeric_value?.should be_true
+  end
+
   it "should be recognised as non numeric" do
     Term.new {path :hello; value 'bob'; default_unit :kg}.has_numeric_value?.should be_false
   end
+
+  it "string should be recognised as non numeric if type declared" do
+    Term.new {path :hello; value '12'; default_unit :kg; type :string}.has_numeric_value?.should be_false
+  end
   
   it "should convert the input to a String if the type is specified as such" do
     Term.new {type :string; value 54}.value.should == "54"
@@ -287,7 +295,7 @@ describe Term do
   end
 
   it "should return self if not a numeric unit" do
-    @term = Term.new { value 'plane'; unit :kg }
+    @term = Term.new { value 'plane'; unit :kg; type :string }
     @term.unit.label.should eql 'kg'
     @term.value.should eql 'plane'
     new_term = @term.convert_unit(:unit => :t)
@@ -356,6 +364,68 @@ describe Term do
     new_term.value.should eql 1.2000
   end
 
+  it "should convert unit if value empty" do
+    @term = Term.new { unit :kg }
+    @term.unit.symbol.should eql 'kg'
+    @term.value.should eql nil
+    new_term = @term.convert_unit(:unit => :t)
+    new_term.unit.symbol.should eql 't'
+    new_term.value.should eql nil
+  end
+
+  it "should convert per unit if value empty" do
+    @term = Term.new { unit :kg; per_unit :min }
+    @term.unit.symbol.should eql 'kg'
+    @term.per_unit.symbol.should eql 'min'
+    @term.value.should eql nil
+    new_term = @term.convert_unit(:per_unit => :h)
+    new_term.unit.symbol.should eql 'kg'
+    new_term.per_unit.symbol.should eql 'h'
+    new_term.value.should eql nil
+  end
+
+  it "should convert unit and per unit if value empty" do
+    @term = Term.new { unit :kg; per_unit :min }
+    @term.unit.symbol.should eql 'kg'
+    @term.per_unit.symbol.should eql 'min'
+    @term.value.should eql nil
+    new_term = @term.convert_unit( :unit => :t, :per_unit => :h )
+    new_term.unit.symbol.should eql 't'
+    new_term.per_unit.symbol.should eql 'h'
+    new_term.value.should eql nil
+  end
+
+  it "should convert unit if value 0" do
+    @term = Term.new { value 0; unit :kg }
+    @term.unit.symbol.should eql 'kg'
+    @term.value.should eql 0
+    new_term = @term.convert_unit(:unit => :t)
+    new_term.unit.symbol.should eql 't'
+    new_term.value.should eql 0.0
+  end
+
+  it "should convert per unit if value 0" do
+    @term = Term.new { value 0; unit :kg; per_unit :min }
+    @term.unit.symbol.should eql 'kg'
+    @term.per_unit.symbol.should eql 'min'
+    @term.value.should eql 0
+    new_term = @term.convert_unit(:per_unit => :h)
+    new_term.unit.symbol.should eql 'kg'
+    new_term.per_unit.symbol.should eql 'h'
+    new_term.value.should eql 0.0
+  end
+
+  it "should convert unit and per unit if value 0" do
+    @term = Term.new { value 0; unit :kg; per_unit :min }
+    @term.unit.symbol.should eql 'kg'
+    @term.per_unit.symbol.should eql 'min'
+    @term.value.should eql 0
+    new_term = @term.convert_unit( :unit => :t, :per_unit => :h )
+    new_term.unit.symbol.should eql 't'
+    new_term.per_unit.symbol.should eql 'h'
+    new_term.value.should eql 0.0
+  end
+
   it "should raise error if trying to convert to non dimensionally equivalent unit" do
     @term = Term.new { value 20; unit :kg; per_unit :min }
     @term.unit.symbol.should eql 'kg'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-abstraction
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,13 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 +01:00
+date: 2011-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: amee
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -35,12 +34,12 @@ dependencies:
         - 1
         - 5
         version: 4.1.5
-  name: amee
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -51,12 +50,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  name: uuidtools
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: quantify
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,12 +66,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  name: quantify
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -83,12 +82,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,12 +98,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -115,12 +114,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -131,12 +130,12 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
-  name: flexmock
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,12 +144,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,8 +158,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdoc
-  version_requirements: *id009
+  prerelease: false
+  type: :development
+  requirement: *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: []
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Calculation and form building tool hiding details of AMEEconnect