opera-mobile-store-sdk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ef23d96109139c5a09b57d6fb5e31bcc35baf6d
-  data.tar.gz: ee58fda10f20bc9895b7e9eea0d30209e4267ab6
+  metadata.gz: 74b3499c0b6013c04854c3bf42825ffa4193c701
+  data.tar.gz: 6698b91cbf6ad11d45cea44ac0461579d00e3c3e
 SHA512:
-  metadata.gz: 983993cc0dd055f20366267a5b2ba093e8ae78e89bc7599f3f749a25e7eeca4a25006f33c88a35d71ea1cdcfa8b1caa0f000317a5d75cb536ace0e9a8b73e27e
-  data.tar.gz: e627c31ccb5af62e9fe5a29217d379fc558d1176e3ad3e02bf4e2ebe374180ebab26bb660a9d01d5f3e5a465494d68112ae505d2e00b9ef5d8d3907f0a2e72af
+  metadata.gz: 70b6f179a33e1f413b1dc95d0a3aca5337f0877ed5221c1d0ac364c4e0b32a80694e25dab4b9b9f3214330bba1139ff41f3536c89db35bf69f06d20c5d51ad62
+  data.tar.gz: 81f2d3db5b3890fcae6f4f698fd5b0cccd820963e60f7e1eeb093ee18a798d7a9a51a2a16b685d20b852da82af3e620e840dc3a74244ef39cfbc85bf5a77f5a9

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .ruby-version
+/opera-mobile-store-sdk-*.gem

data/lib/opera-mobile-store-sdk/version.rb

@@ -1,5 +1,5 @@
 module Opera
   module MobileStoreSDK
-    VERSION = "0.1.0" #
+    VERSION = "0.1.1" #
   end
 end

data/lib/opera/mobile_store/author.rb

@@ -3,6 +3,7 @@ module Opera
     class Author
 
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       include Opera::MobileStoreSDK::IdentityMapable
 
@@ -10,22 +11,19 @@ module Opera
       attr_accessor :id, :name, :email
 
       def attributes
-        [:id, :name, :email].inject({}) do |hash, method|
-          value = self.public_send method
-          hash[method] = value unless value.nil?
+        [:id, :name, :email].inject({}) do |hash, field_name|
+          value = self.public_send field_name
+          hash[field_name.to_s] = value unless value.nil?
           hash
         end
       end
 
       def inspect
-        attr_inspect = attributes.inject [] do |attributes, keyval|
-          key, val = keyval
-          attributes + ["#{key}:#{val}"]
-        end.join(", ")
-
-        "<#{self.class.name} #{attr_inspect}>"
+        "<#{self.class.name} #{attributes.inspect}>"
       end
 
+      self.singleton_class.send :alias_method, :deserialize, :new
+
     end
   end
 end

data/lib/opera/mobile_store/build.rb

@@ -3,6 +3,7 @@ module Opera
     class Build
 
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       # include Opera::MobileStoreSDK::IdentityMapable
 
@@ -32,6 +33,34 @@ module Opera
         @billing ||= false
       end
 
+      def attributes
+        [
+          :id, :name, :platform, :type, :installer_type, :package_name,
+          :version_name, :version_code, :build_update_date, :files, :billing,
+          :languages
+        ].inject({}) do |hash, field_name|
+          field_value = self.public_send field_name
+          hash[field_name.to_s] = field_value if field_value.present?
+          hash
+        end
+      end
+
+      # Override of serializable_hash:
+      #
+      # This override will prevent dumping special objects to the hash:
+      def serializable_hash(options = nil)
+        attributes.inject({}) do |shsh, keyval|
+          field_name, field_value = keyval
+
+          if field_name == 'files' # Array of special objects
+            field_value = field_value.map(&:serializable_hash)
+          end
+
+          shsh[field_name] = field_value
+          shsh
+        end
+      end
+
       def self.build_from_nokogiri_node(node)
 
         version_code = node.xpath("string(version_code)")
@@ -66,22 +95,34 @@ module Opera
           :id, :name, :platform, :type, :installer_type, :package_name,
           :version_name, :version_code, :build_update_date, :files, :billing,
           :languages
-        ].inject({}) do |hash, method|
-          value = self.public_send method
-          hash[method] = value unless value.nil?
+        ].inject({}) do |hash, field_name|
+          field_value = self.public_send field_name
+          hash[field_name.to_s] = field_value if field_value.present?
           hash
         end
       end
 
       def inspect
-        attr_inspect = attributes.inject [] do |attributes, keyval|
-          key, val = keyval
-          attributes + ["#{key}:#{val}"]
-        end.join(", ")
-
-        "<#{self.class.name} #{attr_inspect}>"
+        "<#{self.class.name} #{attributes.inspect}>"
       end
 
+      def self.deserialize(serializable_hash)
+        attributes_hash = serializable_hash.inject({}) do |hsh, keyval|
+          field_name, field_value = keyval
+
+          case field_name
+          when 'files'
+            field_value = field_value.map do |item_serializable_hash|
+              BuildFile.deserialize item_serializable_hash
+            end
+          end
+
+          hsh[field_name] = field_value
+          hsh
+        end
+
+        self.new attributes_hash
+      end
 
     end
   end

data/lib/opera/mobile_store/build_file.rb

@@ -3,10 +3,19 @@ module Opera
     class BuildFile
 
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       # All attributes are Read-Only...
       attr_accessor :size, :url
 
+      def attributes
+        [:size, :url].inject({}) do |hash, field_name|
+          field_value = self.public_send field_name
+          hash[field_name.to_s] = field_value if field_value.present?
+          hash
+        end
+      end
+
       def self.build_from_nokogiri_node(node)
 
         data = { url: node.text.strip }
@@ -19,9 +28,11 @@ module Opera
       end
 
       def inspect
-        "<#{self.class.name} size:#{size}, url:#{url}>"
+        "<#{self.class.name} #{attributes.inspect}>"
       end
 
+      self.singleton_class.send :alias_method, :deserialize, :new
+
     end
   end
 end

data/lib/opera/mobile_store/category.rb

@@ -3,6 +3,7 @@ module Opera
     class Category
 
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       include Opera::MobileStoreSDK::IdentityMapable
 
@@ -10,22 +11,19 @@ module Opera
       attr_accessor :id, :code, :name
 
       def attributes
-        [:id, :code, :name].inject({}) do |hash, method|
-          value = self.public_send method
-          hash[method] = value unless value.nil?
+        [:id, :code, :name].inject({}) do |hash, field_name|
+          field_value = self.public_send field_name
+          hash[field_name.to_s] = field_value unless field_value.nil?
           hash
         end
       end
 
       def inspect
-        attr_inspect = attributes.inject [] do |attributes, keyval|
-          key, val = keyval
-          attributes + ["#{key}:#{val}"]
-        end.join(", ")
-
-        "<#{self.class.name} #{attr_inspect}>"
+        "<#{self.class.name} #{attributes.inspect}>"
       end
 
+      self.singleton_class.send :alias_method, :deserialize, :new
+
     end
   end
 end

data/lib/opera/mobile_store/product.rb

@@ -4,81 +4,139 @@ module Opera
   module 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
+
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       include Opera::MobileStoreSDK::APIAccessible
 
       # All attributes are Read-Only...
-      attr_accessor :id, :code, :category_id, :cp_product_id,
-                  :app_type,
-                  :released_at,    # Release date
-                  :download_count, # Download count at Opera Mobile Store
-                  :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
+      attr_accessor *FIELDS
 
       def category
         Category.find category_id if category_id.present?
       end
 
+      def category=(given_category)
+        @category_id = given_category.id
+      end
+
       def author
         Author.find author_id if author_id.present?
       end
 
+      def author=(given_author)
+        @author_id = given_author.id
+      end
+
       def title(key = "en")
         required_data = i18n.detect do |x|
-          x.language_iso_code == key.to_s
+          x.language_code == key.to_s
         end.title
         required_data.present? ? required_data : title('en')
       end
 
       def short_description(key = "en")
         required_data = i18n.detect do |x|
-          x.language_iso_code == key.to_s
+          x.language_code == key.to_s
         end.short_description
         required_data.present? ? required_data : short_description('en')
       end
 
       def long_description(key = "en")
         required_data = i18n.detect do |x|
-          x.language_iso_code == key.to_s
+          x.language_code == key.to_s
         end.long_description
         required_data.present? ? required_data : long_description('en')
       end
 
       def available_language_codes
-        i18n.map(&:language_iso_code)
+        i18n.map(&:language_code)
+      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
 
+      # 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
+
+          shsh[field_name] = field_value
+          shsh
+        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
+        end
+
+        self.new attributes_hash
+      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
 
