springnote_resources 0.6.5.1 → 0.6.6

data/History.txt

@@ -1,3 +1,6 @@
+== 0.6.6 / 2008-10-23
+ * fix for Rails 2.1.x
+
 == 0.6.5 / 2008-10-6
  * Springnote::Comment added
 

data/Manifest.txt

@@ -15,7 +15,6 @@ lib/springnote/page.rb
 lib/springnote/import_file.rb
 lib/springnote/revision.rb
 lib/exts/active_resource_extension.rb
-lib/exts/common_parameters.rb
 lib/exts/request_with_oauth.rb
 spec/base_spec.rb
 spec/configuration_spec.rb

data/lib/exts/request_with_oauth.rb

@@ -1,17 +1,32 @@
 module RequestWithOauth
   def self.included(mod)
+    mod.send :cattr_accessor, :common_params
+    mod.common_params = {}
+    
     mod.alias_method_chain :request, :oauth
-    mod.send :cattr_accessor, :oauth_configuration
+    mod.send :cattr_accessor, :oauth_configuration    
   end
   
+  def common_params
+    self.class.common_params
+  end 
+  
   delegate :oauth_configuration, :to => "self.class"
     
   def request_with_oauth(method, path, *arguments)
+    # append common parameters
+    unless common_params.empty?
+      path += path.include?('?') ? '&' : '?'
+      path += common_params.to_query
+    end
+    
     logger.info "#{method.to_s.upcase} #{site.scheme}://#{site.host}:#{site.port}#{path}" if logger
     result = nil
     time = Benchmark.realtime { result = http_request(method, path, arguments) }
-    logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body : 0}b %.2fs)" % time if logger
+    logger.info "--> #{result.code} #{result.message} (#{result.body ? result.body.length : 0}b %.2fs)" % time if logger
     handle_response(result)
+  rescue Timeout::Error => e
+    raise TimeoutError.new(e.message)
   end
   
   def http_request(method, path, arguments)

data/lib/springnote/base.rb

@@ -1,5 +1,5 @@
 module Springnote
-  VERSION = "0.6.5.1"
+  VERSION = "0.6.6"
   
   class Base < ActiveResource::Base
     extend ActiveResourceExtension

data/lib/springnote/configuration.rb

@@ -25,6 +25,10 @@ module Springnote
 
       options.each{|k,v| self.send("#{k}=", v)}
       Springnote::Base.site = self.site
+      if @app_key && Springnote::Base.respond_to?(:user=)
+        Springnote::Base.user = self.username
+        Springnote::Base.password = self.password
+      end
       self
     end
         

data/lib/springnote_resources.rb

@@ -15,7 +15,6 @@ unless defined?(ActiveResource)
 end
 
 # extend activeresource
-require 'exts/common_parameters'
 require 'exts/request_with_oauth'
 require 'exts/active_resource_extension'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: springnote_resources
 version: !ruby/object:Gem::Version 
-  version: 0.6.5.1
+  version: 0.6.6
 platform: ruby
 authors: 
 - Bryan Kang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +09:00
+date: 2008-10-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,6 @@ files:
 - lib/springnote/import_file.rb
 - lib/springnote/revision.rb
 - lib/exts/active_resource_extension.rb
-- lib/exts/common_parameters.rb
 - lib/exts/request_with_oauth.rb
 - spec/base_spec.rb
 - spec/configuration_spec.rb

data/lib/exts/common_parameters.rb

@@ -1,21 +0,0 @@
-module CommonParameters
-  def self.included(mod)
-    mod.alias_method_chain :request, :commons
-    mod.send :cattr_accessor, :common_params
-    mod.common_params = {}
-  end
-    
-  def request_with_commons(method, path, *arguments)
-    unless common_params.empty?
-      path += path.include?('?') ? '&' : '?'
-      path += common_params.to_query
-    end
-    request_without_commons(method, path, *arguments)
-  end
-  
-  def common_params
-    self.class.common_params
-  end  
-end
-
-ActiveResource::Connection.send :include, CommonParameters