mmangino-facebooker 1.0.29 → 1.0.30

data/.autotest

@@ -0,0 +1,15 @@
+Autotest.add_hook(:initialize) do |at|
+  at.clear_mappings
+  at.find_directories = %w(lib test)
+
+  at.add_exception("test/test_helper.rb")
+  at.add_exception("test/rails_test_helper.rb")
+
+  at.add_mapping(/^lib\/.*\.rb$/) do |file, _|
+    at.files_matching(/^test\/.*_test\.rb$/)
+  end
+
+  at.add_mapping(/^test\/.*_test\.rb$/) do |file, _|
+    file
+  end
+end

data/Manifest.txt

@@ -0,0 +1,129 @@
+.autotest
+CHANGELOG.rdoc
+COPYING.rdoc
+Manifest.txt
+README.rdoc
+Rakefile
+TODO.rdoc
+examples/desktop_login.rb
+facebooker.gemspec
+generators/facebook/facebook_generator.rb
+generators/facebook/templates/config/facebooker.yml
+generators/facebook/templates/public/javascripts/facebooker.js
+generators/facebook_controller/USAGE
+generators/facebook_controller/facebook_controller_generator.rb
+generators/facebook_controller/templates/controller.rb
+generators/facebook_controller/templates/functional_test.rb
+generators/facebook_controller/templates/helper.rb
+generators/facebook_controller/templates/view.fbml.erb
+generators/facebook_controller/templates/view.html.erb
+generators/facebook_publisher/facebook_publisher_generator.rb
+generators/facebook_publisher/templates/create_facebook_templates.rb
+generators/facebook_publisher/templates/publisher.rb
+generators/facebook_scaffold/USAGE
+generators/facebook_scaffold/facebook_scaffold_generator.rb
+generators/facebook_scaffold/templates/controller.rb
+generators/facebook_scaffold/templates/facebook_style.css
+generators/facebook_scaffold/templates/functional_test.rb
+generators/facebook_scaffold/templates/helper.rb
+generators/facebook_scaffold/templates/layout.fbml.erb
+generators/facebook_scaffold/templates/layout.html.erb
+generators/facebook_scaffold/templates/style.css
+generators/facebook_scaffold/templates/view_edit.fbml.erb
+generators/facebook_scaffold/templates/view_edit.html.erb
+generators/facebook_scaffold/templates/view_index.fbml.erb
+generators/facebook_scaffold/templates/view_index.html.erb
+generators/facebook_scaffold/templates/view_new.fbml.erb
+generators/facebook_scaffold/templates/view_new.html.erb
+generators/facebook_scaffold/templates/view_show.fbml.erb
+generators/facebook_scaffold/templates/view_show.html.erb
+generators/publisher/publisher_generator.rb
+generators/xd_receiver/templates/xd_receiver.html
+generators/xd_receiver/xd_receiver_generator.rb
+init.rb
+install.rb
+lib/facebooker.rb
+lib/facebooker/adapters/adapter_base.rb
+lib/facebooker/adapters/bebo_adapter.rb
+lib/facebooker/adapters/facebook_adapter.rb
+lib/facebooker/admin.rb
+lib/facebooker/batch_request.rb
+lib/facebooker/data.rb
+lib/facebooker/feed.rb
+lib/facebooker/logging.rb
+lib/facebooker/mobile.rb
+lib/facebooker/mock/service.rb
+lib/facebooker/mock/session.rb
+lib/facebooker/model.rb
+lib/facebooker/models/affiliation.rb
+lib/facebooker/models/album.rb
+lib/facebooker/models/applicationproperties.rb
+lib/facebooker/models/applicationrestrictions.rb
+lib/facebooker/models/cookie.rb
+lib/facebooker/models/education_info.rb
+lib/facebooker/models/event.rb
+lib/facebooker/models/friend_list.rb
+lib/facebooker/models/group.rb
+lib/facebooker/models/info_item.rb
+lib/facebooker/models/info_section.rb
+lib/facebooker/models/location.rb
+lib/facebooker/models/notifications.rb
+lib/facebooker/models/page.rb
+lib/facebooker/models/photo.rb
+lib/facebooker/models/tag.rb
+lib/facebooker/models/user.rb
+lib/facebooker/models/video.rb
+lib/facebooker/models/work_info.rb
+lib/facebooker/parser.rb
+lib/facebooker/rails/controller.rb
+lib/facebooker/rails/cucumber.rb
+lib/facebooker/rails/cucumber/world.rb
+lib/facebooker/rails/extensions/action_controller.rb
+lib/facebooker/rails/extensions/rack_setup.rb
+lib/facebooker/rails/extensions/routing.rb
+lib/facebooker/rails/facebook_form_builder.rb
+lib/facebooker/rails/facebook_pretty_errors.rb
+lib/facebooker/rails/facebook_request_fix.rb
+lib/facebooker/rails/facebook_session_handling.rb
+lib/facebooker/rails/facebook_url_helper.rb
+lib/facebooker/rails/facebook_url_rewriting.rb
+lib/facebooker/rails/helpers.rb
+lib/facebooker/rails/helpers/fb_connect.rb
+lib/facebooker/rails/integration_session.rb
+lib/facebooker/rails/profile_publisher_extensions.rb
+lib/facebooker/rails/publisher.rb
+lib/facebooker/rails/routing.rb
+lib/facebooker/rails/test_helpers.rb
+lib/facebooker/rails/utilities.rb
+lib/facebooker/server_cache.rb
+lib/facebooker/service.rb
+lib/facebooker/session.rb
+lib/facebooker/version.rb
+lib/net/http_multipart_post.rb
+lib/rack/facebook.rb
+lib/tasks/facebooker.rake
+lib/tasks/tunnel.rake
+rails/init.rb
+setup.rb
+templates/layout.erb
+test/facebooker/adapters_test.rb
+test/facebooker/admin_test.rb
+test/facebooker/batch_request_test.rb
+test/facebooker/data_test.rb
+test/facebooker/logging_test.rb
+test/facebooker/mobile_test.rb
+test/facebooker/model_test.rb
+test/facebooker/models/event_test.rb
+test/facebooker/models/user_test.rb
+test/facebooker/rails/publisher_test.rb
+test/facebooker/rails_integration_test.rb
+test/facebooker/server_cache_test.rb
+test/facebooker/session_test.rb
+test/facebooker_test.rb
+test/fixtures/multipart_post_body_with_only_parameters.txt
+test/fixtures/multipart_post_body_with_single_file.txt
+test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt
+test/net/http_multipart_post_test.rb
+test/rack/facebook_test.rb
+test/rails_test_helper.rb
+test/test_helper.rb

data/Rakefile

@@ -1,7 +1,6 @@
 # -*- ruby -*-
 # 
 require 'rubygems'
-ENV['RUBY_FLAGS']="-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
 require 'hoe'
 begin
   require 'load_multi_rails_rake_tasks'
@@ -20,13 +19,13 @@ HOE = Hoe.new('facebooker', Facebooker::VERSION::STRING) do |p|
   p.history_file  = 'CHANGELOG.rdoc'
   p.remote_rdoc_dir = '' # Release to root
   p.test_globs = 'test/**/*_test.rb'
-  p.extra_deps << ['json', '>= 1.0.0'] 
+  p.extra_deps << ['json', '>= 1.0.0']
   p.extra_rdoc_files  = FileList['*.rdoc']
 end
 
 require 'rcov/rcovtask'
 
-namespace :test do 
+namespace :test do
   namespace :coverage do
     desc "Delete aggregate coverage data."
     task(:clean) { rm_f "coverage.data" }

data/examples/desktop_login.rb

@@ -0,0 +1,14 @@
+$: << File.join(File.dirname(__FILE__), "..", 'lib')
+require 'facebooker'
+load "~/.facebooker" rescue fail("You'll need to specify API_KEY and SECRET_KEY to run this example.  One way to do that would be to put them in ~/.facebooker")
+session = Facebooker::Session::Desktop.create(API_KEY, SECRET_KEY)
+puts session.login_url
+gets
+
+session.user.friends!.each do |user|
+  puts "#{user.id}:#{user.name}"
+end
+# This time all the data is there because friends! has already retrieved it.
+session.user.friends.each do |user|
+    puts "#{user.id}:#{user.name}"
+end

data/facebooker.gemspec

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{facebooker}
+  s.version = "1.0.30"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis"]
+  s.date = %q{2009-04-29}
+  s.description = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:
+
+* Idiomatic Ruby
+* No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem)
+* Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available
+* Well tested}
+  s.email = %q{mmangino@elevatedrails.com}
+  s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "COPYING.rdoc", "README.rdoc", "TODO.rdoc"]
+  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "generators/facebook_scaffold/templates/view_new.html.erb", "generators/facebook_scaffold/templates/view_show.fbml.erb", "generators/facebook_scaffold/templates/view_show.html.erb", "generators/publisher/publisher_generator.rb", "generators/xd_receiver/templates/xd_receiver.html", "generators/xd_receiver/xd_receiver_generator.rb", "init.rb", "install.rb", "lib/facebooker.rb", "lib/facebooker/adapters/adapter_base.rb", "lib/facebooker/adapters/bebo_adapter.rb", "lib/facebooker/adapters/facebook_adapter.rb", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.rb", "lib/facebooker/model.rb", "lib/facebooker/models/affiliation.rb", "lib/facebooker/models/album.rb", "lib/facebooker/models/applicationproperties.rb", "lib/facebooker/models/applicationrestrictions.rb", "lib/facebooker/models/cookie.rb", "lib/facebooker/models/education_info.rb", "lib/facebooker/models/event.rb", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/controller.rb", "lib/facebooker/rails/cucumber.rb", "lib/facebooker/rails/cucumber/world.rb", "lib/facebooker/rails/extensions/action_controller.rb", "lib/facebooker/rails/extensions/rack_setup.rb", "lib/facebooker/rails/extensions/routing.rb", "lib/facebooker/rails/facebook_form_builder.rb", "lib/facebooker/rails/facebook_pretty_errors.rb", "lib/facebooker/rails/facebook_request_fix.rb", "lib/facebooker/rails/facebook_session_handling.rb", "lib/facebooker/rails/facebook_url_helper.rb", "lib/facebooker/rails/facebook_url_rewriting.rb", "lib/facebooker/rails/helpers.rb", "lib/facebooker/rails/helpers/fb_connect.rb", "lib/facebooker/rails/integration_session.rb", "lib/facebooker/rails/profile_publisher_extensions.rb", "lib/facebooker/rails/publisher.rb", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/batch_request_test.rb", "test/facebooker/data_test.rb", "test/facebooker/logging_test.rb", "test/facebooker/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/fixtures/multipart_post_body_with_only_parameters.txt", "test/fixtures/multipart_post_body_with_single_file.txt", "test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://facebooker.rubyforge.org}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{facebooker}
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]}
+  s.test_files = ["test/facebooker/adapters_test.rb", "test/facebooker/admin_test.rb", "test/facebooker/batch_request_test.rb", "test/facebooker/data_test.rb", "test/facebooker/logging_test.rb", "test/facebooker/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 1.0.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.12.1"])
+    else
+      s.add_dependency(%q<json>, [">= 1.0.0"])
+      s.add_dependency(%q<hoe>, [">= 1.12.1"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 1.0.0"])
+    s.add_dependency(%q<hoe>, [">= 1.12.1"])
+  end
+end

data/lib/facebooker/adapters/adapter_base.rb

@@ -26,6 +26,7 @@ module Facebooker
 
     def initialize(config)
       @config = config
+      @facebook_path_prefix = nil
     end
 
     def  self.facebooker_config
@@ -36,7 +37,7 @@ module Facebooker
     def self.load_adapter(params)
 
       config_key_base = params[:config_key_base] # This allows for loading of a aspecific adapter
-      config_key_base += "_" unless config_key_base.blank?
+      config_key_base += "_" if config_key_base && config_key_base.length > 0
 
       unless api_key = (params[:fb_sig_api_key] || facebooker_config["#{config_key_base}api_key"])
         raise Facebooker::AdapterBase::UnableToLoadAdapter
@@ -51,7 +52,7 @@ module Facebooker
 
         key_base = key.match(/(.*)[_]?api_key/)[1]
 
-        adapter_class_name = if key_base.blank?
+        adapter_class_name = if !key_base || key_base.length == 0
            "FacebookAdapter"
         else
           facebooker_config[key_base + "adapter"]

data/lib/facebooker/adapters/bebo_adapter.rb

@@ -12,16 +12,16 @@ module Facebooker
     def api_rest_path
       "/restserver.php"
     end
-      
+
     def is_for?(application_context)
       application_context == :bebo
     end
-       
+
     def www_server_base_url
       "www.bebo.com"
     end
 
-       
+
     def login_url_base
       "http://#{www_server_base_url}/SignIn.jsp?ApiKey=#{api_key}&v=1.0"
     end
@@ -33,7 +33,6 @@ module Facebooker
 end
 
 # Things that don't actually work as expected in BEBO
-Facebooker::PublishTemplatizedAction
 module Facebooker
    class User
     def set_profile_fbml_with_bebo_adapter(profile_fbml, mobile_fbml, profile_action_fbml, profile_main = nil)
@@ -49,6 +48,9 @@ module Facebooker
     private
     
     BEBO_FIELDS = FIELDS - [:meeting_sex, :wall_count, :meeting_for]
+
+    remove_method :collect
+
     def collect(fields)
       if(Facebooker.is_for?(:bebo) )
          BEBO_FIELDS.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')

data/lib/facebooker/batch_request.rb

@@ -5,19 +5,21 @@ module Facebooker
     attr_reader :method
     class UnexecutedRequest < StandardError; end
     def initialize(params,proc)
-      @method=params[:method]
-      @uri=params.map{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join("&")
-      @proc=proc
+      @exception  = nil
+      @result     = nil
+      @method     = params[:method]
+      @uri        = params.map{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join("&")
+      @proc       = proc
     end
-  
+
     def result=(result_object)
       @result = @proc.nil? ? result_object : @proc.call(result_object)
     end
-    
+
     def exception_raised=(ex)
       @exception=ex
     end
-    
+
     def exception_raised?
       @exception.nil? ? false : raise(@exception)
     end
@@ -25,12 +27,11 @@ module Facebooker
     def respond_to?(name)
       super || @result.respond_to?(name)
     end
-  
+
     def ===(other)
       other === @result
     end
-  
-  
+
     def method_missing(name,*args,&proc)
       if @exception
         raise @exception
@@ -41,4 +42,4 @@ module Facebooker
       end
     end
   end
-end
+end

data/lib/facebooker/logging.rb

@@ -9,16 +9,9 @@ module Facebooker
   end
 
   module Logging
-    
-    def self.skip_api_logging=(val)
-      @skip_api_logging=val
-    end
-    
-    def self.skip_api_logging
-      @skip_api_logging
-    end
-    
-    
+    @skip_api_logging = nil
+    class << self; attr_accessor :skip_api_logging; end
+
     def self.log_fb_api(method, params)
       message = method # might customize later
       dump = format_fb_params(params)
@@ -36,11 +29,11 @@ module Facebooker
       log_info(message, exception)
       raise
     end
-    
+
     def self.format_fb_params(params)
       params.map { |key,value| "#{key} = #{value}" }.join(', ')
     end
-    
+
     def self.log_info(message, dump, seconds = 0)
       return unless Facebooker.logger
       log_message = "#{message} (#{seconds}) #{dump}"
@@ -48,4 +41,4 @@ module Facebooker
     end
     
   end  
-end
+end

data/lib/facebooker/mobile.rb

@@ -3,12 +3,12 @@ module Facebooker
     def initialize(session)
       @session = session
     end
-  
+
     # Used to determine whether the user identified by "uid" has enabled SMS for this application.
     def can_send(user)
       @session.post('facebook.sms.canSend', :uid => User.cast_to_facebook_id(user))
     end
-    
+
     # Send the given message to the user.
     # See http://wiki.developers.facebook.com/index.php/Mobile
     def send(user, message)

data/lib/facebooker/model.rb

@@ -1,6 +1,6 @@
 module Facebooker
   ##
-  # helper methods primarily supporting the management of Ruby objects which are populatable via Hashes.  
+  # helper methods primarily supporting the management of Ruby objects which are populatable via Hashes.
   # Since most Facebook API calls accept and return hashes of data (as XML), the Model module allows us to
   # directly populate a model's attributes given a Hash with matching key names.
   module Model
@@ -19,15 +19,15 @@ module Facebooker
         yield instance if block_given?
         instance
       end
-      
+
       ##
-      # Create a standard attr_writer and a populating_attr_reader      
+      # Create a standard attr_writer and a populating_attr_reader
       def populating_attr_accessor(*symbols)
-        attr_writer *symbols
-        populating_attr_reader *symbols
+        attr_writer(*symbols)
+        populating_attr_reader(*symbols)
       end
 
-      ## 
+      ##
       # Create a reader that will attempt to populate the model if it has not already been populated
       def populating_attr_reader(*symbols)
         symbols.each do |symbol|
@@ -59,27 +59,29 @@ module Facebooker
       def hash_settable_writer(symbol, klass)
         define_method("#{symbol}=") do |value|
           instance_variable_set("@#{symbol}", value.kind_of?(Hash) ? klass.from_hash(value) : value)
-        end        
+        end
       end
       
       #
       # Declares an attribute named ::symbol:: which can be set with either a list of instances of ::klass::
-      # or a list of Hashes which will be used to populate a new instance of ::klass::.      
+      # or a list of Hashes which will be used to populate a new instance of ::klass::.
       def hash_settable_list_accessor(symbol, klass)
         attr_reader symbol
         hash_settable_list_writer(symbol, klass)
       end
-      
+
       def hash_settable_list_writer(symbol, klass)
         define_method("#{symbol}=") do |list|
           instance_variable_set("@#{symbol}", list.map do |item|
             item.kind_of?(Hash) ? klass.from_hash(item) : item
           end)
         end
-      end      
+      end
 
       def id_is(attribute)
-        class_eval <<-EOS
+        (file, line) = caller.first.split(':')
+
+        class_eval(<<-EOS, file, line.to_i)
         def #{attribute}=(value)
           @#{attribute} = value.to_i
         end
@@ -90,7 +92,7 @@ module Facebooker
         EOS
       end
     end
-    
+
     ##
     # Centralized, error-checked place for a model to get the session to which it is bound.
     # Any Facebook API queries require a Session instance.
@@ -113,7 +115,7 @@ module Facebooker
     end
 
     def populated?
-      !@populated.nil?
+      @populated
     end
     
     ##

data/lib/facebooker/models/applicationproperties.rb

@@ -33,7 +33,7 @@ module Facebooker
                :private_install, :installable, :privacy_url, :help_url, :see_all_url, :tos_url,
                :dev_mode, :preload_fql, :icon_url, :canvas_name, :logo_url, :connect_logo_url ]
     
-    attr_accessor *FIELDS
+    attr_accessor(*FIELDS)
          
   end
 end

data/lib/facebooker/models/applicationrestrictions.rb

@@ -3,8 +3,8 @@ module Facebooker
   class ApplicationRestrictions
     include Model
     FIELDS = [ :age, :location, :age_distribution, :type ]
-    
-    attr_accessor *FIELDS
-         
+
+    attr_accessor(*FIELDS)
+
   end
 end

data/lib/facebooker/models/event.rb

@@ -21,8 +21,8 @@ module Facebooker
     end
     
     include Model
-    attr_accessor :eid, :pic, :pic_small, :pic_big, :name, :creator, :update_time, :description, :tagline, :venue, :host, :event_type, :nid, :location, :end_time, :start_time, :event_subtype
+    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :update_time, :description, :tagline, :venue, :host, :event_type, :nid, :location, :end_time, :start_time, :event_subtype
 
     id_is :eid
   end
-end
+end

data/lib/facebooker/models/friend_list.rb

@@ -4,8 +4,8 @@ module Facebooker
   # A simple representation of a friend list.
   class FriendList
     include Model
-    attr_accessor :flid, :name
-    
+    attr_accessor :name
+
     id_is :flid
 
     # We need this to be an integer, so do the conversion

data/lib/facebooker/models/group.rb

@@ -8,10 +8,10 @@ module Facebooker
       attr_accessor :position, :gid, :uid
     end
     include Model
-    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :gid, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid
-    
+    attr_accessor :pic, :pic_small, :pic_big, :name, :creator, :recent_news, :update_time, :group_subtype, :group_type, :website, :office, :description, :venue, :nid
+
     id_is :gid
-    
+
     ##
     # Get the full list of members as populated User objects.  First time fetches group members via Facebook API call.  
     # Subsequent calls return cached values.
@@ -33,4 +33,4 @@ module Facebooker
       end
     end
   end
-end
+end

data/lib/facebooker/models/page.rb

@@ -5,7 +5,7 @@ module Facebooker
     class Genre
       include Model
       FIELDS = [ :dance, :party, :relax, :talk, :think, :workout, :sing, :intimate, :raunchy, :headphones ]
-      attr_accessor *FIELDS
+      attr_accessor(*FIELDS)
 
       def initialize(*args)
         super
@@ -18,7 +18,8 @@ module Facebooker
     end
 
     include Model
-    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :type, :type, :website, :location, :hours, :band_members, :bio, :hometown, :genre, :record_label, :influences, :has_added_app, :founded, :company_overview, :mission, :products, :release_date, :starring, :written_by, :directed_by, :produced_by, :studio, :awards, :plot_outline, :network, :season, :schedule
+    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :type, :type, :website, :location, :hours, :band_members, :bio, :hometown, :record_label, :influences, :has_added_app, :founded, :company_overview, :mission, :products, :release_date, :starring, :written_by, :directed_by, :produced_by, :studio, :awards, :plot_outline, :network, :season, :schedule
+    attr_reader :genre
 
     def genre=(value)
       @genre = value.kind_of?(Hash) ? Genre.from_hash(value) : value

data/lib/facebooker/models/photo.rb

@@ -2,11 +2,11 @@ require 'facebooker/model'
 module Facebooker
   class Photo
     include Model
-    attr_accessor :pid, :aid, :owner, :title,
+    attr_accessor :aid, :owner, :title,
                   :link, :caption, :created,
                   :src, :src_big, :src_small,
                   :story_fbid
 
     id_is :pid
   end
-end
+end

data/lib/facebooker/models/user.rb

@@ -10,22 +10,30 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     end
-    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
+    FIELDS = [:political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :pic_square]
-    populating_attr_accessor *FIELDS
+    populating_attr_accessor(*FIELDS)
     attr_reader :affiliations
     populating_hash_settable_accessor :current_location, Location
     populating_hash_settable_accessor :hometown_location, Location
     populating_hash_settable_accessor :hs_info, EducationInfo::HighschoolInfo
-    populating_hash_settable_accessor :status, Status
     populating_hash_settable_list_accessor :affiliations, Affiliation
     populating_hash_settable_list_accessor :education_history, EducationInfo
     populating_hash_settable_list_accessor :work_history, WorkInfo
-    
+
+    populating_attr_reader :status
+
     # Can pass in these two forms:
     # id, session, (optional) attribute_hash
     # attribute_hash
     def initialize(*args)
+      @friends            = nil
+      @current_location   = nil
+      @pic                = nil
+      @hometown_location  = nil
+      @populated          = false
+      @session            = nil
+      @id                 = nil
       if (args.first.kind_of?(String) || args.first.kind_of?(Integer)) && args.size==1
         self.uid = args.shift
         @session = Session.current
@@ -35,7 +43,7 @@ module Facebooker
       end
       if args.last.kind_of?(Hash)
         populate_from_hash!(args.pop)
-      end     
+      end
     end
 
     id_is :uid

data/lib/facebooker/models/work_info.rb

@@ -1,9 +1,10 @@
 module Facebooker
   class WorkInfo
     include Model
-    attr_accessor :end_date, :start_date, :company_name, :description, :position, :location
+    attr_accessor :end_date, :start_date, :company_name, :description, :position
+    attr_reader :location
     def location=(location)
       @location = location.kind_of?(Hash) ? Location.from_hash(location) : location
     end
   end
-end
+end