Floppy-amee 0.1.5 → 0.2.1

data/README

@@ -23,11 +23,7 @@ examples/view_data_*.rb for simple usage examples. You can also get the list
 of available Profiles. See examples/list_profiles.rb for details.
 
 The gem will use the AMEE JSON API if the JSON gem is installed on the local
-system. Otherwise the XML API will be used. Currently, only DataCategories and
-Profile lists are supported with JSON, so you can disable JSON support by setting
-the fourth argument to AMEE::Connection.new() to false:
-
- > AMEE::Connection.new($srv, $user, $pass, false) # last arg disables JSON support
+system. Otherwise the XML API will be used.
 
 == INTERACTIVE SHELL
 

data/examples/view_data_item.rb

@@ -17,7 +17,7 @@ OptionParser.new do |opts|
 end.parse!
 
 # Connect
-connection = AMEE::Connection.new(options[:server], options[:username], options[:password], false) # Disable JSON support for now
+connection = AMEE::Connection.new(options[:server], options[:username], options[:password])
 
 # For each path in arg list, show details
 ARGV.each do |path|

data/lib/amee.rb

@@ -7,6 +7,12 @@ rescue LoadError
   nil
 end
 
+class String
+  def is_json?
+    slice(0,1) == '{'
+  end
+end
+
 require 'amee/version'
 require 'amee/exceptions'
 require 'amee/connection'
@@ -14,4 +20,4 @@ require 'amee/object'
 require 'amee/data_category'
 require 'amee/data_item'
 require 'amee/data_item_value'
-require 'amee/profile'
+require 'amee/profile'

data/lib/amee/data_category.rb

@@ -13,71 +13,84 @@ module AMEE
       attr_reader :children
       attr_reader :items
 
+      def self.from_json(json)
+        # Parse json
+        doc = JSON.parse(json)
+        data = {}
+        data[:uid] = doc['dataCategory']['uid']
+        data[:created] = DateTime.parse(doc['dataCategory']['created'])
+        data[:modified] = DateTime.parse(doc['dataCategory']['modified'])
+        data[:name] = doc['dataCategory']['name']
+        data[:path] = doc['path']
+        data[:children] = []
+        doc['children']['dataCategories'].each do |child|
+          category_data = {}
+          category_data[:name] = child['name']
+          category_data[:path] = child['path']
+          category_data[:uid] = child['uid']
+          data[:children] << category_data
+        end
+        data[:items] = []
+        if doc['children']['dataItems']['rows']
+          doc['children']['dataItems']['rows'].each do |item|
+            item_data = {}
+            item_data[:label] = item['label']
+            item_data[:path] = item['path']
+            item_data[:uid] = item['uid']
+            data[:items] << item_data
+          end
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load DataCategory from JSON data. Check that your URL is correct.")
+      end
+      
+      def self.from_xml(xml)
+        # Parse XML
+        doc = REXML::Document.new(xml)
+        data = {}
+        data[:uid] = REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@uid").to_s
+        data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@created").to_s)
+        data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@modified").to_s)
+        data[:name] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/Name').text
+        data[:path] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/Path').text || ""
+        data[:children] = []
+        REXML::XPath.each(doc, '/Resources/DataCategoryResource/Children/DataCategories/DataCategory') do |child|
+          category_data = {}
+          category_data[:name] = child.elements['Name'].text
+          category_data[:path] = child.elements['Path'].text
+          category_data[:uid] = child.attributes['uid'].to_s
+          data[:children] << category_data
+        end
+        data[:items] = []
+        REXML::XPath.each(doc, '/Resources/DataCategoryResource/Children/DataItems/DataItem') do |item|
+          item_data = {}
+          item_data[:label] = item.elements['label'].text
+          item_data[:path] = item.elements['path'].text
+          item_data[:uid] = item.attributes['uid'].to_s
+          data[:items] << item_data
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load DataCategory from XML data. Check that your URL is correct.")
+      end
+      
       def self.get(connection, path)
         # Load data from path
         response = connection.get(path)
         # Parse data from response
-        profiles = []
-        if response.slice(0,1) == '{'
-          # Read JSON
-          doc = JSON.parse(response)
-          data = {}
-          data[:uid] = doc['dataCategory']['uid']
-          data[:created] = DateTime.parse(doc['dataCategory']['created'])
-          data[:modified] = DateTime.parse(doc['dataCategory']['modified'])
-          data[:name] = doc['dataCategory']['name']
-          data[:path] = doc['path']
-          data[:children] = []
-          doc['children']['dataCategories'].each do |child|
-            category_data = {}
-            category_data[:name] = child['name']
-            category_data[:path] = child['path']
-            category_data[:uid] = child['uid']
-            data[:children] << category_data
-          end
-          data[:items] = []
-          if doc['children']['dataItems']['rows']
-            doc['children']['dataItems']['rows'].each do |item|
-              item_data = {}
-              item_data[:label] = item['label']
-              item_data[:path] = item['path']
-              item_data[:uid] = item['uid']
-              data[:items] << item_data
-            end
-          end
+        if response.is_json?
+          cat = Category.from_json(response)
         else
-          # Read XML
-          doc = REXML::Document.new(response)
-          data = {}
-          data[:uid] = REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@uid").to_s
-          data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@created").to_s)
-          data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@modified").to_s)
-          data[:name] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/Name').text
-          data[:path] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/Path').text || ""
-          data[:children] = []
-          REXML::XPath.each(doc, '/Resources/DataCategoryResource/Children/DataCategories/DataCategory') do |child|
-            category_data = {}
-            category_data[:name] = child.elements['Name'].text
-            category_data[:path] = child.elements['Path'].text
-            category_data[:uid] = child.attributes['uid'].to_s
-            data[:children] << category_data
-          end
-          data[:items] = []
-          REXML::XPath.each(doc, '/Resources/DataCategoryResource/Children/DataItems/DataItem') do |item|
-            item_data = {}
-            item_data[:label] = item.elements['label'].text
-            item_data[:path] = item.elements['path'].text
-            item_data[:uid] = item.attributes['uid'].to_s
-            data[:items] << item_data
-          end
+          cat = Category.from_xml(response)
         end
-        # Create category object
-        cat = Category.new(data)
         # Store connection in object for future use
         cat.connection = connection
         # Done
         return cat
-      rescue 
+      rescue
         raise AMEE::BadData.new("Couldn't load DataCategory. Check that your URL is correct.")
       end
       

data/lib/amee/data_item.rb

@@ -13,11 +13,43 @@ module AMEE
       attr_reader :choices
       attr_reader :label
 
-      def self.get(connection, path)
-        # Load data from path
-        response = connection.get(path)
+      def self.from_json(json)
+        # Read JSON
+        doc = JSON.parse(json)
+        data = {}
+        data[:uid] = doc['dataItem']['uid']
+        data[:created] = DateTime.parse(doc['dataItem']['created'])
+        data[:modified] = DateTime.parse(doc['dataItem']['modified'])
+        data[:name] = doc['dataItem']['name']
+        data[:path] = doc['path']
+        data[:label] = doc['dataItem']['label']
+        # Get values
+        data[:values] = []
+        doc['dataItem']['itemValues'].each do |value|
+          value_data = {}
+          value_data[:name] = value['name']
+          value_data[:path] = value['path']
+          value_data[:value] = value['value']
+          value_data[:uid] = value['uid']
+          data[:values] << value_data
+        end
+        # Get choices
+        data[:choices] = []
+        doc['userValueChoices']['choices'].each do |choice|
+          choice_data = {}
+          choice_data[:name] = choice['name']
+          choice_data[:value] = choice['value']
+          data[:choices] << choice_data
+        end
+        # Create object
+        Item.new(data)
+      rescue 
+        raise AMEE::BadData.new("Couldn't load DataItem from JSON. Check that your URL is correct.")
+      end
+      
+      def self.from_xml(xml)
         # Parse data from response into hash
-        doc = REXML::Document.new(response)
+        doc = REXML::Document.new(xml)
         data = {}
         data[:uid] = REXML::XPath.first(doc, "/Resources/DataItemResource/DataItem/@uid").to_s
         data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataItemResource/DataItem/@created").to_s)
@@ -40,11 +72,25 @@ module AMEE
         REXML::XPath.each(doc, '/Resources/DataItemResource/Choices/Choices/Choice') do |choice|
           choice_data = {}
           choice_data[:name] = choice.elements['Name'].text
-          choice_data[:value] = choice.elements['Value'].text
+          choice_data[:value] = choice.elements['Value'].text || ""
           data[:choices] << choice_data
         end