-        # Register the category unless it's already registered in the ID Map:
-        Category.register(
+        # 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
 
-        # Register the author unless it's already registered in the ID Map:
+        # Initialize the author unless it's already in it's Identity Map:
         unless Author.registered? author_id
           author_attributes = {
             id: author_id,
@@ -87,7 +145,7 @@ module Opera
           }
           author_attributes.delete(:email) unless author_attributes[:email].present?
 
-          Author.register author_attributes
+          Author.new author_attributes
         end
 
         data = {
@@ -98,7 +156,7 @@ module Opera
           category_id: category_id,
           author_id: author_id,
           app_type: node.xpath("string(apptype)"),
-          released_at: Time.parse(node.xpath "string(release_date)"),
+          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)"),
@@ -106,22 +164,20 @@ module Opera
 
           # Product localization in English:
           i18n: [
-            ProductLocalization.new(
+            ProductLocalization.new({
               language_code: "en",
-              language_iso_code: "en",
-              language_name: "English",
               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: Time.parse(node.xpath "string(update_date)"),
-          added_at: Time.parse(node.xpath "string(add_date)"),
+          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
@@ -134,19 +190,18 @@ module Opera
 
           builds: node.xpath("builds/build").map do |b|
             Build.build_from_nokogiri_node b
-          end,
+          end
 
         }
 
         node.xpath("translates/language").each do |language_node|
-          data[:i18n] << ProductLocalization.new(
-            language_code: language_node.xpath("string(@code)").strip,
-            language_iso_code: language_node.xpath("string(@iso)").strip,
-            language_name: language_node.xpath("string(@language)").strip,
+          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

data/lib/opera/mobile_store/product_image.rb

@@ -3,10 +3,19 @@ module Opera
     class ProductImage
 
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       # All attributes are Read-Only...
       attr_accessor :type, :width, :height, :url
 
+      def attributes
+        [:type, :width, :height, :url].inject({}) do |hash, field_name|
+          field_value = self.public_send field_name
+          hash[field_name.to_s] = field_value if field_value.present?
+          hash
+        end
+      end
+
       def self.build_from_nokogiri_node(node)
 
         data = {
@@ -24,19 +33,11 @@ module Opera
       end
 
       def inspect
-        info = { type: type }
-        info[:width]  = width if width.present?
-        info[:height] = height if height.present?
-        info[:url]    = url
-
-        info = info.inject [] do |attributes, keyval|
-          key, val = keyval
-          attributes + ["#{key}:#{val}"]
-        end
-
-        "<Opera::MobileStore::ProductImage " + info.join(', ') + ">"
+        "<#{self.class.name} #{attributes.inspect}>"
       end
 
+      self.singleton_class.send :alias_method, :deserialize, :new
+
     end
   end
 end

data/lib/opera/mobile_store/product_localization.rb

@@ -3,33 +3,30 @@ module Opera
     class ProductLocalization
 
       include ActiveModel::Model
+      include ActiveModel::Serialization
 
       # All attributes are Read-Only...
       attr_accessor :language_code,
-                    :language_iso_code,
-                    :language_name,
                     :title,
                     :short_description,
                     :long_description
 
       def attributes
-        [:language_code, :language_iso_code, :language_name,
-        :title, :short_description, :long_description].inject({}) do |hash, method|
-          value = self.public_send method
-          hash[method] = value unless value.nil?
+        [
+          :language_code, :title, :short_description, :long_description
+        ].inject({}) do |hash, field_name|
+          field_value = self.public_send field_name
+          hash[field_name.to_s] = field_value if field_value.present?
           hash
         end
       end
 
       def inspect
-        attr_inspect = attributes.inject [] do |attributes, keyval|
-          key, val = keyval
-          attributes + ["#{key}:#{val}"]
-        end.join(", ")
-
-        "<#{self.class.name} #{attr_inspect}>"
+        "<#{self.class.name} #{attributes.inspect}>"
       end
 
+      self.singleton_class.send :alias_method, :deserialize, :new
+
     end
   end
 end

data/lib/opera/mobile_store_sdk/identity_mapable.rb

@@ -4,6 +4,14 @@ module Opera
 
       extend ActiveSupport::Concern
 
+      # Registers itself in the identity map:
+      def initialize(params={})
+        super
+
+        # Register in the identity map:
+        self.class.identity_map[self.id] = self
+      end
+
       module ClassMethods
 
         def identity_map
@@ -22,12 +30,6 @@ module Opera
           identity_map.key? object_id
         end
 
-        def register(given_attributes)
-          obj = self.new given_attributes
-          identity_map[obj.id] = obj
-          identity_map[obj.id]
-        end
-
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opera-mobile-store-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport