Floppy-amee 0.4.6 → 0.4.9

data/lib/amee/drill_down.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module AMEE
   module Data
     class DrillDown < AMEE::Data::Object
@@ -25,9 +27,9 @@ module AMEE
       def choose(choice)
         options = []
         @selections.each_pair do |key, value|
-          options << "#{key}=#{value}"
+          options << "#{CGI::escape(key)}=#{CGI::escape(value)}"
         end
-        options << "#{@choice_name}=#{choice}"
+        options << "#{CGI::escape(@choice_name)}=#{CGI::escape(choice)}"
         query_string = options.join "&"        
         DrillDown.get(connection, "#{full_path}?#{query_string}")
       end
@@ -36,6 +38,17 @@ module AMEE
         # Parse json
         doc = JSON.parse(json)
         data = {}
+        data[:choice_name] = doc['choices']['name']
+        choices = []
+        doc['choices']['choices'].each do |c|
+          choices << c['value']
+        end
+        data[:choices] = choices
+        selections = {}
+        doc['selections'].each do |c|
+          selections[c['name']] = c['value']
+        end
+        data[:selections] = selections
         # Create object
         DrillDown.new(data)
       rescue

data/lib/amee/profile_category.rb

@@ -145,8 +145,8 @@ module AMEE
         AMEE::Profile::Category.get(connection, "#{full_path}/#{child_path}")
       end
 
-      def item(dataItemLabel)
-        item = items.find{ |x| x[:dataItemLabel] == dataItemLabel}
+      def item(label_or_uid)
+        item = items.find{ |x| x[:dataItemLabel] == label_or_uid || x[:dataItemUid] == label_or_uid}
         item ? AMEE::Profile::Item.get(connection, "#{full_path}/#{item[:path]}") : nil
       end
 

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 6
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.9
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-23 00:00:00 -07:00
+date: 2008-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: []