intercom 0.0.12 → 0.1.1

data/intercom.gemspec

@@ -6,8 +6,8 @@ require "intercom/version"
 Gem::Specification.new do |spec|
   spec.name        = "intercom"
   spec.version     = Intercom::VERSION
-  spec.authors     = ["Ben McRedmond", "Ciaran Lee", "Darragh Curran", "Jeff Gardner"]
-  spec.email       = ["ben@intercom.io", "ciaran@intercom.io", "darragh@intercom.io", "jeff@intercom.io"]
+  spec.authors     = ["Ben McRedmond", "Ciaran Lee", "Darragh Curran", "Jeff Gardner", "Kyle Daigle"]
+  spec.email       = ["ben@intercom.io", "ciaran@intercom.io", "darragh@intercom.io", "jeff@intercom.io", "kyle@digitalworkbox.com"]
   spec.homepage    = "https://www.intercom.io"
   spec.summary     = %q{Ruby bindings for the Intercom API}
   spec.description = %Q{Intercom (https://www.intercom.io) is a customer relationship management and messaging tool for web app owners. This library wraps the api provided by Intercom. See http://docs.intercom.io/api for more details. }

data/lib/intercom/{user_custom_data.rb → flat_store.rb}

@@ -1,7 +1,7 @@
 module Intercom
   # Sub-class of {Hash} for storing custom data attributes.
   # Doesn't allow nested Hashes or Arrays. And requires {String} or {Symbol} keys.
-  class UserCustomData < Hash
+  class FlatStore < Hash
     def initialize(attributes={})
       (attributes).each do |key, value|
         validate_key_and_value(key, value)
@@ -20,8 +20,8 @@ module Intercom
 
     private
     def validate_key_and_value(key, value)
-      raise ArgumentError.new("custom_data does not support nested data structures (key: #{key}, value: #{value}") if value.is_a?(Array) || value.is_a?(Hash)
-      raise ArgumentError.new("custom_data key must be String or Symbol: #{key}") unless key.is_a?(String) || key.is_a?(Symbol)
+      raise ArgumentError.new("This does not support nested data structures (key: #{key}, value: #{value}") if value.is_a?(Array) || value.is_a?(Hash)
+      raise ArgumentError.new("Key must be String or Symbol: #{key}") unless key.is_a?(String) || key.is_a?(Symbol)
     end
   end
 end

data/lib/intercom/user.rb

@@ -1,5 +1,5 @@
 require 'intercom/user_resource'
-require 'intercom/user_custom_data'
+require 'intercom/flat_store'
 require 'intercom/user_collection_proxy'
 require 'intercom/social_profile'
 
@@ -222,17 +222,40 @@ module Intercom
     #  user.custom_data[:plan] = "pro"
     #  user.save
     #
-    # @return [UserCustomData]
+    # @return [FlatStore]
     def custom_data
-      @attributes["custom_data"] ||= UserCustomData.new
+      @attributes["custom_data"] ||= FlatStore.new
     end
 
     # Set a {Hash} of custom data attributes to save/update on this user
     #
     # @param [Hash] custom_data
-    # @return [UserCustomData]
+    # @return [FlatStore]
     def custom_data=(custom_data)
-      @attributes["custom_data"] = UserCustomData.new(custom_data)
+      @attributes["custom_data"] = FlatStore.new(custom_data)
+    end
+
+    # Custom attributes stored for this Intercom::User
+    #
+    # See http://docs.intercom.io/#Companies for more information
+    #
+    # Example: Setting a company for an existing user
+    #  user = Intercom::User.find(:email => "someone@example.com")
+    #  user.company[:id] = 6
+    #  user.company[:name] = "Intercom"
+    #  user.save
+    #
+    # @return [FlatStore]
+    def company
+      @attributes["company"] ||= FlatStore.new
+    end
+
+    # Set a {Hash} of company attributes to save/update on this user
+    #
+    # @param [Hash] company
+    # @return [FlatStore]
+    def company=(company)
+      @attributes["company"] = FlatStore.new(company)
     end
 
     protected

data/lib/intercom/user_collection_proxy.rb

@@ -1,5 +1,5 @@
 require 'intercom/user_resource'
-require 'intercom/user_custom_data'
+require 'intercom/flat_store'
 require 'intercom/social_profile'
 
 module Intercom

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "0.0.12"
+  VERSION = "0.1.1"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'intercom'
 require 'minitest/autorun'
-require 'mocha'
+require 'mocha/setup'
 
 def test_user(email="bob@example.com")
   {

data/spec/unit/intercom/{user_custom_data_spec.rb → flat_store_spec.rb}

@@ -1,26 +1,26 @@
 require "spec_helper"
 
-describe Intercom::UserCustomData do
+describe Intercom::FlatStore do
   it "raises if you try to set or merge in nested hash structures" do
-    data = Intercom::UserCustomData.new()
+    data = Intercom::FlatStore.new()
     proc { data["thing"] = [1] }.must_raise ArgumentError
     proc { data["thing"] = {1 => 2} }.must_raise ArgumentError
-    proc { Intercom::UserCustomData.new({1 => {2 => 3}}) }.must_raise ArgumentError
+    proc { Intercom::FlatStore.new({1 => {2 => 3}}) }.must_raise ArgumentError
   end
 
   it "raises if you try to use a non string key" do
-    data = Intercom::UserCustomData.new()
+    data =Intercom::FlatStore.new()
     proc { data[1] = "something" }.must_raise ArgumentError
   end
 
   it "sets and merges valid entries" do
-    data = Intercom::UserCustomData.new()
+    data = Intercom::FlatStore.new()
     data["a"] = 1
     data[:b] = 2
     data[:a].must_equal 1
     data["b"].must_equal 2
     data[:b].must_equal 2
-    data = Intercom::UserCustomData.new({"a" => 1, :b => 2})
+    data = Intercom::FlatStore.new({"a" => 1, :b => 2})
     data["a"].must_equal 1
     data[:a].must_equal 1
     data["b"].must_equal 2

data/spec/unit/intercom/user_spec.rb

@@ -73,6 +73,14 @@ describe "Intercom::User" do
     user.to_hash["custom_data"].must_equal "mad" => 123, "other" => now, "thing" => "yay"
   end
 
+  it "allows easy setting of company data" do
+    now = Time.now
+    user = Intercom::User.new()
+    user.company["name"] = "Intercom"
+    user.company["id"] = 6
+    user.to_hash["company"].must_equal "name" => "Intercom", "id" => 6
+  end
+
   it "rejects nested data structures in custom_data" do
     user = Intercom::User.new()
     proc { user.custom_data["thing"] = [1] }.must_raise ArgumentError
@@ -97,6 +105,12 @@ describe "Intercom::User" do
     user.save
   end
 
+  it "saves a user with a company" do
+    user = Intercom::User.new("email" => "jo@example.com", :user_id => "i-1224242", :company => {:id => 6, :name => "Intercom"})
+    Intercom.expects(:post).with("/v1/users", {"email" => "jo@example.com", "user_id" => "i-1224242", "company" => {"id" => 6, "name" => "Intercom"}}).returns({"email" => "jo@example.com", "user_id" => "i-1224242"})
+    user.save
+  end
+
   it "deletes a user" do
     Intercom.expects(:delete).with("/v1/users", {"email" => "jo@example.com", "user_id" => "i-1224242"}).returns({"email" => "jo@example.com", "user_id" => "i-1224242"})
     Intercom::User.delete("email" => "jo@example.com", "user_id" => "i-1224242")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,11 @@ authors:
 - Ciaran Lee
 - Darragh Curran
 - Jeff Gardner
+- Kyle Daigle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -70,6 +71,7 @@ email:
 - ciaran@intercom.io
 - darragh@intercom.io
 - jeff@intercom.io
+- kyle@digitalworkbox.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -84,6 +86,7 @@ files:
 - intercom.gemspec
 - lib/data/cacert.pem
 - lib/intercom.rb
+- lib/intercom/flat_store.rb
 - lib/intercom/impression.rb
 - lib/intercom/message_thread.rb
 - lib/intercom/note.rb
@@ -92,16 +95,15 @@ files:
 - lib/intercom/unix_timestamp_unwrapper.rb
 - lib/intercom/user.rb
 - lib/intercom/user_collection_proxy.rb
-- lib/intercom/user_custom_data.rb
 - lib/intercom/user_resource.rb
 - lib/intercom/version.rb
 - spec/integration/intercom_api_integration_spec.rb
 - spec/spec_helper.rb
+- spec/unit/intercom/flat_store_spec.rb
 - spec/unit/intercom/impression_spec.rb
 - spec/unit/intercom/message_thread_spec.rb
 - spec/unit/intercom/note_spec.rb
 - spec/unit/intercom/user_collection_proxy_spec.rb
-- spec/unit/intercom/user_custom_data_spec.rb
 - spec/unit/intercom/user_resource_spec.rb
 - spec/unit/intercom/user_spec.rb
 - spec/unit/intercom_spec.rb
@@ -125,18 +127,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: intercom
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Intercom API
 test_files:
 - spec/integration/intercom_api_integration_spec.rb
 - spec/spec_helper.rb
+- spec/unit/intercom/flat_store_spec.rb
 - spec/unit/intercom/impression_spec.rb
 - spec/unit/intercom/message_thread_spec.rb
 - spec/unit/intercom/note_spec.rb
 - spec/unit/intercom/user_collection_proxy_spec.rb
-- spec/unit/intercom/user_custom_data_spec.rb
 - spec/unit/intercom/user_resource_spec.rb
 - spec/unit/intercom/user_spec.rb
 - spec/unit/intercom_spec.rb
+has_rdoc: