widgets 0.1.3 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/app/helpers/application_helper.rb +13 -6
  2. data/lib/widgets/version.rb +1 -1
  3. data/lib/widgets/version.rb~ +1 -1
  4. metadata +38 -7
  5. data/app/helpers/application_helper.rb~ +0 -16
data/app/helpers/application_helper.rb CHANGED
@@ -7,12 +7,19 @@ module ApplicationHelper
7
7
  attributes = {:id => id, :'data-widget' => name, :style => options.delete(:style), :class => options.delete(:effects)}
8
8
  options[:widget_id] = id unless options.include? :widget_id
9
9
 
10
- contents = if block_given?
11
- render :layout => partial, :inline => capture(&block), :locals => options, :formats => [:html]
12
- else
13
- render :template => partial, :locals => options
14
- end
10
+ html = if block_given?
11
+ render :layout => partial, :inline => capture(&block), :locals => options, :formats => [:html]
12
+ else
13
+ render :template => partial, :locals => options, :formats => [:html]
14
+ end
15
15
 
16
- content_tag :div, contents, attributes
16
+ javascript = render :template => partial, :locals => options, :formats => [:js] rescue ActionView::MissingTemplate
17
+
18
+ content = content_tag :div, html, attributes
19
+ if javascript
20
+ content += content_tag :script, javascript, :type => 'text/javascript'
21
+ end
22
+
23
+ content
17
24
  end
18
25
  end
data/lib/widgets/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Widgets
2
- VERSION = '0.1.3'
2
+ VERSION = '0.2.0'
3
3
  end
data/lib/widgets/version.rb~ CHANGED
@@ -1,3 +1,3 @@
1
1
  module Widgets
2
- VERSION = '0.1.2'
2
+ VERSION = '0.1.3'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: widgets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-19 00:00:00.000000000 Z
12
+ date: 2013-02-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: guid
@@ -27,6 +27,22 @@ dependencies:
27
27
  - - ! '>='
28
28
  - !ruby/object:Gem::Version
29
29
  version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: jquery-rails
32
+ requirement: !ruby/object:Gem::Requirement
33
+ none: false
34
+ requirements:
35
+ - - ~>
36
+ - !ruby/object:Gem::Version
37
+ version: 2.2.0
38
+ type: :runtime
39
+ prerelease: false
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ~>
44
+ - !ruby/object:Gem::Version
45
+ version: 2.2.0
30
46
  - !ruby/object:Gem::Dependency
31
47
  name: rails
32
48
  requirement: !ruby/object:Gem::Requirement
@@ -43,22 +59,38 @@ dependencies:
43
59
  - - ~>
44
60
  - !ruby/object:Gem::Version
45
61
  version: 3.2.11
62
+ - !ruby/object:Gem::Dependency
63
+ name: rspec-core
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
67
+ - - ~>
68
+ - !ruby/object:Gem::Version
69
+ version: 2.12.2
70
+ type: :development
71
+ prerelease: false
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: 2.12.2
46
78
  - !ruby/object:Gem::Dependency
47
79
  name: rspec-rails
48
80
  requirement: !ruby/object:Gem::Requirement
49
81
  none: false
50
82
  requirements:
51
- - - ! '>='
83
+ - - ~>
52
84
  - !ruby/object:Gem::Version
53
- version: '0'
85
+ version: 2.12.2
54
86
  type: :development
55
87
  prerelease: false
56
88
  version_requirements: !ruby/object:Gem::Requirement
57
89
  none: false
58
90
  requirements:
59
- - - ! '>='
91
+ - - ~>
60
92
  - !ruby/object:Gem::Version
61
- version: '0'
93
+ version: 2.12.2
62
94
  - !ruby/object:Gem::Dependency
63
95
  name: specstar-support-random
64
96
  requirement: !ruby/object:Gem::Requirement
@@ -115,7 +147,6 @@ extensions: []
115
147
  extra_rdoc_files: []
116
148
  files:
117
149
  - app/helpers/application_helper.rb
118
- - app/helpers/application_helper.rb~
119
150
  - lib/tasks/widgets_tasks.rake
120
151
  - lib/widgets/version.rb
121
152
  - lib/widgets/version.rb~
data/app/helpers/application_helper.rb~ DELETED
@@ -1,16 +0,0 @@
1
- module ApplicationHelper
2
- def widget(name, options={}, &block)
3
- id = Guid.new.to_s
4
- partial = File.join 'widgets', name.to_s
5
- attributes = {:id => id, :'data-widget' => name, :style => options.delete(:style), :class => options.delete(:effects)}
6
- options[:widget_id] = id unless options.include? :widget_id
7
-
8
- contents = if block_given?
9
- render :layout => partial, :inline => capture(&block), :locals => options, :formats => [:html]
10
- else
11
- render :template => partial, :locals => options
12
- end
13
-
14
- content_tag :div, contents, attributes
15
- end
16
- end