7digital 0.1.2 → 0.1.5

data/lib/sevendigital/digestion_tract/api_response_digestor.rb

@@ -1,48 +1,48 @@
-require 'nokogiri'
-
-module Sevendigital
-
-  #@private
-  class ApiResponseDigestor < Digestor # :nodoc:
-
-    def default_element_name; :response end
-
-    def from_http_response(http_response)
-      response = ApiResponse.new
-      response.headers = http_response.header
-      response.content = http_response.body.to_s
-
-      parse_xml_doc(response.content, response)
-
-      if response.error_code >= 10000 && !http_response.is_a?(Net::HTTPSuccess)
-        response.error_code = Integer(http_response.code)
-        response.error_message= http_response.body.to_s
-      end
-      response
-    end
-
-    def parse_xml_doc(xml, response)
-
-      xml_doc = Nokogiri::XML(xml)
-
-      response_node = xml_doc.at_xpath("./response")
-      response_status = nil
-      response_status = get_optional_attribute(response_node, "status") if response_node
-      if response_status == 'ok' then
-        response.error_code = 0
-      else
-        if response_status == 'error'
-          error_node = get_required_node(response_node, "error")
-          response.error_code = get_required_attribute(error_node, "code").to_i
-          response.error_message = get_required_value(error_node, "errorMessage")
-        else
-          response.error_code = 10001
-          response.error_message = 'Invalid 7digital API response'
-        end
-      end
-
-    end
-
-  end
-
-end
+require 'nokogiri'
+
+module Sevendigital
+
+  #@private
+  class ApiResponseDigestor < Digestor # :nodoc:
+
+    def default_element_name; :response end
+
+    def from_http_response(http_response)
+      response = ApiResponse.new
+      response.headers = http_response.header
+      response.content = http_response.body.to_s
+
+      parse_xml_doc(response.content, response)
+
+      if response.error_code >= 10000 && !http_response.is_a?(Net::HTTPSuccess)
+        response.error_code = Integer(http_response.code)
+        response.error_message= http_response.body.to_s
+      end
+      response
+    end
+
+    def parse_xml_doc(xml, response)
+
+      xml_doc = Nokogiri::XML(xml)
+
+      response_node = xml_doc.at_xpath("./response")
+      response_status = nil
+      response_status = get_optional_attribute(response_node, "status") if response_node
+      if response_status == 'ok' then
+        response.error_code = 0
+      else
+        if response_status == 'error'
+          error_node = get_required_node(response_node, "error")
+          response.error_code = get_required_attribute(error_node, "code").to_i
+          response.error_message = get_required_value(error_node, "errorMessage")
+        else
+          response.error_code = 10001
+          response.error_message = 'Invalid 7digital API response'
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/sevendigital/digestion_tract/artist_digestor.rb

@@ -1,35 +1,35 @@
-require 'nokogiri'
-
-module Sevendigital
-
-  #@private
-  class ArtistDigestor < Digestor # :nodoc:
-
-    def default_element_name; :artist end
-    def default_list_element_name; :artists end
-
-    def from_xml_doc(xml_doc)
-      make_sure_eating_nokogiri_node(xml_doc)
-      artist = Artist.new(@api_client)
-      populate_required_properties(artist, xml_doc)
-      populate_optional_properties(artist, xml_doc)
-      artist
-    end
-
-    private
-    
-    def populate_required_properties(artist, xml_node)
-      artist.id = get_required_attribute(xml_node, "id") {|v| v.to_i}
-      artist.name = get_required_value(xml_node, "name")
-    end
-
-    def populate_optional_properties(artist, artist_node)
-      artist.sort_name =  get_optional_value(artist_node, :sortName)
-      artist.appears_as = get_optional_value(artist_node, :appearsAs)
-      artist.image = get_optional_value(artist_node, :image)
-      artist.url = get_optional_value(artist_node, :url)
-      artist.popularity = get_optional_value(artist_node, :popularity) {|v| v.to_s.to_d}
-    end
-
-  end
-end
+require 'nokogiri'
+
+module Sevendigital
+
+  #@private
+  class ArtistDigestor < Digestor # :nodoc:
+
+    def default_element_name; :artist end
+    def default_list_element_name; :artists end
+
+    def from_xml_doc(xml_doc)
+      make_sure_eating_nokogiri_node(xml_doc)
+      artist = Artist.new(@api_client)
+      populate_required_properties(artist, xml_doc)
+      populate_optional_properties(artist, xml_doc)
+      artist
+    end
+
+    private
+    
+    def populate_required_properties(artist, xml_node)
+      artist.id = get_required_attribute(xml_node, "id") {|v| v.to_i}
+      artist.name = get_required_value(xml_node, "name")
+    end
+
+    def populate_optional_properties(artist, artist_node)
+      artist.sort_name =  get_optional_value(artist_node, :sortName)
+      artist.appears_as = get_optional_value(artist_node, :appearsAs)
+      artist.image = get_optional_value(artist_node, :image)
+      artist.url = get_optional_value(artist_node, :url)
+      artist.popularity = get_optional_value(artist_node, :popularity) {|v| v.to_s.to_d}
+    end
+
+  end
+end

