amee-data-abstraction 1.1.0 → 1.2.0

data/.rvmrc

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

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
-gem "amee", "~> 3.0"
+gem "amee", "~> 3.1"
 gem 'uuidtools', '2.1.2'
-gem 'quantify', '1.2.0'
+gem 'quantify', '1.2.2'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (2.3.12)
-    amee (3.0.1)
+    amee (3.1.2)
       activesupport (~> 2.3.5)
       json
       log4r
@@ -14,10 +14,10 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
+    json (1.6.1)
     log4r (1.1.9)
     nokogiri (1.4.3.1)
-    quantify (1.2.0)
+    quantify (1.2.2)
       activesupport
       i18n
     rake (0.9.2)
@@ -32,11 +32,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  amee (~> 3.0)
+  amee (~> 3.1)
   bundler (~> 1.0.0)
   flexmock (> 0.8.6)
   jeweler (~> 1.6.4)
-  quantify (= 1.2.0)
+  quantify (= 1.2.2)
   rcov
   rspec (= 1.3.0)
   rspec_spinner (= 1.1.3)

data/VERSION

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

data/amee-data-abstraction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-abstraction}
-  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-10}
   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,16 +73,16 @@ 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
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amee>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<amee>, ["~> 3.1"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.1.2"])
-      s.add_runtime_dependency(%q<quantify>, ["= 1.2.0"])
+      s.add_runtime_dependency(%q<quantify>, ["= 1.2.2"])
       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"])
@@ -90,9 +90,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec_spinner>, ["= 1.1.3"])
       s.add_development_dependency(%q<flexmock>, ["> 0.8.6"])
     else
-      s.add_dependency(%q<amee>, ["~> 3.0"])
+      s.add_dependency(%q<amee>, ["~> 3.1"])
       s.add_dependency(%q<uuidtools>, ["= 2.1.2"])
-      s.add_dependency(%q<quantify>, ["= 1.2.0"])
+      s.add_dependency(%q<quantify>, ["= 1.2.2"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
@@ -101,9 +101,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<flexmock>, ["> 0.8.6"])
     end
   else
-    s.add_dependency(%q<amee>, ["~> 3.0"])
+    s.add_dependency(%q<amee>, ["~> 3.1"])
     s.add_dependency(%q<uuidtools>, ["= 2.1.2"])
-    s.add_dependency(%q<quantify>, ["= 1.2.0"])
+    s.add_dependency(%q<quantify>, ["= 1.2.2"])
     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-abstraction/drill.rb

@@ -35,6 +35,23 @@ module AMEE
         choice_validation_message
       end
 
+      # Returns the list of available choices for <tt>self</tt>. A custom list of
+      # choices can be provided as an argument, in which case these will override
+      # the list provided by the AMEE platform
+      #
+      def choices(*args)
+        if args.empty?
+          if @choices.blank?
+            c=parent.amee_drill(:before=>label).choices
+            c.length==1 ? [value] : c
+          else
+            @choices
+          end
+        else
+          @choices = [args].flatten
+        end
+      end
+
       private
 
       # Returns <tt>true</tt> if the value set for <tt>self</tt> is one of the
@@ -44,12 +61,6 @@ module AMEE
         super && (choices.include? value)
       end
 
-      # Returns the list of available choices for <tt>self</tt>.
-      def choices
-        c=parent.amee_drill(:before=>label).choices
-        c.length==1 ? [value] : c #Intention is to get autodrilled, drill will result in a UID
-      end
-
       # Returns <tt>true</tt> if <tt>self</tt> is the "first unset" drill, i.e.
       # the one which should be set next
       #

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

@@ -19,6 +19,11 @@ describe PrototypeCalculation do
     pc=PrototypeCalculation.new {drill{label :alpha}}
     pc[:alpha].should be_a Drill
   end
+  it 'can set custom drill choices in the DSL block' do
+    pc=PrototypeCalculation.new {drill{label :alpha; choices "ball","cat","dog"}}
+    pc[:alpha].should be_a Drill
+    pc[:alpha].choices.should eql ["ball","cat","dog"]
+  end
   it 'can''t make a DSL block term without a label' do
     lambda{
       pc=PrototypeCalculation.new {drill}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-data-abstraction
 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-10 00:00:00 +01: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: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 3
-        - 0
-        version: "3.0"
-  name: amee
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+        - 1
+        version: "3.1"
   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: 
     - - "="
@@ -50,28 +49,28 @@ 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: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
-  name: quantify
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+        - 2
+        version: 1.2.2
   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: 
     - - ~>
@@ -82,12 +81,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: 
     - - ~>
@@ -98,12 +97,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: 
     - - "="
@@ -114,12 +113,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.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: rcov
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -128,12 +127,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec_spinner
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -144,12 +143,12 @@ dependencies:
         - 1
         - 3
         version: 1.1.3
-  name: rspec_spinner
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -160,8 +159,9 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
-  name: flexmock
-  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: []
@@ -254,7 +254,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