wildcard-pair 0.3.1 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87d389d67f030de00b57384d85e7cc5ca9ff253
-  data.tar.gz: f9a7c892fef9e4e230d54b007c5da78455b4a767
+  metadata.gz: 00458fca5a7f7e4b7a07f28f969214f1e595afa3
+  data.tar.gz: f6cc5d383fb3a2541c85248c95b0bf10a2bd518d
 SHA512:
-  metadata.gz: 46aba80a945c50cf02ffc8528be3bcff27c289cda1ae59d2fc518e9b5267813f99fe306964083ab848ebd9a50a0b8b9de732805b138d698270f7c14e0879ab43
-  data.tar.gz: e3346365a27cebeaeb36bc690e76cc9ee5611064147921bb6a7de08791912ddd5a2f5d8bdc01666bba904bd025d282d57553e83a1068b1d5ed0b71b03a7432f8
+  metadata.gz: 7c538305caef48cd730255822332f46f83283367cb9846f19ee480e2f456f070febee96eede8914040e928684a802cb2435017d9a3ebf3d6c326617d7837ecf3
+  data.tar.gz: 04f44392320122bf777549b00747a2d7ec39b22cdb755665c171dfbc208754434ff5c7849c70061bef3567e36127f3c7cac9d139b97c3b1de6cf521bb6bf8772

data/lib/wildcard-pair/Article.rb

@@ -1,16 +1,9 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
-require_relative 'Media.rb'
+require_relative 'ObjectWithMedia.rb'
 
 module WildcardPair
-  class Article
-
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
-    include WildcardPair::Media
+  class Article < WildcardPair::ObjectWithMedia
 
     # required fields
     attr_accessor :title, :html_content
@@ -18,21 +11,8 @@ module WildcardPair
     attr_accessor :publication_date, :abstract_content, :source, :author,
       :updated_date, :is_breaking, :app_link_android, :app_link_ios
 
-    attr_reader :media
-
     validates :title, presence: true
-    validates :html_content, presence: true
-    validate :validate_media
-
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def attributes
-      instance_values
-    end
+    validates :abstract_content, presence: true
 
     def metatags=(metatags)
       if metatags.nil? || !metatags.is_a?(Hash)
@@ -47,44 +27,5 @@ module WildcardPair
       self.app_link_ios=metatags['applink_ios']
       self.app_link_android=metatags['applink_android']
     end
-
-    def media=(media)
-      if media.is_a? Video
-        @media = map_hash(media, Media::Video.new)
-      elsif media.is_a? Image
-        @media = map_hash(media, Media::Image.new)
-      elsif media.is_a? Hash
-        if media[:type] == 'video'
-          @media = map_hash(media, Media::Video.new)
-        elsif media[:type] == 'image'
-          @media = map_hash(media, Media::Image.new)
-        else
-          @media = media
-        end
-      end
-    end
-
-    def validate_media
-      if @media.nil? then return end
-
-      if !@media.is_a? Media or !@media.valid?
-        errors.add(:media, "Media is invalid")
-        return false
-      end
-    end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Article is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end

data/lib/wildcard-pair/ArticleCard.rb

@@ -1,44 +1,24 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
-require_relative 'Media.rb'
+require_relative 'Card.rb'
 
 module WildcardPair
-  class ArticleCard
+  class ArticleCard < WildcardPair::Card
     private
 
-    attr_accessor :article, :card_type, :pair_version
+    attr_accessor :article
 
     public
 
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
     include WildcardPair::Media
 
-    attr_accessor :web_url
-    attr_reader :article, :card_type, :pair_version
+    attr_reader :article
 
-    validates :web_url, presence: true
     validate :validate_article
 
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-
+      super
       @card_type = 'article'
-
-      if !Gem.loaded_specs['wildcard-pair'].nil?
-        @pair_version = Gem.loaded_specs['wildcard-pair'].version.to_s
-      else
-        @pair_version = "unknown"
-      end
-    end
-
-    def attributes
-      instance_values
     end
 
     def populate_from_metatags(web_url)
@@ -65,20 +45,6 @@ module WildcardPair
         end
       end
     end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Article Card is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end
 

data/lib/wildcard-pair/Card.rb

@@ -0,0 +1,82 @@
+require 'active_model'
+require_relative 'hash_mappable.rb'
+require_relative 'Creator.rb'
+
+module WildcardPair
+	class Card
+		private
+
+		attr_accessor :card_type, :pair_version, :creator
+
+		public
+
+		include ActiveModel::Validations
+		include ActiveModel::Serializers::JSON
+		include WildcardPair::HashMappable
+
+		attr_accessor :web_url, :keywords, :app_link_android, :app_link_ios
+		attr_reader :card_type, :pair_version, :creator
+
+		validates :web_url, presence: true
+		validate :validate_keywords
+		validate :validate_creator
+
+		def initialize(attributes = {})
+			attributes.each do |name, value|
+				send("#{name}=", value)
+			end
+
+			if !Gem.loaded_specs['wildcard-pair'].nil?
+				@pair_version = Gem.loaded_specs['wildcard-pair'].version.to_s
+			else
+				@pair_version = "unknown"
+			end
+		end
+
+		def attributes
+			instance_values
+		end
+
+		def validate_keywords
+			if !@keywords.nil? and !@keywords.instance_of? Array
+				errors.add(:keywords, "Keywords must be an array of strings")
+				return
+			end
+
+			if !@keywords.nil?
+				@keywords.each do |k|
+					if !k.instance_of? String
+						errors.add(:keywords, "Keywords must be an array of strings")
+						return
+					end
+				end
+			end
+		end
+
+		def creator=(creator)
+			@creator = map_hash(creator, WildcardPair::Creator.new)
+		end
+
+		def validate_creator
+			if @creator.nil? then return end
+
+			if !@creator.is_a? Creator or !@creator.valid?
+				errors.add(:creator, "Creator is invalid")
+				return false
+			end
+		end
+
+		#exclude validation fields in the JSON output
+		def as_json(options={})
+			super(options.merge({:except => [:errors, :validation_context]}))
+		end
+
+		def to_json(options={})
+			if self.valid?
+				super(options)
+			else
+				raise self.card_type.capitalize + " Card is not valid - please remedy the following errors:" << self.errors.messages.to_s
+			end    
+		end 
+	end
+end

data/lib/wildcard-pair/Color.rb

@@ -1,41 +1,13 @@
+#!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
+require_relative 'Object.rb'
 
 module WildcardPair  
-  class Color
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+  class Color < WildcardPair::Object
 
     attr_accessor :display_name, :swatch_url, :value, :mapping_color
 
+    validates :display_name, presence: true
     validates :mapping_color, allow_nil: true, inclusion: {in: %w(beige black blue bronze brown gold green gray metallic multicolored offwhite orange pink purple red silver transparent turquoise white yellow)}
- 
-    def initialize(attributes = {})
-
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end 
-    end
-
-    def attributes
-      instance_values
-    end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-
-    def to_json(options = {})
-      if self.valid?
-        super(options)
-      else
-        raise "Color is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end   
-    end 
-
   end
 end

data/lib/wildcard-pair/Creator.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'Object.rb'
+
+module WildcardPair  
+  class Creator < WildcardPair::Object
+
+    attr_accessor :name, :favicon, :ios_app_store_url, :android_app_store_url, :url
+
+    validates :name, presence: true
+    validates :favicon, presence: true
+  end
+end

data/lib/wildcard-pair/ImageCard.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'Card.rb'
+
+module WildcardPair
+  class ImageCard < WildcardPair::Card
+    private
+
+    attr_accessor :media
+
+    public
+
+    include WildcardPair::Media
+
+    attr_reader :media
+
+    validate :validate_media
+
+    def initialize(attributes = {})
+      super
+      @card_type = 'image'
+    end
+
+    def populate_from_metatags(web_url)
+      @web_url=web_url
+      metatags = WildcardPair::ExtractMetaTags.extract(@web_url)
+
+      ##now that we've extracted metatags, let's create an Image object with it
+      self.media=WildcardPair::Media::Image.new metatags: metatags
+      self.app_link_ios = metatags['applink_ios']
+      self.app_link_android = metatags['applink_android']
+    end
+
+    def media=(media)
+      @media = map_hash(media, WildcardPair::Media::Image.new)
+    end
+
+    def validate_media
+      if @media.nil? || !@media.is_a?(Image)
+        errors.add(:media, "An image is required")
+        return
+      end
+
+      if !@media.valid?
+        @media.errors.each do |error, msg|
+           errors["media[%s]" % error] = msg = msg
+        end
+      end
+    end
+
+  end
+end

