lolita 3.1.10 → 3.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (239) hide show
  1. data/.document +5 -5
  2. data/.rspec +2 -2
  3. data/GUIDELINES.rdoc +24 -24
  4. data/Gemfile +26 -26
  5. data/History.rdoc +162 -154
  6. data/LICENSE.txt +22 -22
  7. data/README.rdoc +98 -98
  8. data/Rakefile +40 -40
  9. data/VERSION +1 -1
  10. data/app/controllers/lolita/info_controller.rb +41 -41
  11. data/app/controllers/lolita/rest_controller.rb +130 -130
  12. data/app/helpers/components/lolita/configuration/list_component.rb +10 -10
  13. data/app/helpers/lolita_helper.rb +11 -11
  14. data/app/views/components/lolita/configuration/column/_display.html.erb +4 -4
  15. data/app/views/components/lolita/configuration/column/_header.html.erb +7 -7
  16. data/app/views/components/lolita/configuration/column/_sort.html.erb +4 -4
  17. data/app/views/components/lolita/configuration/columns/_body.html.erb +4 -4
  18. data/app/views/components/lolita/configuration/columns/_display.html.erb +1 -1
  19. data/app/views/components/lolita/configuration/columns/_first.html.erb +2 -2
  20. data/app/views/components/lolita/configuration/columns/_first_column_header.html.erb +3 -3
  21. data/app/views/components/lolita/configuration/columns/_header.html.erb +8 -8
  22. data/app/views/components/lolita/configuration/columns/_last.html.erb +4 -4
  23. data/app/views/components/lolita/configuration/columns/_last_column_header.html.erb +2 -2
  24. data/app/views/components/lolita/configuration/columns/_row.html.erb +7 -7
  25. data/app/views/components/lolita/configuration/field/_display.html.erb +9 -9
  26. data/app/views/components/lolita/configuration/field/_label.html.erb +1 -1
  27. data/app/views/components/lolita/configuration/field/_object.html.erb +1 -1
  28. data/app/views/components/lolita/configuration/field/array/_display.html.erb +4 -4
  29. data/app/views/components/lolita/configuration/field/array/habtm/_display.html.erb +26 -26
  30. data/app/views/components/lolita/configuration/field/array/select/_display.html.erb +5 -5
  31. data/app/views/components/lolita/configuration/field/boolean/filter/_display.html.erb +1 -1
  32. data/app/views/components/lolita/configuration/field/date/_display.html.erb +1 -1
  33. data/app/views/components/lolita/configuration/field/date_time/date/_display.html.erb +1 -1
  34. data/app/views/components/lolita/configuration/field/integer/_display.html.erb +1 -1
  35. data/app/views/components/lolita/configuration/field/string/_display.html.erb +4 -4
  36. data/app/views/components/lolita/configuration/field/string/disabled/_display.html.erb +1 -1
  37. data/app/views/components/lolita/configuration/field/string/password/_display.html.erb +3 -3
  38. data/app/views/components/lolita/configuration/field/string/text/_display.html.erb +18 -18
  39. data/app/views/components/lolita/configuration/field_set/_display.html.erb +5 -5
  40. data/app/views/components/lolita/configuration/list/_display.html.erb +10 -10
  41. data/app/views/components/lolita/configuration/list/_filter.html.erb +7 -7
  42. data/app/views/components/lolita/configuration/list/_new_resource.html.erb +4 -4
  43. data/app/views/components/lolita/configuration/list/_title.html.erb +4 -4
  44. data/app/views/components/lolita/configuration/tab/_display.html.erb +17 -17
  45. data/app/views/components/lolita/configuration/tab/_fields.html.erb +6 -6
  46. data/app/views/components/lolita/configuration/tab/content/_display.html.erb +1 -1
  47. data/app/views/components/lolita/configuration/tab/default/_display.html.erb +8 -8
  48. data/app/views/components/lolita/configuration/tabs/_display.html.erb +10 -10
  49. data/app/views/components/lolita/navigation/_display.html.erb +2 -2
  50. data/app/views/components/lolita/navigation/_tree.html.erb +38 -38
  51. data/app/views/components/lolita/shared/_flash.html.erb +5 -5
  52. data/app/views/components/lolita/shared/_header.html.erb +8 -8
  53. data/app/views/components/lolita/shared/_right_sidebar.html.erb +13 -13
  54. data/app/views/layouts/lolita/application.html.erb +44 -44
  55. data/app/views/lolita/info/index.html.erb +232 -232
  56. data/app/views/lolita/rest/form.html.erb +1 -1
  57. data/app/views/lolita/rest/index.html.erb +1 -1
  58. data/author +1 -1
  59. data/config/locales/default/lv.yml +180 -180
  60. data/config/locales/en.yml +20 -20
  61. data/config/locales/lv.yml +20 -20
  62. data/config/routes.rb +3 -3
  63. data/db/seed.rb +1 -1
  64. data/features/create_page.feature +19 -19
  65. data/features/step_definitions/lolita_steps.rb +7 -7
  66. data/features/step_definitions/web_steps.rb +219 -219
  67. data/features/support/env.rb +73 -73
  68. data/features/support/paths.rb +35 -35
  69. data/lib/generators/helpers/file_helper.rb +22 -22
  70. data/lib/generators/lolita/assets_generator.rb +18 -18
  71. data/lib/generators/lolita/install_generator.rb +28 -28
  72. data/lib/generators/templates/lolita.rb +19 -19
  73. data/lib/lolita.rb +184 -184
  74. data/lib/lolita/adapter/abstract_adapter.rb +13 -13
  75. data/lib/lolita/adapter/active_record.rb +148 -148
  76. data/lib/lolita/adapter/mongoid.rb +127 -127
  77. data/lib/lolita/base_configuration.rb +165 -165
  78. data/lib/lolita/builder.rb +249 -249
  79. data/lib/lolita/configuration/base.rb +76 -76
  80. data/lib/lolita/configuration/column.rb +93 -94
  81. data/lib/lolita/configuration/columns.rb +66 -66
  82. data/lib/lolita/configuration/factory.rb +55 -55
  83. data/lib/lolita/configuration/field.rb +216 -216
  84. data/lib/lolita/configuration/field/array.rb +75 -75
  85. data/lib/lolita/configuration/field/big_decimal.rb +12 -12
  86. data/lib/lolita/configuration/field/boolean.rb +12 -12
  87. data/lib/lolita/configuration/field/date.rb +12 -12
  88. data/lib/lolita/configuration/field/date_time.rb +13 -13
  89. data/lib/lolita/configuration/field/integer.rb +12 -12
  90. data/lib/lolita/configuration/field/string.rb +13 -13
  91. data/lib/lolita/configuration/field/time.rb +13 -13
  92. data/lib/lolita/configuration/field_set.rb +25 -25
  93. data/lib/lolita/configuration/fields.rb +35 -35
  94. data/lib/lolita/configuration/filter.rb +108 -108
  95. data/lib/lolita/configuration/list.rb +104 -104
  96. data/lib/lolita/configuration/page.rb +125 -124
  97. data/lib/lolita/configuration/tab.rb +187 -187
  98. data/lib/lolita/configuration/tab/content.rb +21 -21
  99. data/lib/lolita/configuration/tab/default.rb +25 -25
  100. data/lib/lolita/configuration/tabs.rb +132 -132
  101. data/lib/lolita/controllers/component_helpers.rb +127 -127
  102. data/lib/lolita/controllers/internal_helpers.rb +109 -109
  103. data/lib/lolita/controllers/url_helpers.rb +111 -111
  104. data/lib/lolita/controllers/user_helpers.rb +32 -32
  105. data/lib/lolita/controllers/view_user_helpers.rb +12 -12
  106. data/lib/lolita/dbi/base.rb +50 -50
  107. data/lib/lolita/errors.rb +12 -12
  108. data/lib/lolita/hooks.rb +355 -355
  109. data/lib/lolita/hooks/named_hook.rb +125 -125
  110. data/lib/lolita/lazy_loader.rb +46 -46
  111. data/lib/lolita/mapping.rb +55 -55
  112. data/lib/lolita/modules.rb +6 -6
  113. data/lib/lolita/modules/rest.rb +10 -10
  114. data/lib/lolita/navigation/branch.rb +132 -132
  115. data/lib/lolita/navigation/tree.rb +116 -116
  116. data/lib/lolita/observed_array.rb +74 -74
  117. data/lib/lolita/rails.rb +20 -20
  118. data/lib/lolita/rails/all.rb +10 -10
  119. data/lib/lolita/rails/routes.rb +133 -133
  120. data/lib/lolita/ruby_ext/accessors.rb +26 -26
  121. data/lib/lolita/support/formatter.rb +62 -62
  122. data/lib/lolita/support/formatter/rails.rb +56 -56
  123. data/lib/lolita/test/matchers.rb +77 -77
  124. data/lolita.gemspec +2 -2
  125. data/public/javascripts/jquery-1.6.min.js +15 -15
  126. data/public/javascripts/jquery-ui-1.8.13.min.js +407 -407
  127. data/public/javascripts/lolita/main.js +39 -39
  128. data/public/javascripts/lolita/tab.js +41 -41
  129. data/public/javascripts/modernizr-1.7.min.js +1 -1
  130. data/public/javascripts/rails.js +137 -137
  131. data/public/javascripts/tinymce/langs/en.js +221 -221
  132. data/public/javascripts/tinymce/license.txt +504 -504
  133. data/public/javascripts/tinymce/themes/advanced/about.htm +52 -52
  134. data/public/javascripts/tinymce/themes/advanced/anchor.htm +26 -26
  135. data/public/javascripts/tinymce/themes/advanced/charmap.htm +51 -51
  136. data/public/javascripts/tinymce/themes/advanced/color_picker.htm +74 -74
  137. data/public/javascripts/tinymce/themes/advanced/editor_template_src.js +1328 -1328
  138. data/public/javascripts/tinymce/themes/advanced/image.htm +80 -80
  139. data/public/javascripts/tinymce/themes/advanced/js/about.js +73 -73
  140. data/public/javascripts/tinymce/themes/advanced/js/anchor.js +42 -42
  141. data/public/javascripts/tinymce/themes/advanced/js/charmap.js +354 -354
  142. data/public/javascripts/tinymce/themes/advanced/js/color_picker.js +329 -329
  143. data/public/javascripts/tinymce/themes/advanced/js/image.js +247 -247
  144. data/public/javascripts/tinymce/themes/advanced/js/link.js +153 -153
  145. data/public/javascripts/tinymce/themes/advanced/js/source_editor.js +56 -56
  146. data/public/javascripts/tinymce/themes/advanced/langs/en.js +68 -68
  147. data/public/javascripts/tinymce/themes/advanced/langs/en_dlg.js +53 -53
  148. data/public/javascripts/tinymce/themes/advanced/link.htm +57 -57
  149. data/public/javascripts/tinymce/themes/advanced/shortcuts.htm +47 -47
  150. data/public/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css +66 -66
  151. data/public/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css +117 -117
  152. data/public/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css +988 -988
  153. data/public/javascripts/tinymce/themes/advanced/source_editor.htm +25 -25
  154. data/public/javascripts/tinymce/tiny_mce_popup.js +4 -4
  155. data/public/javascripts/tinymce_config.js +15 -15
  156. data/public/stylesheets/lolita/default.css +169 -169
  157. data/public/stylesheets/lolita/style.css +253 -253
  158. data/spec/adapter_helper.rb +43 -43
  159. data/spec/builder_spec.rb +120 -120
  160. data/spec/configuration/base_spec.rb +44 -44
  161. data/spec/configuration/column_spec.rb +89 -89
  162. data/spec/configuration/columns_spec.rb +54 -54
  163. data/spec/configuration/field_set_spec.rb +12 -12
  164. data/spec/configuration/field_spec.rb +118 -118
  165. data/spec/configuration/filter_spec.rb +122 -122
  166. data/spec/configuration/list_spec.rb +76 -76
  167. data/spec/configuration/page_spec.rb +19 -19
  168. data/spec/configuration/tab_spec.rb +165 -165
  169. data/spec/configuration/tabs_spec.rb +106 -106
  170. data/spec/controllers/component_helpers_spec.rb +5 -5
  171. data/spec/controllers/internal_helpers_spec.rb +76 -76
  172. data/spec/controllers/lolita_rest_nested_resources_spec.rb +33 -33
  173. data/spec/controllers/lolita_rest_spec.rb +53 -53
  174. data/spec/dbi/base_spec.rb +44 -44
  175. data/spec/hooks_spec.rb +257 -257
  176. data/spec/lolita_spec.rb +13 -13
  177. data/spec/mapping_spec.rb +29 -29
  178. data/spec/navigation/branch_spec.rb +81 -81
  179. data/spec/navigation/tree_spec.rb +73 -73
  180. data/spec/orm/mongoid.rb +11 -11
  181. data/spec/rails_app/app/controllers/application_controller.rb +3 -3
  182. data/spec/rails_app/app/helpers/application_helper.rb +3 -3
  183. data/spec/rails_app/app/mongoid/address.rb +7 -7
  184. data/spec/rails_app/app/mongoid/category.rb +5 -5
  185. data/spec/rails_app/app/mongoid/comment.rb +5 -5
  186. data/spec/rails_app/app/mongoid/post.rb +18 -18
  187. data/spec/rails_app/app/mongoid/preference.rb +5 -5
  188. data/spec/rails_app/app/mongoid/profile.rb +13 -13
  189. data/spec/rails_app/app/mongoid/tag.rb +3 -3
  190. data/spec/rails_app/app/views/components/lolita/configuration/list/_body_cell.html.erb +1 -1
  191. data/spec/rails_app/config/application.rb +26 -26
  192. data/spec/rails_app/config/boot.rb +13 -13
  193. data/spec/rails_app/config/environment.rb +5 -5
  194. data/spec/rails_app/config/environments/development.rb +19 -19
  195. data/spec/rails_app/config/environments/production.rb +33 -33
  196. data/spec/rails_app/config/environments/test.rb +33 -33
  197. data/spec/rails_app/config/initializers/backtrace_silencers.rb +7 -7
  198. data/spec/rails_app/config/initializers/inflections.rb +2 -2
  199. data/spec/rails_app/config/initializers/secret_token.rb +1 -1
  200. data/spec/rails_app/config/routes.rb +2 -2
  201. data/spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb +13 -13
  202. data/spec/rails_app/public/javascripts/jquery-1.5.1.min.js +15 -15
  203. data/spec/rails_app/public/javascripts/lolita/main.js +6 -6
  204. data/spec/rails_app/public/javascripts/lolita/tab.js +40 -40
  205. data/spec/rails_app/public/javascripts/modernizr-1.7.min.js +1 -1
  206. data/spec/rails_app/public/javascripts/rails.js +137 -137
  207. data/spec/rails_app/public/javascripts/tinymce/langs/en.js +221 -221
  208. data/spec/rails_app/public/javascripts/tinymce/license.txt +504 -504
  209. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/about.htm +52 -52
  210. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/anchor.htm +26 -26
  211. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/charmap.htm +51 -51
  212. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/color_picker.htm +74 -74
  213. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/editor_template_src.js +1328 -1328
  214. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/image.htm +80 -80
  215. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/about.js +73 -73
  216. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/anchor.js +42 -42
  217. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/charmap.js +354 -354
  218. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/color_picker.js +329 -329
  219. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/image.js +247 -247
  220. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/link.js +153 -153
  221. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/source_editor.js +56 -56
  222. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/langs/en.js +68 -68
  223. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/langs/en_dlg.js +53 -53
  224. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/link.htm +57 -57
  225. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/shortcuts.htm +47 -47
  226. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css +66 -66
  227. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css +117 -117
  228. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css +988 -988
  229. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/source_editor.htm +25 -25
  230. data/spec/rails_app/public/javascripts/tinymce/tiny_mce_popup.js +4 -4
  231. data/spec/rails_app/public/stylesheets/lolita/default.css +169 -169
  232. data/spec/rails_app/public/stylesheets/lolita/style.css +214 -214
  233. data/spec/routing/routes_spec.rb +15 -15
  234. data/spec/spec_helper.rb +46 -46
  235. data/spec/support/factories/category.rb +3 -3
  236. data/spec/support/factories/post.rb +4 -4
  237. data/spec/support/factories/tag.rb +2 -2
  238. data/spec/support/formatter_spec.rb +42 -42
  239. metadata +31 -31
@@ -1,110 +1,110 @@
1
- module Lolita
2
- module Controllers
3
- module InternalHelpers
4
- extend ActiveSupport::Concern
5
- included do
6
- helper LolitaHelper
7
- #TODO pārnest helperus uz lolitu vai arī uz lolita app nevis likt iekš controllers iekš lolitas
8
- helpers = %w(resource resource_name
9
- resource_class lolita_mapping show_response)
10
- hide_action *helpers
11
-
12
- helper_method *helpers
13
- prepend_before_filter :is_lolita_resource?
14
- prepend_around_filter :switch_locale
15
- end
16
-
17
- # Return instance variable named as resource
18
- # For 'posts' instance variable will be @posts
19
- def resource
20
- instance_variable_get(:"@#{resource_name}")
21
- end
22
-
23
- def resource_name
24
- lolita_mapping.name
25
- end
26
-
27
- def resource_class
28
- lolita_mapping.to
29
- end
30
-
31
- def lolita_mapping
32
- @lolita_mapping||=request.env["lolita.mapping"]
33
- end
34
-
35
- protected
36
-
37
- def is_lolita_resource?
38
- raise ActionController::UnknownAction unless lolita_mapping
39
- end
40
-
41
- def resource=(new_resource)
42
- instance_variable_set(:"@#{resource_name}",new_resource)
43
- end
44
-
45
- def resource_attributes
46
- fix_attributes(params[resource_name] || {})
47
- end
48
-
49
- def resource_with_attributes(current_resource,attributes={})
50
- attributes||=resource_attributes
51
- attributes.each{|key,value|
52
- current_resource.send(:"#{key}=",value)
53
- }
54
- current_resource
55
- end
56
-
57
- def get_resource(id=nil)
58
- self.resource=resource_class.lolita.dbi.find_by_id(id||params[:id])
59
- end
60
-
61
- def build_resource(attributes=nil)
62
- self.run(:before_build_resource)
63
- attributes||=resource_attributes
64
- self.resource=resource_with_attributes(resource_class.new,attributes)
65
- self.run(:after_build_resource)
66
- end
67
-
68
- def build_response_for(conf_part,options={})
69
- # FIXME when asked for some resources that always create new object, there may
70
- # not be any args, like lolita.report on something like that
71
- @component_options = options
72
- @component_object = resource_class.lolita.send(conf_part.to_sym)
73
- @component_builder = @component_object.build(@component_options)
74
- end
75
-
76
-
77
- private
78
-
79
- def fix_attributes attributes
80
- fix_rails_date_attributes attributes
81
- end
82
-
83
- def fix_rails_date_attributes attributes
84
- #{"created_at(1i)"=>"2011", "created_at(2i)"=>"4", "created_at(3i)"=>"19", "created_at(4i)"=>"16", "created_at(5i)"=>"14"}
85
- date_attributes = {}
86
- attributes.each_pair do |k,v|
87
- if k.to_s =~ /(.+)\((\d)i\)$/
88
- date_attributes[$1] = {} unless date_attributes[$1]
89
- date_attributes[$1][$2.to_i] = v.to_i
90
- attributes.delete(k)
91
- end
92
- end
93
- date_attributes.each_pair do |k,v|
94
- unless v.detect{|index,value| value == 0}
95
- attributes[k] = v.size == 3 ? Date.new(v[1],v[2],v[3]) : Time.new(v[1],v[2],v[3],v[4],v[5])
96
- end
97
- end
98
- attributes
99
- end
100
-
101
- def switch_locale
102
- old_locale=::I18n.locale
103
- Lolita.locale=params[:locale]
104
- ::I18n.locale=Lolita.locale
105
- yield
106
- ::I18n.locale=old_locale
107
- end
108
- end
109
- end
1
+ module Lolita
2
+ module Controllers
3
+ module InternalHelpers
4
+ extend ActiveSupport::Concern
5
+ included do
6
+ helper LolitaHelper
7
+ #TODO pārnest helperus uz lolitu vai arī uz lolita app nevis likt iekš controllers iekš lolitas
8
+ helpers = %w(resource resource_name
9
+ resource_class lolita_mapping show_response)
10
+ hide_action *helpers
11
+
12
+ helper_method *helpers
13
+ prepend_before_filter :is_lolita_resource?
14
+ prepend_around_filter :switch_locale
15
+ end
16
+
17
+ # Return instance variable named as resource
18
+ # For 'posts' instance variable will be @posts
19
+ def resource
20
+ instance_variable_get(:"@#{resource_name}")
21
+ end
22
+
23
+ def resource_name
24
+ lolita_mapping.name
25
+ end
26
+
27
+ def resource_class
28
+ lolita_mapping.to
29
+ end
30
+
31
+ def lolita_mapping
32
+ @lolita_mapping||=request.env["lolita.mapping"]
33
+ end
34
+
35
+ protected
36
+
37
+ def is_lolita_resource?
38
+ raise ActionController::UnknownAction unless lolita_mapping
39
+ end
40
+
41
+ def resource=(new_resource)
42
+ instance_variable_set(:"@#{resource_name}",new_resource)
43
+ end
44
+
45
+ def resource_attributes
46
+ fix_attributes(params[resource_name] || {})
47
+ end
48
+
49
+ def resource_with_attributes(current_resource,attributes={})
50
+ attributes||=resource_attributes
51
+ attributes.each{|key,value|
52
+ current_resource.send(:"#{key}=",value)
53
+ }
54
+ current_resource
55
+ end
56
+
57
+ def get_resource(id=nil)
58
+ self.resource=resource_class.lolita.dbi.find_by_id(id||params[:id])
59
+ end
60
+
61
+ def build_resource(attributes=nil)
62
+ self.run(:before_build_resource)
63
+ attributes||=resource_attributes
64
+ self.resource=resource_with_attributes(resource_class.new,attributes)
65
+ self.run(:after_build_resource)
66
+ end
67
+
68
+ def build_response_for(conf_part,options={})
69
+ # FIXME when asked for some resources that always create new object, there may
70
+ # not be any args, like lolita.report on something like that
71
+ @component_options = options
72
+ @component_object = resource_class.lolita.send(conf_part.to_sym)
73
+ @component_builder = @component_object.build(@component_options)
74
+ end
75
+
76
+
77
+ private
78
+
79
+ def fix_attributes attributes
80
+ fix_rails_date_attributes attributes
81
+ end
82
+
83
+ def fix_rails_date_attributes attributes
84
+ #{"created_at(1i)"=>"2011", "created_at(2i)"=>"4", "created_at(3i)"=>"19", "created_at(4i)"=>"16", "created_at(5i)"=>"14"}
85
+ date_attributes = {}
86
+ attributes.each_pair do |k,v|
87
+ if k.to_s =~ /(.+)\((\d)i\)$/
88
+ date_attributes[$1] = {} unless date_attributes[$1]
89
+ date_attributes[$1][$2.to_i] = v.to_i
90
+ attributes.delete(k)
91
+ end
92
+ end
93
+ date_attributes.each_pair do |k,v|
94
+ unless v.detect{|index,value| value == 0}
95
+ attributes[k] = v.size == 3 ? Date.new(v[1],v[2],v[3]) : Time.new(v[1],v[2],v[3],v[4],v[5])
96
+ end
97
+ end
98
+ attributes
99
+ end
100
+
101
+ def switch_locale
102
+ old_locale=::I18n.locale
103
+ Lolita.locale=params[:locale]
104
+ ::I18n.locale=Lolita.locale
105
+ yield
106
+ ::I18n.locale=old_locale
107
+ end
108
+ end
109
+ end
110
110
  end
