amee-data-persistence 2.0.3 → 2.1.0

data/CHANGELOG.txt

@@ -1,4 +1,10 @@
 = Changelog
 
+== 2.1.0
+  * Update for supporting the new handling of Calculation Sets in amee-data-abstraction
+
+== 2.0.0
+  * Update for supporting Rails 3
+
 == 1.0.0
   * Initial public release

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "amee-data-abstraction", "~> 2.0"
+gem "amee-data-abstraction", "~> 2.2.0"
 gem 'activerecord', '~> 3.0.10'
 
 group :development do

data/Gemfile.lock

@@ -16,7 +16,7 @@ GEM
       json
       log4r
       nokogiri (~> 1.4.3.1)
-    amee-data-abstraction (2.0.0)
+    amee-data-abstraction (2.2.0)
       amee (~> 4.0)
       quantify (~> 2.0.0)
       uuidtools (= 2.1.2)
@@ -56,7 +56,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.0.10)
-  amee-data-abstraction (~> 2.0)
+  amee-data-abstraction (~> 2.2.0)
   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
+
+n order to use the persistence library, prototype calculations must be held within
+instances of the AMEE::DataAbstraction::CalculationSet class

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.1.0

data/amee-data-persistence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-persistence}
-  s.version = "2.0.3"
+  s.version = "2.1.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-13}
+  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 = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     "amee-data-persistence.tmproj",
     "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",
@@ -41,8 +41,10 @@ Gem::Specification.new do |s|
     "lib/generators/persistence/templates/db/migrate/004_change_term_column_type.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"
@@ -50,14 +52,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.4.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>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 2.2.0"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.10"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -67,7 +69,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
+      s.add_dependency(%q<amee-data-abstraction>, ["~> 2.2.0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.10"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -78,7 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
+    s.add_dependency(%q<amee-data-abstraction>, ["~> 2.2.0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.10"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/amee-data-persistence.rb

@@ -7,7 +7,7 @@ require 'quantify'
 require 'amee-data-abstraction'
 
 require 'amee/data_abstraction/calculation_collection'
-require 'amee/data_abstraction/persistence_support'
+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/lib/generators/persistence/templates/db/migrate/004_change_term_column_type.rb

@@ -2,7 +2,7 @@ class ChangeTermColumnType < ActiveRecord::Migration
   def self.up
     remove_index :terms, :name => "label_name_calc_id_index"
     change_column :terms, :value, :text
-    execute "CREATE INDEX `label_value_calc_id_index` ON `terms` (label, value(20), calculation_id)"
+    add_index :terms, [:label, :value, :calculation_id], :name => "label_value_calc_id_index", :length => { :value => 20 }
   end
 
   def self.down

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

@@ -4,7 +4,7 @@ describe AMEE::DataAbstraction::OngoingCalculation do
 
   before(:each) do
     populate_db
-    initialize_calculation_set
+    AMEE::DataAbstraction::CalculationSet.find("electricity")
   end
 
   after(:each) 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,25 @@
+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

@@ -8,7 +8,11 @@ RSpec.configure do |config|
   config.mock_with :flexmock
 end
 
-RAILS_ROOT = '.'
+class Rails
+  def self.root
+    File.dirname(__FILE__) + '/amee/fixtures'
+  end
+end
 
 DB_CONFIG = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 DB_MIGRATION = File.join(File.dirname(__FILE__), '..','lib','generators','persistence','templates','db','migrate')
@@ -57,29 +61,4 @@ def populate_db
   [ calculation_one, calculation_two, calculation_three ].each do |attr|
     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
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-persistence
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 3
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,28 +18,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +01:00
+date: 2011-10-18 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: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 2
+        - 2
         - 0
-        version: "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: 
@@ -51,11 +50,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: 
@@ -67,11 +66,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: 
@@ -83,11 +82,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: 
@@ -99,11 +98,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: 
@@ -115,11 +114,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: 
@@ -129,11 +128,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: 
@@ -143,11 +142,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: 
@@ -157,6 +156,8 @@ 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
@@ -180,7 +181,7 @@ files:
 - amee-data-persistence.tmproj
 - 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
@@ -192,8 +193,10 @@ files:
 - lib/generators/persistence/templates/db/migrate/004_change_term_column_type.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
@@ -227,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Persistent storage of calculations performed against the AMEE API