metric 0.0.6 → 0.0.7

data/.travis.yml

@@ -3,9 +3,10 @@ bundler_args: --binstubs
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
 
-script: "bundle exec rspec spec"    
+script: "bundle exec rspec spec"
 
 notifications:
   recipients:

data/Gemfile

@@ -1,9 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'ruby-debug', :platform => :ruby_18
-gem 'linecache19', :platform => :ruby_19
-gem 'ruby-debug19', :platform => :ruby_19
-
 group :test do
   gem 'webmock'
 end

data/README.markdown

@@ -1,4 +1,4 @@
-# Metric [![Build Status](http://travis-ci.org/bittersweet/metric.png)](http://travis-ci.org/bittersweet/metric)
+# Metric [![Build Status](https://secure.travis-ci.org/bittersweet/metric.png)](http://travis-ci.org/bittersweet/metric)
 
 Track simple metrics via [metric.io](metric.io).
 

data/lib/metric/track.rb

@@ -23,21 +23,27 @@ module Metric
       url
     end
 
-    # Uses a thread to perform the request
-    # @note If this gem is used with Rails it will only track data in the production environment
+    # Track the metric
+    # @note curl is called in a seperate thread so this won't block execution
     #
     # @param [String, Hash]
     # @return [nil]
     def self.track(metric, options = {})
-      return if defined?(Rails) && !Rails.env.production?
-      return if options[:amount] && options[:amount] == 0
-
+      return if quit_early?(options)
       url = compose(metric, options)
       Thread.new do
         `curl "#{url}" 2>&1 ; `
       end
     end
 
+    # Check if Rails or Rack env is production, or amount is 0
+    def self.quit_early?(options)
+      return true if defined?(Rails) && !Rails.env.production?
+      return true if ENV['RACK_ENV'] && ENV['RACK_ENV'] != "production"
+      return true if options[:amount] && options[:amount] == 0
+      false
+    end
+
     # CGI escape the metric name so spaces and characters are allowed
     #
     # @param [String]

data/lib/metric/version.rb

@@ -1,3 +1,3 @@
 module Metric
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/metric/configuration_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Metric::Configuration do
+  after do
+    reset_config
+  end
+
   it "uses configuration defaults" do
     Metric.configure do |config|
       config.api_key = "test"

data/spec/metric/receive_spec.rb

@@ -1,13 +1,6 @@
 require 'spec_helper'
 
 describe Metric::Receive do
-  before do
-    reset_config
-    Metric.configure do |config|
-      config.secret_key = "1234"
-    end
-  end
-
   it "generates correct hash via secret_token" do
     Metric::Receive.generate_token("hits").should == "c6daa87bcf8bf7cb4d1c74d872793e5e"
   end

data/spec/metric/track_spec.rb

@@ -1,15 +1,12 @@
 require 'spec_helper'
 
 describe Metric::Track do
-  before do
-    reset_config
-  end
-
   it "composes the request url" do
     Metric::Track.compose("hits").should == "http://api.metric.io/track?api_key=spec&metric=hits"
   end
 
   it "gets correct url when tracking" do
+    Metric::Track.should_receive(:quit_early?).and_return(false)
     Metric::Track.should_receive(:compose).with("hits", {})
     Metric::Track.track("hits")
   end

data/spec/metric_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe Metric do
-  before do
-    reset_config
-  end
-
   it "passes through options to track" do
     Metric::Track.should_receive(:track).with("hits", {})
     Metric.track("hits")

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 require File.expand_path('../../lib/metric', __FILE__)
-require 'ruby-debug'
 require 'webmock/rspec'
 
 def reset_config
   Metric.configuration = nil
   Metric.configure do |config|
     config.api_key = "spec"
+    config.secret_key = "1234"
   end
 end
 
+RSpec.configure do |config|
+  config.before(:all) { reset_config }
+end

metadata

@@ -1,89 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: metric
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Mark Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-08 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152308620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152308620
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2161467860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2161467860
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2161467000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2161467000
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2161465040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2161465040
 description: Track metrics via metric.io
-email: 
+email:
 - markmulder@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -102,41 +80,31 @@ files:
 - spec/metric/track_spec.rb
 - spec/metric_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/bittersweet/metric
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Companion gem to the metric.io site to track metrics
-test_files: 
+test_files:
 - spec/metric/configuration_spec.rb
 - spec/metric/receive_spec.rb
 - spec/metric/track_spec.rb