wideopenspaces-flickry 0.1.6 → 0.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:patch: 6
+:minor: 2
+:patch: 0
 :major: 0

data/lib/flickry.rb

@@ -3,6 +3,7 @@ require 'super_struct'
 
 require 'flickry/base'
 require 'flickry/location'
+require 'flickry/tag'
 require 'flickry/person'
 require 'flickry/sizes'
 require 'flickry/photo'

data/lib/flickry/comment.rb

@@ -1,39 +1,28 @@
 module Flickry
-  class Comment < Flickry::Base
+  class Comment < String
+    attr_reader :comment_id, :author_id, :authorname, :datecreate, :permalink
     def initialize(comment)
-      super(nil)
+      super(comment.to_s)
       @comment_id = comment.id
-      extract_attrs!(comment, [:authorname, :datecreate, :permalink])
-      self.content = comment.to_s
-      self.author_id = comment.author
-    end
-    
-    def comment_id
-      @comment_id
-    end
-    
-    def to_s
-      self.content
-    end
-    
-    # Clean permalink
-    def to_url
-      clean(self.permalink)
+      @author_id = comment.author
+      @authorname = comment.authorname
+      @datecreate = comment.datecreate
+      @permalink = comment.permalink
     end
     
     # datecreate converted into Time object
     def created_at
-      Time.at(self.datecreate.to_i)
+      Time.at(@datecreate.to_i)
     end
     
     # Get a Person record for the author_id
     def author
-      Flickry::Person.find(self.author_id)
+      Flickry::Person.find(@author_id)
     end
     
     # name = authornane
     def name
-      self.authorname
+      @authorname
     end
   end
 end

data/lib/flickry/location.rb

@@ -1,8 +1,18 @@
+require 'flickry/place'
+
 module Flickry
   class Location < Flickry::Base
     def initialize(locus)
       super(nil)
-      extract_attrs!(locus, [:accuracy, :country, :county, :latitude, :locality, :longitude, :neighbourhood, :place_id, :region, :woeid])
+      extract_attrs!(locus, [:accuracy, :latitude, :longitude, :place_id, :woeid])
+      
+      [:country, :county, :locality, :neighbourhood, :region].each do |scale|
+        if locus.respond_to?(scale) and loc = locus.send(scale)
+          self[scale] = Flickry::Place.new(loc, scale)
+        else
+          self[scale] = nil
+        end
+      end
     end
   end
 end

data/lib/flickry/photo.rb

@@ -18,7 +18,11 @@ module Flickry
       })
       self.location = Flickry::Location.new(foto.respond_to?(:location) ? foto.location : nil)
       self.owner    = Flickry::Person.new(foto.respond_to?(:owner) ? foto.owner : nil)
-        
+      
+      _tags = self.tags.dup
+      self.tags = _tags.collect do |t|
+        Flickry::Tag.new(t)
+      end
     end
 
     # Lazily fetches the photo's sizes when called, memoizes so later calls are faster...
@@ -42,6 +46,11 @@ module Flickry
       return @comments
     end     
     
+    # Join tags into a single string 
+    def tag_list(separator = ', ')
+      self.tags.join(separator)
+    end
+    
     def visible_to_family?
       self.visibility.isfamily == 1
     end

data/lib/flickry/place.rb

@@ -0,0 +1,12 @@
+module Flickry
+  class Place < String
+    attr_reader :place_id, :woeid, :scale, :name
+    def initialize(loc, scale)
+      super(loc.to_s)
+      @place_id = loc.place_id
+      @woeid    = loc.woeid
+      @scale    = scale
+      @name     = self.to_s
+    end
+  end
+end

data/lib/flickry/tag.rb

@@ -0,0 +1,21 @@
+module Flickry
+  class Tag < String
+    attr_reader :tag_id, :machine_tag, :author_id, :name
+    def initialize(tag)
+      super(tag.to_s)
+      @tag_id       = tag.id
+      @machine_tag  = tag.machine_tag
+      @author_id    = tag.author
+      @name         = self.to_s
+    end
+    
+    def machine_tag?
+      @machine_tag == 0 ? false : true
+    end
+    
+    # Get a Person record for the author_id
+    def author
+      Flickry::Person.find(@author_id)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wideopenspaces-flickry
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jacob Stetser
@@ -37,8 +37,10 @@ files:
 - lib/flickry/location.rb
 - lib/flickry/person.rb
 - lib/flickry/photo.rb
+- lib/flickry/place.rb
 - lib/flickry/size.rb
 - lib/flickry/sizes.rb
+- lib/flickry/tag.rb
 - lib/flickry.rb
 - lib/super_struct.rb
 - test/flickry_test.rb