zendesk_api 1.3.0.rc2 → 1.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5643ac1a2c1bf9f4bd50df7b8745b2cc1b7858bb
-  data.tar.gz: d887a6f438c5645a37d009275fbd3a54099b6132
+  metadata.gz: e0af96893eadf039d7ee2f55140c99a2ebb6493b
+  data.tar.gz: 3cece9eb1e9d0e1d6028741316148efd0d81aff5
 SHA512:
-  metadata.gz: a7cfc809cae2c3d09e3051be20d56636993d842855682b3b433824fec5fc8c8f37668e108f8c1a60b8531017f229460beb15472737925298372a3547db925ef8
-  data.tar.gz: 3fcba2c5a56dc8ef199bedfdd6f35f64d75c883b04a8388e9c04da6699f119ee1fa6039972032c9d8398d92198a5dffdbe2a8c069831dad122060642ddac38b3
+  metadata.gz: d9a690f20225ad74dc19f0991786edef89b6fcfe721f81850897cca6d9b3b931f1d4c362c2baf26f81a9a21983db4f8479b239c7571999bc26e52cb0f2fc9b07
+  data.tar.gz: ca2b7c76939a390ae9d7ae464e8a5780e69a13afe42e219080444dc9f2f812d9db1b770832da1bc99869e01db02997c9029b6895448b29dcc5cfad1cd0b01831

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.3.0.rc2)
+    zendesk_api (1.3.0.rc3)
       faraday (~> 0.9)
       hashie (>= 1.2)
       inflection
-      mime-types (~> 2.0)
+      mime-types (~> 1.0)
       multi_json
       multipart-post (~> 2.0)
 
@@ -49,7 +49,7 @@ GEM
     i18n (0.6.9)
     inflection (1.0.0)
     json (1.8.1)
-    mime-types (2.1)
+    mime-types (1.25.1)
     mongoid (3.1.6)
       activemodel (~> 3.2)
       moped (~> 1.4)

data/README.md

@@ -204,7 +204,7 @@ Using side-loading, however, the user can be partially loaded in the same reques
 
 ```ruby
 tickets = client.tickets.include(:users)
-# Or client.tickets(include: :users)
+# Or client.tickets(:include => :users)
 # Does *NOT* make a request to the server since it is already loaded
 tickets.first.requester # => #<ZendeskAPI::User id=...>
 ```
@@ -277,11 +277,11 @@ v1.1.0 introduces support for the Zendesk [Apps API](http://developer.zendesk.co
 
 ```ruby
 upload = client.apps.uploads.create!(:file => "path/to/app.zip")
-client.apps.create!(:name => "test", :short_description => "My test app", :upload_id => upload.id)
+client.apps.create!(:name => "test", :upload_id => upload.id)
 
 # Or
 
-app = ZendeskAPI::App.new(client, :name => "test", :short_description => "My test app")
+app = ZendeskAPI::App.new(client, :name => "test")
 app.upload = "path/to/app.zip"
 app.save!
 
@@ -291,12 +291,12 @@ upload = ZendeskAPI::App::Upload.new(client, :file => "path/to/app.zip")
 upload.save!
 
 app = ZendeskAPI::App.new(client, :name => "test")
-app.short_description = "My test app"
 app.upload_id = upload.id
 app.save!
 
-# Not supported!
-client.apps.create!(:name => "test", :short_description => "My test app", :upload => "app.zip")
+# Or
+
+client.apps.create!(:name => "test", :upload => "app.zip")
 ```
 
 *Note: job statuses are currently not supported, so you must manually poll the job status API for app creation.*
@@ -313,12 +313,20 @@ end
 #### Updating Apps
 
 ```ruby
-client.apps.update!(:id => 123, :short_description => "New Description")
+upload = client.apps.uploads.create!(:file => "NewApp.zip")
+
+# Then
+
+client.apps.update!(:id => 123, :upload_id => upload.id)
 
-app = ZendeskAPI::App.new(client, :id => 123, :short_description => "New Description")
+# Or
+
+app = ZendeskAPI::App.new(client, :id => 123, :upload_id => upload.id)
 app.save!
 
-ZendeskAPI::App.update!(client, :id => 123, :short_description => "New Description")
+# Or
+
+ZendeskAPI::App.update!(client, :id => 123, :upload_id => upload.id)
 ```
 
 #### Deleting Apps

data/lib/zendesk_api/resources.rb

@@ -31,6 +31,7 @@ module ZendeskAPI
     include Destroy
 
     alias :name :id
+    alias :to_param :id
 
     def path(opts = {})
       raise "tags must have parent resource" unless association.options.parent
@@ -113,7 +114,7 @@ module ZendeskAPI
 
     has_many Ticket
     has_many User
-    has_many Tag, :extend => Tag::Update
+    has_many Tag, :extend => Tag::Update, :inline => :create
   end
 
   class ForumSubscription < Resource
@@ -169,7 +170,7 @@ module ZendeskAPI
     has_many :comments, :class => TopicComment
     has_many :subscriptions, :class => TopicSubscription
     has :vote, :class => TopicVote
-    has_many Tag, :extend => Tag::Update
+    has_many Tag, :extend => Tag::Update, :inline => :create
 
     def votes(opts = {})
       return @votes if @votes && !opts[:reload]
@@ -322,7 +323,7 @@ module ZendeskAPI
     has :last_comment, :class => Comment, :inline => true
     has_many :last_comments, :class => Comment, :inline => true
 
-    has_many Tag, :extend => Tag::Update
+    has_many Tag, :extend => Tag::Update, :inline => :create
 
     has_many :incidents, :class => Ticket
 
@@ -593,6 +594,14 @@ module ZendeskAPI
       super
     end
 
+    def self.create!(client, attributes = {}, &block)
+      if file_path = attributes.delete(:upload)
+        attributes[:upload_id] = client.apps.uploads.create!(:file => file_path).id
+      end
+
+      super
+    end
+
     class Upload < Data
       class << self
         def resource_path

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.3.0.rc2"
+  VERSION = "1.3.0.rc3"
 end

data/spec/live/app_spec.rb

@@ -1,7 +1,7 @@
 require 'core/spec_helper'
 
 describe ZendeskAPI::App do
-  it "should work "do
+  it "should work" do
     upload = VCR.use_cassette("app_upload_create") do
       ZendeskAPI::App::Upload.new(client, :id => "spec/fixtures/sample_app.zip").tap(&:save!)
     end
@@ -12,20 +12,7 @@ describe ZendeskAPI::App do
 
     VCR.use_cassette("app_create") { app.save! }
 
-    body = {}
-
-    VCR.use_cassette("app_create_job_status") do
-      until %w{failed completed}.include?(body["status"])
-        response = client.connection.get(app.response.headers["Location"])
-        body = response.body
-
-        sleep(3)
-      end
-    end
-
-    if body["status"] == "failed"
-      fail "Could not create app: #{body.inspect}"
-    end
+    body = check_job(app)
 
     app.id = body["app_id"]
     app.author_name = "Mr. Sprinkles"
@@ -37,4 +24,33 @@ describe ZendeskAPI::App do
 
     VCR.use_cassette("app_destroy") { app.destroy! }
   end
+
+  it "should be able to handle the simplest creation api call" do
+    VCR.use_cassette("app_simple_create") do
+      app = ZendeskAPI::App.create!(client, { :name => "Testing App Creation", :upload => "spec/fixtures/sample_app.zip" })
+
+      check_job(app)
+
+      VCR.use_cassette("app_destroy") { app.destroy! }
+    end
+  end
+end
+
+def check_job(app)
+  body = {}
+
+  VCR.use_cassette("app_create_job_status") do
+    until %w{failed completed}.include?(body["status"])
+      response = client.connection.get(app.response.headers["Location"])
+      body = response.body
+
+      sleep(3)
+    end
+  end
+
+  if body["status"] == "failed"
+    fail "Could not create app: #{body.inspect}"
+  end
+
+  body
 end

data/zendesk_api.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "hashie", ">= 1.2"
   s.add_runtime_dependency "inflection"
   s.add_runtime_dependency "multi_json"
-  s.add_runtime_dependency "mime-types", "~> 2.0"
+  s.add_runtime_dependency "mime-types", "~> 1.0"
   s.add_runtime_dependency "multipart-post", "~> 2.0"
 
   s.files              = `git ls-files -x Gemfile.lock`.split("\n") rescue ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
+  version: 1.3.0.rc3
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement