yapra 0.1.3 → 0.2.0

data/legacy_plugins/Download/nicovideo.rb

@@ -13,7 +13,7 @@ require 'cgi'
 
 def nicovideo(config,data)
   auth = YAML.load( File.read( config['authfile'] ) )
-  agent = WWW::Mechanize.new
+  agent = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
   
   page = agent.post("https://secure.nicovideo.jp/secure/login?site=niconico",
       {"mail"=>auth["mail"],"password"=>auth["password"]})

data/legacy_plugins/Filter/Translations/yahoo.rb

@@ -11,19 +11,19 @@ def yahoo(config, data)
   config = (config || { "translation" => "en=>ja" })
 
   trans = case config["translation"]
-          when "en=>ja": "EJ"
-          when "kr=>ja": "KJ"
-          when "cn=>ja": "CJ"
-          when "ja=>en": "JE"
-          when "ja=>kr": "JK"
-          when "ja=>cn": "JC"
+          when "en=>ja" then "EJ"
+          when "kr=>ja" then "KJ"
+          when "cn=>ja" then "CJ"
+          when "ja=>en" then "JE"
+          when "ja=>kr" then "JK"
+          when "ja=>cn" then "JC"
           else
             return data
           end
   
   data.collect {|d|
     if d && d =~ /\S/
-      agent = WWW::Mechanize.new
+      agent = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
       start = agent.get("http://honyaku.yahoo.co.jp/")
       form = start.forms.last
       

data/legacy_plugins/Publish/delicious.rb

@@ -16,7 +16,7 @@ class Delicious
   def initialize username, password, proxy=nil
     @username = username
     @password = password
-    @agent    = WWW::Mechanize.new
+    @agent    = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
     @agent.basic_auth(@username, @password)
     if proxy && proxy.is_a?(Hash) && proxy['proxy_addr'] && proxy['proxy_port']
       @agent.set_proxy(proxy['proxy_addr'], proxy['proxy_port'],

data/legacy_plugins/Publish/hatena_diary_writer.rb

@@ -13,7 +13,7 @@ class HatenaDiaryWriter
   def initialize(id,password)
     @id = id
     @password = password
-    @agent = WWW::Mechanize.new
+    @agent = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
     if proxy = ENV['HTTP_PROXY']
       proxy = URI.parse(proxy)
       @agent.set_proxy(proxy.host, proxy.port)

data/legacy_plugins/Publish/mixi_diary_writer.rb

@@ -31,7 +31,7 @@ class MixiDiaryWriter
     @id = nil
     @username = username
     @password = password
-    @agent = WWW::Mechanize.new
+    @agent = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
   end
 
   def login username=@username, password=@password

data/legacy_plugins/Publish/scuttle.rb

@@ -19,7 +19,7 @@ class Scuttle
     @post_url = url + 'api/posts/add?'
     @username = username
     @password = password
-    @agent    = WWW::Mechanize.new
+    @agent    = defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new
     @agent.basic_auth(@username, @password)
     if proxy && proxy.is_a?(Hash) && proxy['proxy_addr'] && proxy['proxy_port']
       @agent.set_proxy(proxy['proxy_addr'], proxy['proxy_port'],

data/legacy_plugins/plagger.rb

@@ -79,8 +79,8 @@ end
 def input_option(config)
   opt = config.has_key?("input") ? config["input"] : "nothing"
   case opt
-  when "feed": :feed
-  when "nothing": :nothing
+  when "feed" then :feed
+  when "nothing" then :nothing
   else
     :nothing
   end

data/lib/yapra/legacy_plugin/base.rb

@@ -10,7 +10,7 @@ class Yapra::LegacyPlugin::Base
   def initialize(pipeline, plugin_path)
     @_yapra_pipeline     = pipeline
     @_yapra_run_method  = File.basename(plugin_path, '.*')
-    instance_eval( @source = File.read(plugin_path).toutf8, plugin_path, 1)
+    instance_eval( @source = File.read(plugin_path).toutf8, plugin_path.to_s, 1)
   end
   
   def logger

data/lib/yapra/plugin/mechanize_base.rb

@@ -4,7 +4,7 @@ require 'yapra/plugin/base'
 
 class Yapra::Plugin::MechanizeBase < Yapra::Plugin::Base
   def agent
-    pipeline.context['mechanize_agent'] ||= WWW::Mechanize.new
+    pipeline.context['mechanize_agent'] ||= (defined?(Mechanize) ? Mechanize.new : WWW::Mechanize.new)
     pipeline.context['mechanize_agent']
   end
   

data/lib/yapra/version.rb

@@ -1,8 +1,8 @@
 module Yapra
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 3
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib-plugins/yapra/plugin/publish/mail.rb

@@ -61,15 +61,16 @@ module Yapra::Plugin::Publish
     end
     
     def create_attachments item, config
+      mechanize_file_type = defined?(Mechanize) ? Mechanize::File : WWW::Mechanize::File
       attachments = []
       attachment_attributes = config['mail']['attachments']
       if attachment_attributes.kind_of?(String)
         file = item.__send__(attachment_attributes)
-        attachments << file if file.kind_of?(WWW::Mechanize::File)
+        attachments << file if file.kind_of?(mechanize_file_type)
       elsif attachment_attributes.kind_of?(Array)
         attachment_attributes.each do |atc|
           file = item.__send__(atc)
-          attachments << file if file.kind_of?(WWW::Mechanize::File)
+          attachments << file if file.kind_of?(mechanize_file_type)
         end
       end
       attachments

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yapra
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - yuanying
@@ -9,19 +15,25 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +09:00
+date: 2011-02-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 7
+        - 6
         version: 0.7.6
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Yet another pragger implementation.
 email: yuanying at fraction dot jp
 executables: 
@@ -169,21 +181,27 @@ require_paths:
 - lib
 - lib-plugins
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: yapra
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Yet another pragger implementation.