tumblr4r 0.8.0 → 0.8.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e6460942d55510c5376f32efb5b8395b914ea270
+  data.tar.gz: 89a96d187f6c09e6acd6096f1dfc910162132e88
+SHA512:
+  metadata.gz: 3e1a8c3f0339de844aa3ad8b7d37acf482fa86416929555b017b987d35c89fe679f4891608659d2763c080f4076a137e15d505cb0f28b5315655e3a28807a7a1
+  data.tar.gz: c99ef6b3645b754ab4fcc04592c897972b712ac255d1142becd2b3bbcfd3f082379fb864baab670d3de6ad48f224bd6bb8aef80aacad386dd653ef0b828dd344

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/ChangeLog

@@ -1,3 +1,9 @@
+== 0.8.1 / 2014-03-23
+* new: Answer support. Thanks evotopid.
+* new: use bundler to build
+* fix: test
+
+
 == 0.8.0 / 2011-02-20
 * new: dashboard support.
 * new: active_support 3.0 support.
@@ -8,11 +14,10 @@
 
 
 == 0.7.1 / 2009-09-11
-* fix: missing Site#delete 
+* fix: missing Site#delete
 * fix: the number of the records is wrong when finding with :limit and :offset options.
 
-	
+
 == 0.7.0 / 2009-09-09
 
 * initial release
-

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in tumblr4r.gemspec
+gemspec

data/README.md

@@ -0,0 +1,29 @@
+# Tumblr4r
+
+This is an old obsolete api wrapper for tumblr.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'tumblr4r'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install tumblr4r
+
+## Usage
+
+See test/tumblr4r_test.rb
+
+## Contributing
+
+1. Fork it ( http://github.com/<my-github-username>/tumblr4r/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,145 +1 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/sshpublisher'
-require 'fileutils'
-require './lib/tumblr4r'
-include FileUtils
-
-NAME              = "tumblr4r"
-AUTHOR            = "Tomoki MAEDA"
-EMAIL             = "tmaeda@ruby-sapporo.org"
-DESCRIPTION       = "Tumblr API Wrapper for Ruby"
-RUBYFORGE_PROJECT = "tumblr4r"
-HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-BIN_FILES         = %w(  )
-
-VERS              = Tumblr4r::VERSION
-REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-RDOC_OPTS = [
-	'--title', "#{NAME} documentation",
-	"--charset", "utf-8",
-	"--opname", "index.html",
-	"--line-numbers",
-	"--main", "README",
-	"--inline-source",
-]
-
-task :default => [:test]
-task :package => [:clean]
-
-Rake::TestTask.new("test") do |t|
-	t.libs   << "test"
-	t.pattern = "test/**/*_test.rb"
-	t.verbose = true
-end
-
-spec = Gem::Specification.new do |s|
-	s.name              = NAME
-	s.version           = VERS
-	s.platform          = Gem::Platform::RUBY
-	s.has_rdoc          = true
-	s.extra_rdoc_files  = ["README", "ChangeLog"]
-	s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples|extras)/']
-	s.summary           = DESCRIPTION
-	s.description       = DESCRIPTION
-	s.author            = AUTHOR
-	s.email             = EMAIL
-	s.homepage          = HOMEPATH
-	s.executables       = BIN_FILES
-	s.rubyforge_project = RUBYFORGE_PROJECT
-	s.bindir            = "bin"
-	s.require_path      = "lib"
-	#s.autorequire       = ""
-	s.test_files        = Dir["test/*_test.rb"]
-
-	s.add_runtime_dependency('activesupport', '>=2.3.2')
-	s.add_development_dependency('pit', '>=0.0.6')
-	s.required_ruby_version = '>= 1.8.6'
-
-	s.files = %w(README ChangeLog Rakefile) +
-		Dir.glob("{bin,doc,test,lib,templates,generator,extras,website,script}/**/*") + 
-		Dir.glob("ext/**/*.{h,c,rb}") +
-		Dir.glob("examples/**/*.rb") +
-		Dir.glob("tools/*.rb") +
-		Dir.glob("rails/*.rb")
-
-	s.extensions = FileList["ext/**/extconf.rb"].to_a
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-	p.need_tar = true
-	p.gem_spec = spec
-end
-
-task :install do
-	name = "#{NAME}-#{VERS}.gem"
-	sh %{rake package}
-	sh %{sudo gem install pkg/#{name}}
-end
-
-task :uninstall => [:clean] do
-	sh %{sudo gem uninstall #{NAME}}
-end
-
-
-Rake::RDocTask.new do |rdoc|
-	rdoc.rdoc_dir = 'html'
-	rdoc.options += RDOC_OPTS
-	rdoc.template = "resh"
-	#rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-	if ENV['DOC_FILES']
-		rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-	else
-		rdoc.rdoc_files.include('README', 'ChangeLog')
-		rdoc.rdoc_files.include('lib/**/*.rb')
-		rdoc.rdoc_files.include('ext/**/*.c')
-	end
-end
-
-desc "Publish to RubyForge"
-task :rubyforge => [:rdoc, :package] do
-	require 'rubyforge'
-	Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'tmaeda').upload
-end
-
-desc 'Package and upload the release to rubyforge.'
-task :release => [:clean, :package] do |t|
-	v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
-	abort "Versions don't match #{v} vs #{VERS}" unless v == VERS
-	pkg = "pkg/#{NAME}-#{VERS}"
-
-	require 'rubyforge'
-	rf = RubyForge.new.configure
-	puts "Logging in"
-	rf.login
-
-	c = rf.userconfig
-#	c["release_notes"] = description if description
-#	c["release_changes"] = changes if changes
-	c["preformatted"] = true
-
-	files = [
-		"#{pkg}.tgz",
-		"#{pkg}.gem"
-	].compact
-
-	puts "Releasing #{NAME} v. #{VERS}"
-	rf.add_release RUBYFORGE_PROJECT, NAME, VERS, *files
-end
-
-desc 'Show information about the gem.'
-task :debug_gem do
-	puts spec.to_ruby
-end
-
-desc 'Update gem spec'
-task :gemspec do
-  open("#{NAME}.gemspec", 'w').write spec.to_ruby
-end
+require "bundler/gem_tasks"

data/lib/tumblr4r.rb

@@ -1,19 +1,18 @@
 # -*- coding: utf-8 -*-
+require "tumblr4r/version"
 require 'net/http'
-require 'rubygems'
 require 'rexml/document'
-begin 
-  require 'active_support/core_ext' 
-  require 'active_support/core_ext' 
-rescue 
-  require 'activesupport' 
-end 
+begin
+  require 'active_support/core_ext'
+  require 'active_support/core_ext'
+rescue
+  require 'activesupport'
+end
 
 require 'logger'
 require 'cgi'
 
 module Tumblr4r
-  VERSION = '0.8.0'
   class TumblrError < StandardError
     attr_accessor :attachment
     def initialize(msg, attachment=nil)
@@ -30,6 +29,7 @@ module Tumblr4r
     CHAT = "conversation"
     AUDIO = "audio"
     VIDEO = "video"
+    ANSWER = "answer"
   end
 
   # ConnectionオブジェクトとParserオブジェクトを組み合わせて、
@@ -362,6 +362,14 @@ module Tumblr4r
     end
   end
 
+  class Answer < Post
+    attr_accessor :answer, :question
+
+    def params
+      super.merge!({"question" => @question, "answer" => @answer})
+    end
+  end
+
   # Tumblr XML API への薄いラッパー。
   # Rubyオブジェクトからの変換やRubyオブジェクトへの変換などは
   # Parserクラスで行う。Parserクラスへの依存関係は一切持たない。
@@ -529,6 +537,8 @@ module Tumblr4r
           post = self.audio(Audio.new, rexml_post)
         when POST_TYPE::VIDEO
           post = self.video(Video.new, rexml_post)
+        when POST_TYPE::ANSWER
+          post = self.answer(Answer.new, rexml_post)
         else
           raise TumblrError.new("unknown post type #{post_type}")
         end
@@ -615,6 +625,13 @@ module Tumblr4r
       post
     end
 
+    def answer(post, rexml_post)
+      post = self.post(post, rexml_post)
+      post.question = rexml_post.elements["question"].try(:text) || ""
+      post.answer   = rexml_post.elements["answer"].try(:text) || ""
+      post
+    end
+
   end
 
 end # module

data/lib/tumblr4r/version.rb

@@ -0,0 +1,3 @@
+module Tumblr4r
+  VERSION = "0.8.1"
+end

data/test/tumblr4r_test.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+$LOAD_PATH << "."
 require File.dirname(__FILE__) + '/test_helper.rb'
 require "test/unit"
 require 'pit'
@@ -13,7 +14,7 @@ class Tumblr4rTest < Test::Unit::TestCase
     @site = Site.new(READ_TEST_HOST)
     writetest_conf = Pit.get("tumblr4rwritetest",
                              :require => {"email" => "required email",
-                             "password" => "required password"})
+                               "password" => "required password"})
     @write_site = Site.new(WRITE_TEST_HOST,
                            writetest_conf["email"],
                            writetest_conf["password"])
@@ -46,15 +47,11 @@ class Tumblr4rTest < Test::Unit::TestCase
     total = @large_site.count(:filter => "text")
     assert_equal TOTAL_COUNT, total
 
-    total = @large_site.count(:tagged => "test")
-    assert_equal TOTAL_COUNT, total
-
     total = @large_site.count(:search => "test")
     assert_equal TOTAL_COUNT, total
   end
 
   def test_find
-    debugger
     posts = @site.find(:all)
     assert_equal 9, posts.size
     assert_equal Photo, posts[0].class
@@ -120,15 +117,11 @@ class Tumblr4rTest < Test::Unit::TestCase
 <p><b>ボールドです。</b></p>
 <p><i>イタリックです。</i></p>
 <p><strike>取り消し線です。</strike></p>
-<ul>
-<li>unordered 1</li>
+<ul><li>unordered 1</li>
 <li>unordered 2</li>
-</ul>
-<ol>
-<li>ordered 1</li>
+</ul><ol><li>ordered 1</li>
 <li>ordered 2</li>
-</ol>
-<p>ここからインデント</p>
+</ol><p>ここからインデント</p>
 <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">インデント開始<br/>ああああ<br/>インデント終了</blockquote>
 <p>ここまでインデント</p>
 EOF
@@ -168,7 +161,7 @@ EOF
 
     assert_equal "<p>Photoのテストです。</p>\n\n<p>ギコです。</p>", posts[1].photo_caption
     assert_equal "http://www.google.co.jp/", posts[1].photo_link_url
-    assert_equal "http://28.media.tumblr.com/GyEYZujUYopiula4XKmXhCgmo1_250.jpg", posts[1].photo_url
+    assert_equal "http://31.media.tumblr.com/GyEYZujUYopiula4XKmXhCgmo1_250.jpg", posts[1].photo_url
     assert_equal [], posts[1].photoset
 
     # photoset
@@ -278,7 +271,7 @@ EOF
     assert_equal true, posts[0].audio_plays
     assert_equal "<p>tumblr4r miku</p>", posts[0].audio_caption
 #    assert_equal "<embed type=\"application/x-shockwave-flash\" src=\"http://tumblr4rtest.tumblr.com/swf/audio_player.swf?audio_file=http://www.tumblr.com/audio_file/131705561/GyEYZujUYp9df3nv1WMefTH8&color=FFFFFF\" height=\"27\" width=\"207\" quality=\"best\"></embed>", posts[0].audio_player
-    assert_equal "<embed type=\"application/x-shockwave-flash\" src=\"http://assets.tumblr.com/swf/audio_player.swf?audio_file=http://www.tumblr.com/audio_file/131705561/GyEYZujUYp9df3nv1WMefTH8&color=FFFFFF\" height=\"27\" width=\"207\" quality=\"best\"></embed>", posts[0].audio_player
+    assert_equal "<embed type=\"application/x-shockwave-flash\" src=\"http://assets.tumblr.com/swf/audio_player.swf?audio_file=https%3A%2F%2Fwww.tumblr.com%2Faudio_file%2Ftumblr4rtest%2F131705561%2FGyEYZujUYp9df3nv1WMefTH8&color=FFFFFF\" height=\"27\" width=\"207\" quality=\"best\" wmode=\"opaque\"></embed>", posts[0].audio_player
   end
 
   def test_find_with_type_video
@@ -298,7 +291,7 @@ EOF
 
     assert_equal "<p>matrix sappoloaded</p>", posts[0].video_caption
     assert_equal "http://www.youtube.com/watch?v=FavWH5RhYpw", posts[0].video_source
-    assert_equal "<object width=\"400\" height=\"325\"><param name=\"movie\" value=\"http://www.youtube.com/v/FavWH5RhYpw&amp;rel=0&amp;egm=0&amp;showinfo=0&amp;fs=1\"></param><param name=\"wmode\" value=\"transparent\"></param><param name=\"allowFullScreen\" value=\"true\"></param><embed src=\"http://www.youtube.com/v/FavWH5RhYpw&amp;rel=0&amp;egm=0&amp;showinfo=0&amp;fs=1\" type=\"application/x-shockwave-flash\" width=\"400\" height=\"325\" allowFullScreen=\"true\" wmode=\"transparent\"></embed></object>", posts[0].video_player
+    assert_equal "<iframe width=\"400\" height=\"300\" src=\"http://www.youtube.com/embed/FavWH5RhYpw?wmode=transparent&autohide=1&egm=0&hd=1&iv_load_policy=3&modestbranding=1&rel=0&showinfo=0&showsearch=0\" frameborder=\"0\" allowfullscreen></iframe>", posts[0].video_player
   end
 
   def test_find_with_tagged
@@ -347,15 +340,11 @@ EOF
 <p><b>ボールドです。</b></p>
 <p><i>イタリックです。</i></p>
 <p><strike>取り消し線です。</strike></p>
-<ul>
-<li>unordered 1</li>
+<ul><li>unordered 1</li>
 <li>unordered 2</li>
-</ul>
-<ol>
-<li>ordered 1</li>
+</ul><ol><li>ordered 1</li>
 <li>ordered 2</li>
-</ol>
-<p>ここからインデント</p>
+</ol><p>ここからインデント</p>
 <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">インデント開始<br/>ああああ<br/>インデント終了</blockquote>
 <p>ここまでインデント</p>
 EOF
@@ -406,4 +395,3 @@ EOF
     post = @write_site.save(videos[0])
   end
 end
-

data/tumblr4r.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'tumblr4r/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "tumblr4r"
+  spec.version       = Tumblr4r::VERSION
+  spec.authors       = ["Tomoki MAEDA"]
+  spec.email         = ["tmaeda@ruby-sapporo.org"]
+  spec.summary       = "Tumblr API Wrapper for Ruby"
+  spec.homepage      = "https://github.com/tmaeda/tumblr4r"
+  spec.license       = "Ruby's license"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activesupport"
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'pit', '>= 0.0.6'
+end

metadata

@@ -1,94 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tumblr4r
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.0
+version: !ruby/object:Gem::Version
+  version: 0.8.1
 platform: ruby
-authors: 
+authors:
 - Tomoki MAEDA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.2
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.6
   type: :development
-  version_requirements: *id002
-description: Tumblr API Wrapper for Ruby
-email: tmaeda@ruby-sapporo.org
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+description: 
+email:
+- tmaeda@ruby-sapporo.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+files:
+- ".gitignore"
 - ChangeLog
-files: 
+- Gemfile
 - README
-- ChangeLog
+- README.md
 - Rakefile
+- lib/tumblr4r.rb
+- lib/tumblr4r/version.rb
 - test/test_helper.rb
 - test/tumblr4r_dashboard_test.rb
 - test/tumblr4r_test.rb
-- lib/tumblr4r.rb
-homepage: http://tumblr4r.rubyforge.org
-licenses: []
-
+- tumblr4r.gemspec
+homepage: https://github.com/tmaeda/tumblr4r
+licenses:
+- Ruby's license
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --title
-- tumblr4r documentation
-- --charset
-- utf-8
-- --opname
-- index.html
-- --line-numbers
-- --main
-- README
-- --inline-source
-- --exclude
-- ^(examples|extras)/
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: tumblr4r
-rubygems_version: 1.8.11
+rubyforge_project: 
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tumblr API Wrapper for Ruby
-test_files: 
+test_files:
+- test/test_helper.rb
 - test/tumblr4r_dashboard_test.rb
 - test/tumblr4r_test.rb
+has_rdoc: