zendesk2 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -65,15 +65,17 @@ class Zendesk2::Client::User < Zendesk2::Model
65
65
  assoc_accessor :organization
66
66
 
67
67
  def save!
68
- if new_record?
69
- requires :name, :email
70
- data = connection.create_user(params).body["user"]
71
- merge_attributes(data)
72
- else
73
- requires :identity
74
- data = connection.update_user(params.merge("id" => self.identity)).body["user"]
75
- merge_attributes(data)
76
- end
68
+ data = if new_record?
69
+ requires :name, :email
70
+
71
+ connection.create_user(params).body["user"]
72
+ else
73
+ requires :identity
74
+
75
+ connection.update_user(params.merge("id" => self.identity)).body["user"]
76
+ end
77
+
78
+ merge_attributes(data)
77
79
  end
78
80
 
79
81
  def destroy!
@@ -4,7 +4,7 @@ class Zendesk2::Client
4
4
  term = query.map{|k,v| "#{k}:#{v}"}.join(" ")
5
5
  request(
6
6
  :method => :get,
7
- :params => {query: "\"#{term}\""},
7
+ :params => {query: term},
8
8
  :path => "/search.json",
9
9
  )
10
10
  end
@@ -1,3 +1,3 @@
1
1
  module Zendesk2
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
3
3
  end
data/lib/zendesk2.rb CHANGED
@@ -1,15 +1,16 @@
1
1
  require "zendesk2/version"
2
2
 
3
3
  # dependencies
4
- require 'cistern'
5
4
  require 'addressable/uri'
5
+ require 'cistern'
6
6
  require 'faraday'
7
7
  require 'faraday_middleware'
8
8
 
9
9
  # stdlib
10
- require 'time'
11
- require 'logger'
12
10
  require 'forwardable'
11
+ require 'logger'
12
+ require 'time'
13
+ require 'yaml'
13
14
 
14
15
  module Zendesk2
15
16
  autoload :Attributes, 'zendesk2/attributes'
@@ -8,6 +8,7 @@ describe "organizations" do
8
8
 
9
9
  describe "with an organization" do
10
10
  let(:organization) { client.organizations.create(name: Zendesk2.uuid) }
11
+
11
12
  it "should get #users" do
12
13
  user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: organization)
13
14
  organization.users.should include user
metadata CHANGED
@@ -2,14 +2,14 @@
2
2
  name: zendesk2
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.2.2
5
+ version: 0.2.3
6
6
  platform: ruby
7
7
  authors:
8
8
  - Josh Lane
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-04-20 00:00:00.000000000 Z
12
+ date: 2013-05-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: cistern