data/lib/wildcard-pair/LinkCard.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'Card.rb'
+
+module WildcardPair
+  class LinkCard < WildcardPair::Card
+    private
+
+    attr_accessor :target
+
+    public
+
+    attr_reader :target
+
+    validate :validate_target
+
+    def initialize(attributes = {})
+      super
+      @card_type = 'link'
+    end
+
+    def target=(target)
+      @target = map_hash(target, WildcardPair::Target.new)
+    end
+
+    def validate_target
+      if @target.nil? || !@target.is_a?(Target)
+        errors.add(:target, "A target is required")
+        return
+      end
+
+      if !@target.valid?
+        @target.errors.each do |error, msg|
+           errors["media[%s]" % error] = msg = msg
+        end
+      end
+    end
+
+  end
+end

data/lib/wildcard-pair/Media/Image.rb

@@ -1,46 +1,35 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative '../hash_mappable.rb'
 require_relative '../Media.rb'
+require_relative '../Object.rb'
 
 module WildcardPair::Media
-  class Image
+  class Image < WildcardPair::Object
 
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
     include WildcardPair::Media
 
-    attr_accessor :image_url, :image_caption, :type
+    attr_accessor :image_url, :image_caption, :type, 
+      :title, :author, :width, :height, :publication_date
 
     validates :image_url, presence: true
     validates :type, presence: true, inclusion: {in: %w(image), message: 'incorrect media type specified'}
+    validates :width, allow_nil: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+    validates :height, allow_nil: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
 
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-
+      super
       @type = 'image'
     end
 
-    def attributes
-      instance_values
-    end
+    def metatags=(metatags)
+      if metatags.nil? || !metatags.is_a?(Hash)
+        return
+      end
 
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
+      #see what you can set based on metatags
+      self.title=metatags['title']
+      self.image_caption=metatags['description']
+      self.image_url=metatags['image_url']
     end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Image is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end

data/lib/wildcard-pair/Media/Video.rb

@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative '../hash_mappable.rb'
+require_relative '../Media.rb'
+require_relative '../Object.rb'
 
 module WildcardPair::Media
-  class Video
+  class Video < WildcardPair::Object
 
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
     include WildcardPair::Media
 
     # required fields
@@ -25,17 +22,10 @@ module WildcardPair::Media
     validates :type, presence: true, inclusion: {in: %w(video), message: 'incorrect media type specified'}
 
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-
+      super
       @type = 'video'
     end
 
-    def attributes
-      instance_values
-    end
-
     def metatags=(metatags)
       if metatags.nil? || !metatags.is_a?(Hash)
         return
@@ -52,19 +42,5 @@ module WildcardPair::Media
       self.app_link_ios=metatags['applink_ios']
       self.app_link_android=metatags['applink_android']
     end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Video is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end

data/lib/wildcard-pair/Object.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby -wKU
+
+require 'active_model'
+require_relative 'hash_mappable.rb'
+
+module WildcardPair  
+  class Object
+    include ActiveModel::Validations
+    include ActiveModel::Serializers::JSON
+    include WildcardPair::HashMappable
+
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        send("#{name}=", value)
+      end
+    end
+
+    def attributes
+      instance_values
+    end
+
+    #exclude validation fields in the JSON output
+    def as_json(options={})
+      super(options.merge({:except => [:errors, :validation_context]}))
+    end
+
+    def to_json(options={})
+      if self.valid?
+        super(options)
+      else
+        raise self.class.to_s + " is not valid - please remedy the following errors:" << self.errors.messages.to_s
+      end    
+    end 
+  end
+end

