lib/services/ats.rb in Active-0.0.11 vs lib/services/ats.rb in Active-0.0.12

@@ -13,11 +13,11 @@
       def initialize(data={})
         # need to hold on to original data
         @data = data || {}
         @asset_id      = data[:asset_id]
         @url           = data[:url]
-        @asset_id_type = data[:asset_type_id]
+        @asset_type_id = data[:asset_type_id]
         @title         = data[:asset_name] if data[:asset_name]
         @substitution_url = data[:substitution_url]
         @metadata_loaded = false
       end
 
@@ -31,11 +31,10 @@
         if @data.has_key?("assetName")
           @data["assetName"]
         else
           @title
         end
-        
       end
 
       def url
         load_metadata unless @metadata_loaded
         if @data.has_key?("seourl")
@@ -44,14 +43,19 @@
           @data["trackbackurl"]
         else
           @url
         end
       end
-      
+
       def categories
         load_metadata unless @metadata_loaded
-        @data["channel"]
+        categories = @data["channel"]
+        if categories.class==String
+          [@data["channel"]]
+        else
+          @data["channel"]
+        end
       end
 
       def address
         load_metadata unless @metadata_loaded
         @address = {
@@ -61,39 +65,49 @@
           :state   => @data["state"],
           :zip     => @data["zip"],
           :lat     => @data["latitude"],
           :lng     => @data["longitude"],
           :country => @data["country"]
-        }        
+        }
       end
 
       def start_date
         load_metadata unless @metadata_loaded
         if @data.has_key?("startDate")
-          (DateTime.parse @data["startDate"]).to_date
+          if @data.has_key?("startTime")
+            (DateTime.parse "#{@data["startDate"]} #{@data["startTime"]}")
+          else
+            (DateTime.parse @data["startDate"])
+          end
         else
           nil
         end
       end
 
       def start_time
-        load_metadata unless @metadata_loaded
-        @data["startTime"]
+        start_date
       end
 
-      def end_time
+      def end_date
         load_metadata unless @metadata_loaded
-        @data["endTime"]
+        if @data.has_key?("endDate")
+          if @data.has_key?("endTime")
+            (DateTime.parse "#{@data["endDate"]} #{@data["endTime"]}")
+          else
+            (DateTime.parse @data["endDate"])
+          end
+        else
+          nil
+        end
       end
 
-      def end_date
-        load_metadata unless @metadata_loaded
-        DateTime.parse @data["endDate"] if @data.has_key?("endDate")
+      def end_time
+        end_date
       end
 
+
       def category
-        load_metadata unless @metadata_loaded
-        @data["channel"]
+        categories.first
       end
 
       def desc
         load_metadata unless @metadata_loaded
         if @data.has_key?("allText")