npr 1.1.0 → 1.2.0

data/lib/npr/entity/audio.rb

@@ -8,18 +8,17 @@ module NPR
       shallow_attribute "title", "duration", "description", "rightsHolder"
       has_one "permissions", :class_name => NPR::Entity::Permissions
       has_one "formats", :key => "format", :class_name => NPR::Entity::Formats
-      
+
       #-------------------
       # +stream+ returns true if "active" is set to "true"
-      # 
       def initialize(json)
         @id   = json["id"].to_i
         @type = json["type"]
-                
+
         if json["stream"]
           @stream = json["stream"]["active"] == "true"
         end
-        
+
         create_relations(json)
         extract_shallow_attributes(json)
       end

data/lib/npr/entity/author.rb

@@ -7,13 +7,13 @@ module NPR
       attr_accessor :id, :num
       shallow_attribute "title"
       has_one "link", :class_name => NPR::Entity::Link
-      
+
       #-----------------
-      
+
       def initialize(json)
         @id  = json["id"].to_i
         @num = json["num"].to_i
-        
+
         create_relations(json)
         extract_shallow_attributes(json)
       end

data/lib/npr/entity/base.rb

@@ -8,7 +8,7 @@ module NPR
     class Base
       include NPR::Concern::Relation
       include NPR::Concern::ShallowAttributes
-      
+
       #-----------------
       # Override this
       def initialize(json={})

data/lib/npr/entity/book.rb

@@ -7,9 +7,9 @@ module NPR
       attr_accessor :id
       shallow_attribute "title"
       has_one "link", :class_name => NPR::Entity::Link
-      
+
       #---------------------
-      
+
       def initialize(json)
         @id = json["id"].to_i
 

data/lib/npr/entity/book_edition.rb

@@ -7,17 +7,17 @@ module NPR
       attr_accessor :id, :format_num
       shallow_attribute "isbn", "publisher", "pubDate", "pagination", "listPrice"
       has_one "book", :class_name => NPR::Entity::Book
-      
+
       #---------------------
-      # Note that the "format" property is represented on this 
+      # Note that the "format" property is represented on this
       # object as "format_num", because of Kernel's "format"
       def initialize(json)
-        @id         = json["id"].to_i
-        
+        @id = json["id"].to_i
+
         if json["format"]
           @format_num = json["format"]["$text"].to_i
         end
-        
+
         extract_shallow_attributes(json)
         create_relations(json)
       end

data/lib/npr/entity/byline.rb

@@ -4,12 +4,13 @@
 module NPR
   module Entity
     class Byline < Base
+      include NPR::Concern::LinksAssociation
+
       attr_accessor :id
-      has_many "links", :key => "link", :class_name => NPR::Entity::Link
       has_one "name", :class_name => NPR::Entity::Name
-      
+
       #-----------------
-      
+
       def initialize(json)
         @id = json["id"].to_i
         create_relations(json)

data/lib/npr/entity/crop.rb

@@ -5,9 +5,9 @@ module NPR
   module Entity
     class Crop < Base
       attr_accessor :type, :src, :width, :height
-      
+
       #---------------
-      
+
       def initialize(json)
         @type   = json["type"]
         @src    = json["src"]

data/lib/npr/entity/enlargement.rb

@@ -6,9 +6,9 @@ module NPR
     class Enlargement < Base
       attr_accessor :src
       shallow_attribute "caption"
-      
+
       #---------------
-      
+
       def initialize(json)
         @src = json["src"]
         extract_shallow_attributes(json)

data/lib/npr/entity/external_asset.rb

@@ -0,0 +1,27 @@
+##
+# NPR::Entity::ExternalAsset
+#
+# Audio permissions
+#
+module NPR
+  module Entity
+    class ExternalAsset < Base
+      attr_accessor :id, :type
+
+      shallow_attribute \
+        "url",
+        "oEmbed",
+        "externalId",
+        "credit",
+        "parameters",
+        "caption"
+
+      def initialize(json)
+        @id   = json["id"].to_i
+        @type = json["type"]
+
+        extract_shallow_attributes(json)
+      end
+    end
+  end
+end

data/lib/npr/entity/formats.rb

@@ -7,9 +7,9 @@ module NPR
     class Formats < Base
       has_many "mp3s", :key => "mp3", :class_name => NPR::Entity::MP3
       shallow_attribute "wm", "rm", "mediastream"
-      
+
       #--------------------
-      
+
       def initialize(json)
         extract_shallow_attributes(json)
         create_relations(json)

data/lib/npr/entity/image.rb

