nineflats-api 0.0.8 → 0.0.9

data/lib/nineflats-api/base.rb

@@ -1,23 +1,17 @@
 module Nineflats
   class Base
+    attr_accessor :raw_data
+
     def self.client_app_key
       @@client_app_key
     end
-    
+
     def self.client_app_key=(key)
       @@client_app_key = key
     end
 
-    def self.base_url
-      "http://api.9flats.com/api/v1"
-    end
-    
-    def self.api_call
-      raise "override me!"
-    end
-    
     def self.object_link(name, array)
-      link = array.select{ |link|
+      array.select{ |link|
         link["rel"] == name
       }.first["href"]
     end

data/lib/nineflats-api/booking.rb

@@ -0,0 +1,27 @@
+module Nineflats
+  class Booking < Base
+
+    attr_accessor :checkin_date, :checkout_date, :nights, :number_of_guests, :status
+    attr_accessor :host, :links, :place
+
+    def initialize(json)
+      @raw_data = json
+      booking = json.first[1]
+
+      @checkin_date     = booking["checkin_date"]
+      @checkout_date    = booking["checkout_date"]
+      @nights           = booking["nights"]
+      @number_of_guests = booking["number_of_guests"]
+      @status           = booking["status"]
+
+      @host   = User.new({"user" => booking["host"]})
+      @place  = Place.new({"place" => booking["place"]})
+
+      @links = {}
+      booking['links'].each do |link|
+        @links[link['rel']] = link['href']
+      end
+    end
+
+  end
+end

data/lib/nineflats-api/calendar.rb

@@ -1,17 +1,13 @@
 module Nineflats
   class Calendar < Base
     attr_accessor :year, :month, :days
-    
-    def initialize(json)
-      calendar = json.first[1]
 
+    def initialize(calendar)
+      @raw_data = calendar
       @year  = calendar["year"]
       @month = calendar["month"]
       @days  = calendar["days"]
     end
-    
-    def self.api_call(slug, year, month)
-      base_url + "/places/#{slug}/calendar/#{year}/#{month}?client_id=#{Nineflats::Base.client_app_key}"
-    end
+
   end
 end

data/lib/nineflats-api/client.rb

@@ -1,12 +1,6 @@
 require 'nineflats-api/requests'
 module Nineflats
   class Client < Base
-    # API_BASE_URI = "api.9flats.com/api/v1"
-    # API_BASE_URI = "http://localhost.com:3000/api/v1"
-    WEB_BASE_URI = "http://www.9flats.com"
-    # WEB_BASE_URI = "http://localhost.com:3000"
-
-    attr_accessor :request_token
     attr_accessor :access_token
     attr_reader :consumer
 
@@ -20,6 +14,14 @@ module Nineflats
       @@client
     end
 
+    def self.api_site_url
+      @@api_site_url ||= "http://www.9flats.com"
+    end
+
+    def self.api_site_url=(url)
+      @@api_site_url = url
+    end
+
     def self.client
       @@client
     end
@@ -44,12 +46,11 @@ module Nineflats
 
     def initialize(api_key, api_secret, options={})
       @consumer = ::OAuth::Consumer.new(api_key, api_secret, {
-        :site               => WEB_BASE_URI,
+        :site               => Nineflats::Client.api_site_url,
         :scheme             => :header,
         :http_method        => :post
        })
       @access_token = options[:access_token]
-      # Client.default_options[:simple_oauth] = { :consumer => @consumer, :method => 'HMAC-SHA1' }.merge(options)
     end
 
   end

data/lib/nineflats-api/errors.rb

@@ -1,3 +1,4 @@
 module Nineflats
+  class Error < StandardError; end
   class NotAuthenticatedException < StandardError; end
 end

data/lib/nineflats-api/helpers.rb

@@ -40,6 +40,8 @@ module Nineflats
             html += "</div>"
           end
           html += "</div>"
+        elsif object.is_a?(Nineflats::Base)
+          html = ruby_to_html(html, object.raw_data)
         else
           html += "<div class=\"string\">#{object.to_s}</div>"
         end

data/lib/nineflats-api/paginated_array.rb

@@ -4,7 +4,7 @@ module Nineflats
                   :self_url, :full_url, :next_page_url
     
     def next_page
-      Place.search_result(next_page_url)
+      Nineflats::Client.places(:url => next_page_url)
     end
   end
 end

data/lib/nineflats-api/photo.rb

@@ -3,15 +3,12 @@ module Nineflats
     attr_accessor :title, :caption, :url
     
     def initialize(json)
+      @raw_data = json
       photo = json.first[1]
 
       @title   = photo["title"]
       @caption = photo["caption"]
       @url     = photo["url"]
     end
-    
-    def self.api_call(slug)
-      base_url + "/places/#{slug}/photos?client_id=#{Nineflats::Base.client_app_key}"
-    end
   end
 end

data/lib/nineflats-api/place.rb

@@ -1,19 +1,18 @@
 module Nineflats
   class Place < Base
-    attr_accessor :name, :city, :slug, :zipcode, :number_of_beds, :number_of_bedrooms, 
-                  :currency, :lat, :lng, :district, :number_of_bathrooms, 
+    attr_accessor :name, :city, :slug, :zipcode, :number_of_beds, :number_of_bedrooms,
+                  :currency, :lat, :lng, :district, :number_of_bathrooms,
                   :minimum_nights, :maximum_nights, :bed_type, :content_language,
-                  :size, :house_rules, :pets_around, :bathroom_type, :cleaning_fee, 
+                  :size, :house_rules, :pets_around, :bathroom_type, :cleaning_fee,
                   :charge_per_extra_person_limit, :favorites_count, :amenities_list,
                   :featured_photo_url, :price, :charge_per_extra_person, :country,
                   :category, :place_type, :bed_type, :bathroom_type, :description,
-                  :host, :self_url, :full_url, :photos_url, :prices_url, :reviews_url,
-                  :calendar_current_month_url, :calendar_next_month_url, 
-                  :prices, :reviews, :photos
-    
+                  :host, :links, :prices, :reviews, :photos
+
     def initialize(json)
+      @raw_data = json
       place = json.first[1]
-      
+
       @name                          = place["name"]
       @city                          = place["city"]
       @currency                      = place["currency"]
@@ -45,93 +44,41 @@ module Nineflats
       @district                      = place["district"]
       @description                   = place["description"]
 
-      @host = User.new({"user" => place["host"]})
-
-      @self_url                   = Nineflats::Base.object_link("self", place["links"])
-      @full_url                   = Nineflats::Base.object_link("full", place["links"])
-      @photos_url                 = Nineflats::Base.object_link("photos", place["links"])
-      @prices_url                 = Nineflats::Base.object_link("prices", place["links"])
-      @reviews_url                = Nineflats::Base.object_link("reviews", place["links"])
-      @calendar_current_month_url = Nineflats::Base.object_link("calendar: current month", place["links"])
-      @calendar_next_month_url    = Nineflats::Base.object_link("calendar: next month", place["links"])
-    end
+      @host = User.new({"user" => place["host"]}) if place["host"]
 
-    def self.search(params = nil)
-      params ||= {}
-      
-      queries = params.collect do |key, value|
-        "&search[#{key}]=#{value}"
+      @links = {}
+      place['links'].each do |link|
+        @links[link['rel']] = link['href']
       end
-      
-      search_url = base_url + "/places?client_id=#{Nineflats::Base.client_app_key}" + queries.join
-      
-      Place.search_result(search_url)
     end
 
-    def self.search_result(search_url)
-      json = Helpers.get_data(search_url)
-      
-      places = json["places"].collect do |place_json|
-        Place.new(place_json)
-      end
-      
-      result = Nineflats::PaginatedArray.new(places)
-      
-      result.total_entries = json["total_entries"]
-      result.total_pages   = json["total_pages"]
-      result.current_page  = json["current_page"]
-      result.per_page      = json["per_page"]
-      
-      result.self_url      = Nineflats::Base.object_link("self", json["links"])
-      result.full_url      = Nineflats::Base.object_link("full", json["links"])
-      result.next_page_url = Nineflats::Base.object_link("next_page", json["links"])
-      result
+    def self.search(params={})
+      Nineflats::Client.places(params)
     end
 
+
     def self.fetch(slug, lang)
-      Place.new(Helpers.get_data(Place.api_call(slug, lang)))
+      Nineflats::Client.place(slug, :language => lang)
     end
-    
+
     def prices
       return @prices if @prices
-      
-      json = Helpers.get_data(Prices.api_call(slug))
-      
-      @prices = Prices.new(json) if json && json["place_prices"]
+      @prices = Nineflats::Client.place_prices(@slug)
     end
-    
+
     def reviews
       return @reviews if @reviews
-      
-      json = Helpers.get_data(Review.api_call(slug))
-      
-      if json && json["reviews"]
-        @reviews = json["reviews"].collect do |review_hash|
-          Review.new(review_hash)
-        end
-      end
+      @reviews = Nineflats::Client.place_reviews(@slug)
     end
-    
+
     def photos
       return @photos if @photos
-      
-      json = Helpers.get_data(Photo.api_call(slug))
-      
-      if json && json["place_photos"]
-        @photos = json["place_photos"].collect do |photo_hash|
-          Photo.new(photo_hash)
-        end
-      end
+      @photos = Nineflats::Client.place_photos(@slug)
     end
-    
-    def calendar(year, month)
-      json = Helpers.get_data(Calendar.api_call(slug, year, month))
 
-      Calendar.new(json) if json && json["calendar"]
-    end
-    
-    def self.api_call(slug, lang)
-      base_url + "/places/#{slug}?client_id=#{Nineflats::Base.client_app_key}&lang=#{lang}"
+    def calendar(year, month)
+      Nineflats::Client.place_calendar(@slug, year, month)
     end
+
   end
-end
+end

data/lib/nineflats-api/prices.rb

@@ -1,25 +1,21 @@
 module Nineflats
   class Prices < Base
-    attr_accessor :currency, :default_price, :weekend_night_price, 
+    attr_accessor :currency, :default_price, :weekend_night_price,
                   :weekly_discount_in_percent, :monthly_discount_in_percent,
                   :seasons
-    
-    def initialize(json)
-      prices = json.first[1]
-      
+
+    def initialize(prices)
+      @raw_data = prices
       @currency                    = prices["currency"]
       @default_price               = prices["default_price"]
       @weekend_night_price         = prices["weekend_night_price"]
       @weekly_discount_in_percent  = prices["weekly_discount_in_percent"]
       @monthly_discount_in_percent = prices["monthly_discount_in_percent"]
-      
+
       @seasons = prices["seasons"].collect do |season|
         Season.new(season)
       end
     end
-    
-    def self.api_call(slug)
-      base_url + "/places/#{slug}/prices?client_id=#{Nineflats::Base.client_app_key}"
-    end
+
   end
 end

data/lib/nineflats-api/requests.rb

@@ -6,6 +6,89 @@ module Nineflats
 
     module ClassMethods
 
+      def places(search_options)
+        response = if search_options[:url]
+          consumer.request(:get, search_options[:url])
+        else
+          consumer.request(:get, "/api/v1/places?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key, :search => search_options})}")
+        end
+        json = JSON.parse(response.body)
+        if json["places"]
+          places = json["places"].collect do |place_hash|
+            Place.new(place_hash)
+          end
+          result = Nineflats::PaginatedArray.new(places)
+
+          result.total_entries = json["total_entries"]
+          result.total_pages   = json["total_pages"]
+          result.current_page  = json["current_page"]
+          result.per_page      = json["per_page"]
+
+          result.self_url      = Nineflats::Base.object_link("self", json["links"])
+          result.full_url      = Nineflats::Base.object_link("full", json["links"])
+          result.next_page_url = Nineflats::Base.object_link("next_page", json["links"])
+          result
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
+
+      def place(slug, options={})
+        params = {:client_id => consumer.key}
+        params[:lang] = options[:language] if options[:language]
+        url = "/api/v1/places/#{slug}?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}"
+        response = if client.access_token
+          client.access_token.request(:get, url)
+        else
+          consumer.request(:get, url)
+        end
+        Nineflats::Place.new(JSON.parse(response.body))
+      end
+
+      def place_calendar(place_slug, year, month)
+        response = consumer.request(:get, "/api/v1/places/#{place_slug}/calendar/#{year}/#{month}?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}")
+        json = JSON.parse(response.body)
+        if json["calendar"]
+          Calendar.new(json['calendar'])
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
+
+      def place_prices(place_slug)
+        response = consumer.request(:get, "/api/v1/places/#{place_slug}/prices?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}")
+        json = JSON.parse(response.body)
+        if json["place_prices"]
+          Prices.new(json['place_prices'])
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
+
+      def place_reviews(place_slug)
+        response = consumer.request(:get, "/api/v1/places/#{place_slug}/reviews?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}")
+        json = JSON.parse(response.body)
+        if json["reviews"]
+          json["reviews"].collect do |review_hash|
+            Review.new(review_hash)
+          end
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
+
+      def place_photos(place_slug)
+        response = consumer.request(:get, "/api/v1/places/#{place_slug}/photos?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}")
+        json = JSON.parse(response.body)
+        if json["place_photos"]
+          json["place_photos"].collect do |photo_hash|
+            Photo.new(photo_hash)
+          end
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
+
       def user(user_id)
         url = "/api/v1/users/#{user_id}?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}"
         response = if client.access_token
@@ -13,16 +96,35 @@ module Nineflats
         else
           consumer.request(:get, url)
         end
-        JSON.parse(response.body)
-      end # user
+        Nineflats::User.new(JSON.parse(response.body))
+      end
 
-      def bookings(user_id)
+      def user_favorites(user_id)
+        response = consumer.request(:get, "/api/v1/users/#{user_id}/favorites?#{Nineflats::QueryStringNormalizer.normalize({:client_id => consumer.key})}")
+        json = JSON.parse(response.body)
+        if json["places"]
+          json["places"].collect do |place_hash|
+            Place.new(place_hash)
+          end
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
+
+      def user_bookings(user_id)
         raise Nineflats::NotAuthenticatedException.new("User is not authenticated yet!") unless Client.client.authorized?
 
         params = {:client_id => consumer.key}
         response = client.access_token.request(:get, "/api/v1/users/#{user_id}/bookings?#{Nineflats::QueryStringNormalizer.normalize(params)}")
-        JSON.parse(response.body)
-      end # bookings
+        json = JSON.parse(response.body)
+        if json && json["bookings"]
+          json["bookings"].collect do |booking_hash|
+            Booking.new(booking_hash)
+          end
+        else
+          raise Nineflats::Error.new(json['error'])
+        end
+      end
 
     end
   end