Wassruby 0.0.6 → 0.0.7

data/README.txt

@@ -1,46 +1,25 @@
-= Wassruby.rb
-
-Copyright (c) 2008 MANNAMI Takuya <takuya.mannami@gmail.com>
-
-== Example
-
-require 'rubygems'
-
-require 'wassruby'
-
-wassr = WWW::Wassr.new('LOGIN_ID','PASSWORD')
-
-
-#  WWW::Wassr.start('LOGIN_ID','PASSWORD'){|wassr|}
-
-wassr.message = "test"  
-
-
-# require 'kconv'; wassr.message = "test".toutf8
-
-wassr.post_message # => send message "test"  
-
-
-
-
-wassr.user_id = "foo"
-
-wassr.get_show.each {|v|
-	puts v["user_login_id"]
-	puts v["text"]
-}
-
-wassr.get_user_timeline.each {|v|
-	puts v["user_login_id"]
-	puts v["text"]
-}
-
-wassr.get_friends_timeline.each {|v|
-	puts v["user_login_id"]
-	puts v["text"]
-}
-
-wassr.get_footmark.each {|v|
-	puts v["nick"]
-	puts v["login_id"]
-}
+NAME
+    This is Ruby module Wassruby, Simple Wassr Client.
+
+VERSION
+    0.0.7
+
+SYNOPSIS
+    require 'wassruby'
+    #Post a message.
+    client = WWW::Wassr.new("USER_ID", "PASSWORD")
+    client.post("test")
+
+    WWW::Wassr.start("USER_ID", "PASSWORD") { |client|
+      client.post("test")
+    }
+    
+    #Module function
+    #Return value : hash of timeline
+    puts WWW::Wassr.get(:public_timeline)
+    puts WWW::Wassr.get(:user_timeline, "USER_ID")
+
+LICENSE 
+        MIT License
+AUTHOR
+    Takuya Mannami <mtakuya@users.sourceforge.jp>

data/example/example.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+require 'wassr'
+
+user_id = "YOUR WASSR ID"
+pass = "PASSWORD"
+
+client = WWW::Wassr.new(user_id, pass)
+client.post("test")
+
+#WWW::Wassr.start(user_id, pass) { |client|
+#  client.post("test")
+#}
+
+puts "PUBLICK TIMELINE"    
+puts WWW::Wassr.get(:public_timeline)
+
+puts "USER TIMELINE #{user_id}"
+puts WWW::Wassr.get(:user_timeline, user_id)

data/lib/wassruby.rb

@@ -1,12 +1,57 @@
-
-#
-#$:.unshift(File.dirname(__FILE__)) unless
-#  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-	require 'www/wassruby'
-
-	
-	module WWW
-		class Wassr
-		end
-	end
+#= Simple Wassr Client
+#Authors::		Takuya Mannami
+#Version::		0.0.7 (2009/11/24)
+#License::		MIT License
+
+# -*- coding: utf-8 -*-
+
+require 'open-uri'
+require 'net/http'
+require 'cgi'
+require 'json' #NOTE : RUBY_VERSION > '1.9'
+
+module WWW
+  class Wassr
+    VERSION = '0.0.7'
+    WASSR = "api.wassr.jp"
+    WASSR_RUBY = "Wassruby"
+    WASSR_API_URL = { 
+      :UPDATE => "/statuses/update.json?status=",
+      :PUBLIC_TIMELINE => "/statuses/public_timeline.json",
+      :USER_TIMELINE => "/statuses/user_timeline.json?id=",
+    }
+
+    def initialize(login_id, password)
+      @login_id = login_id
+      @password = password
+      @http = Net::HTTP.new(WASSR, 80)
+    end
+
+    class << self
+      def start(login_id, password, &block)
+        block.call(self.new(login_id, password))
+      end
+
+      def get_res_body_json(api_add)
+        JSON.parse(Net::HTTP.new(WASSR, 80).get(api_add).body)
+      end
+
+      def get(key, user_id="")
+        case key
+        when :public_timeline
+          get_res_body_json(WASSR_API_URL[:PUBLIC_TIMELINE])
+        when :user_timeline 
+          get_res_body_json(WASSR_API_URL[:USER_TIMELINE] << user_id)
+        end
+      end
+    end
+    
+    def post(message)
+      req = Net::HTTP::Post.new(WASSR_API_URL[:UPDATE] <<
+                                CGI.escape(message)    <<
+                                "&source=" << WASSR_RUBY)
+      req.basic_auth(@login_id, @password)
+      res = @http.request(req)
+    end
+  end
+end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: Wassruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Takuya Mannami
-autorequire: wassruby
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 +09:00
+date: 2009-11-24 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: 
-email: takuya.mannami@gmail.com
+description: README
+email: mtakuya@users.sourceforge.jp
 executables: []
 
 extensions: []
@@ -23,16 +23,16 @@ extra_rdoc_files:
 - README.txt
 files: 
 - lib/wassruby.rb
-- lib/www/simplejson.rb
-- lib/www/wassruby.rb
-- lib/example/example.rb
+- example/example.rb
 - README.txt
 has_rdoc: true
 homepage: http://wassruby.rubyforge.org/
+licenses: 
+- MIT License
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -50,9 +50,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Wassruby
-rubygems_version: 1.1.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Simple Wassr Client
+specification_version: 3
+summary: A Simple Wassr Client
 test_files: []
 

data/lib/example/example.rb

@@ -1,25 +0,0 @@
-require 'rubygems'
-require 'wassruby'
-require 'kconv'
-
-LOGIN_ID = '' 
-PASSWORD = ''
-WWW::Wassr.start(LOGIN_ID,PASSWORD){|wassr|
-	wassr.message = "TEST".toutf8
-	wassr.post_message
-}
-
-=begin rdoc
-require 'rubygems'
-require 'wassruby'
-require 'kconv'
-
-LOGIN_ID = '' 
-PASSWORD = ''
-WWW::Wassr.start(LOGIN_ID,PASSWORD){|wassr|
-	wassr.message = "TEST".toutf8
-	wassr.post_message
-}
-=end
-
-

data/lib/www/simplejson.rb

@@ -1,285 +0,0 @@
-# = Simple JSON parser & builder
-#
-# Author::  Chihiro Ito
-# License:: Public domain (unlike other files)
-# Support:: http://groups.google.com/group/webos-goodies/
-#
-# This file contains two simple JSON processing classes. JsonParser
-# converts a JSON string to an array or a hash. JsonBuilder performs
-# vice versa. These classes are standard compliant and are designed for
-# stability and reliability. Especially JsonParser has UTF-8 validation
-# functionality so you can avoid some kind of security attack.
-
-require 'strscan'
-
-
-# = Simple JSON parser
-#
-# This class converts a JSON string to an array or a hash. If *json_str*
-# contains a JSON form string, you can convert it like below.
-#
-#   ruby_obj = JsonParser.new.parse(json_str)
-#
-# If *json_str* has one or more invalid UTF-8 sequence, JsonParser throws
-# exception by default. You can change this behavior to replacing with an
-# arbitrary unicode character. See below for details.
-class JsonParser
-
-  #:stopdoc:
-  Debug              = false
-  Name               = 'JsonParser'
-  ERR_IllegalSyntax  = "[#{Name}] Syntax error"
-  ERR_IllegalUnicode = "[#{Name}] Illegal unicode sequence"
-
-  StringRegex = /\s*"((?:\\.|[^"\\])*)"/n
-  ValueRegex  = /\s*(?:
-		(true)|(false)|(null)|            # 1:true, 2:false, 3:null
-		(?:\"((?:\\.|[^\"\\])*)\")|       # 4:String
-		([-+]?\d+\.\d+(?:[eE][-+]?\d+)?)| # 5:Float
-		([-+]?\d+)|                       # 6:Integer
-		(\{)|(\[))/xn                     # 7:Hash, 8:Array
-  #:startdoc:
-
-  # Create a new instance of JsonParser. *options* can contain these values.
-  # [:validation]
-  #     If set to false, UTF-8 validation is disabled. true by default.
-  # [:surrogate]
-  #     If set to false, surrogate pair support is disabled. true by default.
-  # [:malformed_chr]
-  #     An invalid sequence in JSON string will be replaced with this value.
-  #     If set to nil, An exception will be thrown in this situation.
-  #     nil by default.
-  def initialize(options = {})
-    @default_validation    = options.has_key?(:validation)    ? options[:validation]    : true
-    @default_surrogate     = options.has_key?(:surrogate)     ? options[:surrogate]     : true
-    @default_malformed_chr = options.has_key?(:malformed_chr) ? options[:malformed_chr] : nil
-  end
-
-  # Convert *str* to an array or hash.
-  # [str]
-  #     A JSON form string. This must be encoded using UTF-8.
-  # [options]
-  #     Same as new.
-  def parse(str, options = {})
-    @enable_validation = options.has_key?(:validation)    ? options[:validation]    : @default_validation
-    @enable_surrogate  = options.has_key?(:surrogate)     ? options[:surrogate]     : @default_surrogate
-    @malformed_chr     = options.has_key?(:malformed_chr) ? options[:malformed_chr] : @default_malformed_chr
-    @malformed_chr = @malformed_chr[0] if String === @malformed_chr
-    @scanner = StringScanner.new(str)
-    obj = case get_symbol[0]
-          when ?{ then parse_hash
-          when ?[ then parse_array
-          else         raise err_msg(ERR_IllegalSyntax)
-          end
-    @scanner = nil
-    obj
-  end
-
-  private #---------------------------------------------------------
-
-  def validate_string(str, malformed_chr = nil)
-    code  = 0
-    rest  = 0
-    range = nil
-    ucs   = []
-    str.each_byte do |c|
-      if rest <= 0
-        case c
-        when 0x01..0x7f then rest = 0 ; ucs << c
-        when 0xc0..0xdf then rest = 1 ; code = c & 0x1f ; range = 0x00080..0x0007ff
-        when 0xe0..0xef then rest = 2 ; code = c & 0x0f ; range = 0x00800..0x00ffff
-        when 0xf0..0xf7 then rest = 3 ; code = c & 0x07 ; range = 0x10000..0x10ffff
-        else                 ucs << handle_malformed_chr(malformed_chr)
-        end
-      elsif (0x80..0xbf) === c
-        code = (code << 6) | (c & 0x3f)
-        if (rest -= 1) <= 0
-          if !(range === code) || (0xd800..0xdfff) === code
-            code = handle_malformed_chr(malformed_chr)
-          end
-          ucs << code
-        end
-      else
-        ucs << handle_malformed_chr(malformed_chr)
-        rest = 0
-      end
-    end
-    ucs << handle_malformed_chr(malformed_chr) if rest > 0
-    ucs.pack('U*')
-  end
-
-  def handle_malformed_chr(chr)
-    raise err_msg(ERR_IllegalUnicode) unless chr
-    chr
-  end
-
-  def err_msg(err)
-    err + (Debug ? " #{@scanner.string[[0, @scanner.pos - 8].max,16].inspect}" : "")
-  end
-
-  def unescape_string(str)
-    str = str.gsub(/\\(["\\\/bfnrt])/n) do
-      $1.tr('"\\/bfnrt', "\"\\/\b\f\n\r\t")
-    end.gsub(/(\\u[0-9a-fA-F]{4})+/n) do |matched|
-      seq = matched.scan(/\\u([0-9a-fA-F]{4})/n).flatten.map { |c| c.hex }
-      if @enable_surrogate
-        seq.each_index do |index|
-          if seq[index] && (0xd800..0xdbff) === seq[index]
-            n = index + 1
-            raise err_msg(ERR_IllegalUnicode) unless seq[n] && 0xdc00..0xdfff === seq[n]
-            seq[index] = 0x10000 + ((seq[index] & 0x03ff) << 10) + (seq[n] & 0x03ff)
-            seq[n] = nil
-          end
-        end.compact!
-      end
-      seq.pack('U*')
-    end
-    str = validate_string(str, @malformed_chr) if @enable_validation
-    str
-  end
-
-  def get_symbol
-    raise err_msg(ERR_IllegalSyntax) unless @scanner.scan(/\s*(.)/n)
-    @scanner[1]
-  end
-
-  def peek_symbol
-    @scanner.match?(/\s*(.)/n) ? @scanner[1] : nil
-  end
-
-  def parse_string
-    raise err_msg(ERR_IllegalSyntax) unless @scanner.scan(StringRegex)
-    unescape_string(@scanner[1])
-  end
-
-  def parse_value
-    raise err_msg(ERR_IllegalSyntax) unless @scanner.scan(ValueRegex)
-    case
-    when @scanner[1] then true
-    when @scanner[2] then false
-    when @scanner[3] then nil
-    when @scanner[4] then unescape_string(@scanner[4])
-    when @scanner[5] then @scanner[5].to_f
-    when @scanner[6] then @scanner[6].to_i
-    when @scanner[7] then parse_hash
-    when @scanner[8] then parse_array
-    else                  raise err_msg(ERR_IllegalSyntax)
-    end
-  end
-
-  def parse_hash
-    obj = {}
-    if peek_symbol[0] == ?} then get_symbol ; return obj ; end
-    while true
-      index = parse_string
-      raise err_msg(ERR_IllegalSyntax) unless get_symbol[0] == ?:
-      value = parse_value
-      obj[index] = value
-      case get_symbol[0]
-      when ?} then return obj
-      when ?, then next
-      else         raise err_msg(ERR_IllegalSyntax)
-      end
-    end
-  end
-
-  def parse_array
-    obj = []
-    if peek_symbol[0] == ?] then get_symbol ; return obj ; end
-    while true
-      obj << parse_value
-      case get_symbol[0]
-      when ?] then return obj
-      when ?, then next
-      else         raise err_msg(ERR_IllegalSyntax)
-      end
-    end
-  end
-
-end
-
-# = Simple JSON builder
-#
-# This class converts an Ruby object to a JSON string. you can convert
-# *ruby_obj* like below.
-#
-#   json_str = JsonBuilder.new.build(ruby_obj)
-#
-# *ruby_obj* must satisfy these conditions.
-# - It must support to_s method, otherwise must be an array, a hash or nil.
-# - All keys of a hash must support to_s method.
-# - All values of an array or a hash must satisfy all conditions mentioned above.
-#
-# If the *ruby_obj* is not an array or a hash, it will be converted to an array
-# with a single element.
-class JsonBuilder
-
-  #:stopdoc:
-  Name               = 'JsonBuilder'
-  ERR_NestIsTooDeep  = "[#{Name}] Array / Hash nested too deep."
-  ERR_NaN            = "[#{Name}] NaN and Infinite are not permitted in JSON."
-  #:startdoc:
-
-  # Create a new instance of JsonBuilder. *options* can contain these values.
-  # [:max_nest]
-  #     If Array / Hash is nested more than this value, an exception would be thrown.
-  #     64 by default.
-  # [:nan]
-  #     NaN is replaced with this value. If nil or false, an exception will be thrown.
-  #     nil by default.
-  def initialize(options = {})
-    @default_max_nest = options.has_key?(:max_nest) ? options[:max_nest] : 64
-    @default_nan      = options.has_key?(:nan)      ? options[:nan]      : nil
-  end
-
-  # Convert *obj* to a JSON form string.
-  # [obj]
-  #     A ruby object. this object must satisfy all conditions mentioned above.
-  # [options]
-  #     Same as new.
-  def build(obj, options = {})
-    @max_nest = options.has_key?(:max_nest) ? options[:max_nest] : @default_max_nest
-    @nan      = options.has_key?(:nan)      ? options[:nan]      : @default_nan
-    case obj
-    when Array then build_array(obj, 0)
-    when Hash  then build_object(obj, 0)
-    else            build_array([obj], 0)
-    end
-  end
-
-  private #---------------------------------------------------------
-
-  def escape(str)
-    str.gsub(/[^\x20-\x21\x23-\x5b\x5d-\xff]/n) do |chr|
-      if chr[0] != 0 && (index = "\"\\/\b\f\n\r\t".index(chr[0]))
-        "\\" + '"\\/bfnrt'[index, 1]
-      else
-        sprintf("\\u%04x", chr[0])
-      end
-    end
-  end
-
-  def build_value(obj, level)
-    case obj
-    when Integer, TrueClass, FalseClass then obj.to_s
-    when Float    then raise ERR_NaN unless obj.finite? || (obj = @nan) ; obj.to_s
-    when NilClass then 'null'
-    when Array    then build_array(obj, level + 1)
-    when Hash     then build_object(obj, level + 1)
-    else          "\"#{escape(obj.to_s)}\""
-    end
-  end
-
-  def build_array(obj, level)
-    raise ERR_NestIsTooDeep if level >= @max_nest
-    '[' + obj.map { |item| build_value(item, level) }.join(',') + ']'
-  end
-
-  def build_object(obj, level)
-    raise ERR_NestIsTooDeep if level >= @max_nest
-    '{' + obj.map do |item|
-      "#{build_value(item[0].to_s,level)}:#{build_value(item[1],level)}"
-    end.join(',') + '}'
-  end
-
-end

data/lib/www/wassruby.rb

@@ -1,182 +0,0 @@
-#
-#= Simple Wassr Client
-#Authors::		Takuya Mannami
-#Version::		0.0.6 (2008/10/12)
-#License::		MIT License
-#
-#==Wassruby use simplejson.rb
-#WebOS Goodies (http://webos-goodies.jp/archives/51071565.html)
-#
-#Simple JSON parser & builde(http://rubyforge.org/snippet/detail.php?type=snippet&id=148)
-
-require 'open-uri'
-require 'net/http'
-require 'cgi'
-require 'www/simplejson'
-
-module WWW
-  class Wassr
-    VERSION = '0.0.6'
-    WASSR = "api.wassr.jp"
-		
-    WASSR_API_URI = {
-		:UPDATE => "/statuses/update.json?status=",
-    :USER_TIMELINE => "/statuses/user_timeline.json?id=",
-    :FRIENDS_TIMELINE => "/statuses/friends_timeline.json?id=",
-    :PUBLIC_TIMELINE => "/statuses/public_timeline.json",
-		:FOOTMARK => "/footmark/recent.json",
-		:SHOW => "/statuses/show.json?id=",
-		:FRIENDS => "/statuses/friends.json",
-		:FOLLOWERS => "/statuses/followers.json",
-    }
-		
-		###
-		#login id
-		attr_accessor :VERSION
-	attr_accessor :login_id
-		#password
-	attr_accessor :password
-		#post message
-    attr_accessor :message 
-		###
-		
-		###
-		#friend id or user id
-    attr_accessor :user_id
-		###
-
-		#wassr = WWW::Wassr.new('LOGIN_ID', 'PASSWORD')
-    def initialize(login_id, password)
-			###
-      @login_id = login_id
-      @password = password
-      ###
-			
-			###
-      @message = nil
-      @escape_message = nil
-      @user_id = nil
-			###
-			
-			###
-			@http_obj = Net::HTTP.new(WASSR,80)
-			#using simplejson.rb
-			@jp_obj = JsonParser.new
-			###
-    end
-		
-		#
-		#WWW::Wassr.start('LOGIN_ID', 'PASSWORD') {|wassr|
-		#}
-		#
-    def Wassr.start(login_id, password)
-      if block_given?
-        yield self.new(login_id, password)
-      end
-    end
-    
-		
-		#------------------------------------------------------
-		def json_parse(response_body) # :nodoc:
-			return @jp_obj.parse(response_body)
-		end
-		
-		def get_http_response_body(uri) #:nodoc:
-			res = @http_obj.get(uri)
-			return res.body
-		end
-		
-		def get_val(uri) # :nodoc:
-				res_body = get_http_response_body(uri)
-				json_parse(res_body)
-		end
-		
-		#wasssr.message = 'test'
-		#
-		#wassr.post_message # => send message 'test' 
-		def post_message 
-      @escape_message = escape(@message)
-      req = Net::HTTP::Post.new(WASSR_API_URI[:UPDATE]+"#{@escape_message}&source=Wassruby")
-      req.basic_auth @login_id, @password
-      res = @http_obj.request(req)
-      return res
-    end
-		
-		#wassr.user_id = 'FRIEND_ID'
-		#
-		#wassr.get_friends_timeline.each {|v|
-		#	puts v["user_login_id"]
-		#	puts v["text"]
-		#}
-		def get_friends_timeline
-			get_val(WASSR_API_URI[:FRIENDS_TIMELINE]+"#{@user_id.to_s}")
-		end
-		
-		#wassr.get_public_timeline.each {|v|
-		#	puts v[0]["user_login_id"]
-		#	puts v[0]["text"]
-		#}
-		def get_public_timeline
-			get_val(WASSR_API_URI[:PUBLIC_TIMELINE])
-		end
-		
-		#wassr.user_id = "foo"
-		#
-		#wassr.get_user_timeline.each {|v|
-		#	puts v["user_login_id"]
-		#	puts v["text"]
-		#}
-		def get_user_timeline
-			get_val(WASSR_API_URI[:USER_TIMELINE]+"#{@user_id.to_s}")
-		end
-		
-		#
-		#wassr.user_id = "foo"
-		#
-		#wassr.get_show.each {|v|
-		#	puts v["user_login_id"]
-		#	puts v["text"]
-		#}
-		def get_show
-			get_val(WASSR_API_URI[:SHOW]+"#{@user_id.to_s}")
-		end
-		
-		#wassr.get_friends.each{|v|
-		#	puts v["name"]
-		#	puts v["screen_name"]
-		#}
-		def get_friends
-			req = Net::HTTP::Get.new(WASSR_API_URI[:FRIENDS])
-			req.basic_auth @login_id, @password
-			res = @http_obj.request(req)
-			json_parse(res.body)
-		end
-		
-		#wassr.get_followers{|v|
-		#	puts v["name"]
-		#	puts v["screen_name"]
-		#}
-		def get_followers
-			req = Net::HTTP::Get.new(WASSR_API_URI[:FOLLOWERS])
-			req.basic_auth @login_id, @password
-			res = @http_obj.request(req)
-			json_parse(res.body)			
-		end
-		
-		#wassr.get_footmark.each {|v|
-		#	puts v["nick"]
-		#	puts v["login_id"]
-		#}
-		def get_footmark
-			req = Net::HTTP::Get.new(WASSR_API_URI[:FOOTMARK])
-			req.basic_auth @login_id, @password
-			json_parse(@http_obj.request(req).body)
-		end
-		
-		#------------------------------------------------------
-		
-    def escape(str) # :nodoc:
-			return CGI.escape(str)
-		end
-  end
-end