tumblrb 1.0.6 → 2.0.1

metadata

@@ -2,15 +2,15 @@
 name: tumblrb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.6
+  version: 2.0.1
 platform: ruby
 authors: 
-- Jesse Reiss
+- thegorgon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -24,25 +24,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.4.4
+        version: 1.6.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: curb
+  name: faraday
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.7.15
+        version: 0.7.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -51,12 +51,34 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.2.0
   type: :runtime
   version_requirements: *id004
-description: A Ruby wrapper for the Tumblr XML API
+- !ruby/object:Gem::Dependency 
+  name: redis-objects
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id006
+description: A simple blogging platform built on Tumblr and Redis
 email: 
 - jessereiss@gmail.com
 executables: []
@@ -66,23 +88,31 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.mkd
-- LICENSE.mkd
+- .rvmrc
 - Gemfile
-- tumblrb.gemspec
+- Gemfile.lock
+- LICENSE.mkd
+- README.mkd
 - lib/tumblr.rb
-- lib/tumblr/answer.rb
-- lib/tumblr/audio.rb
-- lib/tumblr/conversation.rb
-- lib/tumblr/item.rb
-- lib/tumblr/link.rb
-- lib/tumblr/page.rb
-- lib/tumblr/photo.rb
+- lib/tumblr/api.rb
+- lib/tumblr/blog.rb
+- lib/tumblr/config.rb
+- lib/tumblr/middleware/params.rb
+- lib/tumblr/middleware/parsing.rb
+- lib/tumblr/object.rb
+- lib/tumblr/objects/answer.rb
+- lib/tumblr/objects/audio.rb
+- lib/tumblr/objects/chat.rb
+- lib/tumblr/objects/link.rb
+- lib/tumblr/objects/photo.rb
+- lib/tumblr/objects/post.rb
+- lib/tumblr/objects/text.rb
+- lib/tumblr/objects/user.rb
+- lib/tumblr/objects/video.rb
+- lib/tumblr/query.rb
 - lib/tumblr/quote.rb
-- lib/tumblr/regular.rb
-- lib/tumblr/user.rb
 - lib/tumblr/version.rb
-- lib/tumblr/video.rb
+- tumblrb.gemspec
 homepage: https://github.com/thegorgon/tumblrb
 licenses: []
 
@@ -91,7 +121,6 @@ rdoc_options: []
 
 require_paths: 
 - lib
-- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -107,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tumblrb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Tumblr API

data/lib/tumblr/answer.rb

@@ -1,21 +0,0 @@
-module Tumblr
-  class Answer < Item
-    attr_accessor :question, :answer
-    
-    def as_json
-      super.merge!({
-        :question => question,
-        :answer => answer
-      })
-    end
-
-    private
-    
-    def parse_xml_node(node)
-      super(node)
-      self.caption = node.css('question').first.try(:content)
-      self.source = node.css('answer').first.try(:content)
-      self
-    end
-  end
-end

data/lib/tumblr/audio.rb

@@ -1,21 +0,0 @@
-module Tumblr
-  class Audio < Item
-    attr_accessor :caption, :player
-  
-    def as_json
-      super.merge!({
-        :caption => caption,
-        :player => player
-      })
-    end
-  
-    private
-    
-    def parse_xml_node(node)
-      super(node)
-      self.caption = node.css('audio-caption').first.try(:content)
-      self.source = node.css('audio-player').first.try(:content)
-      self
-    end    
-  end
-end

data/lib/tumblr/conversation.rb

@@ -1,35 +0,0 @@
-module Tumblr
-  class Conversation < Item
-    attr_accessor :title, :text, :lines
-    
-    class Line < Struct.new(:name, :label, :content)
-      def as_json
-        {
-          :name => name,
-          :label => label,
-          :content => content
-        }
-      end
-    end
-
-    def as_json
-      super.merge!({
-        :title => title,
-        :text => text,
-        :lines => lines.map { |l| l.as_json }
-      })
-    end
-
-    private
-    
-    def self.parse_xml_node(node)
-      super(node)
-      self.title = node.css('conversation-title').first.try(:content)
-      self.text = node.css('conversation-text').first.try(:content)
-      self.lines = node.css("convesation line").collect do |line|
-        Line.new(line["name"], line["label"], label.content)
-      end
-      self
-    end    
-  end
-end

data/lib/tumblr/item.rb

@@ -1,110 +0,0 @@
-module Tumblr
-  class Item
-    PAGE_SIZE = 20
-    attr_accessor :id, :slug, :type, :date, :format, :xml
-    attr_accessor :tags
-    
-    def self.paginate(params={})
-      params[:num] = params[:per_page].to_i > 0 ? params[:per_page].to_i : PAGE_SIZE
-      params[:start] = ([params[:page].to_i, 1].max - 1) * params[:num]
-      params.delete(:limit)
-      params.delete(:page)
-      if Tumblr.user
-        params[:email] = Tumblr.user.email
-        params[:password] = Tumblr.user.password
-      end
-      page_xml = xml(params)
-      items = parse(page_xml)
-      page_meta = page_xml.at("posts")
-      if page_meta
-        Tumblr::Page.new(items, page_meta["start"], page_meta["total"], params[:num])
-      else
-        Tumblr::Page.new(items, 0, items.length, params[:num])
-      end
-    end
-    
-    def self.find(id)
-      paginate(:page => 1, :per_page => 1).first
-    end
-    
-    def self.all(params={})
-      parse(xml(params))
-    end
-    
-    def self.xml(params={})
-      Nokogiri::XML(raw(params))
-    end
-    
-    def self.raw(params={})
-      curl = Curl::Easy.perform(url(params))
-      curl.body_str
-    end
-
-    def self.find(id)
-      parse(xml(:id => id.to_i)).first
-    end
-    
-    def to_param
-      "#{id}-#{slug}"
-    end
-    
-    def date_string
-      date.strftime("%B %d, %Y")
-    end
-    
-    def dom_class
-      self.class.to_s.split("::").last.underscore
-    end
-
-    def as_json
-      {
-        :id => id,
-        :slug => slug,
-        :date => date,
-        :type => type,
-        :format => format,
-        :tags => tags
-      }
-    end
-
-    private
-
-    def self.url(params)
-      url = "http://#{Tumblr.blog}/api/read"
-      if params.keys.length > 0
-        query = Addressable::URI.new
-        values = {}
-        params.each do |key, value|
-          values[key.to_s] = value.to_s
-        end
-        query.query_values = values
-        url += "?#{query.query}"
-      end 
-      url
-    end
-
-    def self.parse(xml)
-      xml.css("posts post").collect do |post|
-        object_class = "Tumblr::#{post['type'].classify}".constantize rescue nil
-        if object_class
-          object = object_class.new
-          object.send(:parse_xml_node, post)
-          object
-        end
-      end
-    end
-    
-    def parse_xml_node(node)
-      self.xml = node.to_s
-      self.id = node['id']
-      self.type = node['type']
-      self.slug = node['slug']
-      self.date = Time.at(node['unix-timestamp'].to_i)
-      self.format = node['format']
-      self.tags = node.css("tag").collect do |tag|
-        tag.content
-      end
-      self
-    end    
-  end
-end

data/lib/tumblr/link.rb

@@ -1,21 +0,0 @@
-module Tumblr
-  class Link < Item
-    attr_accessor :text, :url
-    
-    def as_json
-      super.merge!({
-        :text => text,
-        :url => url
-      })
-    end
-    
-    private
-    
-    def parse_xml_node(node)
-      super(node)
-      self.text = node.css('link-text').first.try(:content)
-      self.source = node.css('link-url').first.try(:content)
-      self
-    end    
-  end
-end

data/lib/tumblr/page.rb

@@ -1,39 +0,0 @@
-module Tumblr
-  class Page
-    include Enumerable
-    attr_accessor :items, :start, :total, :page_size
-    
-    def initialize(items, start, total, page_size)
-      self.items = items
-      self.start = start.to_i
-      self.total = total.to_i
-      self.page_size = page_size.to_i
-    end
-        
-    def page
-      (start / page_size).floor + 1      
-    end
-    
-    def success?
-      items.count > 0
-    end
-    
-    def next_page
-      (total - start) > page_size ? page + 1 : nil
-    end
-    
-    def previous_page
-      page > 1 ? page - 1 : nil
-    end
-    
-    [:size, :count, :length].each do |m|
-      define_method m do
-        @items.send(m)
-      end
-    end    
-    
-    def each(&block)
-      items.each(&block)
-    end
-  end
-end

data/lib/tumblr/photo.rb

@@ -1,37 +0,0 @@
-module Tumblr
-  class Photo < Item
-    attr_accessor :caption, :sizes
-  
-    class Size < Struct.new(:url, :max_width)
-      def as_json
-        {
-          :url => url,
-          :max_width => max_width
-        }
-      end
-    end
-
-    def max_size
-      sizes.last
-    end
-
-    def as_json
-      super.merge!({
-        :caption => caption,
-        :sizes => sizes.map { |size| size.as_json }
-      })
-    end
-
-    private
-    
-    def parse_xml_node(node)
-      super(node)
-      self.caption = node.css('photo-caption').first.try(:content)
-      self.sizes = node.css("photo-url").collect do |size|
-        Size.new(size.content, size['max-width'].to_i)
-      end
-      self.sizes.sort! { |s1, s2| s1.max_width <=> s2.max_width }
-      self
-    end    
-  end
-end

data/lib/tumblr/regular.rb

@@ -1,21 +0,0 @@
-module Tumblr
-  class Regular < Item
-    attr_accessor :title, :body
-    
-    def as_json
-      super.merge!({
-        :title => title,
-        :body => body
-      })
-    end
-    
-    private
-    
-    def parse_xml_node(node)
-      super(node)
-      self.title = node.css('regular-title').first.try(:content)
-      self.body = node.css('regular-body').first.try(:content)
-      self
-    end    
-  end
-end