opera-mobile-store-sdk 0.1.1 → 0.1.2

data/lib/opera/mobile_store/inspectable_attributes.rb

@@ -0,0 +1,13 @@
+require 'active_support/concern'
+module Opera::MobileStore
+
+  module InspectableAttributes
+
+    extend ActiveSupport::Concern
+
+    def inspect
+      "<#{self.class.name} #{attributes.inspect}>"
+    end
+
+  end
+end

data/lib/opera/mobile_store/payment_info.rb

@@ -1,105 +1,99 @@
-module Opera
-  module MobileStore
-    class PaymentInfo
+require "active_model"
 
-      include ActiveModel::Model
+module Opera::MobileStore
+  class PaymentInfo
 
-      def self.build_from_nokogiri_node(node)
-        if node.present?
-          type = node.xpath("string(@type)").strip.downcase
-
-          case type
-          when "check"  then Check.build_from_nokogiri_node node
-          when "wired"  then Wired.build_from_nokogiri_node node
-          when "paypal" then PayPal.build_from_nokogiri_node node
-          when "none"   then nil
-          else raise "WTF?"
-          end
-        end
-      end
+    include ActiveModel::Model
+    include ActiveModel::Serialization
 
-      def type
-        self.class.name.demodulize.downcase
-      end
+    include Opera::MobileStore::InspectableAttributes
+
+    def type
+      self.class.name.demodulize.downcase
+    end
 
-      def inspect
-        attr_inspect = attributes.inject [] do |attributes, keyval|
-          key, val = keyval
-          attributes + ["#{key}: \"#{val}\""]
-        end.join(", ")
+    def self.build_from_nokogiri_node(node)
+      if node.present?
+        type = node.xpath("string(@type)").strip.downcase
 
-        "<#{self.class.name} #{attr_inspect}>"
+        case type
+        when "check"  then Check.build_from_nokogiri_node node
+        when "wired"  then Wired.build_from_nokogiri_node node
+        when "paypal" then PayPal.build_from_nokogiri_node node
+        when "none"   then nil
+        else raise "WTF?"
+        end
       end
+    end
 
-      class Check < PaymentInfo
-        attr_accessor :name, :address
+    class Check < PaymentInfo
+      attr_accessor :name, :address
 
-        def self.build_from_nokogiri_node(node)
-          self.new(
-            name:    node.xpath("string(payment_check_name)"),
-            address: node.xpath("string(payment_check_address)")
-          )
-        end
+      def self.build_from_nokogiri_node(node)
+        self.new(
+          name:    node.xpath("string(payment_check_name)"),
+          address: node.xpath("string(payment_check_address)")
+        )
+      end
 
-        def attributes
-          [:name, :address].inject({}) do |hash, method|
-            value = self.public_send method
-            hash[method] = value unless value.nil?
-            hash
-          end
+      def attributes
+        [:name, :address].inject({}) do |hash, method|
+          value = self.public_send method
+          hash[method] = value unless value.nil?
+          hash
         end
       end
+    end
 
-      class Wired < PaymentInfo
-        attr_accessor :bank_account,
-                      :bank_name,
-                      :bank_address,
-                      :bank_swiftbic,
-                      :bank_iban,
-                      :bank_routing_number,
-                      :intermediary_bank_name,
-                      :intermediary_bank_address,
-                      :intermediary_bank_swiftbic,
-                      :intermediary_bank_iban
-
-        def self.build_from_nokogiri_node(node)
-          data = [
-            :bank_account, :bank_name, :bank_address, :bank_swiftbic, :bank_iban,
-            :bank_routing_number, :intermediary_bank_name, :intermediary_bank_address,
-            :intermediary_bank_swiftbic, :intermediary_bank_iban
-          ].inject({}) do |hash, attribute_name|
-            value = node.xpath("string(payment_wired_#{attribute_name})").strip
-            hash[attribute_name] = value if value.present?
-            hash
-          end
-
-          self.new data
-        end
+    class Wired < PaymentInfo
+      attr_accessor :bank_account,
+                    :bank_name,
+                    :bank_address,
+                    :bank_swiftbic,
+                    :bank_iban,
+                    :bank_routing_number,
+                    :intermediary_bank_name,
+                    :intermediary_bank_address,
+                    :intermediary_bank_swiftbic,
+                    :intermediary_bank_iban
 
-        def attributes
-          [
-            :bank_account, :bank_name, :bank_address, :bank_swiftbic, :bank_iban,
-            :bank_routing_number, :intermediary_bank_name, :intermediary_bank_address,
-            :intermediary_bank_swiftbic, :intermediary_bank_iban
-          ].inject({}) do |hash, method|
-            value = self.public_send method
-            hash[method] = value unless value.nil?
-            hash
-          end
+      def self.build_from_nokogiri_node(node)
+        data = [
+          :bank_account, :bank_name, :bank_address, :bank_swiftbic, :bank_iban,
+          :bank_routing_number, :intermediary_bank_name, :intermediary_bank_address,
+          :intermediary_bank_swiftbic, :intermediary_bank_iban
+        ].inject({}) do |hash, attribute_name|
+          value = node.xpath("string(payment_wired_#{attribute_name})").strip
+          hash[attribute_name] = value if value.present?
+          hash
         end
+
+        self.new data
       end
 
-      class PayPal < PaymentInfo
-        attr_accessor :account
-        def self.build_from_nokogiri_node(node)
-          self.new(account: node.xpath("string(account)").strip)
+      def attributes
+        [
+          :bank_account, :bank_name, :bank_address, :bank_swiftbic, :bank_iban,
+          :bank_routing_number, :intermediary_bank_name, :intermediary_bank_address,
+          :intermediary_bank_swiftbic, :intermediary_bank_iban
+        ].inject({}) do |hash, method|
+          value = self.public_send method
+          hash[method] = value unless value.nil?
+          hash
         end
+      end
+    end
 
-        def attributes
-          { account: account }
-        end
+    class PayPal < PaymentInfo
+      attr_accessor :account
+      def self.build_from_nokogiri_node(node)
+        self.new(account: node.xpath("string(account)").strip)
       end
 
+      def attributes
+        { account: account }
+      end
     end
+
   end
 end

data/lib/opera/mobile_store/product.rb

@@ -1,212 +1,207 @@
 require "active_model"
 
-module Opera
-  module MobileStore
-    class Product
+module Opera::MobileStore
+  class Product
 
-      FIELDS = [
-        :id, :code, :category_id, :cp_product_id, :app_type, :author_id,
-        :support_url, :version, :requirements, :price, :adult_content, :rating,
-        :currency, :product_type, :weight, :updated_at, :added_at, :keywords,
-        :rating, :images, :eula, :subsites, :builds, :i18n,
-        :released_at,    # Release Date
-        :download_count # Download count at Opera Mobile Store
-      ].freeze
+    FIELDS = [
+      :id, :code, :category_id, :cp_product_id, :app_type, :author_id,
+      :support_url, :version, :requirements, :price, :adult_content, :rating,
+      :currency, :product_type, :weight, :updated_at, :added_at, :keywords,
+      :rating, :images, :eula, :subsites, :builds, :i18n,
+      :released_at,    # Release Date
+      :download_count # Download count at Opera Mobile Store
+    ].freeze
 
-      include ActiveModel::Model
-      include ActiveModel::Serialization
+    include ActiveModel::Model
+    include ActiveModel::Serialization
 
-      include Opera::MobileStoreSDK::APIAccessible
+    include Opera::MobileStore::InspectableAttributes
 
-      # All attributes are Read-Only...
-      attr_accessor *FIELDS
+    include Opera::MobileStoreSDK::APIAccessible
 
-      def category
-        Category.find category_id if category_id.present?
-      end
-
-      def category=(given_category)
-        @category_id = given_category.id
-      end
+    # All attributes are Read-Only...
+    attr_accessor *FIELDS
 
-      def author
-        Author.find author_id if author_id.present?
-      end
+    def category
+      Category.find category_id if category_id.present?
+    end
 
-      def author=(given_author)
-        @author_id = given_author.id
-      end
+    def category=(given_category)
+      @category_id = given_category.id
+    end
 
-      def title(key = "en")
-        required_data = i18n.detect do |x|
-          x.language_code == key.to_s
-        end.title
-        required_data.present? ? required_data : title('en')
-      end
+    def author
+      Developer.find author_id if author_id.present?
+    end
 
-      def short_description(key = "en")
-        required_data = i18n.detect do |x|
-          x.language_code == key.to_s
-        end.short_description
-        required_data.present? ? required_data : short_description('en')
-      end
+    def author=(given_author)
+      @author_id = given_author.id
+    end
 
-      def long_description(key = "en")
-        required_data = i18n.detect do |x|
-          x.language_code == key.to_s
-        end.long_description
-        required_data.present? ? required_data : long_description('en')
-      end
+    def title(key = "en")
+      required_data = i18n.detect do |x|
+        x.language_code == key.to_s
+      end.title
+      required_data.present? ? required_data : title('en')
+    end
 
-      def available_language_codes
-        i18n.map(&:language_code)
-      end
+    def short_description(key = "en")
+      required_data = i18n.detect do |x|
+        x.language_code == key.to_s
+      end.short_description
+      required_data.present? ? required_data : short_description('en')
+    end
 
-      def attributes
-        FIELDS.inject({}) do |hsh, field_name|
-          field_value = self.public_send field_name
-          hsh[field_name.to_s] = field_value if field_value.present?
-          hsh
-        end
-      end
+    def long_description(key = "en")
+      required_data = i18n.detect do |x|
+        x.language_code == key.to_s
+      end.long_description
+      required_data.present? ? required_data : long_description('en')
+    end
 
-      # Override of serializable_hash:
-      #
-      # In the case of the category and author of a product, since we can't
-      # query the OMS API for a single entity directly, we'll replace the entity
-      # id field (category_id, author_id) with the serializable hash of the
-      # actual object (category, author) as part of the serializable hash:
-      def serializable_hash(options = nil)
-        attributes.inject({}) do |shsh, keyval|
-          field_name, field_value = keyval
-
-          case field_name
-          when 'category_id', 'author_id'
-            field_name = field_name[0..-4]
-            field_value = self.send(field_name).serializable_hash
-          when 'i18n', 'images', 'builds' # Array of special objects
-            field_value = field_value.map(&:serializable_hash)
-          end
+    def available_language_codes
+      i18n.map(&:language_code)
+    end
 
-          shsh[field_name] = field_value
-          shsh
-        end
+    def attributes
+      FIELDS.inject({}) do |hsh, field_name|
+        field_value = self.public_send field_name
+        hsh[field_name.to_s] = field_value if field_value.present?
+        hsh
       end
+    end
 
-      def self.deserialize(serializable_hash)
-        attributes_hash = serializable_hash.inject({}) do |hsh, keyval|
-          field_name, field_value = keyval
-
-          case field_name
-          when 'category'
-            field_value = Category.deserialize field_value
-          when 'author'
-            field_value = Author.deserialize field_value
-          when 'i18n'
-            field_value = field_value.map do |item_serializable_hash|
-              ProductLocalization.deserialize item_serializable_hash
-            end
-          when 'images'
-            field_value = field_value.map do |item_serializable_hash|
-              ProductImage.deserialize item_serializable_hash
-            end
-          when 'builds' # Array of special objects
-            field_value = field_value.map do |item_serializable_hash|
-              Build.deserialize item_serializable_hash
-            end
-          end
-
-          hsh[field_name] = field_value
-          hsh
+    # Override of serializable_hash:
+    #
+    # In the case of the category and author of a product, since we can't
+    # query the OMS API for a single entity directly, we'll replace the entity
+    # id field (category_id, author_id) with the serializable hash of the
+    # actual object (category, author) as part of the serializable hash:
+    def serializable_hash(options = nil)
+      attributes.inject({}) do |shsh, keyval|
+        field_name, field_value = keyval
+
+        case field_name
+        when 'category_id', 'author_id'
+          field_name = field_name[0..-4]
+          field_value = self.send(field_name).serializable_hash
+        when 'i18n', 'images', 'builds' # Array of special objects
+          field_value = field_value.map(&:serializable_hash)
         end
 
-        self.new attributes_hash
+        shsh[field_name] = field_value
+        shsh
       end
+    end
 
-      # TODO: Move this implementation to the SDK namespace
-      def self.build_from_nokogiri_node(node)
-
-        category_id = node.xpath("number(category/@id)").to_i
-        author_id = node.xpath("number(author/@id)").to_i
-
-        # Initialize the category unless it's already in it's Identity Map:
-        Category.new(
-          id: category_id,
-          code: node.xpath("string(category/@code)"),
-          name: node.xpath("string(category)")
-        ) unless Category.registered? category_id
-
-        # Initialize the author unless it's already in it's Identity Map:
-        unless Author.registered? author_id
-          author_attributes = {
-            id: author_id,
-            name: node.xpath("string(author)"),
-            email: node.xpath("string(author_email)")
-          }
-          author_attributes.delete(:email) unless author_attributes[:email].present?
-
-          Author.new author_attributes
+    def self.deserialize(serializable_hash)
+      attributes_hash = serializable_hash.inject({}) do |hsh, keyval|
+        field_name, field_value = keyval
+
+        case field_name
+        when 'category'
+          field_value = Category.deserialize field_value
+        when 'author'
+          field_value = Author.deserialize field_value
+        when 'i18n'
+          field_value = field_value.map do |item_serializable_hash|
+            ProductLocalization.deserialize item_serializable_hash
+          end
+        when 'images'
+          field_value = field_value.map do |item_serializable_hash|
+            ProductImage.deserialize item_serializable_hash
+          end
+        when 'builds' # Array of special objects
+          field_value = field_value.map do |item_serializable_hash|
+            Build.deserialize item_serializable_hash
+          end
         end
 
