km 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    km (1.1.0)
+    km (1.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    awesome_print (0.3.1)
     diff-lcs (1.1.2)
     json (1.5.1)
     rake (0.8.7)
@@ -18,16 +17,13 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print
   bundler (>= 1.0.0)
   json
   km!
   rake
   rspec (~> 2.4.0)
-  watchr

data/README.rdoc

@@ -2,6 +2,10 @@
 
 We are hosting our documentation for our Ruby API here: http://support.kissmetrics.com/apis/ruby
 
+= Installation
+
+  gem install km
+
 = SaaS
 
 This gem includes SaaS calls. For more information please refer to:

data/bin/km_send

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+require 'rubygems'
+require 'optparse'
 require 'km'
 
 env = 'production'

data/km.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["KISSmetrics"]
   s.email       = ["support@kissmetrics.com"]
-  s.homepage    = "http://rubygems.org/gems/km"
+  s.homepage    = "https://github.com/kissmetrics/km"
   s.summary     = "KISSmetrics ruby API gem"
   s.description = "KISSmetrics ruby API gem"
 
@@ -16,9 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "~> 2.4.0"
-  s.add_development_dependency "awesome_print"
   s.add_development_dependency "rake"
-  s.add_development_dependency "watchr"
   s.add_development_dependency "json"
 
   s.files        = `git ls-files`.split("\n")

data/lib/km.rb

@@ -1,17 +1,9 @@
 require 'cgi'
 require 'socket'
+require 'net/http'
 require 'fileutils'
 require 'km/saas'
 
-class Hash
-  def reverse_merge(other_hash)
-    other_hash.merge(self)
-  end if !respond_to?(:reverse_merge)
-  def reverse_merge!(other_hash)
-    replace(reverse_merge(other_hash))
-  end if !respond_to?(:reverse_merge)
-end
-
 class KMError < StandardError; end
 
 class KM
@@ -35,7 +27,8 @@ class KM
         :use_cron  => @use_cron,
         :env       => set_env,
       }
-      options.reverse_merge!(default)
+      options = default.merge(options)
+
       begin
         @key       = key
         @host      = options[:host]
@@ -196,7 +189,8 @@ class KM
       data.update('_p' => @id) unless update == false
       data.update('_k' => @key)
       data.update '_d' => 1 if data['_t']
-      data.reverse_merge!('_t' => Time.now.to_i)
+      data['_t'] ||= Time.now.to_i
+
       data.inject(query) do |query,key_val|
         query_arr <<  key_val.collect { |i| CGI.escape i.to_s }.join('=')
       end
@@ -218,14 +212,11 @@ class KM
         log_sent(line)
         return
       end
-      host,port = @host.split(':')
       begin
-        sock = TCPSocket.open(host,port)
-        request = 'GET ' +  line + " HTTP/1.1\r\n"
-        request += "Host: " + Socket.gethostname + "\r\n"
-        request += "Connection: Close\r\n\r\n";
-        sock.print(request)
-        sock.close
+        host,port = @host.split(':')
+        res = Net::HTTP.start(host, port) do |http|
+          http.get(line)
+        end
       rescue Exception => e
         raise KMError.new("#{e} for host #{@host}")
       end

data/lib/km/version.rb

@@ -1,3 +1,3 @@
 class KM
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/setup.rb

@@ -1,4 +1,3 @@
-require 'ap'
 require 'km'
 require 'fileutils'
 require 'accept'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: km
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors: 
 - KISSmetrics
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id001
@@ -40,65 +32,31 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: awesome_print
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: watchr
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
 description: KISSmetrics ruby API gem
 email: 
 - support@kissmetrics.com
@@ -180,7 +138,7 @@ files:
 - spec/setup.rb
 - spec/watchr.rb
 has_rdoc: true
-homepage: http://rubygems.org/gems/km
+homepage: https://github.com/kissmetrics/km
 licenses: []
 
 post_install_message: 
@@ -193,23 +151,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: kissmetrics
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: KISSmetrics ruby API gem