data/lib/wildcard-pair/ObjectWithMedia.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'Object.rb'
+require_relative 'Media.rb'
+
+module WildcardPair
+	class ObjectWithMedia < WildcardPair::Object
+
+		include WildcardPair::Media
+
+		attr_reader :media
+		validate :validate_media
+
+		def media=(media)
+			if media.is_a? Video
+				@media = map_hash(media, Media::Video.new)
+			elsif media.is_a? Image
+				@media = map_hash(media, Media::Image.new)
+			elsif media.is_a? Hash
+				if media[:type] == 'video'
+					@media = map_hash(media, Media::Video.new)
+				elsif media[:type] == 'image'
+					@media = map_hash(media, Media::Image.new)
+				else
+					@media = media
+				end
+			end
+		end
+
+		def validate_media
+			if @media.nil? then return end
+
+			if !@media.is_a? Media or !@media.valid?
+				errors.add(:media, "Media is invalid")
+				return false
+			end
+		end
+	end
+end

data/lib/wildcard-pair/Offer.rb

@@ -1,12 +1,7 @@
-
-require 'active_model'
-require_relative 'hash_mappable.rb'
+require_relative 'Object.rb'
 
 module WildcardPair  
-  class Offer
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+  class Offer < WildcardPair::Object
 
     attr_accessor :description, :availability, :quantity, :weight, :weight_units, :offer_id, :sale_start_date, :sale_end_date, :expiration_date
 
@@ -19,12 +14,6 @@ module WildcardPair
     validates :quantity, allow_nil: true, numericality: {only_integer: true, greater_than_or_equal_to: 0} 
 
     validate :validatePrices
- 
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end 
-    end
 
     def metatags=(metatags)
       if metatags.nil? || !metatags.is_a?(Hash)
@@ -49,10 +38,6 @@ module WildcardPair
       @shipping_cost = map_hash(shipping_cost, WildcardPair::Price.new)
     end
 
-    def attributes
-      instance_values
-    end
-
     def geographic_availability=(geographic_availability)
       @geographic_availability ||= Array.new
 
@@ -83,20 +68,5 @@ module WildcardPair
         end
       end  
     end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-
-    def to_json(options = {})
-      if self.valid?
-        super(options)
-      else
-        raise "Offer is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end   
-    end 
-
   end
 end

data/lib/wildcard-pair/Price.rb

@@ -1,44 +1,17 @@
-
-require_relative 'hash_mappable.rb'
-require 'active_model'
+require_relative 'Object.rb'
 
 module WildcardPair  
-  class Price
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+  class Price < WildcardPair::Object
 
     attr_accessor :price, :currency
 
     validates :price, presence: true, numericality: {greater_than_or_equal_to: 0}
  
     def initialize(attributes = {})
-
       #let's set currency to USD by default
       @currency = "USD"
 
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end 
+      super
     end
-
-    def attributes
-      instance_values
-    end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-
-    def to_json(options = {})
-      if self.valid?
-        super(options)
-      else
-        raise "Price is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end   
-    end 
-
   end
 end

data/lib/wildcard-pair/Product.rb

@@ -1,14 +1,9 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
+require_relative 'Object.rb'
 
 module WildcardPair
-  class Product
-
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+  class Product < WildcardPair::Object
 
     attr_accessor :name, :merchant, :brand, :description, :gender, :rating, :rating_scale, :rating_count, :sizes, :model, :app_link_ios, :app_link_android
     attr_reader :colors, :images, :related_items, :referenced_items, :options
@@ -20,16 +15,6 @@ module WildcardPair
     validate :validateColors
     validate :validateImages
 
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def attributes
-      instance_values
-    end
-
     def metatags=(metatags)
       if metatags.nil? || !metatags.is_a?(Hash)
         return
@@ -114,19 +99,5 @@ module WildcardPair
         return
       end
     end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Product is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end

data/lib/wildcard-pair/ProductCard.rb

@@ -1,43 +1,23 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
+require_relative 'Card.rb'
 
 module WildcardPair
-  class ProductCard
+  class ProductCard < WildcardPair::Card
     private
 
-    attr_accessor :offers, :product, :card_type, :pair_version
+    attr_accessor :offers, :product
 
     public
 
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+    attr_reader :offers, :product
 
-    attr_accessor :web_url
-    attr_reader :offers, :card_type, :pair_version, :product
-
-    validates :web_url, presence: true
     validate :validateOffers
     validate :validateProduct
 
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-
+      super
       @card_type = 'product'
-
-      if !Gem.loaded_specs['wildcard-pair'].nil?
-        @pair_version = Gem.loaded_specs['wildcard-pair'].version.to_s
-      else
-        @pair_version = "unknown"
-      end
-    end
-
-    def attributes
-      instance_values
     end
 
     def populate_from_metatags(web_url)
@@ -99,18 +79,6 @@ module WildcardPair
       end
     end
 
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Product Card is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
 
   end
 end

data/lib/wildcard-pair/Rating.rb

@@ -1,14 +1,9 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
+require_relative 'Object.rb'
 
 module WildcardPair
-  class Rating
-
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+  class Rating < WildcardPair::Object
 
     # required fields
     attr_accessor :rating, :minimum_rating, :maximum_rating
@@ -19,29 +14,5 @@ module WildcardPair
     validates :minimum_rating, presence: true, numericality: {greater_than_or_equal_to: 0}
     validates :maximum_rating, presence: true, numericality: {greater_than_or_equal_to: 0}
     validates :number_of_ratings, allow_nil: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
-
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def attributes
-      instance_values
-    end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Video is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end

data/lib/wildcard-pair/Review.rb

@@ -1,16 +1,9 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
-require_relative 'Media.rb'
+require_relative 'ObjectWithMedia.rb'
 
 module WildcardPair
-  class Review
-
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
-    include WildcardPair::Media
+  class Review < WildcardPair::ObjectWithMedia
 
     # required fields
     attr_accessor :title, :html_content
@@ -23,7 +16,6 @@ module WildcardPair
     validates :title, presence: true
     validates :html_content, presence: true
 
-    validate :validate_media
     validate :validate_rating
 
     def metatags=(metatags)
@@ -40,45 +32,10 @@ module WildcardPair
       self.app_link_android=metatags['applink_android']
     end
 
-    def media=(media)
-      if media.is_a? Video
-        @media = map_hash(media, Media::Video.new)
-      elsif media.is_a? Image
-        @media = map_hash(media, Media::Image.new)
-      elsif media.is_a? Hash
-        if media[:type] == 'video'
-          @media = map_hash(media, Media::Video.new)
-        elsif media[:type] == 'image'
-          @media = map_hash(media, Media::Image.new)
-        else
-          @media = media
-        end
-      end
-    end
-
-    def validate_media
-      if @media.nil? then return end
-
-      if !@media.is_a? Media or !@media.valid?
-        errors.add(:media, "Media is invalid")
-        return false
-      end
-    end
-
     def rating=(rating)
       @rating = map_hash(rating, WildcardPair::Rating.new)
     end
 
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def attributes
-      instance_values
-    end
-
     def validate_rating
       if @rating.nil? then return end
 
@@ -87,19 +44,5 @@ module WildcardPair
         return false
       end
     end
-
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Video is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end

data/lib/wildcard-pair/ReviewCard.rb

@@ -1,42 +1,22 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
+require_relative 'Card.rb'
 
 module WildcardPair
-  class ReviewCard
+  class ReviewCard < WildcardPair::Card
     private
 
-    attr_accessor :review, :card_type, :pair_version
+    attr_accessor :review
 
     public
 
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
+    attr_reader :review
 
-    attr_accessor :web_url
-    attr_reader :review, :card_type, :pair_version
-
-    validates :web_url, presence: true
     validate :validate_review
 
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-
+      super
       @card_type = 'review'
-
-      if !Gem.loaded_specs['wildcard-pair'].nil?
-        @pair_version = Gem.loaded_specs['wildcard-pair'].version.to_s
-      else
-        @pair_version = "unknown"
-      end
-    end
-
-    def attributes
-      instance_values
     end
 
     def populate_from_metatags(web_url)
@@ -64,19 +44,6 @@ module WildcardPair
       end
     end
 
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Review Card is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
 end
 

data/lib/wildcard-pair/Summary.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'ObjectWithMedia.rb'
+
+module WildcardPair  
+  class Summary < WildcardPair::ObjectWithMedia
+
+    attr_accessor :title, :description
+
+    validates :title, presence: true
+    validates :description, presence: true
+  end
+end