@@ -1,111 +1,111 @@
1
- module Lolita
2
- module Controllers
3
- # This module is included in all controllers and views. UrlHelper provide methods to generate lolita
4
- # resource paths. As all resources goes to one controller (by default), than it is very difficult to
5
- # generate url with <em>:controller</em> and <em>:action</em>.
6
- # There are four methods for path:
7
- # * lolita_resources_path - goes to index action
8
- # * lolita_resource_path - goes to create, destroy or show, it depends what kind of method is used
9
- # * new_lolita_resource_path - goes to new action
10
- # * edit_lolita_resource_path - goes to edit action
11
- # All of those methods accept <em>mapping</em> as a first argument and optional <em>options</em> that
12
- # will be passed to path gererator. It is possible to pass only options, than current mapping will be used.
13
- # ====Example
14
- # # lets say, that current mapping is for posts
15
- # edit_lolita_resource_path(:id=>4) #=> /lolita/posts/4/edit
16
- # edit_lolita_resource_path(comment_mapping,:id=>1,:parent_id=>2) #=> /lolita/comments/1/edit?parent_id=2
17
- # For custom actions there are method #lolita_resource_name that make it easier to generate custom method.
18
- # All other methods use that for real resource path method generation.
19
- module UrlHelpers
20
-
21
- def self.included(model_klass)
22
- model_klass.class_eval do
23
-
24
- # Overrides url_for when controller or view uses this helper.
25
- # It catches hash options and replaces with lolita named route
26
- # Without this method routes always looks like /lolita/rest/[method]
27
- # ====Example
28
- # # in routes.rb
29
- # lolita_for :posts
30
- # # GET /lolita/posts
31
- # # in view
32
- # url_for #=> /lolita/posts
33
- # url_for(:controller=>"/posts",:action=>:index) #=> /posts
34
- # # GET /posts
35
- # url_for #=> /posts
36
- def url_for_with_lolita options = {}
37
- if options.is_a?(Hash) && !options[:use_route] && self.respond_to?(:lolita_mapping)
38
- controller = options[:controller].to_s
39
- if Lolita.mappings[lolita_mapping.name].controllers.values.include?(controller)
40
- resource_type = {
41
- :index => :lolita_resources_path,
42
- :new => :new_lolita_resource_path,
43
- :edit => :edit_lolita_resource_path,
44
- :create => :lolita_resources_path
45
- }
46
- action = (options[:action] || params[:action]).to_sym
47
- options = self.send(resource_type[action] || :lolita_resource_path,options)
48
- end
49
- end
50
- url_for_without_lolita(options)
51
- end
52
- alias_method_chain :url_for, :lolita
53
-
54
- end
55
- end
56
-
57
- protected
58
-
59
- # Path for index.
60
- def lolita_resources_path(*args)
61
- options=args.extract_options!
62
- mapping=args[0]
63
- send(lolita_resource_name(:mapping=>mapping,:plural=>true),options)
64
- end
65
-
66
- # Path for show, create and destroy
67
- def lolita_resource_path(*args)
68
- options=args.extract_options!
69
- mapping=args[0]
70
- send(lolita_resource_name(:mapping=>mapping),options)
71
- end
72
-
73
- # Path for new.
74
- def new_lolita_resource_path(*args)
75
- options=args.extract_options!
76
- mapping=args[0]
77
- send(lolita_resource_name(:mapping=>mapping,:action=>:new),options)
78
- end
79
-
80
- # Path for edit.
81
- def edit_lolita_resource_path(*args)
82
- options=args.extract_options!
83
- options[:id]||=resource.id if resource
84
- #raise "Can edit resource without id." unless options[:id]
85
- mapping=args[0]
86
- send(lolita_resource_name(:mapping=>mapping,:action=>:edit),options)
87
- end
88
-
89
- # It return symbol, that represents named route method for path, like <i>lolita_posts_path</i> and so on.
90
- # It accepts those options:
91
- # * <tt>:mapping</tt> - Lolita::Mapping object, that is used to detect name of named route.
92
- # by default it uses Lolita::InternalHelpers#lolita_mapping.
93
- # * <tt>:plural</tt> - What kind of named route should use, plural or singular.
94
- # * <tt>:action</tt> - Action is used to put before named route like <i>:edit</i>.
95
- # ====Example
96
- # # current mapping is for posts
97
- # lolita_resource_name(:action=>:edit) #=> :edit_lolita_post_path
98
- # lolita_resource_name(:plural=>true,:action=>:list) #=> :list_lolita_posts_path
99
- # # for different mapping
100
- # lolita_resource_name(:mapping=>comments_mapping) #=> :lolita_comment_path
101
- # This methods is very useful to create your own paths in views.
102
- def lolita_resource_name(options={}) #TODO test if path is right
103
- options.assert_valid_keys(:mapping,:plural,:action)
104
- mapping=(options[:mapping]||lolita_mapping)
105
- name=!options[:plural] ? mapping.name : mapping.plural
106
- name="#{mapping.path}_#{name}"
107
- :"#{options[:action]}#{options[:action] ? "_" : ""}#{name}_path"
108
- end
109
- end
110
- end
111
- end
1
+ module Lolita
2
+ module Controllers
3
+ # This module is included in all controllers and views. UrlHelper provide methods to generate lolita
4
+ # resource paths. As all resources goes to one controller (by default), than it is very difficult to
5
+ # generate url with <em>:controller</em> and <em>:action</em>.
6
+ # There are four methods for path:
7
+ # * lolita_resources_path - goes to index action
8
+ # * lolita_resource_path - goes to create, destroy or show, it depends what kind of method is used
9
+ # * new_lolita_resource_path - goes to new action
10
+ # * edit_lolita_resource_path - goes to edit action
11
+ # All of those methods accept <em>mapping</em> as a first argument and optional <em>options</em> that
12
+ # will be passed to path gererator. It is possible to pass only options, than current mapping will be used.
13
+ # ====Example
14
+ # # lets say, that current mapping is for posts
15
+ # edit_lolita_resource_path(:id=>4) #=> /lolita/posts/4/edit
16
+ # edit_lolita_resource_path(comment_mapping,:id=>1,:parent_id=>2) #=> /lolita/comments/1/edit?parent_id=2
17
+ # For custom actions there are method #lolita_resource_name that make it easier to generate custom method.
18
+ # All other methods use that for real resource path method generation.
19
+ module UrlHelpers
20
+
21
+ def self.included(model_klass)
22
+ model_klass.class_eval do
23
+
24
+ # Overrides url_for when controller or view uses this helper.
25
+ # It catches hash options and replaces with lolita named route
26
+ # Without this method routes always looks like /lolita/rest/[method]
27
+ # ====Example
28
+ # # in routes.rb
29
+ # lolita_for :posts
30
+ # # GET /lolita/posts
31
+ # # in view
32
+ # url_for #=> /lolita/posts
33
+ # url_for(:controller=>"/posts",:action=>:index) #=> /posts
34
+ # # GET /posts
35
+ # url_for #=> /posts
36
+ def url_for_with_lolita options = {}
37
+ if options.is_a?(Hash) && !options[:use_route] && self.respond_to?(:lolita_mapping)
38
+ controller = options[:controller].to_s
39
+ if Lolita.mappings[lolita_mapping.name].controllers.values.include?(controller)
40
+ resource_type = {
41
+ :index => :lolita_resources_path,
42
+ :new => :new_lolita_resource_path,
43
+ :edit => :edit_lolita_resource_path,
44
+ :create => :lolita_resources_path
45
+ }
46
+ action = (options[:action] || params[:action]).to_sym
47
+ options = self.send(resource_type[action] || :lolita_resource_path,options)
48
+ end
49
+ end
50
+ url_for_without_lolita(options)
51
+ end
52
+ alias_method_chain :url_for, :lolita
53
+
54
+ end
55
+ end
56
+
57
+ protected
58
+
59
+ # Path for index.
60
+ def lolita_resources_path(*args)
61
+ options=args.extract_options!
62
+ mapping=args[0]
63
+ send(lolita_resource_name(:mapping=>mapping,:plural=>true),options)
64
+ end
65
+
66
+ # Path for show, create and destroy
67
+ def lolita_resource_path(*args)
68
+ options=args.extract_options!
69
+ mapping=args[0]
70
+ send(lolita_resource_name(:mapping=>mapping),options)
71
+ end
72
+
73
+ # Path for new.
74
+ def new_lolita_resource_path(*args)
75
+ options=args.extract_options!
76
+ mapping=args[0]
77
+ send(lolita_resource_name(:mapping=>mapping,:action=>:new),options)
78
+ end
79
+
80
+ # Path for edit.
81
+ def edit_lolita_resource_path(*args)
82
+ options=args.extract_options!
83
+ options[:id]||=resource.id if resource
84
+ #raise "Can edit resource without id." unless options[:id]
85
+ mapping=args[0]
86
+ send(lolita_resource_name(:mapping=>mapping,:action=>:edit),options)
87
+ end
88
+
89
+ # It return symbol, that represents named route method for path, like <i>lolita_posts_path</i> and so on.
90
+ # It accepts those options:
91
+ # * <tt>:mapping</tt> - Lolita::Mapping object, that is used to detect name of named route.
92
+ # by default it uses Lolita::InternalHelpers#lolita_mapping.
93
+ # * <tt>:plural</tt> - What kind of named route should use, plural or singular.
94
+ # * <tt>:action</tt> - Action is used to put before named route like <i>:edit</i>.
95
+ # ====Example
96
+ # # current mapping is for posts
97
+ # lolita_resource_name(:action=>:edit) #=> :edit_lolita_post_path
98
+ # lolita_resource_name(:plural=>true,:action=>:list) #=> :list_lolita_posts_path
99
+ # # for different mapping
100
+ # lolita_resource_name(:mapping=>comments_mapping) #=> :lolita_comment_path
101
+ # This methods is very useful to create your own paths in views.
102
+ def lolita_resource_name(options={}) #TODO test if path is right
103
+ options.assert_valid_keys(:mapping,:plural,:action)
104
+ mapping=(options[:mapping]||lolita_mapping)
105
+ name=!options[:plural] ? mapping.name : mapping.plural
106
+ name="#{mapping.path}_#{name}"
107
+ :"#{options[:action]}#{options[:action] ? "_" : ""}#{name}_path"
108
+ end
109
+ end
110
+ end
111
+ end
@@ -1,32 +1,32 @@
1
- module Lolita
2
- module Controllers
3
- # Add method #authenticate_lolita_user!
4
- # that is called before each action in Lolita controllers.
5
- # Authentication should be defined through Lolita#setup.
6
- # Method call block or send given method name to current controller
7
- # or return True when no authentication is defined.
8
- module UserHelpers
9
- extend ActiveSupport::Concern
10
- included do
11
- helper LolitaHelper
12
- end
13
-
14
- private
15
- # FIXME what to do when block or method return false, and do not redirect
16
- # need some redirect, but how to detect it?
17
- def authenticate_lolita_user!
18
- if auth=Lolita.authentication
19
- if auth.is_a?(Proc)
20
- self.instance_eval(&auth)
21
- else
22
- send(auth)
23
- end
24
- else
25
- #TODO warning
26
- true
27
- end
28
- end
29
-
30
- end
31
- end
32
- end
1
+ module Lolita
2
+ module Controllers
3
+ # Add method #authenticate_lolita_user!
4
+ # that is called before each action in Lolita controllers.
5
+ # Authentication should be defined through Lolita#setup.
6
+ # Method call block or send given method name to current controller
7
+ # or return True when no authentication is defined.
8
+ module UserHelpers
9
+ extend ActiveSupport::Concern
10
+ included do
11
+ helper LolitaHelper
12
+ end
13
+
14
+ private
15
+ # FIXME what to do when block or method return false, and do not redirect
16
+ # need some redirect, but how to detect it?
17
+ def authenticate_lolita_user!
18
+ if auth=Lolita.authentication
19
+ if auth.is_a?(Proc)
20
+ self.instance_eval(&auth)
21
+ else
22
+ send(auth)
23
+ end
24
+ else
25
+ #TODO warning
26
+ true
27
+ end
28
+ end
29
+
30
+ end
31
+ end
32
+ end