cloudprint 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba8810b498a449d87aac8faca6b8be162823469
-  data.tar.gz: 0392e67e8c64ebcfb6914cdc46a73d357f160ce2
+  metadata.gz: 2638b58ecad39880d408b9c6793defe76fc15fc9
+  data.tar.gz: d287456404dd90388eb574f61e9fef3d0205b910
 SHA512:
-  metadata.gz: a0cfd77c155223d8903109f1bec4dc564f2160c52991a7408b956e7392b70b73b5ad1b78d388aaef31bc9b252725957f717bb3cfc288a4a14a9a47fe5da4138a
-  data.tar.gz: ca5036663d42da407548dbd9bfc107ab22b17936b4b70bd972c3a9fe72ec195145b9efcd9751702dedae9fb9058d732d6e7a116482a97faa7f47f19d05a2e0db
+  metadata.gz: a1be2a1705a7ceb82ee291a4f9b980d0b5c551ae0f883471fb4bbca60666369b0e55f639a0ecbe964f5095f79f476a4f73a716c3e91b411531424812eae4b41d
+  data.tar.gz: 47aea8c483e4540aeb16693f087dc84aaba604ea35d4bc04c60bc48d64700dc3e0d513fff7fd0055fb1d5d1c1c71b91d3a821d6493ac8afbfcdd9c6e234704e8

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.idea
 Gemfile.lock
 pkg/*
 tags

data/ChangeLog.md

@@ -1,5 +1,9 @@
 # Cloudprint Change Log
 
+## [0.3.1] - 2016-03-10
+### Fixes
+- Fix search_all delegating to an invalid query.
+- Turn the method_missing magic inside PrinterCollection into simple explicit code.
 ## [0.3.0] - 2016-03-09
 ### Dependencies
 - Update oauth gem requirement since a lot of people were having issues with that.

data/lib/cloudprint/printer.rb

@@ -18,7 +18,8 @@ module CloudPrint
     end
 
     def print(options)
-      method = options[:content].is_a?(IO) ? :multipart_post : :post
+      content = options[:content]
+      method = content.is_a?(IO) || content.is_a?(StringIO) || content.is_a?(Tempfile) ? :multipart_post : :post
       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"]

data/lib/cloudprint/printer_collection.rb

@@ -14,7 +14,7 @@ module CloudPrint
     end
 
     def all
-      search_all
+      search()
     end
 
     def search(query = nil, conditions = {})
@@ -23,13 +23,22 @@ module CloudPrint
       response = client.connection.get('/search', conditions)
       response['printers'].map { |p| new_printer_from_hash(p) }
     end
+    alias_method :search_all, :search
 
-    def method_missing(meth, *args, &block)
-      if meth =~ /^search_(#{Printer::CONNECTION_STATUSES.map(&:downcase).join('|')}|all)$/
-        search args[0], connection_status: $1.upcase
-      else
-        super
-      end
+    def search_online(q = nil, conditions = {})
+      search_with_status(q, 'ONLINE', conditions)
+    end
+
+    def search_unknown(q = nil, conditions = {})
+      search_with_status(q, 'UNKNOWN', conditions)
+    end
+
+    def search_offline(q = nil, conditions = {})
+      search_with_status(q, 'OFFLINE', conditions)
+    end
+
+    def search_dormant(q = nil, conditions = {})
+      search_with_status(q, 'DORMANT', conditions)
     end
 
     def new opts
@@ -49,5 +58,11 @@ module CloudPrint
         capabilities: hash['capabilities']
         )
     end
+
+    private
+
+    def search_with_status(q, status, conditions)
+      search(q, conditions.merge(connection_status: status))
+    end
   end
 end

data/lib/cloudprint/version.rb

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

data/test/printer_test.rb

@@ -95,6 +95,26 @@ class PrinterTest < Minitest::Test
     print_file
   end
 
+  should "print stringio" do
+    stringio = StringIO.new(ruby_png_fixture.read)
+
+    fake_connection.expects(:multipart_post).with('/submit', connection_print_file_params.merge(:content => stringio)).returns(empty_job)
+    stub_connection
+
+    printer = @client.printers.new(:id => 'printer')
+    printer.print(print_file_params.merge(:content => stringio))
+  end
+
+  should "print tempfile" do
+    Tempfile.open "cloundprint_test" do |tempfile|
+      fake_connection.expects(:multipart_post).with('/submit', connection_print_file_params.merge(:content => tempfile)).returns(empty_job)
+      stub_connection
+
+      printer = @client.printers.new(:id => 'printer')
+      printer.print(print_file_params.merge(:content => tempfile))
+    end
+  end
+
   should "print jobs returning 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'}})
@@ -134,21 +154,21 @@ class PrinterTest < Minitest::Test
   context '.search_all' do
     setup { stub_connection }
 
-    should "scope search by printers with any connection status" do
-      fake_connection.expects(:get).with('/search', { :q => 'query', :connection_status => 'ALL' }).returns(one_printer_hash)
+    should "search printers regardless of connection status" do
+      fake_connection.expects(:get).with('/search', { :q => 'query' }).returns(one_printer_hash)
       @client.printers.search_all 'query'
     end
 
     should "return array of Printers" do
-      fake_connection.stubs(:get).with('/search', { :connection_status => 'ALL' }).returns(one_printer_hash)
+      fake_connection.stubs(:get).with('/search', {}).returns(one_printer_hash)
       printers = @client.printers.search_all
       assert_equal 'my_printer', printers[0].id
     end
   end
 
   context '.all' do
-    should 'call .search_all' do
-      @client.printers.expects(:search_all)
+    should 'call .search with no query' do
+      @client.printers.expects(:search)
       @client.printers.all
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudprint
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eugen Minciu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2