qoobaa-opensocial 0.1.8 → 0.2.0

data/lib/opensocial/activity.rb

@@ -30,7 +30,7 @@ module OpenSocial #:nodoc:
     def initialize(json)
       if json
         json.each do |key, value|
-          proper_key = key.snake_case
+          proper_key = key.underscore
           begin
             self.send("#{proper_key}=", value)
           rescue NoMethodError

data/lib/opensocial/base.rb

@@ -12,14 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/http"
-require "uri"
-
-# Use json/pure if you opt-out of including the validation code in
-# opensocial/auth. This gem adds standard to_json behavior for the
-# request classes, instead of using ActiveSupport.
-require "rubygems"
-
 module OpenSocial #:nodoc:
 
   # Provides base functionality for the OpenSocial child classes.

data/lib/opensocial/group.rb

@@ -30,7 +30,7 @@ module OpenSocial #:nodoc:
     def initialize(json)
       if json
         json.each do |key, value|
-          proper_key = key.snake_case
+          proper_key = key.underscore
           begin
             self.send("#{proper_key}=", value)
           rescue NoMethodError

data/lib/opensocial/person.rb

@@ -38,7 +38,7 @@ module OpenSocial #:nodoc:
     def initialize(json)
       if json
         json.each do |key, value|
-          proper_key = key.snake_case
+          proper_key = key.underscore
           begin
             self.send("#{proper_key}=", value)
           rescue NoMethodError

data/lib/opensocial/request.rb

@@ -68,7 +68,7 @@ module OpenSocial #:nodoc:
       data = dispatch(uri)
 
       if unescape
-        JSON.parse(data.os_unescape)
+        JSON.parse(os_unescape(data))
       else
         JSON.parse(data)
       end
@@ -76,6 +76,13 @@ module OpenSocial #:nodoc:
 
     private
 
+    def os_unescape(string)
+      unescaped = string.gsub(/\\\"/, '"')
+      unescaped = unescaped.gsub('"{', "{")
+      unescaped = unescaped.gsub('}"', "}")
+      unescaped = unescaped.gsub(/\"\"/, "\"")
+    end
+
     # Dispatches a request to a given URI with optional POST data. If a
     # request's connection has specified HMAC-SHA1 authentication, OAuth
     # parameters and signature are appended to the request.
@@ -210,7 +217,7 @@ module OpenSocial #:nodoc:
     # Activity, etc.)
     def parse_response(response, unescape)
       if unescape
-        parsed = JSON.parse(response.os_unescape)
+        parsed = JSON.parse(os_unescape(response))
       else
         parsed = JSON.parse(response)
       end

data/lib/opensocial/version.rb

@@ -0,0 +1,3 @@
+module OpenSocial
+  VERSION = "0.2.0"
+end

data/lib/opensocial.rb

@@ -13,19 +13,20 @@
 # limitations under the License.
 
 require "active_support"
+require "active_support/core_ext/string/inflections"
 require "oauth"
 require "oauth/consumer"
-require "oauth/request_proxy/action_controller_request"
+
+require "net/http"
 require "uri"
 
 require "opensocial/base"
 require "opensocial/request"
 require "opensocial/activity"
 require "opensocial/appdata"
-require "opensocial/auth/action_controller_request"
-require "opensocial/auth/base"
 require "opensocial/connection"
 require "opensocial/group"
 require "opensocial/person"
+require "opensocial/version"
 require "opensocial/string/merb_string"
 require "opensocial/string/os_string"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qoobaa-opensocial
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -15,143 +16,135 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2010-06-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         version: "2"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: OpenSocial Google Gem
 email: qoobaa@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- NOTICE
-- README.rdoc
-- Rakefile
-- VERSION
 - lib/opensocial.rb
-- lib/opensocial/activity.rb
-- lib/opensocial/appdata.rb
-- lib/opensocial/auth/action_controller_request.rb
-- lib/opensocial/auth/base.rb
 - lib/opensocial/base.rb
-- lib/opensocial/connection.rb
-- lib/opensocial/group.rb
 - lib/opensocial/person.rb
+- lib/opensocial/version.rb
+- lib/opensocial/activity.rb
+- lib/opensocial/group.rb
+- lib/opensocial/appdata.rb
 - lib/opensocial/request.rb
-- lib/opensocial/string/merb_string.rb
-- lib/opensocial/string/os_string.rb
-- qoobaa-opensocial.gemspec
-- test/fixtures/activities.json
-- test/fixtures/activity.json
-- test/fixtures/appdata.json
-- test/fixtures/appdatum.json
-- test/fixtures/group.json
-- test/fixtures/groups.json
-- test/fixtures/people.json
-- test/fixtures/person.json
-- test/fixtures/person_appdata_rpc.json
-- test/fixtures/person_rpc.json
-- test/helper.rb
-- test/test_activity.rb
-- test/test_appdata.rb
-- test/test_connection.rb
-- test/test_group.rb
-- test/test_online.rb
-- test/test_person.rb
-- test/test_request.rb
-- test/test_rpcrequest.rb
+- lib/opensocial/connection.rb
+- LICENSE
+- NOTICE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/qoobaa/opensocial
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: OpenSocial Google Gem
-test_files: 
-- test/test_request.rb
-- test/test_rpcrequest.rb
-- test/test_connection.rb
-- test/test_appdata.rb
-- test/test_person.rb
-- test/test_activity.rb
-- test/helper.rb
-- test/test_group.rb
-- test/test_online.rb
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Rakefile

@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require "rubygems"
-require "rake"
-
-begin
-  require "jeweler"
-  Jeweler::Tasks.new do |gem|
-    gem.name = "qoobaa-opensocial"
-    gem.summary = %Q{OpenSocial Google Gem}
-    gem.description = %Q{OpenSocial Google Gem}
-    gem.email = "qoobaa@gmail.com"
-    gem.homepage = "http://github.com/qoobaa/opensocial"
-    gem.authors = ["Jakub Kuźma", "Piotr Sarnacki"]
-    gem.add_dependency "oauth"
-    gem.add_development_dependency "test-unit", ">= 2"
-    gem.add_development_dependency "json_pure"
-    gem.add_development_dependency "mocha"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require "rake/testtask"
-Rake::TestTask.new(:test) do |test|
-  test.libs << "lib" << "test"
-  test.pattern = "test/**/test_*.rb"
-  test.verbose = true
-end
-
-begin
-  require "rcov/rcovtask"
-  Rcov::RcovTask.new do |test|
-    test.libs << "test"
-    test.pattern = "test/**/test_*.rb"
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require "rake/rdoctask"
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?("VERSION") ? File.read("VERSION") : ""
-
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "opensocial #{version}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-end

data/VERSION

@@ -1 +0,0 @@
-0.1.8

data/lib/opensocial/auth/action_controller_request.rb

@@ -1,90 +0,0 @@
-# Copyright (c) 2007 Blaine Cook, Larry Halff, Pelle Braendgaard
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Includes modifications by Robin Luckey from:
-# http://github.com/robinluckey/oauth/tree/master/lib%2Foauth%2Frequest_proxy%2Faction_controller_request.rb
-
-module OAuth::RequestProxy #:nodoc: all
-  class ActionControllerRequest < OAuth::RequestProxy::Base
-    if defined?(ActionDispatch::Request)
-      proxies(ActionDispatch::Request)
-    elsif defined?(ActionController::AbstractRequest)
-      proxies(ActionController::AbstractRequest)
-    else
-      proxies(ActionController::Request)
-    end
-
-    def method
-      (request.env["rack.methodoverride.original_method"] || request.method).to_s.upcase
-    end
-
-    def uri
-      uri = URI.parse(request.protocol + request.host + request.port_string + request.path)
-      uri.query = nil
-      uri.to_s
-    end
-
-    def parameters
-      if options[:clobber_request]
-        options[:parameters] || {}
-      else
-        params = request_params.merge(query_params).merge(header_params)
-        params.stringify_keys! if params.respond_to?(:stringify_keys!)
-        params.merge(options[:parameters] || {})
-      end
-    end
-
-    # Override from OAuth::RequestProxy::Base to avoid roundtrip
-    # conversion to Hash or Array and thus preserve the original
-    # parameter names
-    def parameters_for_signature
-      params = []
-      params << options[:parameters].to_query if options[:parameters]
-
-      unless options[:clobber_request]
-        params << header_params.to_query
-        params << CGI.unescape(request.query_string) unless request.query_string.blank?
-        if request.content_type == Mime::Type.lookup("application/x-www-form-urlencoded")
-          if request.env["rack.formunencoder.original_input"]
-            raw_post_data = request.env["rack.formunencoder.original_input"].read
-            request.env["rack.formunencoder.original_input"].rewind if request.env["rack.formunencoder.original_input"].respond_to?(:rewind)
-            params << CGI.unescape(raw_post_data)
-          else
-            params << CGI.unescape(request.raw_post)
-          end
-        end
-      end
-
-      params.join("&").split("&").reject { |kv| kv =~ /^oauth_signature=.*/}.reject(&:blank?).map { |p| p.split("=", 2) }.uniq
-    end
-
-    protected
-
-    def query_params
-      request.query_parameters
-    end
-
-    def request_params
-      request.request_parameters
-    end
-
-  end
-end

data/lib/opensocial/auth/base.rb

@@ -1,109 +0,0 @@
-# Copyright (c) 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module OpenSocial #:nodoc:
-
-  # Provides helper classes to be used in verifying and validating the user.
-  # In particular, support is provided for:
-  #
-  # * Verification of signed makeRequest using OAuth/HMAC-SHA1
-  #   class ExampleController < ApplicationController
-  #     OpenSocial::Auth::CONSUMER_KEY = "623061448914"
-  #     OpenSocial::Auth::CONSUMER_SECRET = "uynAeXiWTisflWX99KU1D2q5"
-  #
-  #     include OpenSocial::Auth
-  #
-  #     before_filter :validate
-  #
-  #     def return_private_data
-  #     end
-  #   end
-  #
-  # * Request for an OAuth request token
-  #
-  # * Request for an OAuth access token, when supplied with a request token
-  #
-
-
-  module Auth
-
-    # Validates an incoming request by using the OAuth library and the supplied
-    # key and secret.
-    def validate(key = CONSUMER_KEY, secret = CONSUMER_SECRET)
-      consumer = OAuth::Consumer.new(key, secret)
-      begin
-        signature = OAuth::Signature.build(request) do
-          [nil, consumer.secret]
-        end
-        pass = signature.verify
-      rescue OAuth::Signature::UnknownSignatureMethod => e
-        logger.error "An unknown signature method was supplied: " + e.to_s
-      end
-      return pass
-    end
-
-    # Gets an OAuth request token, and redirects the user to authorize the app
-    # to access data on their behalf.
-    def get_oauth_token(key, secret, container, callback)
-      consumer = OAuth::Consumer.new(key, secret, {
-        :site => container[:base_uri],
-        :request_token_path => container[:request_token_path],
-        :authorize_path => container[:authorize_path],
-        :access_token_path => container[:access_token_path],
-        :http_method => container[:http_method]
-      })
-      request_token = consumer.get_request_token
-
-      session[:token] = request_token.token
-      session[:secret] = request_token.secret
-
-      redirect_to request_token.authorize_url + "&oauth_callback=" + CGI.escape(callback)
-    end
-
-    # If neccesary, swaps an existing request token and secret for an access
-    # token, storing it in the Connection class, and returning the access token
-    # and secret for later use.
-    def get_access_token(connection, token, secret)
-      if (token && secret)
-        consumer = OAuth::Consumer.new(connection.consumer_key,
-                                       connection.consumer_secret,
-                                       connection.container)
-
-        if connection.consumer_token.token.empty? &&
-           connection.consumer_token.secret.empty?
-          connection.consumer_token = OAuth::Token.new(token, secret)
-
-          uri = URI.parse(connection.container[:base_uri] +
-                          connection.container[:access_token_path])
-          http = Net::HTTP.new(uri.host, uri.port)
-          req = Net::HTTP::Get.new(uri.request_uri)
-          connection.sign!(http, req)
-
-          resp = http.get(req.path)
-
-          matches = resp.body.match(/oauth_token=(.*?)&oauth_token_secret=(.*)/)
-          access_token = matches[1]
-          access_secret = matches[2]
-        end
-
-        reusable_token = OAuth::AccessToken.new(consumer, access_token, access_secret)
-        connection.consumer_token = reusable_token
-
-        return access_token, access_secret
-      end
-
-      return nil, nil
-    end
-  end
-end

data/lib/opensocial/string/merb_string.rb

@@ -1,32 +0,0 @@
-# Copyright (c) 2008 Engine Yard
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class String #:nodoc:
-  def snake_case
-    gsub(/\B[A-Z]/, '_\&').downcase
-  end
-
-  def camel_case
-    words = split('_')
-    camel = words[1..-1].map { |e| e.capitalize }.join
-    words[0] + camel
-  end
-end

data/lib/opensocial/string/os_string.rb

@@ -1,23 +0,0 @@
-# Copyright (c) 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class String #:nodoc:
-  # Removes backslash escaping.
-  def os_unescape
-    unescaped = self.gsub(/\\\"/, '"')
-    unescaped = unescaped.gsub('"{', "{")
-    unescaped = unescaped.gsub('}"', "}")
-    unescaped = unescaped.gsub(/\"\"/, "\"")
-  end
-end