rango 0.1.1.3 → 0.2.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. data/CHANGELOG +17 -1
  2. data/Rakefile +8 -3
  3. data/bin/rango +0 -13
  4. data/lib/rango.rb +23 -12
  5. data/lib/rango/controller.rb +70 -57
  6. data/lib/rango/core_ext.rb +100 -17
  7. data/lib/rango/environments.rb +33 -19
  8. data/lib/rango/exceptions.rb +1 -1
  9. data/lib/rango/forms/form.rb +2 -1
  10. data/lib/rango/helpers/assets.rb +6 -1
  11. data/lib/rango/helpers/general.rb +1 -1
  12. data/lib/rango/mixins/action_args.rb +48 -0
  13. data/lib/rango/mixins/chainable.rb +66 -0
  14. data/lib/rango/mixins/filters.rb +12 -20
  15. data/lib/rango/mixins/logger.rb +1 -0
  16. data/lib/rango/mixins/message.rb +5 -6
  17. data/lib/rango/mixins/render.rb +1 -1
  18. data/lib/rango/orm/tasks/datamapper.rake +4 -4
  19. data/lib/rango/path.rb +6 -1
  20. data/lib/rango/rack/request.rb +18 -29
  21. data/lib/rango/router.rb +1 -1
  22. data/lib/rango/stacks/controller.rb +0 -1
  23. data/lib/rango/templates/exts/tilt.rb +3 -3
  24. data/lib/rango/templates/helpers.rb +55 -27
  25. data/lib/rango/templates/template.rb +11 -9
  26. data/spec/rango/controller_spec.rb +0 -1
  27. data/spec/rango/{loggers/fireruby_spec.rb → core_ext_spec.rb} +0 -0
  28. data/spec/rango/environments_spec.rb +6 -6
  29. data/spec/rango/{mixins/application_spec.rb → gv/router_spec.rb} +0 -0
  30. data/spec/rango/{orm/adapter_spec.rb → gv/scaffolding_spec.rb} +0 -0
  31. data/spec/rango/{orm/adapters/datamapper_spec.rb → mini_render_spec.rb} +0 -0
  32. data/spec/rango/mixins/action_args_spec.rb +78 -0
  33. data/spec/rango/{orm/adapters/sequel_spec.rb → mixins/chainable_spec.rb} +0 -0
  34. data/spec/rango/{orm/support/datamapper/support_spec.rb → mixins/logger_spec.rb} +0 -0
  35. data/spec/rango/mixins/message_spec.rb +4 -1
  36. data/spec/rango/mixins/render_spec.rb +1 -1
  37. data/spec/rango/{settings/erubis_spec.rb → path_spec.rb} +0 -0
  38. data/spec/rango/{settings/framework_spec.rb → stacks/controller_spec.rb} +0 -0
  39. data/spec/rango/{settings/haml_spec.rb → stacks/mini_spec.rb} +0 -0
  40. data/spec/rango/templates/helpers_spec.rb +125 -0
  41. data/spec/rango/templates/template_spec.rb +1 -2
  42. data/spec/rango/{settings/template_spec.rb → version_spec.rb} +0 -0
  43. data/spec/rango_spec.rb +6 -1
  44. data/spec/spec_helper.rb +8 -2
  45. data/spec/stubs/templates/_basic.html.erb +6 -0
  46. data/spec/stubs/templates/block/block.html.haml +2 -0
  47. data/spec/stubs/templates/block/blocks.html.haml +5 -0
  48. data/spec/stubs/templates/block/error.html.haml +2 -0
  49. data/spec/stubs/templates/block/getter.html.haml +3 -0
  50. data/spec/stubs/templates/block/value.html.haml +1 -0
  51. data/spec/stubs/templates/enhance_block/basic.html.haml +5 -0
  52. data/spec/stubs/templates/enhance_block/error.html.haml +3 -0
  53. data/spec/stubs/templates/enhance_block/name_error.html.haml +1 -0
  54. data/spec/stubs/templates/enhance_block/nil.html.haml +3 -0
  55. data/spec/stubs/templates/enhance_block/standalone.html.haml +2 -0
  56. data/spec/stubs/templates/extend_block/basic.html.haml +5 -0
  57. data/spec/stubs/templates/extend_block/error.html.haml +5 -0
  58. data/spec/stubs/templates/extend_block/error2.html.haml +1 -0
  59. data/spec/stubs/templates/extend_block/name_error.html.haml +1 -0
  60. data/spec/stubs/templates/extend_block/nil.html.haml +4 -0
  61. data/spec/stubs/templates/includes/base.html.haml +1 -0
  62. data/spec/stubs/templates/includes/basic.html.haml +1 -0
  63. data/spec/stubs/templates/includes/includes.html.haml +7 -0
  64. data/spec/stubs/templates/includes/integration.html.haml +4 -0
  65. data/spec/stubs/templates/includes/integration2.html.haml +4 -0
  66. data/spec/stubs/templates/library.html.haml +3 -0
  67. data/stubs/features/content/shared/.gitignore +0 -0
  68. data/stubs/stack/content/.gitignore +18 -0
  69. data/stubs/stack/content/.rvmrc.rbt +2 -0
  70. data/stubs/stack/content/Gemfile.rbt +8 -1
  71. data/stubs/stack/content/{settings_local.rb.rbt → environments.rb.rbt} +11 -0
  72. data/stubs/stack/content/init.rb.rbt +8 -4
  73. data/stubs/stack/content/media/.gitignore +0 -0
  74. data/stubs/stack/content/spec/spec_helper.rb +1 -1
  75. data/stubs/stack/content/views.rb.rbt +13 -5
  76. data/stubs/stack/postprocess.rb +2 -9
  77. metadata +62 -29
  78. data/lib/rango/logger.rb +0 -19
  79. data/lib/rango/loggers/fireruby.rb +0 -1
  80. data/lib/rango/mixins/application.rb +0 -27
data/lib/rango/logger.rb DELETED
@@ -1,19 +0,0 @@
1
- # encoding: utf-8
2
-
3
- require "rango"
4
-
5
- begin
6
- require "rubyexts/logger"
7
- rescue LoadError
8
- raise LoadError, "You have to install rubyexts gem"
9
- end
10
-
11
- # @since 0.0.1
12
- # @example
13
- # Rango.root
14
- # # => /usr/lib/ruby/lib/ruby/site_ruby/1.8/rango
15
- # @return [RubyExts::Logger] Logger for logging framework-related stuff. For logging project-relating stuff please use Project.logger.
16
- # @see Project::logger
17
- def Rango.logger
18
- @@logger ||= RubyExts::Logger.new
19
- end
@@ -1 +0,0 @@
1
- # encoding: utf-8
@@ -1,27 +0,0 @@
1
- # encoding: utf-8
2
-
3
- require "rubyexts/mixins/import"
4
-
5
- module Rango
6
- module ApplicationMixin
7
- include RubyExts::ImportMixin
8
- # @since 0.0.1
9
- # @see Path
10
- # @return [Path] Path reprezentation of project root directory.
11
- def path
12
- MediaPath.new(self.root)
13
- end
14
-
15
- # @since 0.0.1
16
- # @return [String] Name of the project. Taken from basename of project directory.
17
- def name
18
- path.basename
19
- end
20
-
21
- # @since 0.0.1
22
- # @return [RubyExts::Logger] Logger for project related stuff.
23
- def logger
24
- @logger ||= RubyExts::Logger.new
25
- end
26
- end
27
- end