-        # Create item object
-        item = Item.new(data)
+        # Create object
+        Item.new(data)
+      rescue 
+        raise AMEE::BadData.new("Couldn't load DataItem from XML. Check that your URL is correct.")
+      end
+
+      
+      def self.get(connection, path)
+        # Load data from path
+        response = connection.get(path)
+        # Parse data from response
+        if response.is_json?
+          item = Item.from_json(response)
+        else
+          item = Item.from_xml(response)
+        end
         # Store connection in object for future use
         item.connection = connection
         # Done

data/lib/amee/data_item_value.rb

@@ -29,11 +29,26 @@ module AMEE
         @from_data
       end
       
-      def self.get(connection, path)
-        # Load data from path
-        response = connection.get(path)
-        # Parse data from response into hash
-        doc = REXML::Document.new(response)
+      def self.from_json(json, path)
+        # Read JSON
+        doc = JSON.parse(json)['itemValue']
+        data = {}
+        data[:uid] = doc['uid']
+        data[:created] = DateTime.parse(doc['created'])
+        data[:modified] = DateTime.parse(doc['modified'])
+        data[:name] = doc['name']
+        data[:path] = path
+        data[:value] = doc['value']
+        data[:type] = doc['itemValueDefinition']['valueDefinition']['valueType']
+        # Create object
+        ItemValue.new(data)
+      rescue 
+        raise AMEE::BadData.new("Couldn't load DataItemValue from JSON. Check that your URL is correct.")
+      end
+      
+      def self.from_xml(xml, path)
+        # Read XML
+        doc = REXML::Document.new(xml)
         data = {}
         data[:uid] = REXML::XPath.first(doc, "/Resources/DataItemValueResource/ItemValue/@uid").to_s
         data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataItemValueResource/ItemValue/@Created").to_s)
@@ -44,12 +59,26 @@ module AMEE
         data[:type] = REXML::XPath.first(doc, '/Resources/DataItemValueResource/ItemValue/ItemValueDefinition/ValueDefinition/ValueType').text
         data[:from_profile] = REXML::XPath.first(doc, '/Resources/DataItemValueResource/ItemValue/ItemValueDefinition/FromProfile').text == "true" ? true : false
         data[:from_data] = REXML::XPath.first(doc, '/Resources/DataItemValueResource/ItemValue/ItemValueDefinition/FromData').text == "true" ? true : false
-        # Create item object
-        item = ItemValue.new(data)
+        # Create object
+        ItemValue.new(data)
+      rescue 
+        raise AMEE::BadData.new("Couldn't load DataItemValue from XML. Check that your URL is correct.")
+      end
+
+      def self.get(connection, path)
+        # Load data from path
+        response = connection.get(path)
+        # Parse data from response
+        data = {}
+        if response.is_json?
+          value = ItemValue.from_json(response, path)
+        else
+          value = ItemValue.from_xml(response, path)
+        end
         # Store connection in object for future use
-        item.connection = connection
+        value.connection = connection
         # Done
-        return item
+        return value
       rescue 
         raise AMEE::BadData.new("Couldn't load DataItemValue. Check that your URL is correct.")
       end

data/lib/amee/profile.rb

@@ -6,7 +6,7 @@ module AMEE
       response = connection.get('/profiles')      
       # Parse data from response
       profiles = []
-      if response.slice(0,1) == '{'
+      if response.is_json?
         # Read JSON
         doc = JSON.parse(response)
         doc['profiles'].each do |p|

data/lib/amee/shell.rb

@@ -60,7 +60,7 @@ require 'amee'
 include AMEE::Shell
 
 # Set up connection
-$connection = AMEE::Connection.new(ENV['AMEE_SERVER'], ENV['AMEE_USERNAME'], ENV['AMEE_PASSWORD'], false)  # Disable JSON support for now
+$connection = AMEE::Connection.new(ENV['AMEE_SERVER'], ENV['AMEE_USERNAME'], ENV['AMEE_PASSWORD'])
 
 if $connection.valid?
   # Change to root of data api to get going

data/lib/amee/version.rb

@@ -2,8 +2,8 @@ module AMEE
   
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 5
+    MINOR = 2
+    TINY  = 1
     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.1.5
+  version: 0.2.1
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 -07:00
+date: 2008-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: []