@@ -12,7 +12,7 @@ module NPR
 
 
       # NOTE that the "link" attribute here is not cast into a Link
-      # object, and the "url" parameter is ignored. Instead, just 
+      # object, and the "url" parameter is ignored. Instead, just
       # calling +image.link+ will return the URL parameter.
       def initialize(json)
         @id        = json["id"].to_i
@@ -20,18 +20,18 @@ module NPR
         @width     = json["width"].to_i
         @src       = json["src"]
         @hasBorder = json["hasBorder"] == "true"
-        
+
         if json["link"]
           @link = json["link"]["url"]
         end
-        
+
         extract_shallow_attributes(json)
         create_relations(json)
       end
 
 
       # Find a crop by its type.
-      # 
+      #
       # Arguments:
       #
       # * (String) type - the type of crop you're looking for

data/lib/npr/entity/intro_text.rb

@@ -5,14 +5,14 @@ module NPR
   module Entity
     class IntroText < Base
       attr_accessor :num, :content
-      
+
       def initialize(json)
         @num     = json["num"].to_i
-        @content = json["$text"] 
+        @content = json["$text"]
       end
-      
+
       #--------------------
-      
+
       def to_s
         @content.to_s
       end

data/lib/npr/entity/link.rb

@@ -5,16 +5,16 @@ module NPR
   module Entity
     class Link < Base
       attr_accessor :type, :content
-      
+
       #---------------------
-    
+
       def initialize(json)
         @content = json["$text"]
         @type    = json["type"]
       end
 
       #---------------------
-    
+
       def to_s
         @content.to_s
       end

data/lib/npr/entity/list.rb

@@ -4,9 +4,7 @@
 module NPR
   module Entity
     class List < Base
-      #------------------
-
-      has_many "links",   :key => "link",  :class_name => NPR::Entity::Link
+      include NPR::Concern::LinksAssociation
       has_many "stories", :key => "story", :class_name => NPR::Entity::Story
 
       #------------------
@@ -18,7 +16,7 @@ module NPR
       )
 
       #------------------
-    
+
       def initialize(json)
         extract_shallow_attributes(json)
         create_relations(json)

data/lib/npr/entity/list_text.rb

@@ -6,9 +6,9 @@ module NPR
     class ListText < Base
       attr_accessor :id, :tag
       has_many "paragraphs", :key => "paragraph", :class_name => NPR::Entity::Paragraph
-      
+
       #-------------------
-      
+
       def initialize(json)
         @id = json["id"].to_i
         @tag = json["tag"]

data/lib/npr/entity/member.rb

@@ -13,7 +13,7 @@ module NPR
       has_one "byline",      :class_name => NPR::Entity::MemberByline
 
       #------------------
-      
+
       def initialize(json)
         @id = json["id"].to_i
         create_relations(json)

data/lib/npr/entity/member_byline.rb

@@ -5,9 +5,9 @@ module NPR
   module Entity
     class MemberByline < Base
       attr_accessor :refId, :num
-      
+
       #-------------------
-      
+
       def initialize(json)
         @refId = json["refId"].to_i
         @num   = json["num"].to_i

data/lib/npr/entity/member_promo_art.rb

@@ -5,9 +5,9 @@ module NPR
   module Entity
     class MemberPromoArt < Base
       attr_accessor :refId, :num
-      
+
       #-------------------
-      
+
       def initialize(json)
         @refId = json["refId"].to_i
         @num   = json["num"].to_i

data/lib/npr/entity/mp3.rb

@@ -5,16 +5,16 @@ module NPR
   module Entity
     class MP3 < Base
       attr_accessor :type, :content
-      
+
       #-----------------
-      
+
       def initialize(json)
         @type    = json["type"]
         @content = json["$text"]
       end
-      
+
       #-----------------
-      
+
       def to_s
         @content.to_s
       end

data/lib/npr/entity/name.rb

@@ -7,16 +7,16 @@ module NPR
   module Entity
     class Name < Base
       attr_accessor :personId, :content
-      
+
       #-------------------
-      
+
       def initialize(json)
         @personId = json["personId"].to_i
         @content  = json["$text"]
       end
-      
+
       #-------------------
-      
+
       def to_s
         @content.to_s
       end

data/lib/npr/entity/organization.rb

@@ -6,10 +6,10 @@ module NPR
     class Organization < Base
       attr_accessor :orgId, :orgAbbr
       shallow_attribute "name", "website"
-      
+
       def initialize(json)
         extract_shallow_attributes(json)
-        
+
         @orgId   = json["orgId"].to_i
         @orgAbbr = json["orgAbbr"]
       end

