posterous 0.2.2 → 0.2.3

data/bin/posterous

@@ -35,34 +35,48 @@ end
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-%w{posterous irb}.each { |f| require f }
-
-rc  = File.exists?(RC_PATH) ? File.open(RC_PATH, 'r') : File.open(RC_PATH, 'w')
-yml = YAML.load_file(RC_PATH)
+%w{posterous irb fileutils}.each { |f| require f }
+
+
+def setup
+  @yml = YAML.load_file(RC_PATH) rescue nil
+
+  if @yml.is_a?(Hash)
+    @cfg = @yml
+  else
+    @rc  = File.open(RC_PATH, 'w')
+    @cfg = {}
+    puts "Email Address:"
+    @cfg['username'] = gets.chomp
+    begin
+      puts "Password:"
+      system('stty -echo')
+      @cfg['password'] = gets.chomp
+    rescue
+    ensure
+      system('stty echo')
+    end
+    puts "Api Token:"
+    @cfg['api_token'] = gets.chomp
+    @rc.puts @cfg.to_yaml
+    @rc.close
+  end
 
-if yml.is_a?(Hash)
-  cfg = yml
-else
-  cfg = {}
-  puts "Email Address:"
-  cfg['username'] = gets.chomp
+  Posterous.config = @cfg
+  
   begin
-    puts "Password:"
-    system('stty -echo')
-    cfg['password'] = gets.chomp
-  rescue
-  ensure
-    system('stty echo')
+    Posterous::User.me
+  rescue Exception => e
+    FileUtils.rm(RC_PATH, :force => true)
+    puts "*"*100
+    puts "Invalid Login: #{e.inspect}"
+    puts "*"*100
+    setup
   end
-  puts "Api Token:"
-  cfg['api_token'] = gets.chomp
-  rc.puts cfg.to_yaml
 end
 
-rc.puts cfg.to_yaml
-rc.close
+setup
 
-Posterous.config = cfg
 
 include Posterous
 
@@ -70,6 +84,8 @@ def current_user
   @current_user ||= User.me
 end
 
+
+
 puts "*"*100
 puts "Hi #{current_user.nickname}, welcome to the Posterous API Console! For help type `newb`.\n"
 puts "*"*100

data/lib/posterous/association_proxy.rb

@@ -1,7 +1,8 @@
 module Posterous
   class AssociationProxy
     attr_reader :klass, :proxied
-
+    
+    # poached from activerecord
     instance_methods.each { |m| undef_method m unless m.to_s =~ /^(?:nil\?|send|object_id|to_a)$|^__|^respond_to|proxy_/ }
     
     def initialize proxied, klass, association_type, *args
@@ -9,7 +10,10 @@ module Posterous
       @proxied            = proxied
       @association        = nil
 
+      # set the parent id for the assoc class
       @association_klass.finder_opts[klass.resource_url_keys.last] = proxied.id
+      # grab any needed finder opts from the proxied instance
+      # and grab them from the parent resource
       @association_klass.finder_opts.merge!(@proxied.finder_opts)
 
       load_method   =  association_type == :many ? :all : :load

data/lib/posterous/model.rb

@@ -16,6 +16,18 @@ module Posterous
         AssociationProxy.new self, klass, :one, *args
       end
     end
+
+    def self.parsed_resource_url
+      resource_path.gsub(/:\w+/) {|sym| finder_opts[sym.sub(/:/,'').to_sym] }
+    end
+
+    def parsed_resource_url
+      self.class.parsed_resource_url     
+    end
+
+    def self.resource_url_keys
+      resource_path.scan(/:(\w+)/).flatten.collect(&:to_sym)
+    end
     
     # hack for ruby 1.8.7 
     def id
@@ -77,33 +89,26 @@ module Posterous
 
       new post(parsed_resource_url, param_scope => params, :media => media)
     end
+
+    # url used for the update & delete actions
+    def instance_url
+      "#{parsed_resource_url}/#{self.id}"
+    end
     
     def save
       return if hash_for_update.empty?
-      @struct = self.class.post(parsed_resource_url + "/#{self.id}", { param_scope => hash_for_update, '_method' => 'put' } )
+      @struct = self.class.post(instance_url, { param_scope => hash_for_update, '_method' => 'put' } )
       changed_fields.clear
     end
 
     def destroy
-      self.class.delete(parsed_resource_url + "/#{self.id}")
+      self.class.delete(instance_url)
     end
 
     def reload
       self.class.find(self.id)
     end
 
-    def self.parsed_resource_url
-      resource_path.gsub(/:\w+/) {|sym| finder_opts[sym.sub(/:/,'').to_sym] }
-    end
-
-    def parsed_resource_url
-      self.class.parsed_resource_url     
-    end
-
-    def self.resource_url_keys
-      resource_path.scan(/:(\w+)/).flatten.collect(&:to_sym)
-    end
-        
     def initialize struct
       @struct = struct
     end

data/lib/posterous/models/profile.rb

@@ -6,14 +6,9 @@ module Posterous
       'site_profile'
     end
 
-    def save
-      return if hash_for_update.empty?
-      @struct = self.class.post(parsed_resource_url, { param_scope => hash_for_update, '_method' => 'put' } )
-      changed_fields.clear
+    def instance_url
+      parsed_resource_url
     end
 
-    def destroy
-      self.class.delete(parsed_resource_url)
-    end
   end
 end

data/lib/posterous/version.rb

@@ -1,3 +1,3 @@
 module Posterous
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Christopher Burnett @twoism
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency