social_stream-documents 0.11.5 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -15,7 +15,7 @@
15
15
  ) %>
16
16
  <%end%>
17
17
 
18
- <% toolbar :profile => profile_subject %>
18
+ <% toolbar :profile, :subject => profile_subject %>
19
19
  <br class="clearfloat" />
20
20
  <div class="space_center"></div>
21
21
  <div id="repository_filter">
@@ -1,8 +1,10 @@
1
1
  require 'social_stream/documents/dependencies'
2
2
 
3
3
  module SocialStream
4
- module ToolbarConfig
5
- autoload :Documents, 'social_stream/toolbar_config/documents'
4
+ module Views
5
+ module Toolbar
6
+ autoload :Documents, 'social_stream/views/toolbar/documents'
7
+ end
6
8
  end
7
9
 
8
10
  module Documents
@@ -53,9 +53,9 @@ module SocialStream
53
53
  Mime::Type.register "video/webm", :webm
54
54
  end
55
55
 
56
- initializer "social_stream-documents.toolbar_config" do
57
- SocialStream::ToolbarConfig.module_eval do
58
- include SocialStream::ToolbarConfig::Documents
56
+ initializer "social_stream-documents.views.toolbar" do
57
+ SocialStream::Views::Toolbar.module_eval do
58
+ include SocialStream::Views::Toolbar::Documents
59
59
  end
60
60
  end
61
61
  end
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Documents
3
- VERSION = "0.11.5".freeze
3
+ VERSION = "0.12.0".freeze
4
4
  end
5
5
  end
@@ -0,0 +1,28 @@
1
+ module SocialStream
2
+ module Views
3
+ module Toolbar
4
+ module Documents
5
+ def toolbar_menu_items type, options = {}
6
+ super.tap do |items|
7
+ case type
8
+ when :home
9
+ items << {
10
+ :key => :documents,
11
+ :html => link_to(image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
12
+ [current_subject, Document.new],
13
+ :id => "toolbar_menu-documents")
14
+ }
15
+ when :profile
16
+ items << {
17
+ :key => :documents,
18
+ :name => link_to(image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
19
+ [options[:subject], Document.new],
20
+ :id => "toolbar_menu-documents")
21
+ }
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
28
+ 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.17.2')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.18.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.5
4
+ version: 0.12.0
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-12 00:00:00.000000000Z
13
+ date: 2012-03-21 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &80253580 !ruby/object:Gem::Requirement
17
+ requirement: &80334340 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.17.2
22
+ version: 0.18.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *80253580
25
+ version_requirements: *80334340
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: paperclip-ffmpeg
28
- requirement: &80252820 !ruby/object:Gem::Requirement
28
+ requirement: &80333480 !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: *80252820
36
+ version_requirements: *80333480
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: paperclip
39
- requirement: &80252300 !ruby/object:Gem::Requirement
39
+ requirement: &80332760 !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: *80252300
47
+ version_requirements: *80332760
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: delayed_paperclip
50
- requirement: &80251720 !ruby/object:Gem::Requirement
50
+ requirement: &80331980 !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: *80251720
58
+ version_requirements: *80331980
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: sqlite3-ruby
61
- requirement: &80251310 !ruby/object:Gem::Requirement
61
+ requirement: &80331280 !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: *80251310
69
+ version_requirements: *80331280
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec-rails
72
- requirement: &80250890 !ruby/object:Gem::Requirement
72
+ requirement: &80330520 !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: *80250890
80
+ version_requirements: *80330520
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: factory_girl
83
- requirement: &80250480 !ruby/object:Gem::Requirement
83
+ requirement: &80329490 !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: *80250480
91
+ version_requirements: *80329490
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: forgery
94
- requirement: &80250100 !ruby/object:Gem::Requirement
94
+ requirement: &80328730 !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: *80250100
102
+ version_requirements: *80328730
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: capybara
105
- requirement: &80249660 !ruby/object:Gem::Requirement
105
+ requirement: &80313000 !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: *80249660
113
+ version_requirements: *80313000
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
 
@@ -241,7 +241,7 @@ files:
241
241
  - lib/social_stream/documents/engine.rb
242
242
  - lib/social_stream/documents/version.rb
243
243
  - lib/social_stream/migrations/documents.rb
244
- - lib/social_stream/toolbar_config/documents.rb
244
+ - lib/social_stream/views/toolbar/documents.rb
245
245
  - social_stream-documents.gemspec
246
246
  - spec/controllers/documents_controller_spec.rb
247
247
  - spec/controllers/pictures_controller_spec.rb
@@ -1,27 +0,0 @@
1
- module SocialStream
2
- module ToolbarConfig
3
- module Documents
4
- def profile_toolbar_items(subject = current_subject)
5
- items = super
6
-
7
- items << {
8
- :key => :documents,
9
- :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
10
- :url => polymorphic_path([subject, Document.new]),
11
- :options => {:link => {:id => "documents_menu"}}
12
- }
13
- end
14
-
15
- def home_toolbar_items
16
- items = super
17
-
18
- items << {
19
- :key => :documents,
20
- :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
21
- :url => polymorphic_path([current_subject, Document.new]),
22
- :options => {:link => {:id => "documents_menu"}}
23
- }
24
- end
25
- end
26
- end
27
- end