data/lib/sevendigital/digestion_tract/basket_digestor.rb

@@ -1,19 +1,19 @@
-module Sevendigital
-
-  #@private
-  class BasketDigestor < Digestor # :nodoc:
-
-    def default_element_name; :basket end
-
-    def from_xml_doc(xml_node)
-        make_sure_eating_nokogiri_node(xml_node)
-        basket = Sevendigital::Basket.new(@api_client)
-        basket.id = get_required_attribute(xml_node, "id")
-        basket.basket_items = get_required_node(xml_node, "basketItems") { |v| @api_client.basket_item_digestor.list_from_xml_doc(v) }
-
-        basket
-    end
-
-  end
-
-end
+module Sevendigital
+
+  #@private
+  class BasketDigestor < Digestor # :nodoc:
+
+    def default_element_name; :basket end
+
+    def from_xml_doc(xml_node)
+        make_sure_eating_nokogiri_node(xml_node)
+        basket = Sevendigital::Basket.new(@api_client)
+        basket.id = get_required_attribute(xml_node, "id")
+        basket.basket_items = get_required_node(xml_node, "basketItems") { |v| @api_client.basket_item_digestor.list_from_xml_doc(v) }
+
+        basket
+    end
+
+  end
+
+end

data/lib/sevendigital/digestion_tract/basket_item_digestor.rb

@@ -1,26 +1,26 @@
-module Sevendigital
-
-  #@private
-  class BasketItemDigestor < Digestor # :nodoc:
-    
-    def default_element_name; :basketItem end
-    def default_list_element_name; :basketItems end
-
-    def from_xml_doc(xml_node)
-      make_sure_eating_nokogiri_node(xml_node)
-      basket_item = BasketItem.new(@api_client)
-
-      basket_item.id = get_required_attribute(xml_node, "id") {|v| v.to_i}
-      basket_item.type = get_required_value(xml_node, "type") {|v| v.downcase.to_sym}
-      basket_item.artist_name = get_required_value(xml_node, "artistName")
-      basket_item.item_name = get_required_value(xml_node, "itemName")
-      basket_item.release_id = get_required_value(xml_node, "releaseId") {|v| v.to_i}
-      basket_item.track_id = get_required_value(xml_node, "trackId") {|v| v.to_i}
-      basket_item.price = get_required_node(xml_node, "price") {|v| @api_client.price_digestor.from_xml_doc(v)}
-
-      basket_item
-    end
-
-  end
-
-end
+module Sevendigital
+
+  #@private
+  class BasketItemDigestor < Digestor # :nodoc:
+    
+    def default_element_name; :basketItem end
+    def default_list_element_name; :basketItems end
+
+    def from_xml_doc(xml_node)
+      make_sure_eating_nokogiri_node(xml_node)
+      basket_item = BasketItem.new(@api_client)
+
+      basket_item.id = get_required_attribute(xml_node, "id") {|v| v.to_i}
+      basket_item.type = get_required_value(xml_node, "type") {|v| v.downcase.to_sym}
+      basket_item.artist_name = get_required_value(xml_node, "artistName")
+      basket_item.item_name = get_required_value(xml_node, "itemName")
+      basket_item.release_id = get_required_value(xml_node, "releaseId") {|v| v.to_i}
+      basket_item.track_id = get_required_value(xml_node, "trackId") {|v| v.to_i}
+      basket_item.price = get_required_node(xml_node, "price") {|v| @api_client.price_digestor.from_xml_doc(v)}
+
+      basket_item
+    end
+
+  end
+
+end

data/lib/sevendigital/digestion_tract/chart_item_digestor.rb

@@ -1,34 +1,34 @@
-module Sevendigital
-
-  #@private
-  class ChartItemDigestor < Digestor # :nodoc:
-
-    def default_element_name; :chartItem end
-    def default_list_element_name; :chart end
-    
-    def from_proxy(chart_item_proxy)
-      
-      from_xml_string(chart_item_proxy.to_s)
-
-    end
-
-    def from_xml_doc(xml_node)
-      make_sure_eating_nokogiri_node(xml_node)
-
-      chart_item = ChartItem.new(@client)
-
-      chart_item.position = get_required_value(xml_node, "position") {|v| v.to_i}
-      chart_item.change = get_required_value(xml_node, "change") {|v| v.downcase.to_sym}
-      if xml_node.at_xpath("./release") then
-        chart_item.item = get_required_node(xml_node, "release") {|v| @api_client.release_digestor.from_xml_doc(v) }
-      elsif xml_node.at_xpath("./track")
-        chart_item.item = get_required_node(xml_node, "track") {|v| @api_client.track_digestor.from_xml_doc(v) }
-      else
-        chart_item.item = get_required_node(xml_node, "artist") {|v| @api_client.artist_digestor.from_xml_doc(v) }
-      end
-      return chart_item
-    end
-
-  end
-  
-end
+module Sevendigital
+
+  #@private
+  class ChartItemDigestor < Digestor # :nodoc:
+
+    def default_element_name; :chartItem end
+    def default_list_element_name; :chart end
+    
+    def from_proxy(chart_item_proxy)
+      
+      from_xml_string(chart_item_proxy.to_s)
+
+    end
+
+    def from_xml_doc(xml_node)
+      make_sure_eating_nokogiri_node(xml_node)
+
+      chart_item = ChartItem.new(@client)
+
+      chart_item.position = get_required_value(xml_node, "position") {|v| v.to_i}
+      chart_item.change = get_required_value(xml_node, "change") {|v| v.downcase.to_sym}
+      if xml_node.at_xpath("./release") then
+        chart_item.item = get_required_node(xml_node, "release") {|v| @api_client.release_digestor.from_xml_doc(v) }
+      elsif xml_node.at_xpath("./track")
+        chart_item.item = get_required_node(xml_node, "track") {|v| @api_client.track_digestor.from_xml_doc(v) }
+      else
+        chart_item.item = get_required_node(xml_node, "artist") {|v| @api_client.artist_digestor.from_xml_doc(v) }
+      end
+      return chart_item
+    end
+
+  end
+  
+end

data/lib/sevendigital/digestion_tract/country_digestor.rb

@@ -1,16 +1,16 @@
-module Sevendigital
-
-  #@private
-  class CountryDigestor < Digestor # :nodoc:
-
-    def default_element_name; :country end
-
-    def from_xml_doc(xml_node)
-      make_sure_eating_nokogiri_node(xml_node)
-
-      get_required_value(xml_node, "countryCode")
-    end
-
-  end
-
+module Sevendigital
+
+  #@private
+  class CountryDigestor < Digestor # :nodoc:
+
+    def default_element_name; :country end
+
+    def from_xml_doc(xml_node)
+      make_sure_eating_nokogiri_node(xml_node)
+
+      get_required_value(xml_node, "countryCode")
+    end
+
+  end
+
 end

data/lib/sevendigital/digestion_tract/digestor.rb

