amee-data-abstraction 2.0.0 → 2.1.0

data/.rvmrc

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

data/Gemfile

@@ -12,3 +12,7 @@ group :development do
   gem 'rcov'
   gem 'rdoc'
 end
+
+group :test do
+  gem "builder"
+end

data/Gemfile.lock

@@ -7,6 +7,7 @@ GEM
       json
       log4r
       nokogiri (~> 1.4.3.1)
+    builder (3.0.0)
     diff-lcs (1.1.3)
     flexmock (0.9.0)
     git (1.2.5)
@@ -39,6 +40,7 @@ PLATFORMS
 
 DEPENDENCIES
   amee (~> 4.0)
+  builder
   bundler (~> 1.0.0)
   flexmock (> 0.8.6)
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/amee-data-abstraction.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-data-abstraction}
-  s.version = "2.0.0"
+  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-09-28}
+  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 = [
@@ -71,7 +71,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.4.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/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

@@ -21,6 +21,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: 15
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,13 +18,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +01:00
+date: 2011-10-10 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: 
@@ -35,11 +33,11 @@ dependencies:
         - 4
         - 0
         version: "4.0"
+  prerelease: false
+  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: uuidtools
-  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,11 +49,11 @@ 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: 
@@ -67,11 +65,11 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  prerelease: false
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: bundler
-  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,11 +81,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: 
@@ -99,11 +97,11 @@ 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: 
@@ -115,11 +113,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  prerelease: false
+  type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: flexmock
-  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -131,11 +129,11 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
+  prerelease: false
+  type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rcov
-  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,11 +143,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rdoc
-  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,6 +157,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  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
@@ -250,7 +250,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: Calculation and form building tool hiding details of AMEEconnect