3scale_client 2.3.2 → 2.3.3

data/.gitignore

@@ -1,3 +1,18 @@
-pkg
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
 Gemfile.lock
-.*.swp
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.idea

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby
+  - rbx-19mode

data/3scale_client.gemspec

@@ -1,58 +1,27 @@
-# encoding: UTF-8
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require '3scale/client/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{3scale_client}
-  s.version = "2.3.2"
+Gem::Specification.new do |spec|
+  spec.name          = "3scale_client"
+  spec.version       = ThreeScale::Client::VERSION
+  spec.authors       = ["Michal Cichra"] | ['Adam Cigánek', 'Tiago Macedo', 'Joaquin Rivera Padron (joahking)', 'Maria Pilar Guerra']
+  spec.email         = ["support@3scale.net"]
+  spec.description   = "This gem allows to easily connect an application that provides a Web Service with the 3scale API Management System to authorize it's users and report the usage."
+  spec.summary       = 'Client for 3scale Web Service Management System API'
+  spec.homepage      = "http://www.3scale.net"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Adam Cigánek", "Tiago Macedo", "Joaquin Rivera Padron (joahking)"]
-  s.description = %q{Ruby client for 3scale platform. 3scale is an API Infrastructure service which handles API Keys, Rate Limiting, Analytics, Billing Payments and Developer Management. Includes a configurable API dashboard and developer portal CMS. More information at http://www.3scale.net/ or http://support.3scale.net/.
-}
-  s.email = %q{adam@3scale.net tiago@3scale.net}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "3scale_client.gemspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENCE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/3scale_client.rb",
-     "lib/3scale/authorize_response.rb",
-     "lib/3scale/client.rb",
-     "lib/3scale/response.rb",
-     "test/client_test.rb",
-     "test/remote_test.rb"
-  ]
-  s.homepage = %q{http://www.3scale.net}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Client for 3scale Web Service Management System API}
-  s.test_files = [
-    "test/remote_test.rb",
-     "test/client_test.rb"
-  ]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-    else
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-  end
-
-  s.add_development_dependency 'fakeweb'
-  s.add_development_dependency 'jeweler'
-  s.add_development_dependency 'mocha'
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "fakeweb"
+  spec.add_development_dependency "mocha"
+  spec.add_dependency 'nokogiri'
 end
-

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec

data/Rakefile

@@ -2,6 +2,8 @@
 require "rubygems"
 require "bundler/setup"
 
+require "bundler/gem_tasks"
+
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'
@@ -23,24 +25,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name     = '3scale_client'
-    gemspec.summary  = 'Client for 3scale Web Service Management System API'
-    gemspec.description = <<END
-This gem allows to easily connect an application that provides a Web Service with the 3scale API Management System to authorize it's users and report the usage.
-END
-    gemspec.email    = 'support@3scale.net'
-    gemspec.homepage = 'http://www.3scale.net'
-    gemspec.authors  = ['Adam Cigánek', 'Tiago Macedo', 'Joaquin Rivera Padron (joahking)']
-
-    gemspec.add_dependency 'nokogiri'
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/lib/3scale/client/version.rb

@@ -0,0 +1,5 @@
+module ThreeScale
+  class Client
+    VERSION = '2.3.3'
+  end
+end

data/lib/3scale/client.rb

@@ -185,7 +185,7 @@ module ThreeScale
       path = "/transactions/authorize.xml" +
         "?provider_key=#{CGI.escape(provider_key)}" +
         "&app_id=#{CGI.escape(options[:app_id].to_s)}"
-      path += "&app_key=#{CGI.escape(options[:app_key])}" if options[:app_key]
+        path += "&app_key=#{CGI.escape(options[:app_key])}" if options[:app_key]
 
       uri = URI.parse("http://#{host}#{path}")
       http_response = Net::HTTP.get_response(uri)
@@ -234,7 +234,7 @@ module ThreeScale
       path = "/transactions/oauth_authorize.xml" +
         "?provider_key=#{CGI.escape(provider_key)}" +
         "&app_id=#{CGI.escape(options[:app_id].to_s)}"
-      path += "&app_key=#{CGI.escape(options[:app_key])}" if options[:app_key]
+        path += "&app_key=#{CGI.escape(options[:app_key])}" if options[:app_key]
       path += "&redirect_url=#{CGI.escape(options[:redirect_url])}" if options[:redirect_url]
 
       uri = URI.parse("http://#{host}#{path}")
@@ -298,8 +298,8 @@ module ThreeScale
       doc.css('usage_reports usage_report').each do |node|
         response.add_usage_report(:metric        => node['metric'].to_s.strip,
                                   :period        => node['period'].to_s.strip.to_sym,
-                                  :period_start  => node.at('period_start').content,
-                                  :period_end    => node.at('period_end').content,
+                                  :period_start  => node.at('period_start') ? node.at('period_start').content : '' ,
+                                  :period_end    => node.at('period_end') ? node.at('period_end').content : '',
                                   :current_value => node.at('current_value').content.to_i,
                                   :max_value     => node.at('max_value').content.to_i)
       end

metadata

@@ -1,32 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: 3scale_client
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
+- Michal Cichra
 - Adam Cigánek
 - Tiago Macedo
 - Joaquin Rivera Padron (joahking)
+- Maria Pilar Guerra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &69287240 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *69287240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &69286720 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +57,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69286720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &69286430 !ruby/object:Gem::Requirement
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +73,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69286430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &69286170 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,38 +89,57 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69286170
-description: ! 'Ruby client for 3scale platform. 3scale is an API Infrastructure service
-  which handles API Keys, Rate Limiting, Analytics, Billing Payments and Developer
-  Management. Includes a configurable API dashboard and developer portal CMS. More
-  information at http://www.3scale.net/ or http://support.3scale.net/.
-
-'
-email: adam@3scale.net tiago@3scale.net
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This gem allows to easily connect an application that provides a Web
+  Service with the 3scale API Management System to authorize it's users and report
+  the usage.
+email:
+- support@3scale.net
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - 3scale_client.gemspec
 - Gemfile
-- Gemfile.lock
 - LICENCE
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/3scale_client.rb
 - lib/3scale/authorize_response.rb
 - lib/3scale/client.rb
+- lib/3scale/client/version.rb
 - lib/3scale/response.rb
+- lib/3scale_client.rb
 - test/client_test.rb
 - test/remote_test.rb
 homepage: http://www.3scale.net
-licenses: []
+licenses:
+- MIT
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -96,19 +148,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4299208069213055852
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4299208069213055852
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Client for 3scale Web Service Management System API
 test_files:
-- test/remote_test.rb
 - test/client_test.rb
-has_rdoc: 
+- test/remote_test.rb

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    3scale_client (2.3.2)
-      nokogiri
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    fakeweb (1.3.0)
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.5)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    nokogiri (1.5.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  3scale_client!
-  fakeweb
-  jeweler
-  mocha