papermill 1.1.2 → 1.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. data/README.rdoc +20 -34
  2. data/VERSION +1 -1
  3. data/app/controllers/papermill_controller.rb +23 -28
  4. data/app/views/papermill/_asset.html.erb +2 -2
  5. data/app/views/papermill/crop.html.erb +34 -0
  6. data/app/views/papermill/edit.html.erb +8 -1
  7. data/config/locales/papermill.yml +15 -15
  8. data/config/routes.rb +1 -1
  9. data/generators/papermill_assets/papermill_assets_generator.rb +1 -2
  10. data/generators/papermill_initializer/papermill_initializer_generator.rb +1 -1
  11. data/lib/papermill.rb +2 -6
  12. data/lib/papermill/form_builder.rb +96 -102
  13. data/lib/papermill/papermill.rb +1 -1
  14. data/lib/papermill/papermill_asset.rb +2 -0
  15. data/lib/papermill/papermill_helper.rb +9 -13
  16. data/lib/papermill/papermill_initializer.rb +132 -0
  17. data/lib/papermill/papermill_options.rb +49 -131
  18. data/lib/papermill/papermill_paperclip_processor.rb +1 -1
  19. data/public/facebox/README.txt +4 -0
  20. data/public/facebox/b.png +0 -0
  21. data/public/facebox/bl.png +0 -0
  22. data/public/facebox/br.png +0 -0
  23. data/public/facebox/closelabel.gif +0 -0
  24. data/public/facebox/facebox.css +95 -0
  25. data/public/facebox/facebox.js +319 -0
  26. data/public/facebox/fbx-border-sprite.png +0 -0
  27. data/public/facebox/loading.gif +0 -0
  28. data/public/facebox/logo.png +0 -0
  29. data/public/facebox/shadow.gif +0 -0
  30. data/public/facebox/tl.png +0 -0
  31. data/public/facebox/tr.png +0 -0
  32. data/public/jgrowl/jquery.jgrowl.css +127 -0
  33. data/public/jgrowl/jquery.jgrowl_minimized.js +4 -0
  34. data/public/papermill/images/mass-delete.png +0 -0
  35. data/public/papermill/jquery-1.3.2.min.js +19 -0
  36. data/public/papermill/jquery-ui-1.7.2.custom.min.js +34 -0
  37. data/public/papermill/jquery.Jcrop.css +35 -0
  38. data/public/papermill/jquery.Jcrop.min.js +163 -0
  39. data/public/papermill/papermill.css +15 -4
  40. data/public/papermill/papermill.js +47 -69
  41. data/test/papermill_test.rb +4 -8
  42. metadata +23 -2
data/test/papermill_test.rb CHANGED
@@ -8,18 +8,17 @@ require 'active_support'
8
8
  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/info.log")
9
9
  RAILS_ROOT = File.join( File.dirname(__FILE__), "../../../.." )
10
10
 
11
-
12
- require File.join(File.dirname(__FILE__), '../init.rb')
13
-
14
11
  module Papermill
15
- OPTIONS = OPTIONS.merge(
12
+ OPTIONS = {
16
13
  :aliases => {
17
14
  'tall' => :"1000x1000",
18
15
  :small => "100x100",
19
16
  :hashed_style => {:geometry => "100x100"}
20
- })
17
+ }
18
+ }
21
19
  end
22
20
 
21
+ require File.join(File.dirname(__FILE__), '../init.rb')
23
22
 
24
23
  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "test.sqlite3")
25
24
  ActiveRecord::Schema.define(:version => 1) do
@@ -34,8 +33,6 @@ ActiveRecord::Schema.define(:version => 1) do
34
33
  end
35
34
  end
36
35
 
37
-
38
-
39
36
  class MyAsset < PapermillAsset
40
37
  end
41
38
 
@@ -47,7 +44,6 @@ class Article < ActiveRecord::Base
47
44
  papermill :my_assets, :class_name => "MyAsset"
48
45
  end
49
46
 
50
-
51
47
  class PapermillTest < Test::Unit::TestCase
52
48
  @article = Article.create!
53
49
  @decoy_article = Article.create!
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: papermill
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-11-25 00:00:00 +01:00
12
+ date: 2009-12-01 00:00:00 +01:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -42,6 +42,7 @@ files:
42
42
  - app/views/papermill/_form.html.erb
43
43
  - app/views/papermill/_raw_asset.html.erb
44
44
  - app/views/papermill/_thumbnail_asset.html.erb
45
+ - app/views/papermill/crop.html.erb
45
46
  - app/views/papermill/edit.html.erb
46
47
  - config/locales/papermill.yml
47
48
  - config/routes.rb
@@ -62,9 +63,25 @@ files:
62
63
  - lib/papermill/papermill.rb
63
64
  - lib/papermill/papermill_asset.rb
64
65
  - lib/papermill/papermill_helper.rb
66
+ - lib/papermill/papermill_initializer.rb
65
67
  - lib/papermill/papermill_options.rb
66
68
  - lib/papermill/papermill_paperclip_processor.rb
67
69
  - public/.DS_Store
70
+ - public/facebox/README.txt
71
+ - public/facebox/b.png
72
+ - public/facebox/bl.png
73
+ - public/facebox/br.png
74
+ - public/facebox/closelabel.gif
75
+ - public/facebox/facebox.css
76
+ - public/facebox/facebox.js
77
+ - public/facebox/fbx-border-sprite.png
78
+ - public/facebox/loading.gif
79
+ - public/facebox/logo.png
80
+ - public/facebox/shadow.gif
81
+ - public/facebox/tl.png
82
+ - public/facebox/tr.png
83
+ - public/jgrowl/jquery.jgrowl.css
84
+ - public/jgrowl/jquery.jgrowl_minimized.js
68
85
  - public/papermill/README
69
86
  - public/papermill/images/background.png
70
87
  - public/papermill/images/container-background.jpg
@@ -73,6 +90,10 @@ files:
73
90
  - public/papermill/images/mass-edit.png
74
91
  - public/papermill/images/upload-blank.png
75
92
  - public/papermill/images/upload.png
93
+ - public/papermill/jquery-1.3.2.min.js
94
+ - public/papermill/jquery-ui-1.7.2.custom.min.js
95
+ - public/papermill/jquery.Jcrop.css
96
+ - public/papermill/jquery.Jcrop.min.js
76
97
  - public/papermill/papermill.css
77
98
  - public/papermill/papermill.js
78
99
  - public/papermill/swfupload.js