nov-iknow 0.0.1 → 0.0.2

data/lib/iknow/rest_client/base.rb

@@ -13,9 +13,6 @@ class Iknow::RestClient::Base
       "HTTP #{@code}: #{@message} at #{@uri}"
     end
   end
-  class ResourceError < RESTError            ; end
-  class ResourceNotFound < ResourceError     ; end
-  class ResourceAccessDenied < ResourceError ; end
 
   def self.valid_action?(action) ; self::ACTIONS.keys.include? action.to_sym          end
   def self.path(action)          ; self::ACTIONS[action.to_sym][:path]                end
@@ -40,32 +37,19 @@ class Iknow::RestClient::Base
 
   private
 
-  def self.config; Iknow::Config.instance end
+  def self.config; Iknow::Config end
   
   def self.api_key_required
     raise ArgumentError.new("iKnow! API key is required") if self.config.api_key == ''
   end
 
   def self.http_connect
-    connection = Net::HTTP.new(self.config.host, self.config.port)
+    connection = Net::HTTP.new(self.config.api_host, self.config.api_port)
     connection.start do |conn|
       request  = yield connection
       response = conn.request(request)
       handle_rest_response(response)
-      json_response = JSON.parse(response.body)
-      handle_json_response(json_response)
-      json_response
-    end
-  end
-
-  def self.raise_json_error(code, message, uri = nil)
-    case code
-    when 403
-      raise ResourceAccessDenied.new(:code => code, :message => message, :uri => uri)
-    when 404
-      raise ResourceNotFound.new(:code => code, :message => message, :uri => uri)
-    else
-      raise ResourceError.new(:code => code, :message => message, :uri => uri)
+      JSON.parse(response.body)
     end
   end
 
@@ -73,11 +57,6 @@ class Iknow::RestClient::Base
     raise RESTError.new(:code => response.code, :message => response.message, :uri => uri)
   end
 
-  def self.handle_json_response(json_response, uri = nil)
-    jsoon_error = json_response.is_a?(Hash) ? json_response['error'] : nil
-    raise_json_error(jsoon_error['code'], jsoon_error['message'], uri) unless jsoon_error.nil?
-  end
-
   def self.handle_rest_response(response, uri = nil)
     raise_rest_error(response, uri) unless response.is_a?(Net::HTTPSuccess)
   end
@@ -94,18 +73,22 @@ class Iknow::RestClient::Base
   end
 
   def self.replace_uri_params(uri, params = {})
+    replaced_uri = uri.clone
     unless params.empty?
       params.each do |key, value|
-        if uri=~/__#{key}__/
-          uri.sub!(/__#{key}__/, value.to_s)
+        if replaced_uri=~/__#{key}__/
+          replaced_uri.sub!(/__#{key}__/, value.to_s)
           params.delete(key)
         end
       end
     end
-    return uri, params
+    return replaced_uri, params
   end
 
   def self.http_get_request(uri, params = {})
+    unless self.config.api_key.blank?
+      params.merge!(:api_key => self.config.api_key)
+    end
     path = (params.size > 0) ? "#{uri}?#{params.to_http_str}" : uri
     Net::HTTP::Get.new(path, http_header)
   end
@@ -118,6 +101,9 @@ class Iknow::RestClient::Base
   end
 
   def self.http_delete_request(uri, params = {})
+    unless self.config.api_key.blank?
+      params.merge!(:api_key => self.config.api_key)
+    end
     path = (params.size > 0) ? "#{uri}?#{params.to_http_str}" : uri
     Net::HTTP::Delete.new(path, http_header)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nov-iknow
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - nov
@@ -9,9 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-16 00:00:00 -07:00
+date: 2008-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
   version_requirement: 
@@ -21,6 +30,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.2.4
+    version: 
 description: A rubygem for iKnow! APIs
 email: developer@iknow.co.jp
 executables: []
@@ -58,6 +76,54 @@ files:
 - lib/iknow/rest_client/user.rb
 - lib/iknow/rest_client.rb
 - lib/iknow.rb
+- generators/iknow
+- generators/iknow/iknow_generator.rb
+- generators/iknow/templates
+- generators/iknow/templates/iknow_oauth_controller.rb
+- generators/iknow/templates/iknow_oauth_controller_test.rb
+- generators/iknow/templates/iknow_oauth_helper.rb
+- generators/iknow/templates/iknow_oauth_system.rb
+- generators/iknow/templates/iknow_oauth_token.rb
+- generators/iknow/templates/iknow_oauth_token_test.rb
+- generators/iknow/templates/iknow_oauth_tokens_migration.rb
+- generators/iknow/templates/index.rhtml
+- generators/iknow/USAGE
+- generators/iknow_oauth
+- generators/iknow_oauth/iknow_oauth_generator.rb
+- generators/iknow_oauth/templates
+- generators/iknow_oauth/templates/iknow_oauth_controller.rb
+- generators/iknow_oauth/templates/iknow_oauth_controller_test.rb
+- generators/iknow_oauth/templates/iknow_oauth_helper.rb
+- generators/iknow_oauth/templates/iknow_oauth_system.rb
+- generators/iknow_oauth/templates/iknow_oauth_token.rb
+- generators/iknow_oauth/templates/iknow_oauth_token_test.rb
+- generators/iknow_oauth/templates/iknow_oauth_tokens_migration.rb
+- generators/iknow_oauth/templates/index.rhtml
+- generators/iknow_oauth/USAGE
+- examples/iknow_on_rails/app/controllers/application.rb
+- examples/iknow_on_rails/app/controllers/iknow_oauth_controller.rb
+- examples/iknow_on_rails/app/controllers/users_controller.rb
+- examples/iknow_on_rails/app/helpers/application_helper.rb
+- examples/iknow_on_rails/app/helpers/iknow_oauth_helper.rb
+- examples/iknow_on_rails/app/helpers/users_helper.rb
+- examples/iknow_on_rails/app/models/iknow_oauth_token.rb
+- examples/iknow_on_rails/config/boot.rb
+- examples/iknow_on_rails/config/environment.rb
+- examples/iknow_on_rails/config/environments/development.rb
+- examples/iknow_on_rails/config/environments/production.rb
+- examples/iknow_on_rails/config/environments/test.rb
+- examples/iknow_on_rails/config/initializers/inflections.rb
+- examples/iknow_on_rails/config/initializers/mime_types.rb
+- examples/iknow_on_rails/config/initializers/new_rails_defaults.rb
+- examples/iknow_on_rails/config/routes.rb
+- examples/iknow_on_rails/db/migrate/20081017012212_create_iknow_oauth_tokens.rb
+- examples/iknow_on_rails/db/schema.rb
+- examples/iknow_on_rails/lib/iknow_oauth_system.rb
+- examples/iknow_on_rails/public/dispatch.rb
+- examples/iknow_on_rails/test/functional/iknow_oauth_controller_test.rb
+- examples/iknow_on_rails/test/functional/users_controller_test.rb
+- examples/iknow_on_rails/test/test_helper.rb
+- examples/iknow_on_rails/test/unit/iknow_oauth_token_test.rb
 - examples/pure_ruby.rb
 has_rdoc: true
 homepage: http://iknow.rubyforge.org
@@ -81,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: