hoptoad-api 2.1.0 → 2.2.0

data/Rakefile

@@ -1,31 +1,9 @@
-require 'rubygems'
 require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-$LOAD_PATH.unshift 'lib'
-
-begin
-  require 'jeweler'
-  require 'hoptoad-api/version'
-  
-  Jeweler::Tasks.new do |gem|
-    gem.name = "hoptoad-api"
-    gem.summary = %Q{An unofficial gem for interacting with the Hoptoad API}
-    gem.email = "steve.agalloco@gmail.com"
-    gem.homepage = "http://github.com/spagalloco/hoptoad-api"
-    gem.description = "An unofficial gem for interacting with the Hoptoad API"
-    gem.authors = ["Steve Agalloco"]
-    gem.version = Hoptoad::VERSION
-    
-    gem.add_dependency(%q<httparty>, [">= 0.5.2"])
-    gem.add_dependency(%q<hashie>, [">= 0.2.0"])
-    
-    gem.add_development_dependency "shoulda", ">= 0"
-    gem.add_development_dependency "fakeweb", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+$:.unshift 'lib'
+require 'hoptoad-api/version'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -34,23 +12,13 @@ Rake::TestTask.new(:test) do |test|
   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
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = Hoptoad::VERSION
@@ -60,3 +28,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => :test

data/lib/hoptoad-api.rb

@@ -3,26 +3,20 @@ require 'httparty'
 
 module Hoptoad
   extend self
-  attr_accessor :secure
+  attr_accessor :account, :auth_token, :secure
 
   class HoptoadError < StandardError; end
 
-  def account=(account)
-    @account = account
+  def configure(options={})
+    @account = options[:account] if options.has_key?(:account)
+    @auth_token = options[:auth_token] if options.has_key?(:auth_token)
+    @secure = options[:secure] if options.has_key?(:secure)
   end
 
-  def account
+  def account_path
     "#{protocol}://#{@account}.hoptoadapp.com"
   end
 
-  def auth_token=(token)
-    @auth_token = token
-  end
-
-  def auth_token
-    @auth_token
-  end
-
   def protocol
     secure ? "https" : "http"
   end

data/lib/hoptoad-api/client.rb

@@ -25,7 +25,7 @@
 #   Hoptoad::Error.find(:all, :params => { :page => 2 })
 #
 #   find individual error by ID
-#   Hoptoad::Error.find(44) 
+#   Hoptoad::Error.find(44)
 #
 # Find *all* notices by error_id
 #
@@ -39,27 +39,27 @@ module Hoptoad
   class Base
     include HTTParty
     format :xml
-    
+
     private
-    
+
     def self.setup
-      base_uri Hoptoad.account
+      base_uri Hoptoad.account_path
       default_params :auth_token => Hoptoad.auth_token
-      
+
       check_configuration
     end
-    
+
     def self.check_configuration
       raise HoptoadError.new('API Token cannot be nil') if default_options.nil? || default_options[:default_params].nil? || !default_options[:default_params].has_key?(:auth_token)
       raise HoptoadError.new('Account cannot be nil') unless default_options.has_key?(:base_uri)
     end
-    
+
     def self.fetch(path, options)
       response = get(path, { :query => options })
       if response.code == 403
         raise HoptoadError.new('SSL should be enabled - use Hoptoad.secure = true in configuration')
       end
-      
+
       Hashie::Mash.new(response)
     end
 
@@ -69,7 +69,7 @@ module Hoptoad
 
     def self.find(*args)
       setup
-      
+
       results = case args.first
         when Fixnum
           find_individual(args)
@@ -78,16 +78,16 @@ module Hoptoad
         else
           raise HoptoadError.new('Invalid argument')
       end
-      
+
       raise HoptoadError.new('No results found.') if results.nil?
       raise HoptoadError.new(results.errors.error) if results.errors
-      
+
       results.group || results.groups
     end
 
     def self.update(error, options)
       setup
-      
+
       self.class.put(collection_path, options)
     end
 
@@ -95,7 +95,7 @@ module Hoptoad
 
     def self.find_all(args)
       options = args.extract_options!
-      
+
       fetch(collection_path, options)
     end
 
@@ -120,19 +120,19 @@ module Hoptoad
 
     def self.find(id, error_id, options={})
       setup
-      
+
       hash = fetch(find_path(id, error_id), options)
-      
+
       if hash.errors
         raise HoptoadError.new(results.errors.error)
       end
-      
+
       hash.notice
     end
-    
+
     def self.find_all_by_error_id(error_id)
       setup
-      
+
       options = {}
       notices = []
       page = 1
@@ -143,7 +143,7 @@ module Hoptoad
           raise HoptoadError.new(results.errors.error)
         end
         notice_stubs = hash.notices
-        
+
         notice_stubs.map do |notice|
           notices << find(notice.id, error_id)
         end
@@ -155,12 +155,12 @@ module Hoptoad
 
     def self.find_by_error_id(error_id, options={ 'page' => 1})
       setup
-      
+
       hash = fetch(all_path(error_id), options)
       if hash.errors
         raise HoptoadError.new(results.errors.error)
       end
-      
+
       hash.notices
     end
 

data/lib/hoptoad-api/version.rb

@@ -1,3 +1,3 @@
 module Hoptoad
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/test/test_hoptoad-api.rb

@@ -2,6 +2,44 @@ require 'test_helper'
 
 class HoptoadTest < Test::Unit::TestCase
 
+  context "configuration" do
+    setup do
+      Hoptoad.account = nil
+      Hoptoad.auth_token = nil
+      Hoptoad.secure = false
+    end
+
+
+    should "allow setting of the account" do
+      Hoptoad.account = 'myapp'
+      assert_equal Hoptoad.account, 'myapp'
+      assert_equal Hoptoad.account_path, 'http://myapp.hoptoadapp.com'
+    end
+
+    should "allow setting of the auth token" do
+      Hoptoad.auth_token = '123456'
+      assert_equal Hoptoad.auth_token, '123456'
+    end
+
+    should "allow setting of ssl protocol" do
+      Hoptoad.secure = true
+      assert_equal Hoptoad.protocol, 'https'
+    end
+
+    should "default to standard http" do
+      Hoptoad.secure = false
+      assert_equal Hoptoad.protocol, 'http'
+    end
+
+    should "should immplement #configure" do
+      Hoptoad.configure(:account => 'anapp', :auth_token => 'abcdefg', :secure => true)
+      assert_equal Hoptoad.protocol, 'https'
+      assert_equal Hoptoad.auth_token, 'abcdefg'
+      assert_equal Hoptoad.account, 'anapp'
+      assert_equal Hoptoad.account_path, 'https://anapp.hoptoadapp.com'
+    end
+  end
+
   context "given a Hoptoad account & API key" do
     setup do
       Hoptoad.account = 'myapp'
@@ -18,57 +56,57 @@ class HoptoadTest < Test::Unit::TestCase
     end
 
     context "when finding errors" do
-    
+
       should "find a page of the 30 most recent errors" do
         errors = Hoptoad::Error.find(:all)
         ordered = errors.sort_by(&:most_recent_notice_at).reverse
         assert_equal ordered, errors
         assert_equal errors.size, 30
       end
-      
+
       should "paginate errors" do
         errors = Hoptoad::Error.find(:all, :page => 2)
         ordered = errors.sort_by(&:most_recent_notice_at).reverse
         assert_equal ordered, errors
         assert_equal errors.size, 2
       end
-      
+
       should "find an individual error" do
         error = Hoptoad::Error.find(1696170)
         assert_equal error.action, 'index'
         assert_equal error.id, 1696170
       end
-      
+
     end
-    
+
     context "when finding notices" do
-      
+
       should "find error notices" do
         notices = Hoptoad::Notice.find_by_error_id(1696170)
         assert_equal notices.size, 30
         assert_equal notices.first.id, 1234
       end
-      
+
       should "find all error notices" do
         notices = Hoptoad::Notice.find_all_by_error_id(1696170)
         assert_equal notices.size, 42
       end
-      
+
       should "find individual notices" do
         Hoptoad::Notice.find(1234, 1696170)
       end
-      
+
     end
-    
+
     context "when using SSL" do
-    
+
       should "find an error if account is SSL enabled" do
         Hoptoad.secure = true
         Hoptoad.account = "sslapp"
         error = Hoptoad::Error.find(1696170)
         assert_equal error.id, 1696170
       end
-      
+
       should "raise exception if trying to access SSL enabled account with unsecure connection" do
         Hoptoad.account = "sslapp"
         Hoptoad.secure = false
@@ -77,7 +115,7 @@ class HoptoadTest < Test::Unit::TestCase
         end
       end
     end
-    
+
   end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoptoad-api
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Steve Agalloco
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-11-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
@@ -35,9 +38,11 @@ dependencies:
   name: hashie
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
@@ -49,9 +54,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +68,11 @@ dependencies:
   name: fakeweb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -75,17 +84,14 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- README.textile
 - Rakefile
-- hoptoad-api.gemspec
-- lib/hoptoad-api.rb
 - lib/hoptoad-api/client.rb
 - lib/hoptoad-api/core_extensions.rb
 - lib/hoptoad-api/version.rb
+- lib/hoptoad-api.rb
 - test/fixtures/errors.xml
 - test/fixtures/individual_error.xml
 - test/fixtures/individual_notice.xml
@@ -94,36 +100,40 @@ files:
 - test/fixtures/paginated_notices.xml
 - test/test_helper.rb
 - test/test_hoptoad-api.rb
+- README.textile
 has_rdoc: true
 homepage: http://github.com/spagalloco/hoptoad-api
 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: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: An unofficial gem for interacting with the Hoptoad API
-test_files: 
-- test/test_helper.rb
-- test/test_hoptoad-api.rb
+summary: Hoptoad API
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-*.gem
-pkg/*

data/hoptoad-api.gemspec

@@ -1,68 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{hoptoad-api}
-  s.version = "2.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steve Agalloco"]
-  s.date = %q{2010-05-26}
-  s.description = %q{An unofficial gem for interacting with the Hoptoad API}
-  s.email = %q{steve.agalloco@gmail.com}
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.textile",
-     "Rakefile",
-     "hoptoad-api.gemspec",
-     "lib/hoptoad-api.rb",
-     "lib/hoptoad-api/client.rb",
-     "lib/hoptoad-api/core_extensions.rb",
-     "lib/hoptoad-api/version.rb",
-     "test/fixtures/errors.xml",
-     "test/fixtures/individual_error.xml",
-     "test/fixtures/individual_notice.xml",
-     "test/fixtures/notices.xml",
-     "test/fixtures/paginated_errors.xml",
-     "test/fixtures/paginated_notices.xml",
-     "test/test_helper.rb",
-     "test/test_hoptoad-api.rb"
-  ]
-  s.homepage = %q{http://github.com/spagalloco/hoptoad-api}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{An unofficial gem for interacting with the Hoptoad API}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/test_hoptoad-api.rb"
-  ]
-
-  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<httparty>, [">= 0.5.2"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0.2.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0.5.2"])
-      s.add_dependency(%q<hashie>, [">= 0.2.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0.5.2"])
-    s.add_dependency(%q<hashie>, [">= 0.2.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-  end
-end
-