Putting together new data structures for display

src/isbnnetinclj/models/info.clj

@@ -4,7 +4,6 @@
             [net.cgrand.enlive-html :as html]
             [monger.collection :as mc]
             [isbnnetinclj.models.stores :as stores]
-            [isbnnetinclj.models.infolog :as infolog]
             [isbnnetinclj.utils :as utils]))
 
 
@@ -35,7 +34,7 @@
 
 (defn flipkart-page-content
   [isbn]
-  (utils/fetch-url (format (get-in stores/sites [:flipkart :url]) isbn)))
+  (utils/fetch-page (format (get-in stores/sites [:flipkart :url]) isbn)))
 
 
 (defn flipkart-image
@@ -66,7 +65,7 @@
             :publisher (book-row 7)}}))
 
 
-(defn flipkart-book-info
+(defn fetch-book-info
   [isbn]
   (try
     (let [info (flipkart-details isbn (flipkart-page-content isbn))]
@@ -79,4 +78,4 @@
 (defn book-info
   [isbn]
   (or (get-stored-book-info isbn)
-      (flipkart-book-info isbn)))
+      (fetch-book-info isbn)))

src/isbnnetinclj/models/stores.clj

@@ -72,8 +72,8 @@
 
 (defn fetch-book-data-from-one-store
   [isbn [site-name {:keys [url price-path]}]]
-  (let [url (format url isbn)
-        content (utils/fetch-url url)
+  (let [address (format url isbn)
+        content (utils/fetch-page address)
         price-data (parse-price-from-content content price-path)]
     (try (swap! book-data-cache
                 assoc-in [isbn :price site-name] price-data)
@@ -97,4 +97,4 @@
 (defn book-data
   [isbn]
   (or (get-stored-book-data isbn)
-      (do (future (fetch-book-data isbn)) {})))
+      (do (future (fetch-book-data isbn)) {:when (java.util.Date.)})))

src/isbnnetinclj/utils.clj

@@ -4,9 +4,10 @@
             [monger.query :as mq]
             [monger.joda-time]
             [clj-time.core :as time]
-            [clj-time.format :as timeformat]))
+            [clj-time.format :as timeformat]
+            [clj-time.coerce :as timecoerce]))
 
-(defn fetch-url
+(defn fetch-page
   [url]
   (html/html-resource (java.net.URL. url)))
 
@@ -15,13 +16,13 @@
   (time/minus (time/now) (time/days 1)))
 
 (defn format-timestamp
-  [timestamp]
-  (timeformat/unparse (timeformat/formatters :rfc822) timestamp))
+  [when]
+  (timeformat/unparse (timeformat/formatters :rfc822) (timecoerce/from-date when)))
 
 (defn get-fresh-db-data
-  [db_collection isbn]
+  [collection-name isbn]
   (first (mq/with-collection
-           db_collection
+           collection-name
            (mq/find {:isbn isbn :when {"$gt" (twenty-four-hours-ago)}})
            (mq/sort {:when -1})
            (mq/limit 1))))

src/isbnnetinclj/views/book.clj

@@ -6,7 +6,8 @@
             [isbnnetinclj.utils :as utils])
   (:use [noir.core]
         [isbnnetinclj.models.info :only [book-info]]
-        [isbnnetinclj.models.stores :only [book-data]]))
+        [isbnnetinclj.models.stores :only [book-data sites]]
+        [clojure.pprint :only [pprint]]))
 
 
 (def request-collection "request")
@@ -19,12 +20,20 @@
    :when (java.util.Date.)})
 
 
+(defn convert-prices-for-display
+  [isbn prices]
+  (map (fn [[store-name price]]
+         {:name (name store-name)
+          :price price
+          :url (format (get-in sites [store-name :url]) isbn)}) prices))
+
+
 (defpage "/:isbn" {:keys [isbn]}
-  (let [prices-log (book-data isbn)
+  (let [data (book-data isbn)
         info (book-info isbn)]
     (mc/insert request-collection (core-details-of-request (noir.request/ring-request)))
-    (mus/render-file "book.mustache" {:prices (:prices prices-log)
-                                      :when-prices (utils/format-timestamp (:timestamp prices-log))
+    (mus/render-file "book.mustache" {:prices (convert-prices-for-display isbn (:price data))
+                                      :when-prices (utils/format-timestamp (:when data))
                                       :isbn isbn
                                       :info (:info info)
                                       :title (or (get-in book-info [:info :title]) "isbn.net.in")})))