oa_test 0.0.4 → 0.0.5

data/bin/oa_test

@@ -6,7 +6,8 @@ How to oa_test:
 ~~~~~~~~~~~~~~~~~~~~~~~
 syntax:
 oa_test [--consumer:token/secret] --yauth:login/passwd [--return:body|body_hash|boolean|object] [--host:host] [--api:path]
-
+params --host must prefix with "http://"
+params --api must prefix with "/"
 Enjoy... 
 
 END
@@ -20,18 +21,21 @@ if arg.size>0
   retrn    = arg.select{|x|/^--return/=~x}[0]
   host     = arg.select{|x|/^--host/=~x}[0]
   api      = arg.select{|x|/^--api/=~x}[0]
-  
-  cons     = consumer.split(':')[1].split('/')
-  yths     =    yauth.split(':')[1].split('/')
+  cons     = consumer ? consumer.split(':')[1].split('/') : [nil,nil]
+  yths     = yauth.split(':')[1].split('/')
 
   require 'rubygems'
   require 'oa_test'
 
-  OA = oa = OAuthTest.new(
-   :key    => cons[0].strip,
-   :secret => cons[1].strip,
-   :return => (retrn ? retrn.split(':')[1].to_sym : :body)
-  ).yauth(
+  OA = oa = OAuthTest.
+  new(
+   :key    => cons[0],
+   :secret => cons[1],
+   :return => (retrn ? retrn.split(':')[1].to_sym : :body),
+   :host   => (host ? host.split(':')[1,99].join(':') : nil),
+   :api    => (api ? api.split(':')[1]: nil)
+  ).
+  yauth(
    :login  => yths[0].strip,
    :passwd => yths[1].strip
   )
@@ -41,6 +45,9 @@ if arg.size>0
     def oa
       OA
     end
+    
+    alias_method :http, :oa
+    
   end
   
   # remove non irb arguments...
@@ -52,8 +59,9 @@ if arg.size>0
   require 'irb'
   puts ''
   puts "PATH: #{oa.host}#{oa.api}<path>"
-  puts "Your instance object stored in OA|oa"
-  puts "Ex: oa.get '/me.json'"
+  puts "Your instance object stored in OA|oa|http"
+  puts "The response object: http.resp"
+  puts "Ex: http.get '/me.json'"
   puts ''
   
   IRB.start      

data/lib/oa_test/cattr.rb

@@ -0,0 +1,264 @@
+class Module
+
+  # Creates a class-variable attribute that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CARExample
+  #     @@a = 10
+  #     cattr :a
+  #   end
+  #
+  #   CARExample.a           #=> 10
+  #   CARExample.new.a       #=> 10
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def cattr(*syms)
+    writers, readers = syms.flatten.partition{ |a| a.to_s =~ /=$/ }
+    writers = writers.map{ |e| e.to_s.chomp('=').to_sym }
+    ##readers.concat( writers ) # writers also get readers
+
+    cattr_reader(*readers)
+    cattr_writer(*writers)
+
+    return readers + writers
+  end
+
+  # Creates a class-variable attr_reader that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CARExample
+  #     @@a = 10
+  #     cattr_reader :a
+  #   end
+  #
+  #   CARExample.a           #=> 10
+  #   CARExample.new.a       #=> 10
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def cattr_reader(*syms)
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+
+        def #{sym}
+          @@#{sym}
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_writer that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CAWExample
+  #     cattr_writer :a
+  #     def self.a
+  #       @@a
+  #     end
+  #   end
+  #
+  #   CAWExample.a = 10
+  #   CAWExample.a            #=> 10
+  #   CAWExample.new.a = 29
+  #   CAWExample.a            #=> 29
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def cattr_writer(*syms)
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+
+        def #{sym}=(obj)
+          @@#{sym}=(obj)
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_accessor that can
+  # be accessed both on an instance and class level.
+  #
+  #   class CAAExample
+  #     cattr_accessor :a
+  #   end
+  #
+  #   CAAExample.a = 10
+  #   CAAExample.a           #=> 10
+  #   mc = CAAExample.new
+  #   mc.a                   #=> 10
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def cattr_accessor(*syms)
+    cattr_reader(*syms) + cattr_writer(*syms)
+  end
+
+  # Creates a class-variable attribute that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     mattr :a
+  #     def initialize
+  #       @@a = 10
+  #     end
+  #   end
+  #
+  #   c.new.a       #=> 10
+  #   c.a           #=> 10
+  #
+  # NOTE: The #mattr methods may not be as useful for modules as the #cattr
+  # methods are for classes, becuase class-level methods are not "inherited"
+  # across the metaclass for included modules.
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def mattr(*syms)
+    writers, readers = syms.flatten.partition{ |a| a.to_s =~ /=$/ }
+    writers = writers.collect{ |e| e.to_s.chomp('=').to_sym }
+    ##readers.concat( writers ) # writers also get readers
+
+    mattr_writer( *writers )
+    mattr_reader( *readers )
+
+    return readers + writers
+  end
+
+  # Creates a class-variable attr_reader that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     @@a = 10
+  #     mattr_reader :a
+  #   end
+  #
+  #   c.a           #=> 10
+  #   c.new.a       #=> 10
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def mattr_reader( *syms )
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}
+          @@#{sym}
+        end
+
+        def #{sym}
+          @@#{sym}
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_writer that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     mattr_writer :a
+  #     def self.a
+  #       @@a
+  #     end
+  #   end
+  #
+  #   c.a = 10
+  #   c.a            #=> 10
+  #
+  #   c.new.a = 29
+  #   c.a            #=> 29
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def mattr_writer(*syms)
+    syms.flatten.each do |sym|
+      module_eval(<<-EOS, __FILE__, __LINE__)
+        unless defined? @@#{sym}
+          @@#{sym} = nil
+        end
+
+        def self.#{sym}=(obj)
+          @@#{sym} = obj
+        end
+
+        def #{sym}=(obj)
+          @@#{sym}=(obj)
+        end
+      EOS
+    end
+    return syms
+  end
+
+  # Creates a class-variable attr_accessor that can
+  # be accessed both on an instance and class level.
+  #
+  #   c = Class.new do
+  #     mattr_accessor :a
+  #   end
+  #
+  #   c.a = 10
+  #   c.a           #=> 10
+  #
+  #   x = c.new
+  #   x.a           #=> 10
+  #
+  # NOTE: This is not (presently) a common core extension and is not
+  # loaded automatically when using <code>require 'facets'</code>.
+  #
+  # CREDIT: David Heinemeier Hansson
+  def mattr_accessor(*syms)
+    mattr_reader(*syms) + mattr_writer(*syms)
+  end
+
+end
+
+# Consider the issue where a module's metaclass is not inherited.
+#
+#   m = Module.new do
+#     @@a = 10
+#     mattr_reader :a
+#   end
+#
+#   c = Class.new do
+#     include m
+#   end
+#
+#   expect NoMethodError do
+#     c.a
+#   end
+#
+# Ideally this would work.

data/lib/oa_test/oa_config.rb

@@ -0,0 +1,44 @@
+require 'ostruct'
+require 'yaml'
+
+class OpenStruct
+  def _to_hash
+    h = @table
+    #handles nested structures
+    h.each do |k,v|
+      if v.class == OpenStruct
+        h[k] = v._to_hash
+      end
+    end
+    return h
+  end
+end
+
+class OAuthTest
+  attr_reader :config
+  
+  protected 
+  
+  def config_load(ks)
+    fl = File.expand_path("~/.oa_test")
+    @config = File.exist?(fl) ? YAML.load_file(fl) : OpenStruct.new
+    
+    #@config = OpenStruct.new(ym)
+    puts 'Read config: ~/.oa_test'
+
+    @config.key    = ks[:key].strip    if ks[:key]
+    @config.secret = ks[:secret].strip if ks[:secret]
+    
+    @config.host   = 'http://www.koprol.com' if !@config.host
+    @config.api    = '/api/v2'               if !@config.api
+    @config.host   = ks[:host]   if ks[:host]
+    @config.api    = ks[:api]    if ks[:api]
+    
+    @config.return = ks[:return] if ks[:return]
+    
+    if ks[:key] || ks[:secret] || ks[:return] || ks[:host] || ks[:api]
+      File.open(File.expand_path("~/.oa_test"),'w') { |f| f.puts @config.to_yaml }
+    end
+  end  
+end
+

data/lib/oa_test/oa_test.rb

@@ -3,78 +3,80 @@ require 'OAuth'
 require 'HTTParty'
 
 class OAuthTest
- attr_accessor :host,:api
- 
- def initialize(ks)
-   @key    = ks[:key]
-   @secret = ks[:secret]
-   @return = ks[:return] 
-   @host   = ks[:host]   ? ks[:host] : 'http://www.koprol.com'
-   @api    = ks[:api]    ? ks[:api]  : '/api/v2'
-   @typ    = {
+  attr_accessor :host,:api
+  attr_reader :resp
+
+  def initialize(ks)
+    config_load(ks)
+    @key    = config.key
+    @secret = config.secret
+    @return = config.return 
+    @host   = config.host   
+    @api    = config.api    
+    @typ    = {
      :json => {"Accept" => "application/json", "Content-Type" => "application/json"},
      :xml  => {"Accept" => "application/xml", "Content-Type" => "application/xml"},
-   }
- end
+    }
+  end
+
+  def yauth(lp)
+    get_part(lp).get_token()
+  end
+
+  def get(path)
+    rtn @access_token.get(@host+@api+path,typ(path))
+  end
 
- def yauth(lp)
-   get_part(lp).get_token()
- end
+  def post(path,params)
+    rtn @access_token.post(@host+@api+path,params.to_json,typ(path))
+  end
 
- def get(path)
-   rtn @access_token.get(@host+@api+path,typ(path))
- end
+  def put(path,params)
+    rtn @access_token.put(@host+@api+path,params.to_json,typ(path))
+  end
 
- def post(path,params)
-   rtn @access_token.post(@host+@api+path,params.to_json,typ(path))
- end
+  def delete(path)
+    rtn @access_token.delete(@host+@api+path,typ(path))
+  end
 
- def put(path,params)
-   rtn @access_token.put(@host+@api+path,params.to_json,typ(path))
- end
+  protected
 
- def delete(path)
-   rtn @access_token.delete(@host+@api+path,typ(path))
- end
+  def get_part(lp)
+    url     = "https://login.yahoo.com/WSLogin/V1/get_auth_token"	
+    content = {:query=>{:oauth_consumer_key=>@key, :passwd=>lp[:passwd], :login=>lp[:login]}}
+    @part   = HTTParty.get(url, content).parsed_response.split('=')[1].gsub("\n","")
+    self
+  end
 
- protected
+  def get_token
+    consumer     = OAuth::Consumer.new(@key,@secret, { :site => "https://api.login.yahoo.com", :access_token_path => "/oauth/v2/get_token" })
+    req_token    = OAuth::RequestToken.new(consumer, @part)
+    token_hash   = consumer.token_request(:post, "/oauth/v2/get_token", req_token)
+    @access_token= OAuth::AccessToken.new(consumer,token_hash["oauth_token"],token_hash["oauth_token_secret"])
+    self
+  end
 
- def get_part(lp)
-   url     = "https://login.yahoo.com/WSLogin/V1/get_auth_token"	
-   content = {:query=>{:oauth_consumer_key=>@key, :passwd=>lp[:passwd], :login=>lp[:login]}}
-   @part   = HTTParty.get(url, content).parsed_response.split('=')[1].gsub("\n","")
-   self
- end
+  def typ(path)
+    @ext = path[/.(json|xml)($|\?)/,1]
+    @ext = 'json' if !@ext
+    @typ[@ext.to_sym]
+  end
 
- def get_token
-   consumer     = OAuth::Consumer.new(@key,@secret, { :site => "https://api.login.yahoo.com", :access_token_path => "/oauth/v2/get_token" })
-   req_token    = OAuth::RequestToken.new(consumer, @part)
-   token_hash   = consumer.token_request(:post, "/oauth/v2/get_token", req_token)
-   @access_token= OAuth::AccessToken.new(consumer,token_hash["oauth_token"],token_hash["oauth_token_secret"])
-   self
- end
- 
- def typ(path)
-   @ext = path[/.(json|xml)($|\?)/,1]
-   @ext = 'json' if !@ext
-   @typ[@ext.to_sym]
- end
- 
- def rtn(resp)
-   puts resp.class
-   if @return==nil || resp.class!=Net::HTTPOK || @return==:body
-     resp.body
-   elsif @return==:body_hash && resp.class==Net::HTTPOK 
-     if @ext=='json'
-       Hash.from_json(resp.body)
-     elsif @ext=='xml'
-       Hash.from_xml(resp.body)
-     end
-   elsif @return==:boolean
-     resp.class==Net::HTTPOK 
-   else
-     resp
-   end
- end
- 
+  def rtn(resp)
+    @resp = resp
+    puts resp.class
+    if @return==nil || resp.class!=Net::HTTPOK || @return==:body
+      resp.body
+    elsif @return==:body_hash && resp.class==Net::HTTPOK 
+      if @ext=='json'
+        Hash.from_json(resp.body)
+      elsif @ext=='xml'
+        Hash.from_xml(resp.body)
+      end
+    elsif @return==:boolean
+      resp.class==Net::HTTPOK 
+    else
+      resp
+    end
+  end
 end

data/lib/oa_test/oa_test_version.rb

@@ -0,0 +1,3 @@
+module OaTestVersion
+  VERSION = "0.0.5"
+end

data/lib/oa_test.rb

@@ -1,2 +1,3 @@
 files =Dir[File.join(File.dirname(__FILE__),%w[.. lib oa_test ** *.rb])]
 files.each{ |f|require(f) }
+OAuthTest.send :include, ::OaTestVersion

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa_test
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Watchmen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 +07:00
+date: 2011-09-04 00:00:00 +07:00
 default_executable: oa_test
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,9 +92,11 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/oa_test/cattr.rb
 - lib/oa_test/from_jsonxml.rb
+- lib/oa_test/oa_config.rb
 - lib/oa_test/oa_test.rb
-- lib/oa_test/version.rb
+- lib/oa_test/oa_test_version.rb
 - lib/oa_test.rb
 - bin/oa_test
 has_rdoc: true

data/lib/oa_test/version.rb

@@ -1,3 +0,0 @@
-module Capykit
-  VERSION = "0.0.4"
-end