wideopenspaces-flickry 0.1.3 → 0.1.5

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:minor: 1
+:patch: 5
+:major: 0

data/lib/flickry/base.rb

@@ -39,5 +39,9 @@ module Flickry
       end
       return str
     end
+    
+    def clean(text)
+      text.gsub(' ','').gsub("\\",'')
+    end
   end
 end

data/lib/flickry/comment.rb

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

data/lib/flickry/person.rb

@@ -2,7 +2,23 @@ module Flickry
   class Person < Flickry::Base
     def initialize(user)
       super(nil)
-      extract_attrs!(user, [:location, :nsid, :realname, :username])
+      extract_attrs!(user, [:location, :nsid, :realname, :username, :photosurl, :profileurl])
+    end
+    
+    def self.find(nsid)
+      if person = flickr.people.getInfo(:user_id => nsid)
+        return new(person)
+      else
+        return nil
+      end
+    end
+    
+    def profile
+      clean(self.profileurl)
+    end
+    
+    def photos
+      clean(self.photosurl)
     end
   end
 end

data/lib/flickry/photo.rb

@@ -3,9 +3,10 @@ module Flickry
     def initialize(flickr_id)
       super(nil)
       foto = flickr.photos.getInfo(:photo_id => flickr_id)
+      self.raw_photo = foto
       self.photo_id = flickr_id
 
-      extract_attrs!(foto, [:comments, :dateuploaded, :description, :farm, :id, :isfavorite, :license,
+      extract_attrs!(foto, [:dateuploaded, :description, :farm, :id, :isfavorite, :license,
         :media, :notes, :originalformat, :originalsecret, :rotation, :secret, :server, :tags,
         :title, :urls])
       extract_attrs_into_substructs!(foto, {
@@ -17,10 +18,30 @@ 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)
-      
-      self.sizes    = Flickry::Sizes.new(flickr.photos.getSizes(:photo_id => self.photo_id))
+        
+    end
+
+    # Lazily fetches the photo's sizes when called, memoizes so later calls are faster...
+    def sizes
+      @sizes ||= Flickry::Sizes.new(flickr.photos.getSizes(:photo_id => self.photo_id))
     end
     
+    # Lazily fetches the photo's comments when called, memoizes so later calls are faster...
+    def comments
+      return @comments if @comments
+      
+      if raw_photo.comments.to_i == 0
+        @comments = []
+      else
+        @comments = []
+        flickr_comments = flickr.photos.comments.getList(:photo_id => self.photo_id)
+        flickr_comments.each do |comment|
+          @comments << Flickry::Comment.new(comment)
+        end
+      end
+      return @comments
+    end     
+    
     def visible_to_family?
       self.visibility.isfamily == 1
     end
@@ -32,20 +53,6 @@ module Flickry
     def visible_to_public?
       self.visibility.ispublic == 1
     end
-
-    def to_flickr_photo
-      { :secret => self.secret,
-        :originalsecret => self.originalsecret,
-        :farm => self.farm,
-        :server => self.server,
-        :content_type => self.originalformat,
-        :content => self.description,
-        :created_at => Time.parse(self.dates.taken) }
-    end
-
-    def to_story
-      return {:title => self.title, :slug => self.photo_id, :published_at => self.dates.taken }
-    end
-
+    
   end
 end

data/lib/flickry/size.rb

@@ -13,9 +13,5 @@ module Flickry
       clean(self.source)
     end
     
-    protected
-    def clean(text)
-      text.gsub(' ','').gsub("\\",'')
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wideopenspaces-flickry
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jacob Stetser
@@ -9,17 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-16 00:00:00 -08:00
+date: 2009-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: flickraw
+  name: wideopenspaces-flickraw
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.5
+        version: 0.5.2
     version: 
 description: Interface to Flickr API to make working with API responses safer and easier. DO NOT USE ME YET!
 email: jake@wideopenspac.es
@@ -30,14 +30,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- MIT-LICENSE
-- README
-- Rakefile
-- flickry.gemspec
-- init.rb
-- install.rb
+- VERSION.yml
 - lib/flickry
 - lib/flickry/base.rb
+- lib/flickry/comment.rb
 - lib/flickry/location.rb
 - lib/flickry/person.rb
 - lib/flickry/photo.rb
@@ -45,14 +41,14 @@ files:
 - lib/flickry/sizes.rb
 - lib/flickry.rb
 - lib/super_struct.rb
-- rails/init.rb
-- tasks/flickry_tasks.rake
-- uninstall.rb
+- test/flickry_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/wideopenspaces/flickry
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --inline-source
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -69,11 +65,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: flickry
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Friendlier interface to flickr API, uses flickraw underneath
-test_files: 
-- test/flickry_test.rb
-- test/test_helper.rb
+test_files: []
+

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -1,13 +0,0 @@
-Flickry
-=======
-
-Introduction goes here.
-
-
-Example
-=======
-
-Example goes here.
-
-
-Copyright (c) 2008 [name of plugin creator], released under the MIT license

data/Rakefile

@@ -1,23 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the flickry plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the flickry plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Flickry'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/flickry.gemspec

@@ -1,35 +0,0 @@
-Gem::Specification.new do |s|
-  s.name     = "flickry"
-  s.version  = "0.1.3"
-  s.date     = "2008-11-16"
-  s.summary  = "Friendlier interface to flickr API, uses flickraw underneath"
-  s.email    = "jake@wideopenspac.es"
-  s.homepage = "http://github.com/wideopenspaces/flickry"
-  s.rubyforge_project = "flickry"
-  s.description = "Interface to Flickr API to make working with API responses safer and easier. DO NOT USE ME YET!"
-  s.has_rdoc = true
-  s.authors  = ["Jacob Stetser"]
-  s.files    = ["MIT-LICENSE",
-    "README",
-    "Rakefile",
-    "flickry.gemspec",
-    "init.rb",
-    "install.rb",
-    "lib/flickry",
-    "lib/flickry/base.rb",
-    "lib/flickry/location.rb",
-    "lib/flickry/person.rb",
-    "lib/flickry/photo.rb",
-    "lib/flickry/size.rb",
-    "lib/flickry/sizes.rb",
-    "lib/flickry.rb",
-    "lib/super_struct.rb",
-    "rails/init.rb",
-    "tasks/flickry_tasks.rake",
-    "uninstall.rb"]
-  s.test_files = ["test/flickry_test.rb",
-    "test/test_helper.rb"]
-  s.rdoc_options = []
-  s.extra_rdoc_files = []
-  s.add_dependency("flickraw", [" 0.4.5"])
-end

data/init.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + "/rails/init"

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/rails/init.rb

@@ -1,21 +0,0 @@
-# Copyright (c) 2008 Jacob Stetser
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require 'flickry'

data/tasks/flickry_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :flickry do
-#   # Task goes here
-# end

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here