data/lib/wildcard-pair/SummaryCard.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'Card.rb'
+
+module WildcardPair
+  class SummaryCard < WildcardPair::Card
+    private
+
+    attr_accessor :summary
+
+    public
+
+    attr_reader :summary
+
+    validate :validate_summary
+
+    def initialize(attributes = {})
+      super
+      @card_type = 'summary'
+    end
+
+    def summary=(summary)
+      @summary = map_hash(summary, WildcardPair::Summary.new)
+    end
+
+    def validate_summary
+      if @summary.nil? || !@summary.is_a?(Summary)
+        errors.add(:summary, "A summary is required")
+        return
+      end
+
+      if !@summary.valid?
+        @summary.errors.each do |error, msg|
+           errors["summary[%s]" % error] = msg
+        end
+      end
+    end
+  end
+end
+

data/lib/wildcard-pair/Target.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby -wKU
+
+require_relative 'Object.rb'
+
+module WildcardPair  
+  class Target < WildcardPair::Object
+
+    attr_accessor :url, :title, :description, :publication_date
+
+    validates :url, presence: true
+  end
+end

data/lib/wildcard-pair/VideoCard.rb

@@ -1,44 +1,24 @@
 #!/usr/bin/env ruby -wKU
 
-require 'active_model'
-require_relative 'hash_mappable.rb'
-require_relative 'Media.rb'
+require_relative 'Card.rb'
 
 module WildcardPair
-  class VideoCard
+  class VideoCard < WildcardPair::Card
     private
 
-    attr_accessor :media, :card_type, :pair_version
+    attr_accessor :media
 
     public
 
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include WildcardPair::HashMappable
     include WildcardPair::Media
 
-    attr_accessor :web_url
-    attr_reader :media, :card_type, :pair_version
+    attr_reader :media
 
-    validates :web_url, presence: true
     validate :validate_media
 
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-
+      super
       @card_type = 'video'
-
-      if !Gem.loaded_specs['wildcard-pair'].nil?
-        @pair_version = Gem.loaded_specs['wildcard-pair'].version.to_s
-      else
-        @pair_version = "unknown"
-      end
-    end
-
-    def attributes
-      instance_values
     end
 
     def populate_from_metatags(web_url)
@@ -66,19 +46,5 @@ module WildcardPair
       end
     end
 
-    #exclude validation fields in the JSON output
-    def as_json(options={})
-      super(options.merge({:except => [:errors, :validation_context]}))
-    end
-
-    def to_json(options={})
-      if self.valid?
-        super(options)
-      else
-        raise "Video Card is not valid - please remedy the following errors:" << self.errors.messages.to_s
-      end    
-    end 
-
   end
-end
-
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wildcard-pair
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.6
 platform: ruby
 authors:
 - Karthik Senthil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -81,10 +81,16 @@ files:
 - lib/wildcard-pair.rb
 - lib/wildcard-pair/Article.rb
 - lib/wildcard-pair/ArticleCard.rb
+- lib/wildcard-pair/Card.rb
 - lib/wildcard-pair/Color.rb
+- lib/wildcard-pair/Creator.rb
+- lib/wildcard-pair/ImageCard.rb
+- lib/wildcard-pair/LinkCard.rb
 - lib/wildcard-pair/Media.rb
 - lib/wildcard-pair/Media/Image.rb
 - lib/wildcard-pair/Media/Video.rb
+- lib/wildcard-pair/Object.rb
+- lib/wildcard-pair/ObjectWithMedia.rb
 - lib/wildcard-pair/Offer.rb
 - lib/wildcard-pair/Price.rb
 - lib/wildcard-pair/Product.rb
@@ -94,6 +100,9 @@ files:
 - lib/wildcard-pair/Rating.rb
 - lib/wildcard-pair/Review.rb
 - lib/wildcard-pair/ReviewCard.rb
+- lib/wildcard-pair/Summary.rb
+- lib/wildcard-pair/SummaryCard.rb
+- lib/wildcard-pair/Target.rb
 - lib/wildcard-pair/VideoCard.rb
 - lib/wildcard-pair/hash_mappable.rb
 - lib/wildcard-pair/util/extract_metatags.rb
@@ -117,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Wildcard Pair Ruby SDK