wp2tumblr 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcbe7618bf9a026e696e9e26e198be786a537686
-  data.tar.gz: eee95d425a089d79e51343b26ef049947e2d2d45
+  metadata.gz: aa3cb0fc81507ba8122d6dfdfe7092fda46be2b5
+  data.tar.gz: dc2c48808a149bd84ca16020207fb833c2a96650
 SHA512:
-  metadata.gz: 9d49c3d3ffb7bbff1d1804a998867d8548eed64c5d1936d583d4a143ce4956ef80af6be6d4dc230441ed55d4baa4427036508de4fbb3e2bb641095cbb16959bc
-  data.tar.gz: 4e6481f7739e05fd3da1ea5e7f2af207255da4bd41d2f83e27c1dea1d3ea6e8512be87b39f11166a3128459ff7a3214092f6a0a1737996864f0fd6b0e200d3e0
+  metadata.gz: 88090ceaa17c302081022e2ed2b538f087a1558393fbf34548f7077ef3ce52cc13ac8894a8dd5654e22c4f5a79df5a6f115a1ec545a9de527a9125fe7266be76
+  data.tar.gz: e352f6afa69a041df9645b52da2f492ca9d6a5a54e5c2a7f6a8aba6928e4e0e29a29826550ca16b7184610b5e82cdee15b0049fc180a292f168fc792d8421556

data/bin/wp2tumblr

@@ -6,11 +6,14 @@ require "yaml"
 require "optparse"
 
 options = {}
+site = "http://www.tumblr.com"
+
 opt_parser = OptionParser.new do |opt|
   opt.banner = "Usage: wp2tumblr COMMAND [OPTIONS]"
   opt.separator ""
   opt.separator "Commands"
   opt.separator "    text: upload posts as type 'text'"
+  opt.separator "    config: configure your Tumblr API credentials"
   opt.separator ""
   opt.separator "Options"
 
@@ -25,28 +28,52 @@ end
 
 opt_parser.parse!
 
-case ARGV[0]
-when "text"
-  puts "Posting text posts with the options: #{options.inspect}"
-else
-  puts opt_parser
-end
+puts opt_parser unless ARGV[0]
+
+tumblr_config_path = File.join ENV['HOME'], '.wp2tumblr'
+
+if ARGV[0] === "config"
+  api_config = {}
+  puts "Register an application at: #{site}/oauth/apps" 
+
+  print "OAuth Consumer key: "
+  api_config[:consumer_key] = $stdin.gets.chomp
+
+  print "OAuth Consumer secret: "
+  api_config[:consumer_secret] = $stdin.gets.chomp
+
+  consumer = OAuth::Consumer.new(api_config[:consumer_key], api_config[:consumer_secret], :site => site)
+  request_token = consumer.get_request_token :exclude_callback => true
+
+  puts request_token.authorize_url
 
-tumblr_config_path = File.join ENV['HOME'], '.tumblr'
+  puts "After you have received your oauth_verifier, paste it below."
+  puts "OAuth Verifier: "
+  api_config[:verifier] = $stdin.gets.chomp
+
+  access_token = request_token.get_access_token :oauth_verifier => api_config[:verifier]
+  api_config[:oauth_token] = access_token.token
+  api_config[:oauth_token_secret] = access_token.secret
+
+  Wp2tumblr::Config.save_api_credentials(api_config, ".wp2tumblr")
+
+  puts "Credentials saved, run 'wp2tumblr COMMAND [OPTIONS]' again"
+end
 
 if File.exists?(tumblr_config_path)
 
   config = YAML.load_file tumblr_config_path
   client = Wp2tumblr::TumblrClient.new(config["consumer_key"], config["consumer_secret"], config["oauth_token"], config["oauth_token_secret"])
-  file = File.open(options[:file]) if File.exists?(options[:file])
+  file = File.open(options[:file]) if options[:file] and File.exists?(options[:file])
   
-  if client.connect
-    puts "Successfully authenticated with Tumblr!"
-  else 
-    puts "There was an error authenticating with Tumblr. Please check #{tumblr_config_path} and make sure your credentials are correct."
-  end
-
   if ARGV[0] === "text"
+    if client.connect
+      puts "Successfully authenticated with Tumblr!"
+      puts "Posting text posts with the options: #{options.inspect}"
+    else 
+      puts "There was an error authenticating with Tumblr. Please check #{tumblr_config_path} and make sure your credentials are correct."
+    end
+
     if file
       posts = Wp2tumblr::Wordpress.parse_xml(file, :posts)
       client.text_posts(options[:blog_name], posts)
@@ -57,7 +84,6 @@ if File.exists?(tumblr_config_path)
 
 else
   puts ""
-  puts "You need to configure your Tumblr api credentials."
-  puts "For more info see: https://github.com/tumblr/tumblr_client#the-irb-console"
-  puts "run 'tumblr' then try again"
+  puts "You need to configure your Tumblr API credentials."
+  puts "run 'wp2tumblr config'"
 end

data/lib/wp2tumblr.rb

@@ -1,4 +1,5 @@
 require "open-uri"
+require "wp2tumblr/config"
 require "wp2tumblr/wordpress"
 require "wp2tumblr/tumblr_client"
 

data/lib/wp2tumblr/config.rb

@@ -0,0 +1,22 @@
+module Wp2tumblr
+  module Config
+
+     VALID_OPTIONS_KEYS = [
+      :consumer_key,
+      :consumer_secret,
+      :oauth_token,
+      :oauth_token_secret
+    ]
+    
+    def self.save_api_credentials(credentials, file_name)
+      File.open(File.join(ENV['HOME'], file_name), "w") do |f|
+        configuration = {}
+        VALID_OPTIONS_KEYS.each do |key|
+          configuration[key.to_s] = credentials[key]
+        end
+        f.write YAML.dump configuration
+      end
+    end
+  
+  end
+end

data/lib/wp2tumblr/tumblr_client.rb

@@ -31,5 +31,6 @@ module Wp2tumblr
         sleep 1
       end
     end
+
   end
 end

data/lib/wp2tumblr/version.rb

@@ -1,3 +1,3 @@
 module Wp2tumblr
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/wp2tumblr/wordpress.rb

@@ -20,7 +20,7 @@ module Wp2tumblr
       items = get_file_contents(file)
       @posts = []
       items.to_enum.with_index(0) do |item, i|
-        @posts[i] = {title: item.at_xpath("title").text, content: parse_images(item.at_xpath("content:encoded").text), created_at: item.at_xpath("pubDate").text}
+        @posts[i] = {title: item.at_xpath("title").text, content: parse_images(item.at_xpath("content:encoded")), created_at: item.at_xpath("pubDate").text}
       end
       @posts
     end
@@ -88,7 +88,7 @@ module Wp2tumblr
     end
 
     def self.parse_images(post_content)
-      html = Nokogiri::HTML(post_content)
+      html = post_content
       html.css("img").each do |image|
         begin
           encoded_image = Base64.encode64(open(image['src']) {|io| io.read})
@@ -97,7 +97,7 @@ module Wp2tumblr
           next
         end
         file_extension = image['src'][/\.[^.]*$/].split('.')[1]
-        image['src'] = "data:image/#{file_extension};base64,#{encoded_image}"
+        image['src'] = "data:image/#{file_extension};base64,#{encoded_image}" if encoded_image
       end
       html
     end

data/spec/wp2tumblr/wordpress_format.xml

@@ -113,7 +113,7 @@
     <dc:creator>testuser</dc:creator>
     <guid isPermaLink="false">http://testblog.com/?p=3199</guid>
     <description></description>
-    <content:encoded><![CDATA[test content <div class="center"><img src="http://placehold.it/120x120" alt=""/></div>]]></content:encoded>
+    <content:encoded><![CDATA[test content <div class="center"><img src="http://placekitten.com.s3.amazonaws.com/homepage-samples/200/287.jpg" alt=""/></div>]]></content:encoded>
     <excerpt:encoded><![CDATA[]]></excerpt:encoded>
     <wp:post_id>3199</wp:post_id>
     <wp:post_date>2013-03-01 07:59:29</wp:post_date>

data/spec/wp2tumblr_spec.rb

@@ -53,7 +53,7 @@ describe Wp2tumblr::Wordpress do
   describe ".parse_images" do
     it "Encodes images as base64" do
       posts = Wp2tumblr::Wordpress.parse_xml(file, :posts)
-      post = posts[0][:content]
+      post = Nokogiri::HTML(posts[0][:content].text)
       Wp2tumblr::Wordpress.parse_images(post).to_s.should include('base64')
     end
   end
@@ -82,7 +82,22 @@ describe Wp2tumblr::TumblrClient do
     it "should post text posts to the Tumblr api" do 
       posts = Wp2tumblr::Wordpress.parse_xml(file, :posts)
       client.connect
-      client.text_posts(config["tumblr_blog_name"] ,posts)
+      client.text_posts(config["tumblr_blog_name"], posts)
     end
   end
+end
+
+describe Wp2tumblr::Config do
+  it "saves API credentials to a YAML file." do
+    api_config = {
+      :consumer_key => "CONSUMER_KEY",
+      :consumer_secret => "CONSUMER_SECRET",
+      :oauth_token => "OAUTH_TOKEN",
+      :oauth_token_secret => "OAUTH_TOKEN_SECRET"
+    }
+
+    Wp2tumblr::Config.save_api_credentials(api_config, ".wp2tumblr_spec")
+    config = YAML.load_file File.join ENV['HOME'], '.wp2tumblr_spec'
+    config["consumer_key"].should eq("CONSUMER_KEY");
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp2tumblr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jonlunsford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -138,6 +138,7 @@ files:
 - Rakefile
 - bin/wp2tumblr
 - lib/wp2tumblr.rb
+- lib/wp2tumblr/config.rb
 - lib/wp2tumblr/tumblr_client.rb
 - lib/wp2tumblr/version.rb
 - lib/wp2tumblr/wordpress.rb
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: This gem utilizes the Tumblr api to create posts from a wordpress post XML