amee-data-abstraction 1.3.1 → 2.0.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-abstraction
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,26 +18,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +01:00
+date: 2011-09-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: amee
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 27
         segments: 
-        - 3
-        - 1
-        version: "3.1"
-  prerelease: false
-  type: :runtime
+        - 4
+        - 0
+        version: "4.0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: uuidtools
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,27 +51,27 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  prerelease: false
-  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: quantify
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 15
         segments: 
-        - 1
-        - 2
         - 2
-        version: 1.2.2
-  prerelease: false
-  type: :runtime
+        - 0
+        - 0
+        version: 2.0.0
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: bundler
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,11 +83,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: jeweler
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,70 +99,66 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: rspec
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
-        - 1
-        - 3
+        - 2
+        - 6
         - 0
-        version: 1.3.0
-  prerelease: false
-  type: :development
+        version: 2.6.0
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  prerelease: false
+  name: flexmock
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 51
         segments: 
         - 0
-        version: "0"
-  prerelease: false
-  type: :development
+        - 8
+        - 6
+        version: 0.8.6
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec_spinner
+  prerelease: false
+  name: rcov
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  prerelease: false
-  type: :development
+        - 0
+        version: "0"
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: flexmock
+  prerelease: false
+  name: rdoc
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 3
         segments: 
         - 0
-        - 8
-        - 6
-        version: 0.8.6
-  prerelease: false
-  type: :development
+        version: "0"
   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
@@ -183,7 +181,6 @@ files:
 - amee-data-abstraction.gemspec
 - examples/_calculator_form.erb
 - examples/calculation_controller.rb
-- init.rb
 - lib/amee-data-abstraction.rb
 - lib/amee-data-abstraction/calculation.rb
 - lib/amee-data-abstraction/calculation_set.rb
@@ -203,7 +200,6 @@ files:
 - lib/core-extensions/hash.rb
 - lib/core-extensions/ordered_hash.rb
 - lib/core-extensions/proc.rb
-- rails/init.rb
 - spec/amee-data-abstraction/calculation_set_spec.rb
 - spec/amee-data-abstraction/calculation_spec.rb
 - spec/amee-data-abstraction/drill_spec.rb
@@ -219,10 +215,9 @@ files:
 - spec/core-extensions/hash_spec.rb
 - spec/core-extensions/ordered_hash_spec.rb
 - spec/core-extensions/proc_spec.rb
-- spec/fixtures/config/calculations/electricity.rb
-- spec/fixtures/config/calculations/electricity_and_transport.rb
-- spec/fixtures/config/calculations/transport.rb
-- spec/fixtures/config/electricity.rb
+- spec/fixtures/electricity.rb
+- spec/fixtures/electricity_and_transport.rb
+- spec/fixtures/transport.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -255,7 +250,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: Calculation and form building tool hiding details of AMEEconnect

data/init.rb

@@ -1,4 +0,0 @@
-# Copyright (C) 2011 AMEE UK Ltd. - http://www.amee.com
-# Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
-
-require File.dirname(__FILE__) + "/rails/init"

data/rails/init.rb

@@ -1,32 +0,0 @@
-
-# Authors::   James Hetherington, James Smith, Andrew Berkeley, George Palmer
-# Copyright:: Copyright (c) 2011 AMEE UK Ltd
-# License::   Permission is hereby granted, free of charge, to any person obtaining
-#             a copy of this software and associated documentation files (the
-#             "Software"), to deal in the Software without restriction, including
-#             without limitation the rights to use, copy, modify, merge, publish,
-#             distribute, sublicense, and/or sell copies of the Software, and to
-#             permit persons to whom the Software is furnished to do so, subject
-#             to the following conditions:
-#
-#             The above copyright notice and this permission notice shall be included
-#             in all copies or substantial portions of the Software.
-#
-#             THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#             EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#             MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-#             IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-#             CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-#             TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-#             SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'amee-data-abstraction.rb'
-
-module AMEE::DataAbstraction
-
-  # Override the connection accessor to provide the global connection in rails apps
-  def self.connection
-    AMEE::Rails.connection
-  end
-
-end

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

@@ -1,35 +0,0 @@
-calculation { # The application has support for an electricity calculation. :electricity is the internal label used to refer to it
-  label :electricity
-  name "Electricity Consumption"
-  path '/business/energy/electricity/grid'
-  
-  drill {
-    fixed 'argentina' #Not to be unset, value pre-given
-    label :country  #Name will default to label.humanize if not given
-    path 'country' #Some of the fields on the form are drill-downs, but the application doesn't need to display these differently
-    #type :autocompleting_text_box #default for a drill with entries is probably a dropdown
-  }
-
-  profile {
-    label :energy_used
-    # Symbol provided here is used in generating html ids for elements etc
-    path 'energyPerTime' #The amee profile item value corresponding to the field
-    name "Energy Used" #The display name used on the form
-    unit "kWh" #Default unit choice
-    interface :text_box #Probably not needed, as likely to be the default for profile item value unsets
-    validation lambda{|x|x.is_a? Float} #Probably not needed, as default can be deduced from PIV TYPE in API. Here as illustrative.
-    alternative_units :MWh, :MBTU, :BTU # If these are explcitly specified then the alternatives are limited to only these units. Otherwise all dimensionally equivalent units are available as alternatives by default
-  }
-  
-  # Alternatively, the drill might be fixed
-  #permanent :country {
-  #   drill_path 'country'
-  #   value 'Argentina'
-
-  output { #A marv output value
-    label :co2
-    path 'default' #It's not a marv, use the default output
-    name "Carbon Dioxide"
-  }
-}
-

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

@@ -1,53 +0,0 @@
-all_calculations {
-  metadatum {
-    label :department
-    choices %w{stuff things more_stuff meta_things}
-  }
-}
-
-calculation{
-  name 'electricity'
-  label :electricity
-  path '/business/energy/electricity/grid'
-  profile {
-    label :usage
-    name 'Electricity Used'
-    path 'energyPerTime'
-  }
-  drill {
-    label :country
-    path 'country'
-    fixed 'Argentina'
-  }
-  output {
-    label :co2
-    path 'default'
-  }
-}
-
-calculation {
-  name 'transport'
-  label :transport
-  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'
-  }
-}