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,27 +1,27 @@
1
- class Object
2
- # Works similar as <code>attr_accessor</code> only reader method is changed
3
- # to allow to set value (used for Lolita blocks in different classes).
4
- # ====Example
5
- # class Klass
6
- # lolita_accessor :my_method
7
- # end
8
- # k=Klass.new
9
- # k.my_method("it's me")
10
- # puts k.my_method #=> it's me
11
- def lolita_accessor *methods
12
- if [Class,Module].include?(self.class)
13
- methods.each do |method|
14
- class_eval <<-ACCESSORS,__FILE__,__LINE__+1
15
- def #{method}(value=nil)
16
- @#{method}=value if value
17
- @#{method}
18
- end
19
-
20
- def #{method}=(value)
21
- @#{method}=value
22
- end
23
- ACCESSORS
24
- end
25
- end
26
- end
1
+ class Object
2
+ # Works similar as <code>attr_accessor</code> only reader method is changed
3
+ # to allow to set value (used for Lolita blocks in different classes).
4
+ # ====Example
5
+ # class Klass
6
+ # lolita_accessor :my_method
7
+ # end
8
+ # k=Klass.new
9
+ # k.my_method("it's me")
10
+ # puts k.my_method #=> it's me
11
+ def lolita_accessor *methods
12
+ if [Class,Module].include?(self.class)
13
+ methods.each do |method|
14
+ class_eval <<-ACCESSORS,__FILE__,__LINE__+1
15
+ def #{method}(value=nil)
16
+ @#{method}=value if value
17
+ @#{method}
18
+ end
19
+
20
+ def #{method}=(value)
21
+ @#{method}=value
22
+ end
23
+ ACCESSORS
24
+ end
25
+ end
26
+ end
27
27
  end
@@ -1,63 +1,63 @@
1
- module Lolita
2
- module Support
3
- # Containes different kind of formaters.
4
- # Change output format of different input types.
5
- # To define, pass block, or String.
6
- # ====Exmaple
7
- # Lolita::Support::Formatter.new do |value|
8
- # value.to_i**2
9
- # end
10
- # # or as String
11
- # Lolita::Support::Formatter.new("%U")
12
- # To format any value with defined formater call #with
13
- # ====Example
14
- # # Previous examples may be called like this
15
- # formatter.with(1)
16
- # formatter.with(Date.today)
17
- class Formatter
18
-
19
- def initialize(format=nil,&block)
20
- @format=format
21
- @block=block if block_given?
22
- end
23
-
24
- def format
25
- @format
26
- end
27
-
28
- def block
29
- @block
30
- end
31
-
32
- def with(value,*optional_values)
33
- if @block
34
- @block.call(value,*optional_values)
35
- elsif @format
36
- use_format_for(value,*optional_values)
37
- else
38
- use_default_format(value,*optional_values)
39
- end
40
- end
41
-
42
- private
43
-
44
- def use_default_format(value,*optional_values)
45
- value
46
- end
47
-
48
- def use_format_for(value, *optional_values)
49
- if value.respond_to?(:format)
50
- call_block(value,*optional_values)
51
- else
52
- @format ? (@format % value) : value
53
- end
54
- end
55
-
56
- def call_block(value,*optional_values)
57
- value.send(:format,value,*optional_values)
58
- end
59
-
60
- end
61
-
62
- end
1
+ module Lolita
2
+ module Support
3
+ # Containes different kind of formaters.
4
+ # Change output format of different input types.
5
+ # To define, pass block, or String.
6
+ # ====Exmaple
7
+ # Lolita::Support::Formatter.new do |value|
8
+ # value.to_i**2
9
+ # end
10
+ # # or as String
11
+ # Lolita::Support::Formatter.new("%U")
12
+ # To format any value with defined formater call #with
13
+ # ====Example
14
+ # # Previous examples may be called like this
15
+ # formatter.with(1)
16
+ # formatter.with(Date.today)
17
+ class Formatter
18
+
19
+ def initialize(format=nil,&block)
20
+ @format=format
21
+ @block=block if block_given?
22
+ end
23
+
24
+ def format
25
+ @format
26
+ end
27
+
28
+ def block
29
+ @block
30
+ end
31
+
32
+ def with(value,*optional_values)
33
+ if @block
34
+ @block.call(value,*optional_values)
35
+ elsif @format
36
+ use_format_for(value,*optional_values)
37
+ else
38
+ use_default_format(value,*optional_values)
39
+ end
40
+ end
41
+
42
+ private
43
+
44
+ def use_default_format(value,*optional_values)
45
+ value
46
+ end
47
+
48
+ def use_format_for(value, *optional_values)
49
+ if value.respond_to?(:format)
50
+ call_block(value,*optional_values)
51
+ else
52
+ @format ? (@format % value) : value
53
+ end
54
+ end
55
+
56
+ def call_block(value,*optional_values)
57
+ value.send(:format,value,*optional_values)
58
+ end
59
+
60
+ end
61
+
62
+ end
63
63
  end
@@ -1,57 +1,57 @@
1
- module Lolita
2
- module Support
3
- class Formatter
4
-
5
- # Formater for work with rails, it localize Date and Time.
6
- # Also
7
- class Rails < Lolita::Support::Formatter
8
-
9
-
10
- private
11
-
12
- def use_format_for(value,*optional_values)
13
- if @format && (value.is_a?(Time) || value.is_a?(Date))
14
- localize_time_with_format(value,*optional_values)
15
- else
16
- use_default_format(value,*optional_values)
17
- end
18
- end
19
-
20
- def localize_time_with_format(value,*optional_values)
21
- if defined?(::I18n)
22
- ::I18n.localize(value, :format => @format)
23
- else
24
- use_default_format(value,*optional_values)
25
- end
26
- end
27
-
28
- def use_default_format(value,*optional_values)
29
- if value
30
- if value.is_a?(String)
31
- @format ? (@format % value) : value
32
- elsif value.is_a?(Numeric)
33
- @format ? (@format % value) : value
34
- elsif value.is_a?(Date)
35
- if defined?(::I18n)
36
- ::I18n.localize(value, :format => :long)
37
- else
38
- value.strftime("%Y/%m%/%d")
39
- end
40
- elsif value.is_a?(Time)
41
- if defined?(::I18n)
42
- ::I18n.localize(value, :format => :long)
43
- else
44
- value.strftime("%Y/%m/%d %H:%M:%S")
45
- end
46
- else
47
- value.to_s
48
- end
49
- else
50
- ""
51
- end
52
- end
53
- end
54
-
55
- end
56
- end
1
+ module Lolita
2
+ module Support
3
+ class Formatter
4
+
5
+ # Formater for work with rails, it localize Date and Time.
6
+ # Also
7
+ class Rails < Lolita::Support::Formatter
8
+
9
+
10
+ private
11
+
12
+ def use_format_for(value,*optional_values)
13
+ if @format && (value.is_a?(Time) || value.is_a?(Date))
14
+ localize_time_with_format(value,*optional_values)
15
+ else
16
+ use_default_format(value,*optional_values)
17
+ end
18
+ end
19
+
20
+ def localize_time_with_format(value,*optional_values)
21
+ if defined?(::I18n)
22
+ ::I18n.localize(value, :format => @format)
23
+ else
24
+ use_default_format(value,*optional_values)
25
+ end
26
+ end
27
+
28
+ def use_default_format(value,*optional_values)
29
+ if value
30
+ if value.is_a?(String)
31
+ @format ? (@format % value) : value
32
+ elsif value.is_a?(Numeric)
33
+ @format ? (@format % value) : value
34
+ elsif value.is_a?(Date)
35
+ if defined?(::I18n)
36
+ ::I18n.localize(value, :format => :long)
37
+ else
38
+ value.strftime("%Y/%m%/%d")
39
+ end
40
+ elsif value.is_a?(Time)
41
+ if defined?(::I18n)
42
+ ::I18n.localize(value, :format => :long)
43
+ else
44
+ value.strftime("%Y/%m/%d %H:%M:%S")
45
+ end
46
+ else
47
+ value.to_s
48
+ end
49
+ else
50
+ ""
51
+ end
52
+ end
53
+ end
54
+
55
+ end
56
+ end
57
57
  end
@@ -1,77 +1,77 @@
1
- module Lolita
2
- module Test
3
- # Matchers that make easier to test Lolita and Lolita addons
4
- module Matchers
5
-
6
- class BeRoutable
7
-
8
- def matches?(actual)
9
- @actual=actual
10
- collect_routes
11
- set_method_and_url
12
- result=@routes.detect{|route|
13
- method_match(route) && @url.to_s.match(route[:path_info])
14
- }
15
- !!result
16
- end
17
-
18
- def failure_message
19
- "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""} to be routable"
20
- end
21
- def negative_failure_message
22
- "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""} to not be routable"
23
- end
24
-
25
- private
26
-
27
- def method_match(route)
28
- if route[:request_method]
29
- if @method
30
- @method.to_s.upcase.match(route[:request_method])
31
- else
32
- false
33
- end
34
- else
35
- true
36
- end
37
- end
38
-
39
- def set_method_and_url
40
- if @actual.is_a?(Hash)
41
- @method,@url=@actual.keys.first,@actual.values.first
42
- elsif @actual.is_a?(Array)
43
- if @actual.size>=2
44
- @method,@url=@actual[0],@actual[1]
45
- elsif
46
- @url=@actual.first
47
- end
48
- else
49
- @url=@actual.to_s
50
- end
51
- end
52
-
53
- def collect_routes
54
- @routes=[]
55
- all_applications.each do |application|
56
- @routes+=application.routes.routes.map(&:conditions)
57
- end
58
- end
59
-
60
- def all_applications
61
- if defined?(Rails) && defined?(Rails::Application)
62
- ObjectSpace.each_object(Rails::Application).select { |klass|
63
- klass.class < Rails::Application
64
- }.map(&:class)
65
- else
66
- []
67
- end
68
- end
69
- end
70
-
71
- def be_routable
72
- BeRoutable.new
73
- end
74
- end
75
- end
76
- end
77
-
1
+ module Lolita
2
+ module Test
3
+ # Matchers that make easier to test Lolita and Lolita addons
4
+ module Matchers
5
+
6
+ class BeRoutable
7
+
8
+ def matches?(actual)
9
+ @actual=actual
10
+ collect_routes
11
+ set_method_and_url
12
+ result=@routes.detect{|route|
13
+ method_match(route) && @url.to_s.match(route[:path_info])
14
+ }
15
+ !!result
16
+ end
17
+
18
+ def failure_message
19
+ "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""} to be routable"
20
+ end
21
+ def negative_failure_message
22
+ "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""} to not be routable"
23
+ end
24
+
25
+ private
26
+
27
+ def method_match(route)
28
+ if route[:request_method]
29
+ if @method
30
+ @method.to_s.upcase.match(route[:request_method])
31
+ else
32
+ false
33
+ end
34
+ else
35
+ true
36
+ end
37
+ end
38
+
39
+ def set_method_and_url
40
+ if @actual.is_a?(Hash)
41
+ @method,@url=@actual.keys.first,@actual.values.first
42
+ elsif @actual.is_a?(Array)
43
+ if @actual.size>=2
44
+ @method,@url=@actual[0],@actual[1]
45
+ elsif
46
+ @url=@actual.first
47
+ end
48
+ else
49
+ @url=@actual.to_s
50
+ end
51
+ end
52
+
53
+ def collect_routes
54
+ @routes=[]
55
+ all_applications.each do |application|
56
+ @routes+=application.routes.routes.map(&:conditions)
57
+ end
58
+ end
59
+
60
+ def all_applications
61
+ if defined?(Rails) && defined?(Rails::Application)
62
+ ObjectSpace.each_object(Rails::Application).select { |klass|
63
+ klass.class < Rails::Application
64
+ }.map(&:class)
65
+ else
66
+ []
67
+ end
68
+ end
69
+ end
70
+
71
+ def be_routable
72
+ BeRoutable.new
73
+ end
74
+ end
75
+ end
76
+ end
77
+