@@ -1,122 +1,122 @@
-module Sevendigital
-
-  #@private
-  #internal generic class used for digesting XML responses from the API
-  class Digestor # :nodoc:
-
-      #TODO TEST THIS CRAP
-
-      def initialize(api_client)
-        @api_client = api_client
-      end
-
-      def from_xml_string(xml, element_name = default_element_name)
-        xml_doc = Nokogiri::XML(xml)
-        from_xml_doc(xml_doc.at_xpath("./#{element_name}"))
-      end
-
-      def list_from_xml_string(xml, list_element_name = default_list_element_name)
-         xml_doc = Nokogiri::XML(xml)
-         list_from_xml_doc(xml_doc.at_xpath("./#{list_element_name}"))
-       end
-
-       def list_from_xml_doc(list_node)
-         make_sure_eating_nokogiri_node(list_node)
-         list = []
-         list_node.xpath("./#{default_element_name}").each { |node| list << from_xml_doc(node)}
-         paginate_results(list_node, list)
-       end
-
-      #nested parsing for api methods that return standard object inside containers with no additional (useful) information
-      #e.g. tagged_item.artist, recommendation.release, search_result.track, etc
-
-      def nested_list_from_xml_string(xml, container_element_name, list_element_name = default_list_element_name)
-        xml_doc = Nokogiri::XML(xml)
-        nested_list_from_xml_doc(xml_doc.at_xpath("./#{container_element_name}"), list_element_name)
-      end
-
-      def nested_list_from_xml_doc(list_node, list_element_name = default_list_element_name, element_name = default_element_name)
-        make_sure_eating_nokogiri_node(list_node)
-        list = []
-        list_node.xpath("./#{list_element_name}/#{element_name}").each { |node| list << from_xml_doc(node)}
-        paginate_results(list_node, list)
-      end
-
-      def paginate_results(results_xml_node, list)
-        pager = @api_client.pager_digestor.from_xml_doc(results_xml_node)
-        return list if !pager
-        pager.paginate_list(list)
-      end
-
-      def make_sure_eating_nokogiri_node(xml)
-        raise DigestiveProblem, "There's nothing i can digest" unless xml
-        raise DigestiveProblem, "I'm not eating this! It's not a Nokogiri XML node.'" unless xml.kind_of?(Nokogiri::XML::Node)
-      end
-
-      def value_present?(proxy_node)
-        !proxy_node.nil? &&  !proxy_node.value.nil? && !proxy_node.value.empty?
-      end
-
-      def content_present?(proxy_node)
-        !proxy_node.nil?
-      end
-
-      def get_required_value(node, element_name)
-        if node.at_xpath("./#{element_name}") then
-          content = node.at_xpath("./#{element_name}").content
-          return yield(content) if block_given?
-          return content
-        end
-        raise DigestiveProblem, "I need #{element_name} element to digest the response"
-      end
-
-      def get_required_node(node, element_name)
-        if node.at_xpath("./#{element_name}") then
-          subnode = node.at_xpath("./#{element_name}")
-          return yield(subnode) if block_given?
-          return subnode
-        end
-        raise DigestiveProblem, "I need #{element_name} element to digest the response"
-      end
-
-      def get_required_attribute(node, attribute_name)
-        if node.at_xpath("@#{attribute_name}") then
-          content = node.at_xpath("@#{attribute_name}").content
-          return yield(content) if block_given?
-          return content
-        end
-        raise DigestiveProblem, "I need #{attribute_name} attribute to digest the response"
-      end
-
-      def get_optional_value(node, element_name)
-        if node.at_xpath("./#{element_name}") then
-          content = node.at_xpath("./#{element_name}").content
-          return yield(content) if block_given?
-          return content
-        end
-        nil
-      end
-
-      def get_optional_node(node, element_name)
-        if node.at_xpath("./#{element_name}") then
-          subnode = node.at_xpath("./#{element_name}")
-          return yield(subnode) if block_given?
-          return subnode
-        end
-        nil
-      end
-
-      def get_optional_attribute(node, attribute_name)
-        if node.at_xpath("@#{attribute_name}") then
-          content = node.at_xpath("@#{attribute_name}").content
-          return yield(content) if block_given?
-          return content
-        end
-        nil
-      end
-
-  end
-
-  class DigestiveProblem < StandardError;  end
-
-end
+module Sevendigital
+
+  #@private
+  #internal generic class used for digesting XML responses from the API
+  class Digestor # :nodoc:
+
+      #TODO TEST THIS CRAP
+
+      def initialize(api_client)
+        @api_client = api_client
+      end
+
+      def from_xml_string(xml, element_name = default_element_name)
+        xml_doc = Nokogiri::XML(xml)
+        from_xml_doc(xml_doc.at_xpath("./#{element_name}"))
+      end
+
+      def list_from_xml_string(xml, list_element_name = default_list_element_name)
+         xml_doc = Nokogiri::XML(xml)
+         list_from_xml_doc(xml_doc.at_xpath("./#{list_element_name}"))
+       end
+
+       def list_from_xml_doc(list_node)
+         make_sure_eating_nokogiri_node(list_node)
+         list = []
+         list_node.xpath("./#{default_element_name}").each { |node| list << from_xml_doc(node)}
+         paginate_results(list_node, list)
+       end
+
+      #nested parsing for api methods that return standard object inside containers with no additional (useful) information
+      #e.g. tagged_item.artist, recommendation.release, search_result.track, etc
+
+      def nested_list_from_xml_string(xml, container_element_name, list_element_name = default_list_element_name)
+        xml_doc = Nokogiri::XML(xml)
+        nested_list_from_xml_doc(xml_doc.at_xpath("./#{container_element_name}"), list_element_name)
+      end
+
+      def nested_list_from_xml_doc(list_node, list_element_name = default_list_element_name, element_name = default_element_name)
+        make_sure_eating_nokogiri_node(list_node)
+        list = []
+        list_node.xpath("./#{list_element_name}/#{element_name}").each { |node| list << from_xml_doc(node)}
+        paginate_results(list_node, list)
+      end
+
+      def paginate_results(results_xml_node, list)
+        pager = @api_client.pager_digestor.from_xml_doc(results_xml_node)
+        return list if !pager
+        pager.paginate_list(list)
+      end
+
+      def make_sure_eating_nokogiri_node(xml)
+        raise DigestiveProblem, "There's nothing i can digest" unless xml
+        raise DigestiveProblem, "I'm not eating this! It's not a Nokogiri XML node.'" unless xml.kind_of?(Nokogiri::XML::Node)
+      end
+
+      def value_present?(proxy_node)
+        !proxy_node.nil? &&  !proxy_node.value.nil? && !proxy_node.value.empty?
+      end
+
+      def content_present?(proxy_node)
+        !proxy_node.nil?
+      end
+
+      def get_required_value(node, element_name)
+        if node.at_xpath("./#{element_name}") then
+          content = node.at_xpath("./#{element_name}").content
+          return yield(content) if block_given?
+          return content
+        end
+        raise DigestiveProblem, "I need #{element_name} element to digest the response"
+      end
+
+      def get_required_node(node, element_name)
+        if node.at_xpath("./#{element_name}") then
+          subnode = node.at_xpath("./#{element_name}")
+          return yield(subnode) if block_given?
+          return subnode
+        end
+        raise DigestiveProblem, "I need #{element_name} element to digest the response"
+      end
+
+      def get_required_attribute(node, attribute_name)
+        if node.at_xpath("@#{attribute_name}") then
+          content = node.at_xpath("@#{attribute_name}").content
+          return yield(content) if block_given?
+          return content
+        end
+        raise DigestiveProblem, "I need #{attribute_name} attribute to digest the response"
+      end
+
+      def get_optional_value(node, element_name)
+        if node.at_xpath("./#{element_name}") then
+          content = node.at_xpath("./#{element_name}").content
+          return yield(content) if block_given?
+          return content
+        end
+        nil
+      end
+
+      def get_optional_node(node, element_name)
+        if node.at_xpath("./#{element_name}") then
+          subnode = node.at_xpath("./#{element_name}")
+          return yield(subnode) if block_given?
+          return subnode
+        end
+        nil
+      end
+
+      def get_optional_attribute(node, attribute_name)
+        if node.at_xpath("@#{attribute_name}") then
+          content = node.at_xpath("@#{attribute_name}").content
+          return yield(content) if block_given?
+          return content
+        end
+        nil
+      end
+
+  end
+
+  class DigestiveProblem < StandardError;  end
+
+end