data/lib/npr/entity/paragraph.rb

@@ -11,14 +11,14 @@ module NPR
       attr_accessor :num, :content
 
       #---------------------
-    
+
       def initialize(json)
         @content = json["$text"]
         @num     = json["num"].to_i
       end
 
       #---------------------
-    
+
       def to_s
         @content.to_s
       end

data/lib/npr/entity/parent.rb

@@ -0,0 +1,23 @@
+##
+# NPR::Entity::Parent
+#
+module NPR
+  module Entity
+    class Parent < Base
+      include NPR::Concern::LinksAssociation
+
+      attr_accessor :id, :type
+      shallow_attribute "title"
+
+      #-------------------
+
+      def initialize(json)
+        @id      = json["id"].to_i
+        @type    = json["type"]
+
+        extract_shallow_attributes(json)
+        create_relations(json)
+      end
+    end # Program
+  end # Entity
+end # NPR

data/lib/npr/entity/permissions.rb

@@ -7,12 +7,25 @@ module NPR
   module Entity
     class Permissions < Base
       attr_accessor :download, :stream, :embed
-      
+
       def initialize(json)
         @download = json["download"]["allow"] == "true" if json["download"]
         @stream   = json["stream"]["allow"]   == "true" if json["stream"]
         @embed    = json["embed"]["allow"]    == "true" if json["embed"]
       end
+
+
+      def download?
+        !!@download
+      end
+
+      def stream?
+        !!@stream
+      end
+
+      def embed?
+        !!@embed
+      end
     end
   end
 end

data/lib/npr/entity/program.rb

@@ -6,19 +6,21 @@ module NPR
     class Program < Base
       attr_accessor :id, :code, :content
 
-      #---------------------
-    
+      #-------------------
+
       def initialize(json)
         @id      = json["id"].to_i
         @content = json["$text"]
         @code    = json["code"]
       end
 
-      #---------------------
-    
-      def to_s
+      #-------------------
+
+      def title
         @content.to_s
       end
+
+      alias_method :to_s, :title
     end # Program
   end # Entity
 end # NPR

data/lib/npr/entity/promo_art.rb

@@ -5,9 +5,9 @@ module NPR
   module Entity
     class PromoArt < Image
       attr_accessor :bookEditionId
-      
+
       #--------------------
-      
+
       def initialize(json)
         @bookEditionId = json["bookEditionId"].to_i
         super

data/lib/npr/entity/promo_art_book_edition.rb

@@ -5,9 +5,9 @@ module NPR
   module Entity
     class PromoArtBookEdition < Base
       attr_accessor :refId, :num
-      
+
       #-------------------
-      
+
       def initialize(json)
         @refId = json["refId"].to_i
         @num   = json["num"].to_i
@@ -15,4 +15,3 @@ module NPR
     end # PromoArtBookEdition
   end # Entity
 end # NPR
-    

data/lib/npr/entity/provider.rb

@@ -3,18 +3,18 @@
 #
 module NPR
   module Entity
-    class Provider < Base      
+    class Provider < Base
       attr_accessor :content, :url
 
       #----------------
-      
+
       def initialize(json)
         @content = json["$text"]
         @url     = json["url"]
       end
-      
+
       #----------------
-      
+
       def to_s
         @content.to_s
       end

data/lib/npr/entity/pull_quote.rb

@@ -6,7 +6,7 @@ module NPR
     class PullQuote < Base
       attr_accessor :id
       shallow_attribute "text", "person", "date"
-      
+
       def initialize(json)
         extract_shallow_attributes(json)
         @id = json["id"].to_i

data/lib/npr/entity/related_link.rb

@@ -4,15 +4,15 @@
 module NPR
   module Entity
     class RelatedLink < Base
+      include NPR::Concern::LinksAssociation
+
       attr_accessor :id, :type
-      
-      has_many "links", :key => "link", :class_name => NPR::Entity::Link
       shallow_attribute "caption"
-      
+
       def initialize(json)
         extract_shallow_attributes(json)
         create_relations(json)
-        
+
         @id   = json["id"].to_i
         @type = json["type"]
       end

data/lib/npr/entity/show.rb

@@ -6,13 +6,13 @@ module NPR
     class Show < Base
       attr_accessor :program
       shallow_attribute "showDate", "segNum"
-      
+
       def initialize(json)
         extract_shallow_attributes(json)
-        
+
         if program = json["program"]
           @program = NPR::Entity::Program.new(program)
-        end        
+        end
       end
     end # Show
   end # Entity