Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ group :development do
end

gem 'paperclip', '>= 3.1.0'
gem 'docsplit', '0.6.4'
gem 'sidekiq', '>= 3.3.0'
gem 'docsplit', '0.7.6'
gem 'sidekiq', '>= 3.3.0'
7 changes: 5 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ GEM
cocaine (0.5.5)
climate_control (>= 0.0.3, < 1.0)
connection_pool (2.1.0)
docsplit (0.6.4)
docsplit (0.7.6)
git (1.2.8)
hitimes (1.2.2)
i18n (0.7.0)
Expand Down Expand Up @@ -58,9 +58,12 @@ PLATFORMS

DEPENDENCIES
bundler
docsplit (= 0.6.4)
docsplit (= 0.7.6)
jeweler (~> 1.8.4)
paperclip (>= 3.1.0)
rdoc (~> 3.12)
shoulda
sidekiq (>= 3.3.0)

BUNDLED WITH
1.11.2
10 changes: 5 additions & 5 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ aptitude install pdftk

On the Mac, you can download a [http://www.pdflabs.com/docs/install-pdftk/](recent installer for the binary). Without pdftk installed, you can use Docsplit, but won't be able to split apart a multi-page PDF into single-page PDFs.

#### 6. (Optional) Install OpenOffice. On Linux, use aptitude, apt-get or yum:
#### 6. (Optional) Install LibreOffice. On Linux, use aptitude, apt-get or yum:

```bash
aptitude install openoffice.org openoffice.org-java-common
aptitude install libreoffice
```

On Mac, download and install [http://www.openoffice.org/download/index.html](http://www.openoffice.org/download/index.html).
On Mac, download and install [http://www.libreoffice.org/download](http://www.libreoffice.org/download).

### Install Gem

Expand Down Expand Up @@ -91,7 +91,7 @@ docsplit_images requires sidekiq to be turned on the process.

[bundle exec] sidekiq

While it is processing using [https://github.com/collectiveidea/delayed_job](delayed_job), you can check if it is processing by accessing attribute ``is_processing_image``
While it is processing using [https://github.com/mperham/sidekiq](sidekiq), you can check if it is processing by accessing attribute ``is_processing_image``

```ruby
asset.is_processing_image?
Expand Down Expand Up @@ -142,4 +142,4 @@ Copyright
-------------

Copyright (c) 2012 jameshuynh. See LICENSE.txt for
further details.
further details.
4 changes: 2 additions & 2 deletions docsplit_images.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ Gem::Specification.new do |s|

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<paperclip>, [">= 3.1.0"])
s.add_runtime_dependency(%q<docsplit>, ["= 0.6.4"])
s.add_runtime_dependency(%q<docsplit>, ["= 0.7.6"])
s.add_runtime_dependency(%q<sidekiq>, [">= 3.3.0"])
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
s.add_development_dependency(%q<bundler>, [">= 0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
else
s.add_dependency(%q<paperclip>, [">= 3.1.0"])
s.add_dependency(%q<docsplit>, ["= 0.6.4"])
s.add_dependency(%q<docsplit>, ["= 0.7.6"])
s.add_dependency(%q<sidekiq>, [">= 3.3.0"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<rdoc>, ["~> 3.12"])
Expand Down
4 changes: 2 additions & 2 deletions lib/docsplit_images/conversion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module Conversion
def self.included(base)

base.before_save :check_for_file_change
base.after_save :docsplit_images
base.after_commit :docsplit_images

def check_for_file_change
@file_has_changed = self.send(self.class.docsplit_attachment_name).dirty?
Expand Down Expand Up @@ -101,4 +101,4 @@ def docsplit_images_conversion_for(attribute, opts={})
self.send(:include, DocsplitImages::Conversion)
end
end
end
end