ruby-satisfaction 0.2.0 → 0.3.0

data/lib/satisfaction.rb

@@ -1,5 +1,6 @@
 require 'satisfaction/external_dependencies'
-
+module Sfn
+end
 class Satisfaction
   # ==================
   # = Core Utilities =
@@ -42,8 +43,8 @@ class Satisfaction
       :access_token_url => 'http://getsatisfaction.com/api/access_token',
       :authorize_url => 'http://getsatisfaction.com/api/authorize',
     })
-    @loader = Satisfaction::Loader.new
-    @identity_map = Satisfaction::IdentityMap.new
+    @loader = Sfn::Loader.new
+    @identity_map = Sfn::IdentityMap.new
     
     has_many :companies, :url => '/companies'
     has_many :people, :url => '/people'
@@ -59,7 +60,7 @@ class Satisfaction
   
   def me
     me = satisfaction.identity_map.get_record(Me, 'me') do
-      Me.new('me', satisfaction)
+      Sfn::Me.new('me', satisfaction)
     end
     
     if me.loaded?
@@ -90,7 +91,9 @@ class Satisfaction
   end
   
   def request_token
-    response = CGI.parse(@loader.get("#{options[:request_token_url]}", :force => true, :consumer => @consumer, :token => nil))
+    result, body = *@loader.get("#{options[:request_token_url]}", :force => true, :consumer => @consumer, :token => nil)
+    raise "Could not retrieve request token" unless result == :ok
+    response = CGI.parse(body)
     OAuth::Token.new(response["oauth_token"], response["oauth_token_secret"])
   end
   
@@ -99,7 +102,9 @@ class Satisfaction
   end
   
   def access_token(token)
-    response = CGI.parse(@loader.get("#{options[:access_token_url]}", :force => true, :consumer => @consumer, :token => token))
+    result, body = *@loader.get("#{options[:access_token_url]}", :force => true, :consumer => @consumer, :token => token)
+    raise "Could not retrieve access token" unless result == :ok
+    response = CGI.parse(body)
     OAuth::Token.new(response["oauth_token"], response["oauth_token_secret"])
   end
   

data/lib/satisfaction/associations.rb

@@ -1,15 +1,15 @@
 module Associations
   def has_many(resource, options={})
-    class_name = options[:class_name] || resource.to_s.classify
+    class_name = options[:class_name] || "Sfn::#{resource.to_s.classify}"
     eval <<-EOS
       def #{resource}
-        @#{resource} ||= ResourceCollection.new(#{class_name}, self.satisfaction, '#{options[:url]}')
+        @#{resource} ||= Sfn::ResourceCollection.new(#{class_name}, self.satisfaction, '#{options[:url]}')
       end
     EOS
   end
   
   def belongs_to(resource, options={})
-    class_name = options[:class_name] || resource.to_s.classify
+    class_name = options[:class_name] || "Sfn::#{resource.to_s.classify}"
     parent_id = options[:parent_attribute] || "#{resource}_id"
     eval <<-EOS
       def #{resource}

data/lib/satisfaction/cache/hash.rb

@@ -1,11 +1,11 @@
-class Satisfaction::Loader::HashCache
+class Sfn::Loader::HashCache
   def initialize
     @cached_responses = {}
   end
   
   def put(url, response)
     return nil if response["ETag"].blank?
-    @cached_responses[url.to_s] = Satisfaction::Loader::CacheRecord.new(url, response["ETag"], response.body)
+    @cached_responses[url.to_s] = Sfn::Loader::CacheRecord.new(url, response["ETag"], response.body)
   end
   
   def get(url)

data/lib/satisfaction/cache/memcache.rb

@@ -1,5 +1,5 @@
 
-class Satisfaction::Loader::MemcacheCache
+class Sfn::Loader::MemcacheCache
   def initialize(options = {})
     options = options.reverse_merge({:servers => ['127.0.0.1:11211'], :namespace => 'satisfaction', })
     @m = MemCache.new(options.delete(:servers), options)
@@ -8,7 +8,7 @@ class Satisfaction::Loader::MemcacheCache
   def put(url, response)
     return nil if response["ETag"].blank?
     
-    @m[url.to_s] = Loader::CacheRecord.new(url, response["ETag"], response.body)
+    @m[url.to_s] = Sfn::Loader::CacheRecord.new(url, response["ETag"], response.body)
   end
   
   def get(url)

data/lib/satisfaction/company.rb

@@ -1,4 +1,4 @@
-class Company < Resource
+class Sfn::Company < Sfn::Resource
   
   attributes :domain, :name, :logo, :description
   
@@ -10,7 +10,7 @@ class Company < Resource
     has_many :people, :url => "#{path}/people"
     has_many :topics, :url => "#{path}/topics"
     has_many :products, :url => "#{path}/products"
-    has_many :employees, :url => "#{path}/employees", :class_name => 'Person'
+    has_many :employees, :url => "#{path}/employees", :class_name => 'Sfn::Person'
     has_many :tags, :url => "#{path}/tags"
     
   end

data/lib/satisfaction/has_satisfaction.rb

@@ -1,4 +1,4 @@
-class Satisfaction::HasSatisfaction
+class Sfn::HasSatisfaction
   attr_reader :satisfaction
   
   def initialize(satisfaction)

data/lib/satisfaction/identity_map.rb

@@ -1,4 +1,4 @@
-class Satisfaction::IdentityMap
+class Sfn::IdentityMap
   attr_reader :records, :pages
   
   def initialize

data/lib/satisfaction/loader.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'uri'
 
 
-class Satisfaction::Loader
+class Sfn::Loader
   require 'satisfaction/cache/hash'
   require 'satisfaction/cache/memcache'
 
@@ -34,7 +34,7 @@ class Satisfaction::Loader
     end
     
     http = Net::HTTP.new(uri.host, uri.port)
-    add_authentication(request, options)
+    add_authentication(request, http, options)
     response = execute(http, request)
     
     case response
@@ -73,7 +73,7 @@ class Satisfaction::Loader
     request.set_form_data(form)
     
     http = Net::HTTP.new(uri.host, uri.port)
-    add_authentication(request, options)
+    add_authentication(request, http, options)
     response = execute(http, request)
     
     case response
@@ -104,7 +104,7 @@ class Satisfaction::Loader
     end
   end
   
-  def add_authentication(request, options)
+  def add_authentication(request, http, options)
     if options[:user]
       request.basic_auth(options[:user], options[:password])
     elsif options[:consumer]

data/lib/satisfaction/person.rb

@@ -1,4 +1,4 @@
-class Person < Resource
+class Sfn::Person < Sfn::Resource
   attributes :name, :id, :photo, :tagline
   
   def path
@@ -8,11 +8,11 @@ class Person < Resource
   def setup_associations
     has_many :replies, :url => "#{path}/replies"
     has_many :topics, :url => "#{path}/topics"
-    has_many :followed_topics, :url => "#{path}/followed/topics", :class_name => 'Topic'
+    has_many :followed_topics, :url => "#{path}/followed/topics", :class_name => 'Sfn::Topic'
   end
 end
 
-class Me < Person  
+class Me < Sfn::Person  
   def path
     loaded? ? super : "/me"
   end

data/lib/satisfaction/product.rb

@@ -1,4 +1,4 @@
-class Product < Resource
+class Sfn::Product < Sfn::Resource
   attributes :name, :url, :image, :description
   attribute :last_active_at, :type => Time
   attribute :created_at, :type => Time

data/lib/satisfaction/reply.rb

@@ -1,7 +1,7 @@
-class Reply < Resource
+class Sfn::Reply < Sfn::Resource
   attributes :content, :star_count, :topic_id
   attribute :created_at, :type => Time
-  attribute :author, :type => Person
+  attribute :author, :type => Sfn::Person
   
   def path
     "/replies/#{id}"

data/lib/satisfaction/resource.rb

@@ -1,11 +1,11 @@
 require 'forwardable'
 
-class Resource < Satisfaction::HasSatisfaction
+class Sfn::Resource < Sfn::HasSatisfaction
   require 'satisfaction/resource/attributes'
   include ::Associations
   include Attributes
   attr_reader :id
-  include Satisfaction::Util
+  include Sfn::Util
   
   
   def initialize(id, satisfaction)
@@ -56,15 +56,19 @@ class Resource < Satisfaction::HasSatisfaction
   end
   
   def inspect
-    "<#{self.class.name} #{attributes.map{|k,v| "#{k}: #{v}"}.join(' ') if !attributes.nil?}>"
+    if loaded?
+      "<#{self.class.name} #{attributes.map{|k,v| "#{k}: #{v}"}.join(' ') if !attributes.nil?}>"
+    else
+      "<#{self.class.name} #{path} UNLOADED>"      
+    end
   end
 
 end
 
-class ResourceCollection < Satisfaction::HasSatisfaction
+class Sfn::ResourceCollection < Sfn::HasSatisfaction
   attr_reader :klass
   attr_reader :path
-  include Satisfaction::Util
+  include Sfn::Util
   
   def initialize(klass, satisfaction, path)
     super satisfaction
@@ -73,7 +77,7 @@ class ResourceCollection < Satisfaction::HasSatisfaction
   end
   
   def page(number, options={})
-    Page.new(self, number, options)
+    Sfn::Page.new(self, number, options)
   end
   
   def get(id, options={})
@@ -112,7 +116,7 @@ class ResourceCollection < Satisfaction::HasSatisfaction
   
 end
 
-class Page < Satisfaction::HasSatisfaction
+class Sfn::Page < Sfn::HasSatisfaction
   attr_reader :total
   attr_reader :collection
   

data/lib/satisfaction/resource/attributes.rb

@@ -1,4 +1,4 @@
-module Resource::Attributes
+module Sfn::Resource::Attributes
   def self.included(base)
     base.class_eval do
       extend ClassMethods
@@ -54,7 +54,7 @@ class Time
   end
 end
 
-class Resource
+class Sfn::Resource
   def self.decode_sfn(value, satisfaction)
     case value
     when Hash

data/lib/satisfaction/tag.rb

@@ -1,4 +1,4 @@
-class Tag < Resource
+class Sfn::Tag < Sfn::Resource
   attributes :name
 
   def path

data/lib/satisfaction/topic.rb

@@ -1,8 +1,8 @@
-class Topic < Resource
-  attributes :subject, :style, :content, :reply_count, :follower_count, :company_id
+class Sfn::Topic < Sfn::Resource
+  attributes :subject, :style, :content, :reply_count, :follower_count, :company_id, :at_sfn
   attribute :last_active_at, :type => Time
   attribute :created_at, :type => Time
-  attribute :author, :type => Person
+  attribute :author, :type => Sfn::Person
   
   def path
     "/topics/#{@id}"

data/lib/satisfaction/util.rb

@@ -1,4 +1,4 @@
-module Satisfaction::Util
+module Sfn::Util
   def requestify(parameters, prefix=nil)
     parameters.inject({}) do |results, kv|
       if Hash === kv.last

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-satisfaction
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Scott Fleckenstein
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 -08:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: oauth
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: memcache-client
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -57,9 +61,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/satisfaction
 - lib/satisfaction/associations.rb
-- lib/satisfaction/cache
 - lib/satisfaction/cache/hash.rb
 - lib/satisfaction/cache/memcache.rb
 - lib/satisfaction/company.rb
@@ -70,7 +72,6 @@ files:
 - lib/satisfaction/person.rb
 - lib/satisfaction/product.rb
 - lib/satisfaction/reply.rb
-- lib/satisfaction/resource
 - lib/satisfaction/resource/attributes.rb
 - lib/satisfaction/resource.rb
 - lib/satisfaction/tag.rb
@@ -78,8 +79,10 @@ files:
 - lib/satisfaction/util.rb
 - lib/satisfaction/version.rb
 - lib/satisfaction.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://nullstyle.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -100,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Helper gem for the getsatisfaction.com API
 test_files: []