social_stream-documents 0.11.2 → 0.11.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,7 @@
1
1
  //= require jquery.jplayer
2
+ //= require jquery.ae.image.resize
3
+ //
4
+ //= require_self
2
5
  //= require_tree .
3
- //= require jquery.ae.image.resize
6
+
7
+ SocialStream.Documents = SocialStream.Documents || {};
@@ -70,9 +70,10 @@ class Document < ActiveRecord::Base
70
70
  end
71
71
 
72
72
  protected
73
-
73
+
74
74
  def set_title
75
- self.title ||= self.file_file_name
75
+ self.title = file_file_name if self.title.blank?
76
76
  end
77
-
78
77
  end
78
+
79
+ ActiveSupport.run_load_hooks(:document, Document)
@@ -4,6 +4,8 @@ class Picture < Document
4
4
  :path => ':rails_root/documents/:class/:id_partition/:style',
5
5
  :styles => {:thumb48sq => ["48x48"],
6
6
  :thumbwall => ["130x97#"],
7
+ # midwall preserves A4 proportion: 210x297
8
+ :midwall => ["80x113#"],
7
9
  :preview => ["500>"]
8
10
  }
9
11
 
@@ -23,6 +25,8 @@ class Picture < Document
23
25
  "#{ size.to_s }/photo.png"
24
26
  when 48
25
27
  helper.picture_path self, :format => format, :style => 'thumb48sq'
28
+ when 80
29
+ helper.picture_path self, :format => format, :style => 'midwall'
26
30
  when 130
27
31
  helper.picture_path self, :format => format, :style => 'thumbwall'
28
32
  when 500
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Documents
3
- VERSION = "0.11.2".freeze
3
+ VERSION = "0.11.3".freeze
4
4
  end
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 0.16.4')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
16
16
  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
17
17
  s.add_runtime_dependency('paperclip','= 2.4.5')
18
18
  s.add_runtime_dependency('delayed_paperclip','2.4.5.1')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-documents
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.2
4
+ version: 0.11.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,22 +10,22 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-03-01 00:00:00.000000000Z
13
+ date: 2012-03-07 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &69285090 !ruby/object:Gem::Requirement
17
+ requirement: &81586060 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.16.4
22
+ version: 0.17.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *69285090
25
+ version_requirements: *81586060
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: paperclip-ffmpeg
28
- requirement: &69280270 !ruby/object:Gem::Requirement
28
+ requirement: &81585800 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 0.7.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *69280270
36
+ version_requirements: *81585800
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: paperclip
39
- requirement: &69255690 !ruby/object:Gem::Requirement
39
+ requirement: &81585560 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - =
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 2.4.5
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *69255690
47
+ version_requirements: *81585560
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: delayed_paperclip
50
- requirement: &69251690 !ruby/object:Gem::Requirement
50
+ requirement: &81585310 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - =
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 2.4.5.1
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *69251690
58
+ version_requirements: *81585310
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: sqlite3-ruby
61
- requirement: &69244970 !ruby/object:Gem::Requirement
61
+ requirement: &81585110 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *69244970
69
+ version_requirements: *81585110
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec-rails
72
- requirement: &69243360 !ruby/object:Gem::Requirement
72
+ requirement: &81584820 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 2.6.0
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *69243360
80
+ version_requirements: *81584820
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: factory_girl
83
- requirement: &69242130 !ruby/object:Gem::Requirement
83
+ requirement: &81584540 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: 1.3.2
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *69242130
91
+ version_requirements: *81584540
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: forgery
94
- requirement: &69241240 !ruby/object:Gem::Requirement
94
+ requirement: &81584280 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ~>
@@ -99,10 +99,10 @@ dependencies:
99
99
  version: 0.4.2
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *69241240
102
+ version_requirements: *81584280
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: capybara
105
- requirement: &69238780 !ruby/object:Gem::Requirement
105
+ requirement: &81583950 !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
108
  - - ~>
@@ -110,7 +110,7 @@ dependencies:
110
110
  version: 0.3.9
111
111
  type: :development
112
112
  prerelease: false
113
- version_requirements: *69238780
113
+ version_requirements: *81583950
114
114
  description: ! 'Social Stream is a Ruby on Rails engine providing your application
115
115
  with social networking features and activity streams.
116
116