cloudprint 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDE5OGMzZjBmZGJlNTg1MWU2Mjg0NjI0YWE5MjdlNmYxY2E2ZTQ3MA==
-  data.tar.gz: !binary |-
-    MzMwNTlkZDBiMTAwMGE5MTUzNTE2MzI1ZTUwYjFiN2UxNWVkMjE1Ng==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWQxZDI3YjZjNGU2NGU0NWQyNmQwZTIxZTZjYWNlZmZlZmM2MzY3Y2JmMTFk
-    YmJjODZhMzY4ODMzYjE5NWYwNzI1NWFhZDY3MGRkMjRiZmNmOGUyYmJjZjQ0
-    Nzc2YTQyNjZlZjVmODBkYThiMjA2MjRlMDViY2Q5NDRkZGIwYjE=
-  data.tar.gz: !binary |-
-    NTA0NjI3ZDZhNDM0OWMyNWRlNDU0MDM1MTZhM2I1ZTE4ZjVkZTBjYjkyY2Fj
-    NWU0YzU4MDMxMDViMDk2M2E5ZjI0NmQ5ZGViYjgzNDc1ZTNkMWI4NTliNjlm
-    MDM5NGYwY2ZiNzFlYTdjNmVmNDA2ZjkxOTQ3Y2Y1MDZlOWJjNTM=
+SHA1:
+  metadata.gz: 5ba8810b498a449d87aac8faca6b8be162823469
+  data.tar.gz: 0392e67e8c64ebcfb6914cdc46a73d357f160ce2
+SHA512:
+  metadata.gz: a0cfd77c155223d8903109f1bec4dc564f2160c52991a7408b956e7392b70b73b5ad1b78d388aaef31bc9b252725957f717bb3cfc288a4a14a9a47fe5da4138a
+  data.tar.gz: ca5036663d42da407548dbd9bfc107ab22b17936b4b70bd972c3a9fe72ec195145b9efcd9751702dedae9fb9058d732d6e7a116482a97faa7f47f19d05a2e0db

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0

data/ChangeLog.md

@@ -0,0 +1,8 @@
+# Cloudprint Change Log
+
+## [0.3.0] - 2016-03-09
+### Dependencies
+- Update oauth gem requirement since a lot of people were having issues with that.
+- Change test_unit to minitest due to my own issues with the build and test_unit being really old.
+### Fixes
+- Removed a few warnings that were raised during the build.

data/cloudprint.gemspec

@@ -9,19 +9,19 @@ Gem::Specification.new do |s|
   s.email       = ["eugen@lesseverything.com"]
   s.homepage    = "http://github.com/minciue/cloudprint"
   s.licenses    = ["MIT"]
-  s.summary     = "This library provides a ruby-esque interface to Google Cloud Print."
+  s.summary     = "This library provides a Ruby interface to Google Cloud Print."
   s.description = <<-DESC
-This library provides a ruby-esque interface to Google Cloud Print.
+This library provides a Ruby interface to Google Cloud Print.
 cloudprint is a work in progress. I'll be adding documentation once all the basic GCP functionality is supported."
 DESC
 
-  s.add_dependency 'oauth2', '~> 0.8.0'
+  s.add_dependency 'oauth2', '>= 1.0.0'
   s.add_dependency 'json'
 
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'shoulda-context'
-  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'minitest'
 
   s.rubyforge_project = "cloudprint"
 

data/lib/cloudprint/client.rb

@@ -7,8 +7,9 @@ module CloudPrint
     attr_reader :connection
     attr_reader :printers
     attr_reader :print_jobs
-    
+
     def initialize(options = {})
+      @access_token = nil
       @refresh_token = options[:refresh_token]
       @client_id = options[:client_id]
       @client_secret = options[:client_secret]
@@ -17,7 +18,7 @@ module CloudPrint
       @printers = PrinterCollection.new(self)
       @print_jobs = PrintJobCollection.new(self)
     end
-    
+
     def access_token
       (access_token_valid? && @access_token || renew_access_token!).token
     end

data/lib/cloudprint/connection.rb

@@ -8,7 +8,7 @@ module CloudPrint
     def initialize client
       @client = client
     end
-    
+
     def get(path, params = {})
       response = request(:get, path, params)
       parse_response(response)
@@ -37,7 +37,7 @@ module CloudPrint
 
     def request(method, path, params)
       url = full_url_for(path)
-      response = make_http_request(:method => method, :url => url, :params => params)
+      make_http_request(:method => method, :url => url, :params => params)
     end
 
     def make_http_request(options = {})

data/lib/cloudprint/print_job.rb

@@ -49,7 +49,8 @@ module CloudPrint
           :create_time => Time.at(response_hash['createTime'].to_f / 1000),
           :update_time => Time.at(response_hash['updateTime'].to_f / 1000),
           :message => response_hash['message'],
-          :tags => response_hash['tags']
+          :tags => response_hash['tags'],
+          :ticket => response_hash['ticket']
         }
       end
     end

data/lib/cloudprint/printer.rb

@@ -1,10 +1,10 @@
 module CloudPrint
   class Printer
     CONNECTION_STATUSES = %w{ONLINE UNKNOWN OFFLINE DORMANT}
-    CONFIG_OPTS = [:id, :status, :name, :tags, :display_name, :client, :connection_status, :description]
-    
-    attr_reader *CONFIG_OPTS
-    
+    CONFIG_OPTS = [:id, :status, :name, :tags, :display_name, :client, :connection_status, :description, :capabilities]
+
+    CONFIG_OPTS.each { |opt| attr_reader(opt) }
+
     def initialize(options = {})
       @client = options[:client]
       @id = options[:id]
@@ -14,11 +14,12 @@ module CloudPrint
       @tags = options[:tags] || {}
       @connection_status = options[:connection_status] || 'UNKNOWN'
       @description = options[:description]
+      @capabilities = options[:capabilities]
     end
 
     def print(options)
       method = options[:content].is_a?(IO) ? :multipart_post : :post
-      response = client.connection.send(method, '/submit', :printerid => self.id, :title => options[:title], :content => options[:content], :contentType => options[:content_type]) || {}
+      response = client.connection.send(method, '/submit', :printerid => self.id, :title => options[:title], :content => options[:content], :ticket => options[:ticket].to_json, :contentType => options[:content_type]) || {}
       return nil if response.nil? || response["job"].nil?
       client.print_jobs.new_from_response response["job"]
     end

data/lib/cloudprint/printer_collection.rb

@@ -45,7 +45,8 @@ module CloudPrint
         display_name: hash['displayName'],
         tags: hash['tags'],
         connection_status: hash['connectionStatus'],
-        description: hash['description']
+        description: hash['description'],
+        capabilities: hash['capabilities']
         )
     end
   end

data/lib/cloudprint/version.rb

@@ -1,3 +1,3 @@
 module Cloudprint
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/test/cloudprint_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class CloudPrintTest < Test::Unit::TestCase
+class CloudPrintTest < Minitest::Test
   def setup
     stub_access_token
     @client = new_client

data/test/connection_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class ConnectionTest < Test::Unit::TestCase
+class ConnectionTest < Minitest::Test
   def setup
     stub_access_token
     @connection = new_client.connection

data/test/helper.rb

@@ -1,14 +1,14 @@
 require 'cloudprint'
-require 'test/unit'
+require 'minitest/autorun'
 require 'shoulda/context'
-require 'mocha/test_unit'
+require 'mocha/mini_test'
 
-class Test::Unit::TestCase
+class Minitest::Test
 
   def new_client
     CloudPrint::Client.new(refresh_token: "refresh_token")
   end
-  
+
   def any_connection
     CloudPrint::Connection.any_instance
   end
@@ -64,4 +64,21 @@ class Test::Unit::TestCase
   def fixture_file(filename)
     File.join(File.dirname(__FILE__), 'fixtures', filename)
   end
+
+  # Adapted from minitest's assert_raises
+  def assert_nothing_raised(msg = nil)
+    begin
+      yield
+      pass # count assertion
+    rescue Minitest::Skip, Minitest::Assertion
+      # don't count assertion
+      raise
+    rescue SignalException, SystemExit
+      raise
+    rescue Exception => e
+      flunk proc {
+        exception_details(e, "#{e} exception not expected")
+      }
+    end
+  end
 end

data/test/print_job_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class PrintJobTest < Test::Unit::TestCase
+class PrintJobTest < Minitest::Test
   def setup
     # TODO: Is it necessary to pass a fake token to #setup?
     @client = new_client
@@ -125,7 +125,7 @@ class PrintJobTest < Test::Unit::TestCase
     should "raise a RequestError on failure" do
       fake_connection.stubs(:get).with('/deletejob', { :jobid => 'job_id' }).returns({ 'success' => false, 'message' => 'This is an error', 'errorCode' => '123' })
 
-      assert_raise(CloudPrint::RequestError, 'This is an error') do
+      assert_raises(CloudPrint::RequestError, 'This is an error') do
         @client.print_jobs.new(:id => 'job_id').delete!
       end
     end

data/test/printer_test.rb

@@ -1,5 +1,6 @@
 require "helper"
-class PrinterTest < Test::Unit::TestCase
+
+class PrinterTest < Minitest::Test
   def setup
     @client = new_client
   end
@@ -180,11 +181,11 @@ class PrinterTest < Test::Unit::TestCase
   end
 
   def print_params
-     { :title => "Hello World", :content => "<h1>ohai!</h1>", :content_type => "text/html" }
+     { :title => "Hello World", :content => "<h1>ohai!</h1>", :content_type => "text/html", :ticket => ticket_hash }
   end
 
   def connection_print_params
-    { :printerid => 'printer', :title => "Hello World", :content => "<h1>ohai!</h1>", :contentType => "text/html" }
+    { :printerid => 'printer', :title => "Hello World", :content => "<h1>ohai!</h1>", :contentType => "text/html", :ticket => ticket_hash.to_json }
   end
 
   def print_file
@@ -193,11 +194,11 @@ class PrinterTest < Test::Unit::TestCase
   end
 
   def print_file_params
-    { :title => "Ruby!", :content => ruby_png_fixture, :content_type => "image/png" }
+    { :title => "Ruby!", :content => ruby_png_fixture, :content_type => "image/png", :ticket => ticket_hash }
   end
 
   def connection_print_file_params
-    { :printerid => 'printer', :title => "Ruby!", :content => ruby_png_fixture, :contentType => "image/png" }
+    { :printerid => 'printer', :title => "Ruby!", :content => ruby_png_fixture, :contentType => "image/png", :ticket => ticket_hash.to_json }
   end
 
   def one_printer_hash
@@ -211,6 +212,20 @@ class PrinterTest < Test::Unit::TestCase
     ]}
   end
 
+  def ticket_hash
+    { 'version' => '1.0',
+      'print' => {
+        'vendor_ticket_item' => [
+          {'id' => 'PageRegion', 'value' => "Letter"},
+          {'id' => 'BRMediaType', 'value' => 'Plain'},
+          {'id' => 'InputSlot', 'value' => 'Tray1'}
+        ],
+        'page_orientation' => {'type' => 2},
+        'fit_to_page' => {'type' => 3}
+      }
+    }
+  end
+
   def ruby_png_fixture
     @ruby_png_fixture ||= File.open(fixture_file('ruby.png'))
   end

metadata

@@ -1,114 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: cloudprint
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Eugen Minciu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'This library provides a ruby-esque interface to Google Cloud Print.
-
-  cloudprint is a work in progress. I''ll be adding documentation once all the basic
-  GCP functionality is supported."
-
-'
+description: |
+  This library provides a Ruby interface to Google Cloud Print.
+  cloudprint is a work in progress. I'll be adding documentation once all the basic GCP functionality is supported."
 email:
 - eugen@lesseverything.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
+- ChangeLog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,20 +137,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cloudprint
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: This library provides a ruby-esque interface to Google Cloud Print.
+summary: This library provides a Ruby interface to Google Cloud Print.
 test_files:
 - test/cloudprint_test.rb
 - test/connection_test.rb
@@ -160,3 +158,4 @@ test_files:
 - test/helper.rb
 - test/print_job_test.rb
 - test/printer_test.rb
+has_rdoc: