cloudprint 0.0.1 → 0.0.2

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
-gem "oauth2"
-#gem "curb"
-gem "faraday"
+gem "oauth2", "~> 0.5.0"
 gem "json"
 
 group :development do
@@ -11,7 +9,7 @@ end
 
 group :test do
   gem "test-unit", ">= 0"
-  gem "net-http-spy"
+  # gem "net-http-spy"
   gem "rcov", ">= 0"
   gem "mocha", ">= 0"
   gem "ruby-debug"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.2.7)
     columnize (0.3.6)
     faraday (0.7.6)
       addressable (~> 2.2)
@@ -18,9 +18,8 @@ GEM
     metaclass (0.0.1)
     mocha (0.10.4)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     multipart-post (1.1.5)
-    net-http-spy (0.2.1)
     oauth2 (0.5.2)
       faraday (~> 0.7)
       multi_json (~> 1.0)
@@ -40,12 +39,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  faraday
   jeweler (~> 1.6.4)
   json
   mocha
-  net-http-spy
-  oauth2
+  oauth2 (~> 0.5.0)
   rcov
   ruby-debug
   test-unit

data/README.rdoc

@@ -17,4 +17,3 @@ cloudprint is a work in progress. I'll be adding documentation once all the basi
 
 Copyright (c) 2012 Eugen Minciu. See LICENSE.txt for
 further details.
-

data/Rakefile

@@ -30,7 +30,7 @@ Jeweler::RubygemsDotOrgTasks.new
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/*_test.rb'
   test.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cloudprint.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudprint}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eugen Minciu"]
-  s.date = %q{2012-02-14}
+  s.date = %q{2012-02-28}
   s.description = %q{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.}
   s.email = %q{eugen@lesseverything.com}
@@ -28,10 +28,12 @@ cloudprint is a work in progress. I'll be adding documentation once all the basi
     "cloudprint.gemspec",
     "lib/cloudprint.rb",
     "lib/cloudprint/connection.rb",
+    "lib/cloudprint/print_job.rb",
     "lib/cloudprint/printer.rb",
     "test/cloudprint_test.rb",
     "test/connection_test.rb",
     "test/helper.rb",
+    "test/print_job_test.rb",
     "test/printer_test.rb"
   ]
   s.homepage = %q{http://github.com/minciue/cloudprint}
@@ -44,21 +46,18 @@ cloudprint is a work in progress. I'll be adding documentation once all the basi
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth2>, [">= 0"])
-      s.add_runtime_dependency(%q<faraday>, [">= 0"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
-      s.add_dependency(%q<oauth2>, [">= 0"])
-      s.add_dependency(%q<faraday>, [">= 0"])
+      s.add_dependency(%q<oauth2>, ["~> 0.5.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
   else
-    s.add_dependency(%q<oauth2>, [">= 0"])
-    s.add_dependency(%q<faraday>, [">= 0"])
+    s.add_dependency(%q<oauth2>, ["~> 0.5.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/cloudprint.rb

@@ -1,9 +1,11 @@
 require "rubygems"
 require "bundler/setup"
-Bundler.require(:default)
+require "oauth2"
+require "json"
 
 require "cloudprint/printer"
 require "cloudprint/connection"
+require "cloudprint/print_job"
 
 
 module CloudPrint

data/lib/cloudprint/connection.rb

@@ -1,5 +1,4 @@
 require 'ostruct'
-require 'faraday/utils'
 require "net/https"
 require "uri"
 

data/lib/cloudprint/print_job.rb

@@ -0,0 +1,34 @@
+module CloudPrint
+  class PrintJob
+    attr_reader :id, :status, :error_code
+    def initialize(options = {})
+      @id = options[:id]
+      @status = options[:status]
+      @error_code = options[:error_code]
+    end
+
+    def self.find(jobid)
+      response = CloudPrint.connection.post('/jobs', :jobid => jobid) || {}
+      return nil unless response['jobs'].is_a?(Array)
+      job = response['jobs'].first
+      return nil if job.nil?
+      self.new(:id => job['id'], :status => job['status'], :error_code => job['errorCode'])
+    end
+
+    def queued?
+      status == "QUEUED"
+    end
+
+    def in_progress?
+      status == "IN_PROGRESS"
+    end
+
+    def done?
+      status == "DONE"
+    end
+
+    def error?
+      status == "ERROR"
+    end
+  end
+end

data/lib/cloudprint/printer.rb

@@ -1,14 +1,16 @@
 module CloudPrint
   class Printer
-    attr_reader :id, :status, :name
+    attr_reader :id, :status, :name, :tags
     def initialize(options = {})
       @id = options[:id]
       @status = options[:status]
       @name = options[:name]
+      @tags = options[:tags] || {}
     end
 
     def print(options)
-      CloudPrint.connection.post('/submit', :printerid => self.id, :title => options[:title], :content => options[:content], :contentType => options[:content_type])
+      response = CloudPrint.connection.post('/submit', :printerid => self.id, :title => options[:title], :content => options[:content], :contentType => options[:content_type]) || {}
+      CloudPrint::PrintJob.new(:id => response["job"]["id"], :status => response["job"]["status"], :error_code => response["job"]["errorCode"])
     end
 
     class << self
@@ -26,8 +28,8 @@ module CloudPrint
       private
 
       def new_from_hash(hash)
-        Printer.new(:id => hash['id'], :status => hash['status'], :name => hash['name'])
+        Printer.new(:id => hash['id'], :status => hash['status'], :name => hash['name'], :tags => hash['tags'])
       end
     end
   end
-end
+end

data/test/helper.rb

@@ -45,4 +45,13 @@ class Test::Unit::TestCase
   def stub_oauth_client
     CloudPrint.stubs(:oauth_client).returns(mock_oauth_client)
   end
+
+  def fake_connection
+    @connection ||= mock('connection')
+  end
+
+  def stub_connection
+    CloudPrint.stubs(:connection).returns(fake_connection)
+    @connection.stub_everything
+  end
 end

data/test/print_job_test.rb

@@ -0,0 +1,74 @@
+require 'helper'
+
+class PrintJobTest < Test::Unit::TestCase
+  def setup
+    CloudPrint.setup('refresh_token')
+    stub_connection
+  end
+
+  test "find a job" do
+    fake_connection.stubs(:post).with('/jobs', :jobid => 'job_id').returns(job_response)
+    assert CloudPrint::PrintJob.find('job_id').is_a?(CloudPrint::PrintJob)
+  end
+
+  # Google doesn't list jobid as a possible value in its public docs, but it seems to work just fine
+  test 'find a job performs a remote request' do
+    fake_connection.expects(:post).with('/jobs', :jobid => 'job_id').returns({})
+
+    CloudPrint::PrintJob.find('job_id')
+  end
+
+  test 'find a job gets the job details' do
+    fake_connection.stubs(:post).with('/jobs', :jobid => 'job_id').returns(job_response)
+    job = CloudPrint::PrintJob.find('job_id')
+
+    assert_equal 'job_id', job.id
+    assert_equal 'status', job.status
+    assert_equal 'Error', job.error_code
+  end
+
+  test 'a job is queued' do
+    job = CloudPrint::PrintJob.new(:status => "QUEUED")
+
+    assert !job.done?
+    assert !job.in_progress?
+    assert !job.error?
+
+    assert job.queued?
+  end
+
+  test 'a job is in progress' do
+    job = CloudPrint::PrintJob.new(:status => "IN_PROGRESS")
+
+    assert !job.done?
+    assert !job.queued?
+    assert !job.error?
+
+    assert job.in_progress?
+  end
+
+  test 'a job is done' do
+    job = CloudPrint::PrintJob.new(:status => "DONE")
+
+    assert !job.in_progress?
+    assert !job.queued?
+    assert !job.error?
+
+    assert job.done?
+  end
+
+  test "a job has an error" do
+    job = CloudPrint::PrintJob.new(:status => "ERROR")
+
+    assert !job.done?
+    assert !job.in_progress?
+    assert !job.queued?
+
+    assert job.error?
+  end
+  private
+
+  def job_response
+    {"jobs" => [{"id" => "job_id", "status" => "status", "errorCode" => "Error"}]}
+  end
+end

data/test/printer_test.rb

@@ -15,6 +15,14 @@ class PrinterTest < Test::Unit::TestCase
     assert_equal 'My Printer', printer.name
   end
 
+  test "a printer has tags" do
+    printer = CloudPrint::Printer.new(:id => 'printer_id', :status => 'online', :name => "My Printer")
+    assert_equal printer.tags, {}
+
+    printer = CloudPrint::Printer.new(:id => 'printer_id', :status => 'online', :name => "My Printer", :tags => {"email" => 'a@b.com'})
+    assert_equal printer.tags, {"email" => "a@b.com"}
+  end
+
   test "finding a printer by its id should get a connection" do
     fake_connection.stubs(:get).returns(one_printer_hash)
 
@@ -41,6 +49,7 @@ class PrinterTest < Test::Unit::TestCase
     assert_equal 'my_printer', printer.id
     assert_equal 'online', printer.status
     assert_equal 'My Printer', printer.name
+    assert_equal printer.tags, {'email' => 'a@b.com' }
   end
 
   test "finding all printer should initialize an array of printers" do
@@ -56,20 +65,49 @@ class PrinterTest < Test::Unit::TestCase
   end
 
   test "print stuff" do
-    title = 'Hello World'
-    content = '<h1>ohai!</h1>'
-    content_type = 'text/html'
-    printer = CloudPrint::Printer.new(:id => 'printer')
-    fake_connection.expects(:post).with('/submit', :printerid => 'printer', :title => title, :content => content, :contentType => content_type)
+    fake_connection.expects(:post).with('/submit', connection_print_params).returns(empty_job)
+    stub_connection
+
+    print_stuff
+  end
+
+  test "print stuff returns a job" do
+    stub_connection
+    fake_connection.stubs(:post).with('/submit', connection_print_params).returns(empty_job)
+    job = print_stuff
+    assert job.is_a?(CloudPrint::PrintJob)
+  end
+
+  test "print job has an id and a status" do
     stub_connection
+    fake_connection.expects(:post).with('/submit', connection_print_params).returns({"success" => true, "job" => {"id" => "job_id", "status" => 'status'}})
+    job = print_stuff
 
-    printer.print(:title => title, :content => content, :content_type => content_type)
+    assert_equal 'job_id', job.id
+    assert_equal 'status', job.status
   end
 
   private
 
+  def empty_job
+    {"job" => {}}
+  end
+
+  def print_stuff
+    printer = CloudPrint::Printer.new(:id => 'printer')
+    printer.print(print_params)
+  end
+
+  def print_params
+     { :title => "Hello World", :content => "<h1>ohai!</h1>", :content_type => "text/html" }
+  end
+
+  def connection_print_params
+    { :printerid => 'printer', :title => "Hello World", :content => "<h1>ohai!</h1>", :contentType => "text/html" }
+  end
+
   def one_printer_hash
-    {'printers' =>[{'id' => 'my_printer', 'status' => 'online', 'name' => "My Printer"}]}
+    {'printers' =>[{'id' => 'my_printer', 'status' => 'online', 'name' => "My Printer", 'tags' => { 'email' => 'a@b.com'}}]}
   end
 
   def multiple_printer_hash
@@ -79,15 +117,5 @@ class PrinterTest < Test::Unit::TestCase
     ]}
   end
 
-  def fake_connection
-    if @connection.nil?
-      @connection = mock('connection')
-      @connection.stub_everything
-    end
-    @connection
-  end
 
-  def stub_connection
-    CloudPrint.stubs(:connection).returns(fake_connection)
-  end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudprint
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eugen Minciu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-14 00:00:00 +02:00
+date: 2012-02-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,12 +23,14 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 0
+        version: 0.5.0
   requirement: *id001
   prerelease: false
   name: oauth2
@@ -45,24 +47,10 @@ dependencies:
         version: "0"
   requirement: *id002
   prerelease: false
-  name: faraday
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-  prerelease: false
   name: json
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +61,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
+  requirement: *id003
   prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,7 +77,7 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id005
+  requirement: *id004
   prerelease: false
   name: jeweler
 description: |-
@@ -114,10 +102,12 @@ files:
 - cloudprint.gemspec
 - lib/cloudprint.rb
 - lib/cloudprint/connection.rb
+- lib/cloudprint/print_job.rb
 - lib/cloudprint/printer.rb
 - test/cloudprint_test.rb
 - test/connection_test.rb
 - test/helper.rb
+- test/print_job_test.rb
 - test/printer_test.rb
 has_rdoc: true
 homepage: http://github.com/minciue/cloudprint