jwagener-oauth-active-resource 0.1.1 → 0.1.5

data/Rakefile

@@ -12,10 +12,6 @@ begin
     gem.add_dependency "oauth"
     gem.add_dependency "activeresource"    
     gem.add_dependency "multipart"    
-    
-    #    gem.add_dependency "uri"    
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 1 
+:patch: 5

data/lib/oauth_active_resource.rb

@@ -11,6 +11,11 @@ module OAuthActiveResource
   def self.register(add_to_module, model_module, options = {})
     
     oauth_connection = options[:access_token]
+    
+    if oauth_connection.nil?
+      oauth_connection = FakeOAuthAccessToken.new 
+    end
+    
     site = options[:site]
 
     mod = Module.new do
@@ -29,6 +34,10 @@ module OAuthActiveResource
         super(name,*args)
       end
       
+      def self.destroy
+        name =  self.model_name.split('::').last
+        p self.parent.send :remove_const, name
+      end    
     end
     
     # Obscure (=Hash) token+secret, b/c it should stay one
@@ -39,7 +48,12 @@ module OAuthActiveResource
       dynamic_module_name = "OAuthConsumer#{hash}"
     end
     
-    add_to_module.const_set(dynamic_module_name, mod)
+    if add_to_module.const_defined? dynamic_module_name
+      mod = add_to_module.const_get dynamic_module_name  
+    else
+      add_to_module.const_set(dynamic_module_name, mod) 
+    end
+    
     return mod
   end
   
@@ -48,5 +62,5 @@ end
 
 require 'oauth_active_resource/connection'
 require 'oauth_active_resource/resource'
-require 'oauth_active_resource/collection'
-
+require 'oauth_active_resource/unique_resource_array'
+require 'oauth_active_resource/fake_oauth_access_token'

data/lib/oauth_active_resource/connection.rb

@@ -11,13 +11,18 @@ module OAuthActiveResource
       request(:get, path, build_request_headers(headers, :get))
     end
     
+    # make handle_response public
+    def handle_response(*args)
+      super(*args)
+    end
+    
    private
     def request(method, path, *arguments)    
       if @oauth_connection == nil
         super(method, path, *arguments)
       else
-        result = @oauth_connection.send(method, "#{site.scheme}://#{site.host}:#{site.port}#{path}", *arguments) 
-        handle_response(result)
+        response = @oauth_connection.request(method, "#{site.scheme}://#{site.host}:#{site.port}#{path}", *arguments) 
+        handle_response(response)
       end
     rescue Timeout::Error => e 
       raise TimeoutError.new(e.message)

data/lib/oauth_active_resource/fake_oauth_access_token.rb

@@ -0,0 +1,55 @@
+module OAuthActiveResource
+  
+  # just simulates the request and sign! methods of a oauth access token
+  class FakeOAuthAccessToken < OAuth::Consumer
+    
+    attr_accessor :token, :secret
+    def initialize()
+      @key    = nil
+      token = 'Anonymous'
+      secret = 'Anonymous'
+      
+      # ensure that keys are symbols
+      @options = @@default_options    
+    end
+    
+    def request(http_method, path, token = nil, request_options = {}, *arguments)
+      if path !~ /^\//
+        @http = create_http(path)
+        _uri = URI.parse(path)
+        path = "#{_uri.path}#{_uri.query ? "?#{_uri.query}" : ""}"
+
+      end
+
+      rsp = http.request(create_http_request(http_method, path, token, request_options, *arguments))
+
+      rsp
+    end
+    
+    def get(path, headers = {})
+      request(:get, path, headers)
+    end
+ 
+    def head(path, headers = {})
+      request(:head, path, headers)
+    end
+ 
+    def post(path, body = '', headers = {})
+      request(:post, path, body, headers)
+    end
+
+    def put(path, body = '', headers = {})
+      request(:put, path, body, headers)
+    end
+
+    def delete(path, headers = {})
+      request(:delete, path, headers)
+    end
+    
+    def sign!(*args)
+      # do nothing
+    end
+    
+  end
+end
+

data/lib/oauth_active_resource/resource.rb

@@ -21,7 +21,37 @@ module OAuthActiveResource
       super(*args)  
       self.id = self.uri.split('/').last if self.id.nil? and defined? self.uri
     end
-     
+    
+    def ==(other)
+        return (other.is_a? Resource) && (self.is_a? Resource) && (self.element_name == other.element_name) && (self.id == other.id)
+      rescue
+        return super(other)
+    end
+    
+    def self.load_collection(*args)
+      instantiate_collection(*args)
+    end     
+
+    #
+    #   belongs_to :user
+    #  => will look for a user-id tag and load this user
+    # 
+    def self.belongs_to(*args)
+      args.each do |k| 
+        name = k.to_s
+        define_method(k) do          
+          if @belongs_to_cache.nil?
+            @belongs_to_cache = {}
+          end
+          if not @belongs_to_cache[name]
+            resource  = find_or_create_resource_for(name)
+            @belongs_to_cache[name] = resource.find(self.send("#{name}_id"))
+          end
+          return @belongs_to_cache[name]          
+        end
+      end
+    end
+    
     # has_many allows resources with sub-resources which arent nested to be accessable.
     #
     # Example:
@@ -53,16 +83,16 @@ module OAuthActiveResource
             @has_many_cache = {}
           end
           if not @has_many_cache[name]
-            uri = "/#{self.element_name.pluralize}/#{self.id}/#{name}"
+
+            collection_path = "/#{self.element_name.pluralize}/#{self.id}/#{name}"
             resource  = find_or_create_resource_for(singular)
-            @has_many_cache[name] = OAuthActiveResource::Collection.new(self.connection,resource,uri)
+            @has_many_cache[name] = OAuthActiveResource::UniqueResourceArray.new(self.connection,resource,collection_path)
           end
           return @has_many_cache[name]          
         end
       end
     end
     
-    
     # allows you to POST/PUT an oauth authenticated multipart request
     def self.send_multipart_request(method,path,file_param_name,file,params={})
       req = Net::HTTP::Post.new(path)
@@ -70,12 +100,9 @@ module OAuthActiveResource
         params[:_method] = "PUT"
       end
       post_file = Net::HTTP::FileForPost.new(file)
-      req.set_multipart_data({file_param_name => post_file},params)     
-
-      oauth_connection.sign!(req)                  
-      uri = URI.parse oauth_connection.consumer.site      
-      
-      res = Net::HTTP.new(uri.host,uri.port).start do |http|
+      req.set_multipart_data({file_param_name => post_file},params)  
+      oauth_connection.sign!(req) if not oauth_connection.nil?   
+      res = Net::HTTP.new(site.host, site.port).start do |http|
         http.request(req)
       end
       res

data/lib/oauth_active_resource/unique_resource_array.rb

@@ -0,0 +1,86 @@
+require 'set'
+
+module OAuthActiveResource
+  class UniqueArray < Array
+    def initialize(*args)
+      if args.size == 1 and args[0].is_a? Array then
+        super(args[0].uniq)
+      else
+        super(*args)
+      end
+    end
+
+    def insert(i, v)
+      super(i, v) unless include?(v)
+    end
+
+    def <<(v)
+      super(v) unless include?(v)
+    end
+
+    def []=(*args)
+      # note: could just call super(*args) then uniq!, but this is faster
+
+      # there are three different versions of this call:
+      # 1. start, length, value
+      # 2. index, value
+      # 3. range, value
+      # We just need to get the value
+      v = case args.size
+        when 3 then args[2]
+        when 2 then args[1]
+        else nil
+      end
+
+      super(*args) if v.nil? or not include?(v)
+    end
+  end
+  
+  # see has_many in Resource
+  class UniqueResourceArray < UniqueArray
+    def initialize(connection, resource,  collection_path)   
+      super()   
+      
+      @connection = connection
+      @collection_path = collection_path
+      @resource = resource
+      reload
+    end
+   
+    def to_json
+      return "[ #{self.map { |obj| obj.to_json }.join(',')} ]"
+    end
+    
+    def to_xml
+      # or use __method__ here?
+      pt = @resource.element_name.pluralize
+      return "<#{pt}> #{self.map { |obj| obj.to_xml({:skip_instruct => true})}.join(' ')} </#{pt}>"
+    end
+    
+    
+    # DEPRECATED...
+    #def find(look_for)
+    #  if not (look_for.is_a? String or look_for.is_a? Integer)
+    #    look_for_id = look_for
+    #  else      
+    #    look_for_id = look_for.id
+    #  end  
+    #  
+    #  self.each do |obj|
+    #      obj.id == look_for_id and return obj 
+    #  end
+    #  return nil
+    #end
+    
+    def save
+      response = @connection.handle_response( @connection.put("#{@collection_path}",self.to_xml) )
+      self.replace( @resource.load_collection( @connection.format.decode(response.body) ) )
+    end
+    
+    def reload
+      self.replace(@resource.find(:all, :from => @collection_path))
+      return self
+    end
+  end
+
+end

data/spec/oauth_active_resource_spec.rb

@@ -1,7 +1,24 @@
+require 'rubygems'
+
+gem 'oauth'
+require 'oauth'
+
 require 'spec_helper'
 
 describe "OauthActiveResource" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  
+  it "should register a new Module fork" do
+    cl = TestClient.register
+  end
+  
+  it "should destroy it self" do
+    consumer_token = OAuth::ConsumerToken.new('test123','test123')
+    access_token = OAuth::AccessToken.new(consumer_token, 'access_token', 'access_secret')
+    
+    old_count = TestClient.constants.count      
+    sc = TestClient.register({:access_token => access_token })
+    TestClient.constants.count.should be (old_count+1)
+    sc.destroy
+    TestClient.constants.count.should be old_count   
   end
 end

data/spec/spec_helper.rb

@@ -2,8 +2,29 @@ require 'spec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+
+gem 'oauth'
+require 'oauth'
+
+
 require 'oauth_active_resource'
 
+
+
 Spec::Runner.configure do |config|
   
 end
+
+# Test Modul
+module TestClient
+  def self.register(options = {})
+    OAuthActiveResource.register(self.ancestors.first, self.ancestors.first.const_get('Models'), options)      
+  end
+  module Models
+    class XZ < OAuthActiveResource::Resource
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jwagener-oauth-active-resource
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,9 +57,10 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/oauth_active_resource.rb
-- lib/oauth_active_resource/collection.rb
 - lib/oauth_active_resource/connection.rb
+- lib/oauth_active_resource/fake_oauth_access_token.rb
 - lib/oauth_active_resource/resource.rb
+- lib/oauth_active_resource/unique_resource_array.rb
 - spec/oauth_active_resource_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/oauth_active_resource/collection.rb

@@ -1,28 +0,0 @@
-module OAuthActiveResource
-  # see has_many in Resource
-  class Collection < Set
-    def initialize(connection, resource, collection_uri)        
-      super()
-      @connection = connection
-      @collection_uri = collection_uri
-      @resource = resource
-      reload
-    end
-   
-    def to_json
-      return "[ #{self.map { |obj| obj.to_json }.join(',')} ]"
-    end
-    
-    def to_xml
-      raise "NotImplemented"
-    end
-    
-    def save
-      @connection.put("#{@resource.class.site}#{@collection_uri}",self.to_json,{ 'Accept'=>'application/json', 'Content-Type' => 'application/json' })
-    end
-    
-    def reload
-      self.replace(@resource.find(:all, :from => @collection_uri))
-    end
-  end
-end