hiptail 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40f2b86adfb078fdfb6c2ab65914df13d287662
-  data.tar.gz: e86ecd9975dc49d3f4cff0ebe9ae534b6b8d7d12
+  metadata.gz: 080df2b0b73328a9b0604413adfeefc8292fc9aa
+  data.tar.gz: fd4008027616aeda25d04578e75f9c4f0bdd7109
 SHA512:
-  metadata.gz: 99118dd455c9787bf37dfc8dcbbefc3cb519ae55602c6f09c32c8424fd832eab7a870e0a99221354f1e568b162d5b1567663713935c49bf33697d08dbf4b6d7a
-  data.tar.gz: 1783b1cd1b84b0867c25da66b26f953d5f2a4e706e82d8c240691f242fbb25b8bee7cab3a76f60caea53ee834811e1f7c6c01ddb6d64607fbcc49949bae86ccb
+  metadata.gz: a84d101dcce6ac0ea5bda7b3bcda1c963a21792223dd086fed53020f1fb149b995301d8facbc6ae00a50a8d6edf7acd2827e81470d6634f6e5cda1fa3b532c5a
+  data.tar.gz: 069b76c1859dd8981b6149487b8a581dfb7699d3fdaf2182d28c17ba8f5554d11a854bcaf9ae2087adac441dbb9497d9c9673d6666a2d6a0d562afa205e272ee

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.3
+* Use :ascii_only flag of JSON.generate.  (thx to kimoto)
+
 ## 0.0.2
 * Support room_topic_message event.
 * Change default vendor name / url.

data/README.md

@@ -1,6 +1,6 @@
 # HipTail
 
-HipChat Add-on Framework
+HipChat Integration (Add-on) Framework
 
 ## Installation
 

data/examples/integrate_sinatra/README.md

@@ -5,5 +5,5 @@
     $ bundle install
     $ bundle exec -- rackup
 
-Then install this add-on on integrations page in HipChat administration page.
+Then install this integration on integrations page in HipChat administration page.
 Specify the application capability URL (e.g. http://example.com:4567/cap).

data/examples/simple_rack_app_1/README.md

@@ -5,5 +5,5 @@
     $ bundle install
     $ bundle exec -- rackup
 
-Then install this add-on on integrations page in HipChat administration page.
+Then install this integration on integrations page in HipChat administration page.
 Specify the application capability URL (e.g. http://example.com:9292/cap).

data/examples/simple_rack_app_2/README.md

@@ -5,5 +5,5 @@
     $ bundle install
     $ bundle exec -- rackup
 
-Then install this add-on on integrations page in HipChat administration page.
+Then install this integration on integrations page in HipChat administration page.
 Specify the application capability URL (e.g. http://example.com:9292/cap).

data/hiptail.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = HipTail::VERSION
   spec.authors       = ["ITO Nobuaki"]
   spec.email         = ["daydream.trippers@gmail.com"]
-  spec.summary       = %q{HipChat Add-on Framework}
-  spec.description   = %q{HipChat Add-on Framework}
+  spec.summary       = %q{HipChat Integration (Add-on) Framework}
+  spec.description   = %q{HipChat Integration (Add-on) Framework}
   spec.homepage      = "https://github.com/dayflower/hiptail"
   spec.license       = "MIT"
 

data/lib/hiptail/authority.rb

@@ -96,7 +96,8 @@ module HipTail
     # @return [HipTail::Rooms]
     def get_all_rooms(params = {})
       res = call_api(:method => :get, :uri => @api_base.merge("room"), :query_params => params)
-      Rooms.new(res)
+      return unless res.successful?
+      Rooms.new(res.data)
     end
 
     # Issues get room API.
@@ -107,27 +108,30 @@ module HipTail
       room_id = self.room_id || params.delete(:room_id)
       raise ArgumentError.new("room_id required") unless room_id
       res = call_api(:method => :get, :uri => @api_base.merge("room/#{room_id}"), :query_params => params)
-      Room::Detail.new(res)
+      return unless res.successful?
+      Room::Detail.new(res.data)
     end
 
     # Issues get all members API.
     # @param [Hash] params Parameters for get all members API.
     # @return [HipTail::Users]
-    def get_all_members(params)
+    def get_all_members(params = {})
       room_id = self.room_id || params.delete(:room_id)
       raise ArgumentError.new("room_id required") unless room_id
       res = call_api(:method => :get, :uri => @api_base.merge("room/#{room_id}/member"), :query_params => params)
-      Users.new(res)
+      return unless res.successful?
+      Users.new(res.data)
     end
 
     # Issues get all participants API.
     # @param [Hash] params Parameters for get all participants API.
     # @return [HipTail::Users]
-    def get_all_participants(params)
+    def get_all_participants(params = {})
       room_id = self.room_id || params.delete(:room_id)
       raise ArgumentError.new("room_id required") unless room_id
       res = call_api(:method => :get, :uri => @api_base.merge("room/#{room_id}/participant"), :query_params => params)
-      Users.new(res)
+      return unless res.successful?
+      Users.new(res.data)
     end
 
     # Issues add member API.
@@ -164,6 +168,27 @@ module HipTail
       call_api(:method => :delete, :uri => @api_base.merge("room/#{room_id}/member/#{user_name}"), :body_params => params)
     end
 
+    # Issues view user API.
+    # @param [Hash] params Parameters for view user API with :user_id.
+    # @option params [String] :user_id User ID or email or mention name (beginning with an '@').
+    # @return [HipTail::User]
+    def view_user(params)
+      user_id = params.delete(:user_id)
+      raise ArgumentError.new("user_id required") unless user_id
+      res = call_api(:method => :get, :uri => @api_base.merge("user/#{user_id}"), :query_params => params)
+      return unless res.successful?
+      User::Person.new(res.data)
+    end
+
+    # Issues get all users API.
+    # @param [Hash] params Parameters for get all users API.
+    # @return [HipTail::Users]
+    def get_all_users(params = {})
+      res = call_api(:method => :get, :uri => @api_base.merge("user"), :query_params => params)
+      return unless res.successful?
+      Users.new(res.data)
+    end
+
     private
 
     def user_name_from_params(params)
@@ -190,7 +215,7 @@ module HipTail
       }
 
       if args[:body_params]
-        body = JSON.generate(args[:body_params] || {})
+        body = JSON.generate(args[:body_params] || {}, :ascii_only => true)
         headers['Content-Length'] = body.bytesize.to_s
       else
         body = nil
@@ -215,11 +240,24 @@ module HipTail
         http.request(req)
       end
 
+      def res.successful?
+        self.is_a?(Net::HTTPSuccess)
+      end
+
       if res.content_type =~ %r{\A application/json}x
-        return JSON.parse(res.body)
+        body_data = JSON.parse(res.body)
       else
-        return {}
+        body_data = {}
       end
+
+      res_class = class << res; self; end
+      res_class.class_eval do
+        define_method(:data) do
+          body_data
+        end
+      end
+
+      res
     end
 
     def token

data/lib/hiptail/util.rb

@@ -5,13 +5,13 @@ module HipTail
 
     # Build capability object.
     # @param [Hash] params
-    # @option params [String] :key Identical key for add-on
-    # @option params [String] :name Add-on name
-    # @option params [String] :base_url Base URL for add-on
+    # @option params [String] :key Identical key for integration
+    # @option params [String] :name integration name
+    # @option params [String] :base_url Base URL for integration
     # @option params [String] :capability_url URL for capability
     # @option params [String] :webhook_url URL for event webhook
     # @option params [String] :installed_url URL for installed / uninstalled event webhook
-    # @option params [String] :description (same as :name) Add-on description (optional)
+    # @option params [String] :description (same as :name) integration description (optional)
     # @option params [String] :vendor_name (same as :name) Vendor name (optional)
     # @option params [String] :vendor_url (same as :base_url) Vendor URL (optional)
     # @option params [String] :homepage_url (same as :base_url) Homepage (optional)

data/lib/hiptail/version.rb

@@ -1,3 +1,3 @@
 module HipTail
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/hiptail/web/handler.rb

@@ -46,13 +46,13 @@ module HipTail
     # Handles retrieving capability request.
     # @param [Rack::Request] request
     # @param [Hash] params Capability parameters
-    # @option params [String] :key Identical key for add-on
-    # @option params [String] :name Add-on name
-    # @option params [String] :base_url Base URL for add-on
+    # @option params [String] :key Identical key for integration
+    # @option params [String] :name integration name
+    # @option params [String] :base_url Base URL for integration
     # @option params [String] :capability_url URL for capability
     # @option params [String] :webhook_url URL for event webhook
     # @option params [String] :installed_url URL for installed / uninstalled event webhook
-    # @option params [String] :description (same as :name) Add-on description (optional)
+    # @option params [String] :description (same as :name) integration description (optional)
     # @option params [String] :vendor_name (same as :name) Vendor name (optional)
     # @option params [String] :vendor_url (same as :base_url) Vendor URL (optional)
     # @option params [String] :homepage_url (same as :base_url) Homepage (optional)
@@ -85,10 +85,7 @@ module HipTail
     # @param [Hash] data
     # @param [Integer] status (200)
     def create_response(data, status = 200)
-      body = JSON.generate(data)
-
-      body.gsub!(/[\u{007f}-\u{10ffff}]+/) { |match| match.unpack("U*").map! { |i| "\\u#{i.to_s(16)}" }.join }
-
+      body = JSON.generate(data, :ascii_only => true)
       headers = {
         'Content-Type'   => 'application/json; charset=UTF-8',
         'Content-Length' => body.bytesize.to_s,

data/lib/hiptail/web/rack_app.rb

@@ -8,17 +8,17 @@ module HipTail
 
   class Web::RackApp
     # @return [HipTail::Manager] Returns HipTail::Manager.
-    attr_reader :manager
+    attr_reader :manager, :path
 
     # @param [Hash] params Capability parameters (and manager)
     # @option params [HipTail::Manager] :manager HipTail::Manager instance (optional)
-    # @option params [String] :key Identical key for add-on
-    # @option params [String] :name Add-on name
-    # @option params [String] :base_url Base URL for add-on
+    # @option params [String] :key Identical key for integration
+    # @option params [String] :name integration name
+    # @option params [String] :base_url Base URL for integration
     # @option params [String] :capability_url URL for capability
     # @option params [String] :webhook_url URL for event webhook
     # @option params [String] :installed_url URL for installed / uninstalled event webhook
-    # @option params [String] :description (same as :name) Add-on description (optional)
+    # @option params [String] :description (same as :name) integration description (optional)
     # @option params [String] :vendor_name (same as :name) Vendor name (optional)
     # @option params [String] :vendor_url (same as :base_url) Vendor URL (optional)
     # @option params [String] :homepage_url (same as :base_url) Homepage (optional)
@@ -38,19 +38,19 @@ module HipTail
       @capability_params = params
 
       base_url = URI.parse('http://example.com/').merge(params[:base_path])
-      path = {
+      @path = {
         :base => base_url.request_uri,
       }
       [ :webhook, :installed, :capability ].each do |key|
-        path[key] = base_url.merge('./' + params["#{key}_path".to_sym]).request_uri
+        @path[key] = base_url.merge('./' + params["#{key}_path".to_sym]).request_uri
       end
 
       @regex = {}
-      @regex[:capability] = %r{\A #{Regexp.escape(path[:capability])} \z}xm
-      @regex[:event]      = %r{\A #{Regexp.escape(path[:webhook])} \z}xm
+      @regex[:capability] = %r{\A #{Regexp.escape(@path[:capability])} \z}xm
+      @regex[:event]      = %r{\A #{Regexp.escape(@path[:webhook])} \z}xm
 
-      @regex[:install]   = %r{\A #{Regexp.escape(path[:installed])} \z}xm
-      @regex[:uninstall] = %r{\A #{Regexp.escape(path[:installed])} / ([-0-9a-fA-F]+) \z}xm
+      @regex[:install]   = %r{\A #{Regexp.escape(@path[:installed])} \z}xm
+      @regex[:uninstall] = %r{\A #{Regexp.escape(@path[:installed])} / ([-0-9a-fA-F]+) \z}xm
     end
 
     def call(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ITO Nobuaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: HipChat Add-on Framework
+description: HipChat Integration (Add-on) Framework
 email:
 - daydream.trippers@gmail.com
 executables: []
@@ -123,5 +123,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: HipChat Add-on Framework
+summary: HipChat Integration (Add-on) Framework
 test_files: []