amee-data-persistence 1.1.0 → 1.2.0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.8.7@amee-data-persistence
+rvm 1.8.7@amee-data-persistence-rails2

data/CHANGELOG.txt

@@ -1,4 +1,7 @@
 = Changelog
 
+== 1.2.0
+  * Update for supporting the new handling of Calculation Sets in amee-data-abstraction
+
 == 1.0.0
   * Initial public release

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 # Dependencies
-gem "amee-data-abstraction","~> 1.1"
+gem "amee-data-abstraction","~> 1.3"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -4,14 +4,14 @@ GEM
     activerecord (2.3.12)
       activesupport (= 2.3.12)
     activesupport (2.3.12)
-    amee (3.0.1)
+    amee (3.1.2)
       activesupport (~> 2.3.5)
       json
       log4r
       nokogiri (~> 1.4.3.1)
-    amee-data-abstraction (1.1.0)
-      amee (~> 3.0)
-      quantify (= 1.2.0)
+    amee-data-abstraction (1.3.0)
+      amee (~> 3.1)
+      quantify (= 1.2.2)
       uuidtools (= 2.1.2)
     flexmock (0.9.0)
     git (1.2.5)
@@ -23,7 +23,7 @@ GEM
     json (1.5.3)
     log4r (1.1.9)
     nokogiri (1.4.3.1)
-    quantify (1.2.0)
+    quantify (1.2.2)
       activesupport
       i18n
     rake (0.9.2)
@@ -40,7 +40,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 2.3.5)
-  amee-data-abstraction (~> 1.1)
+  amee-data-abstraction (~> 1.3)
   bundler (~> 1.0.0)
   flexmock (> 0.8.6)
   jeweler (~> 1.6.4)

data/README.txt

@@ -86,4 +86,7 @@ where <storage_level> can be either 'everything', 'outputs' or 'metadata', e.g.,
 
   my_calculation.save            #=> true
 
-  my_calculation.delete          #=> nil
+  my_calculation.delete          #=> nil
+
+In order to use the persistence library, prototype calculations must be held within
+instances of the AMEE::DataAbstraction::CalculationSet class

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/amee-data-persistence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-persistence}
-  s.version = "1.1.0"
+  s.version = "1.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-08-30}
+  s.date = %q{2011-10-18}
   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 = [
@@ -35,15 +35,17 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/amee-data-persistence.rb",
     "lib/amee/data_abstraction/calculation_collection.rb",
-    "lib/amee/data_abstraction/persistence_support.rb",
+    "lib/amee/data_abstraction/ongoing_calculation_persistence_support.rb",
     "lib/amee/db/calculation.rb",
     "lib/amee/db/config.rb",
     "lib/amee/db/term.rb",
     "rails/init.rb",
     "spec/amee/db/calculation_spec.rb",
     "spec/amee/db/config_spec.rb",
-    "spec/amee/db/persistence_support_spec.rb",
+    "spec/amee/db/ongoing_calculation_persistence_support_spec.rb",
     "spec/amee/db/term_spec.rb",
+    "spec/amee/fixtures/config/calculations/electricity.lock.rb",
+    "spec/amee/fixtures/config/calculations/electricity.rb",
     "spec/database.yml",
     "spec/spec.opts",
     "spec/spec_helper.rb"
@@ -51,14 +53,14 @@ 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.6.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Persistent storage of calculations performed against the AMEE API}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 1.1"])
+      s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 1.3"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
@@ -68,7 +70,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<activerecord>, ["~> 2.3.5"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<amee-data-abstraction>, ["~> 1.1"])
+      s.add_dependency(%q<amee-data-abstraction>, ["~> 1.3"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
@@ -79,7 +81,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<amee-data-abstraction>, ["~> 1.1"])
+    s.add_dependency(%q<amee-data-abstraction>, ["~> 1.3"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])

data/lib/amee-data-persistence.rb

@@ -7,6 +7,7 @@ require 'active_record'
 require 'quantify'
 
 require 'amee/data_abstraction/calculation_collection'
+require 'amee/data_abstraction/ongoing_calculation_persistence_support'
 require 'amee/db/calculation'
 require 'amee/db/term'
 require 'amee/db/config'

data/lib/amee/data_abstraction/{persistence_support.rb → ongoing_calculation_persistence_support.rb}

@@ -223,7 +223,7 @@ module AMEE
           unless record.is_a? AMEE::Db::Calculation
             raise ArgumentError.new("Argument is not of class AMEE::Db::Calculation")
           end
-          calc = Calculations.calculations[record.type].begin_calculation
+          calc = AMEE::DataAbstraction::CalculationSet.find_prototype_calculation(record.type).begin_calculation
           calc.db_calculation = record
           # Means that validation needs to occur before calcs are saved
     		  calc.choose_without_validation!(record.to_hash)

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 rescue nil
         raise "amee-data-persistence: Invalid storage method" unless [:metadata, :outputs, :everything].include? m
         m
       end

data/spec/amee/db/{persistence_support_spec.rb → ongoing_calculation_persistence_support_spec.rb}

@@ -4,7 +4,7 @@ describe AMEE::DataAbstraction::OngoingCalculation do
 
   before(:all) do
     populate_db
-    initialize_calculation_set
+    AMEE::DataAbstraction::CalculationSet.find("electricity")
   end
 
   after(:all) do
@@ -133,8 +133,8 @@ describe AMEE::DataAbstraction::OngoingCalculation do
 
 
     it "should give nil id, if not saved" do
-      Calculations[:electricity].begin_calculation.db_calculation.should be_nil
-      Calculations[:electricity].begin_calculation.id.should be_nil
+      AMEE::DataAbstraction::CalculationSet.find("electricity")[:electricity].begin_calculation.db_calculation.should be_nil
+      AMEE::DataAbstraction::CalculationSet.find("electricity")[:electricity].begin_calculation.id.should be_nil
     end
   end
 

data/spec/amee/fixtures/config/calculations/electricity.lock.rb

@@ -0,0 +1,30 @@
+calculation {
+
+  name "Electricity"
+  label :electricity
+  path "/business/energy/electricity/grid"
+
+  drill {
+    name "Country"
+    label :country
+    path "country"
+    value "Argentina"
+    fixed "Argentina"
+    interface :drop_down
+  }
+
+  profile {
+    name "Electricity Used"
+    label :usage
+    path "energyPerTime"
+    interface :text_box
+  }
+
+  output {
+    name "Carbon Dioxide"
+    label :co2
+    path "default"
+  }
+
+}
+

data/spec/amee/fixtures/config/calculations/electricity.rb

@@ -0,0 +1,20 @@
+calculation {
+   name 'Electricity'
+   label :electricity
+   path '/business/energy/electricity/grid'
+   drill {
+     label :country
+     path 'country'
+     fixed 'Argentina'
+   }
+   profile {
+     label :usage
+     name 'Electricity Used'
+     path 'energyPerTime'
+   }
+   output {
+     label :co2
+     name 'Carbon Dioxide'
+     path 'default'
+   }
+ }

data/spec/spec_helper.rb

@@ -6,14 +6,18 @@ require 'logger'
 gem 'amee-data-abstraction'
 require 'amee-data-abstraction'
 
-RAILS_ROOT = '.'
-
 DB_CONFIG = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 DB_MIGRATION = File.join(File.dirname(__FILE__), '..','generators','persistence','templates','db','migrate')
 
+class Rails
+  def self.root
+    File.dirname(__FILE__) + '/amee/fixtures'
+  end
+end
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'amee-data-persistence'
-require 'amee/data_abstraction/persistence_support'
+require 'amee/data_abstraction/ongoing_calculation_persistence_support'
 
 ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))
 AMEE::DataAbstraction::OngoingCalculation.class_eval { include AMEE::DataAbstraction::PersistenceSupport }
@@ -66,71 +70,3 @@ def populate_db
     AMEE::Db::Calculation.new { |calc| calc.update_calculation! attr }
   end
 end
-
-def initialize_calculation_set
-  eval "Calculations = AMEE::DataAbstraction::CalculationSet.new {
-      calculation{
-        name 'Electricity'
-        label :electricity
-        path '/business/energy/electricity/grid'
-        drill {
-          label :country
-          path 'country'
-          fixed 'Argentina'
-        }
-        profile {
-          label :usage
-          name 'Electricity Used'
-          path 'energyPerTime'
-        }
-        output {
-          label :co2
-          name 'Carbon Dioxide'
-          path :default
-        }
-      }
-    }"
-end
-
-
-# Stub activerecord for rails tests
-# Taken from http://muness.blogspot.com/2006/12/unit-testing-rails-activerecord-classes.html
-#class ActiveRecordUnitTestHelper
-# attr_accessor :klass
-#
-# def initialize klass
-#   self.klass = klass
-#   self
-# end
-#
-# def where attributes
-#   klass.stubs(:columns).returns(columns(attributes))
-#   instance = klass.new(attributes)
-#   instance.id = attributes[:id] if attributes[:id] #the id attributes works differently on active record classes
-#   instance
-# end
-#
-#protected
-# def columns attributes
-#   attributes.keys.collect{|attribute| column attribute.to_s, attributes[attribute]}
-# end
-#
-# def column column_name, value
-#   ActiveRecord::ConnectionAdapters::Column.new(column_name, nil, ActiveRecordUnitTestHelper.active_record_type(value.class), false)
-# end
-#
-# def self.active_record_type klass
-#   return case klass.name
-#     when "Fixnum"         then "integer"
-#     when "Float"          then "float"
-#     when "Time"           then "time"
-#     when "Date"           then "date"
-#     when "String"         then "string"
-#     when "Object"         then "boolean"
-#   end
-# end
-#end
-#
-#def disconnected klass
-# ActiveRecordUnitTestHelper.new(klass)
-#ßend

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-persistence
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,28 +18,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +01:00
+date: 2011-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: amee-data-abstraction
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 1
-        - 1
-        version: "1.1"
-  name: amee-data-abstraction
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+        - 3
+        version: "1.3"
   prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,12 +49,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +65,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -82,12 +81,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  name: rspec
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +95,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  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_spinner
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,12 +111,12 @@ dependencies:
         - 1
         - 3
         version: 1.1.3
-  name: rspec_spinner
-  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: 
     - - ">"
@@ -128,12 +127,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: activerecord
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,12 +143,12 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  name: activerecord
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,8 +157,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3
-  version_requirements: *id009
+  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
 executables: []
@@ -188,15 +188,17 @@ files:
 - init.rb
 - lib/amee-data-persistence.rb
 - lib/amee/data_abstraction/calculation_collection.rb
-- lib/amee/data_abstraction/persistence_support.rb
+- lib/amee/data_abstraction/ongoing_calculation_persistence_support.rb
 - lib/amee/db/calculation.rb
 - lib/amee/db/config.rb
 - lib/amee/db/term.rb
 - rails/init.rb
 - spec/amee/db/calculation_spec.rb
 - spec/amee/db/config_spec.rb
-- spec/amee/db/persistence_support_spec.rb
+- spec/amee/db/ongoing_calculation_persistence_support_spec.rb
 - spec/amee/db/term_spec.rb
+- spec/amee/fixtures/config/calculations/electricity.lock.rb
+- spec/amee/fixtures/config/calculations/electricity.rb
 - spec/database.yml
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -230,7 +232,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: Persistent storage of calculations performed against the AMEE API