-        data = {
-          id:   node.xpath("number(@id)").to_i,
-          code: node.xpath("string(@code)"),
-          cp_product_id: node.xpath("number(cp_product_id)").to_i,
-
-          category_id: category_id,
-          author_id: author_id,
-          app_type: node.xpath("string(apptype)"),
-          released_at: DateTime.parse(node.xpath "string(release_date)"),
-          download_count: node.xpath("number(downloads_count)").to_i,
-          support_url: node.xpath("string(support_url)"),
-          version: node.xpath("string(version)"),
-          # TODO: process requirements node
-
-          # Product localization in English:
-          i18n: [
-            ProductLocalization.new({
-              language_code: "en",
-              title: node.xpath("string(product_name)").strip,
-              short_description: node.xpath("string(short_description)").strip,
-              long_description: node.xpath("string(long_description)").strip
-            }.select { |key, val| val.present? })
-          ],
-
-          price: node.xpath("number(price)"),
-          currency: node.xpath("string(currency)"),
-          product_type: node.xpath("string(type)"),
-          weight: node.xpath("number(weight)").to_i,
-          updated_at: DateTime.parse(node.xpath "string(update_date)"),
-          added_at: DateTime.parse(node.xpath "string(add_date)"),
-
-          keywords: node.xpath("keywords/keyword").map do |x|
-            value = x.text.strip
-            value.present? ? Opera::MobileStoreSDK.html_entities.decode(value) : nil
-          end.compact,
-
-          images: node.xpath("images/*").map do |i|
-            ProductImage.build_from_nokogiri_node i
-          end,
-
-          builds: node.xpath("builds/build").map do |b|
-            Build.build_from_nokogiri_node b
-          end
+        hsh[field_name] = field_value
+        hsh
+      end
 
-        }
+      self.new attributes_hash
+    end
 
-        node.xpath("translates/language").each do |language_node|
-          data[:i18n] << ProductLocalization.new({
-            # We'll ignore the "@code" attribute... only Opera Devs knows WTF with it.
-            language_code: language_node.xpath("string(@iso)").strip,
-            title: node.xpath("string(title)").strip,
+    # TODO: Move this implementation to the SDK namespace
+    def self.build_from_nokogiri_node(node)
+
+      # Initialize the category unless it's already in it's Identity Map:
+      category_id = node.xpath("number(category/@id)").to_i
+      Category.new(
+        id: category_id,
+        code: node.xpath("string(category/@code)"),
+        name: node.xpath("string(category)")
+      ) unless Category.identity_mapped? category_id
+
+      # Initialize the category unless it's already in it's Identity Map:
+      author_id = node.xpath("number(author/@id)").to_i
+      Developer.new(
+        id: author_id,
+        name: node.xpath("string(author)"),
+        email: node.xpath("string(author_email)")
+      ) unless Developer.identity_mapped? author_id
+
+      data = {
+        id:   node.xpath("number(@id)").to_i,
+        code: node.xpath("string(@code)"),
+        cp_product_id: node.xpath("number(cp_product_id)").to_i,
+
+        category_id: category_id,
+        author_id: author_id,
+
+        app_type: node.xpath("string(apptype)"),
+        released_at: DateTime.parse(node.xpath "string(release_date)"),
+        download_count: node.xpath("number(downloads_count)").to_i,
+        support_url: node.xpath("string(support_url)"),
+        version: node.xpath("string(version)"),
+        # TODO: process requirements node
+
+        # Product localization in English:
+        i18n: [
+          ProductLocalization.new({
+            language_code: "en",
+            title: node.xpath("string(product_name)").strip,
             short_description: node.xpath("string(short_description)").strip,
-            long_description: node.xpath("string(description)").strip
+            long_description: node.xpath("string(long_description)").strip
           }.select { |key, val| val.present? })
+        ],
+
+        price: node.xpath("number(price)"),
+        currency: node.xpath("string(currency)"),
+        product_type: node.xpath("string(type)"),
+        weight: node.xpath("number(weight)").to_i,
+        updated_at: DateTime.parse(node.xpath "string(update_date)"),
+        added_at: DateTime.parse(node.xpath "string(add_date)"),
+
+        keywords: node.xpath("keywords/keyword").map do |x|
+          value = x.text.strip
+          value.present? ? Opera::MobileStoreSDK.html_entities.decode(value) : nil
+        end.compact,
+
+        images: node.xpath("images/*").map do |i|
+          ProductImage.build_from_nokogiri_node i
+        end,
+
+        builds: node.xpath("builds/build").map do |b|
+          Build.build_from_nokogiri_node b
         end
 
-        self.new data
+      }
+
+      node.xpath("translates/language").each do |language_node|
+        data[:i18n] << ProductLocalization.new({
+          # We'll ignore the "@code" attribute... only Opera Devs knows WTF with it.
+          language_code: language_node.xpath("string(@iso)").strip,
+          title: node.xpath("string(title)").strip,
+          short_description: node.xpath("string(short_description)").strip,
+          long_description: node.xpath("string(description)").strip
+        }.select { |key, val| val.present? })
       end
 
+      self.new data
     end
+
   end
 end