RubyGems - rad_core - Versions diffs - 0.2.6 → 0.2.7 - Mend

rad_core 0.2.6 → 0.2.7

Files changed (167) hide show

data/Rakefile +2 -2
data/bin/rad +20 -25
data/lib/components/config.rb +1 -1
data/lib/components/configurators.rb +2 -2
data/lib/components/controller.rb +2 -2
data/lib/components/conveyors.rb +2 -2
data/lib/components/environment.rb +1 -1
data/lib/components/environment.yml +28 -28
data/lib/components/flash.rb +1 -1
data/lib/components/html.rb +1 -1
data/lib/components/http.rb +1 -1
data/lib/components/http.yml +1 -1
data/lib/components/logger.rb +2 -2
data/lib/components/mailer.rb +2 -2
data/lib/components/remote.rb +1 -1
data/lib/components/router.rb +3 -3
data/lib/components/template.rb +2 -2
data/lib/components/web.rb +3 -3
data/lib/rad.rb +1 -1
data/lib/rad/_support/active_support.rb +7 -7
data/lib/rad/_support/active_support/locales/ru/actionview.yml +8 -8
data/lib/rad/_support/active_support/locales/ru/activesupport.yml +4 -4
data/lib/rad/_support/active_support/locales/ru/datetime.yml +5 -5
data/lib/rad/_support/active_support/time.rb +2 -2
data/lib/rad/_support/addressable.rb +6 -6
data/lib/rad/_support/class_loader.rb +1 -1
data/lib/rad/_support/extensions.rb +5 -5
data/lib/rad/_support/filters.rb +13 -13
data/lib/rad/_support/hacks_and_fixes.rb +5 -5
data/lib/rad/_support/mime.rb +4 -4
data/lib/rad/_support/module.rb +11 -11
data/lib/rad/_support/require.rb +5 -5
data/lib/rad/_support/rson.rb +4 -4
data/lib/rad/_support/string.rb +9 -9
data/lib/rad/cli/helper.rb +5 -5
data/lib/rad/configurators/_require.rb +2 -2
data/lib/rad/configurators/abstract.rb +5 -5
data/lib/rad/configurators/web.rb +8 -8
data/lib/rad/controller/_abstract.rb +15 -14
data/lib/rad/controller/_abstract/miscellaneous.rb +5 -5
data/lib/rad/controller/_abstract/render.rb +40 -40
data/lib/rad/controller/_abstract/responder.rb +1 -1
data/lib/rad/controller/_context.rb +1 -1
data/lib/rad/controller/_http.rb +11 -11
data/lib/rad/controller/_require.rb +6 -6
data/lib/rad/controller/processors/controller_caller.rb +3 -3
data/lib/rad/controller/processors/controller_error_handling.rb +14 -14
data/lib/rad/controller/processors/controller_logger.rb +1 -1
data/lib/rad/conveyors/_conveyor.rb +9 -9
data/lib/rad/conveyors/_conveyors.rb +4 -4
data/lib/rad/conveyors/_params.rb +5 -5
data/lib/rad/conveyors/_processor.rb +2 -2
data/lib/rad/conveyors/_workspace.rb +5 -5
data/lib/rad/conveyors/processors/conveyor_logger.rb +3 -3
data/lib/rad/environment/_config.rb +4 -4
data/lib/rad/environment/_environment.rb +10 -10
data/lib/rad/environment/_files_helper.rb +5 -5
data/lib/rad/environment/_logger.rb +9 -9
data/lib/rad/environment/_require.rb +4 -4
data/lib/rad/gems.rb +14 -14
data/lib/rad/html/_flash.rb +5 -5
data/lib/rad/html/_helpers/basic_html_helper.rb +12 -12
data/lib/rad/html/_helpers/form_helper.rb +19 -19
data/lib/rad/html/_helpers/javascript_helper.rb +6 -6
data/lib/rad/html/_helpers/model_helper.rb +17 -17
data/lib/rad/html/_require.rb +1 -1
data/lib/rad/html/processors/prepare_flash.rb +3 -3
data/lib/rad/html/processors/scoped_params.rb +4 -4
data/lib/rad/http/_http.rb +4 -4
data/lib/rad/http/_http_adapter.rb +5 -5
data/lib/rad/http/_request.rb +11 -11
data/lib/rad/http/_require.rb +8 -8
data/lib/rad/http/_response.rb +5 -5
data/lib/rad/http/_support/rack/fixes.rb +3 -3
data/lib/rad/http/_support/rack/rack_adapter.rb +5 -5
data/lib/rad/http/processors/evaluate_format.rb +4 -4
data/lib/rad/http/processors/http_logger.rb +3 -3
data/lib/rad/http/processors/http_writer.rb +7 -7
data/lib/rad/http/processors/prepare_params.rb +5 -5
data/lib/rad/mailer/_letter.rb +1 -1
data/lib/rad/mailer/_mailer.rb +1 -1
data/lib/rad/mailer/_mailer_controller.rb +6 -6
data/lib/rad/mailer/_require.rb +1 -1
data/lib/rad/mailer/processors/letter_builder.rb +6 -6
data/lib/rad/profiles/mailer.rb +2 -2
data/lib/rad/profiles/web.rb +13 -13
data/lib/rad/remote/processors/remote_caller.rb +10 -10
data/lib/rad/remote/processors/remote_logger.rb +1 -1
data/lib/rad/router/_abstract_router.rb +9 -9
data/lib/rad/router/_alias_router.rb +34 -34
data/lib/rad/router/_basic_router.rb +12 -12
data/lib/rad/router/_configurator.rb +6 -6
data/lib/rad/router/_core_routing_helper.rb +4 -4
data/lib/rad/router/_object_router.rb +45 -45
data/lib/rad/router/_require.rb +8 -8
data/lib/rad/router/_restful_router.rb +25 -25
data/lib/rad/router/_router.rb +78 -78
data/lib/rad/router/_simple_router.rb +5 -5
data/lib/rad/router/processors/router.rb +6 -6
data/lib/rad/spec/controller.rb +9 -9
data/lib/rad/spec/environment.rb +7 -7
data/lib/rad/spec/http.rb +2 -2
data/lib/rad/spec/http_controller.rb +22 -22
data/lib/rad/spec/mailer.rb +4 -4
data/lib/rad/spec/remote.rb +1 -1
data/lib/rad/spec/router.rb +4 -4
data/lib/rad/spec/template.rb +2 -2
data/lib/rad/tasks.rb +2 -2
data/lib/rad/template/_context.rb +15 -15
data/lib/rad/template/_relative_path_resolver.rb +1 -1
data/lib/rad/template/_support/tilt.rb +17 -17
data/lib/rad/template/_support/tilt_fixes.rb +3 -3
data/lib/rad/template/_template.rb +47 -47
data/lib/rad/web/_ajax_helper.rb +4 -4
data/lib/rad/web/_controller_miscellaneous_helper.rb +5 -5
data/lib/rad/web/_ensure_no_www.rb +5 -5
data/lib/rad/web/_protect_from_forgery.rb +18 -18
data/lib/rad/web/_require.rb +7 -7
data/lib/rad/web/_router/abstract_routing_helper.rb +4 -4
data/lib/rad/web/_router/controller_routing_helper.rb +15 -15
data/lib/rad/web/_router/view_routing_helper.rb +12 -12
data/readme.md +5 -5
data/spec/controller/abstract_spec.rb +29 -29
data/spec/controller/context_spec.rb +32 -32
data/spec/controller/error_handling_spec.rb +31 -31
data/spec/controller/helper_spec.rb +13 -13
data/spec/controller/http_spec.rb +32 -32
data/spec/controller/render_spec.rb +59 -59
data/spec/conveyors/conveyors_spec.rb +32 -32
data/spec/environment/config_spec.rb +6 -6
data/spec/environment/environment_spec.rb +7 -7
data/spec/environment/minimal_app_spec.rb +4 -4
data/spec/environment/standard_app_spec.rb +10 -10
data/spec/html/basic_html_helper_spec.rb +6 -6
data/spec/html/form_helper_spec.rb +5 -5
data/spec/html/javascript_helper_spec.rb +4 -4
data/spec/html/model_helper_spec.rb +12 -12
data/spec/html/scoped_params_spec.rb +2 -2
data/spec/html/spec_helper.rb +3 -3
data/spec/http/http_spec.rb +9 -9
data/spec/http/miscellaneous_spec.rb +2 -2
data/spec/mailer/mail_controller_spec.rb +23 -23
data/spec/remote/remote_spec.rb +26 -26
data/spec/router/alias_router_spec.rb +22 -22
data/spec/router/basic_router_spec.rb +8 -8
data/spec/router/configurator_spec.rb +4 -4
data/spec/router/integration_spec.rb +17 -17
data/spec/router/object_router_spec.rb +47 -47
data/spec/router/persistent_params_spec.rb +18 -18
data/spec/router/restful_router_spec.rb +39 -39
data/spec/router/router_spec.rb +37 -37
data/spec/router/routing_helper_spec.rb +18 -18
data/spec/support/filters_spec.rb +11 -13
data/spec/template/template_spec.rb +43 -45
data/spec/template/template_spec/views/layout/content_for/content.erb +3 -1
data/spec/template/template_spec/views/layout/content_for/layout.erb +1 -1
data/spec/template/tilt_spec.rb +24 -24
data/spec/web/basic_spec.rb +25 -25
data/spec/web/controller_routing_helper_spec.rb +26 -26
data/spec/web/flash_spec.rb +31 -31
data/spec/web/protect_from_forgery_spec.rb +44 -44
data/spec/web/spec_helper_spec.rb +16 -16
data/spec/web/view_routing_helper_spec.rb +31 -31
metadata +46 -49
data/lib/rad/_support/callbacks.rb +0 -166
data/lib/rad/_support/ruby_ext_with_active_support.rb +0 -4
data/spec/support/callbacks_spec.rb +0 -157

data/lib/rad/router/_basic_router.rb CHANGED

@@ -1,51 +1,51 @@
 class Rad::Router::BasicRouter
   include Rad::Router::AbstractRouter
   inject workspace: :workspace, logger: :logger
   attr_accessor :skip_routes, :redirect_routes
   SKIP_DEFAULT = [/^#{rad.http.url_root}\/(favicon|fs|packaged)/]
-  def initialize
+  def initialize
     self.skip_routes = SKIP_DEFAULT.clone
     self.redirect_routes = []
   end
   def skip path_regexp
     path_regexp.must_be.a Regexp
     skip_routes << path_regexp unless skip_routes.include? path_regexp
   end
   def redirect path_regexp, processor
     path_regexp.must_be.a Regexp
     processor.must_be.a String, Proc
     redirect_routes << [path_regexp, processor] unless redirect_routes.include? [path_regexp, processor]
   end
   def encode *a
   end
   def decode path, params
     # skip
     if skip_routes.any?{|path_regexp| path_regexp =~ path}
       logger.info "RAD skipping '#{path}'"
       throw :halt, true
     end
     # redirect
     if meta = redirect_routes.find{|path_regexp, processor| path_regexp =~ path}
-      path_regexp, processor = meta
+      path_regexp, processor = meta
       target = if processor.is_a? String
         path.sub(path_regexp, processor)
       else
         processor.call path
       end
       response = workspace.response
       # content_type = Mime[params.format]
       response.set!(
-        status:       :redirect,
+        status:       :redirect,
         # content_type: content_type,
         body:         %(<html><body>You are being <a href="#{target.html_escape if target}">redirected</a>.</body></html>)
       )
@@ -63,7 +63,7 @@ Rad::Router::Configurator.class_eval do
     raise "There's no BasicRouter (use config to add it)!" unless basic_router
     basic_router.skip *a, &b
   end
   def redirect *a, &b
     basic_router = @router.routers[:basic_router]
     raise "There's no BasicRouter (use config to add it)!" unless basic_router

data/lib/rad/router/_configurator.rb CHANGED

@@ -1,19 +1,19 @@
 class Rad::Router::Configurator
   inject router: :router
   def initialize router
     @router = router
-  end
+  end
   def persistent_params *args
     args.each{|v| router.persistent_params << v}
   end
   class << self
     inject router: :router
     def configure &block
       block.call Rad::Router::Configurator.new(router)
-    end
+    end
   end
 end

data/lib/rad/router/_core_routing_helper.rb CHANGED

@@ -1,14 +1,14 @@
 module Rad::Router::CoreRoutingHelper
   inject router: :router
-  delegate :url_for, :url_for_path, :persist_params, :persist_params?, :dont_persist_params, to: :router
+  delegate :url_for, :url_for_path, :persist_params, :persist_params?, :dont_persist_params, to: :router
   def default_path options = {}
     url_for_path rad.router.default_path, options.merge(url_root: false)
   end
   def return_to_path options = {}
-    dont_persist_params do
+    dont_persist_params do
       path = params[:_return_to] || workspace.request.session['return_to'] || rad.router.default_path
       url_for_path path, options.merge(url_root: false)
     end
@@ -21,7 +21,7 @@ module Rad::Router::CoreRoutingHelper
       raise "duplicate :id pameter!" if params.include?(:id) or params.include?('id')
       params[:id] = args.first.to_param
     end
-    params
+    params
   end
   protected
@@ -30,7 +30,7 @@ module Rad::Router::CoreRoutingHelper
       if m =~ /path$/
         params = parse_routing_arguments(*args)
         klass, method = router.encode_method m, params.include?(:id)
         url_for klass, method, params
       else
         super m.to_sym, *args, &block

data/lib/rad/router/_object_router.rb CHANGED

@@ -1,75 +1,75 @@
 class Rad::Router::ObjectRouter
-  include Rad::Router::AbstractRouter
+  include Rad::Router::AbstractRouter
   def initialize
     self.class_to_resource = -> klass      {raise ':class_to_resource not specified!'}
     self.resource_to_class = -> resource   {raise ':resource_to_class not specified!'}
     self.id_to_class       = -> id, params {raise ':id_to_class not specified!'}
     self.default_class_method = :all
     self.default_object_method    = :show
     @cached_class_to_resource, @cached_resource_to_class = {}, {}
   end
   def configure options = {}
     raise "can't configure ObjectRouter twice!" if configured?
     self.configured = true
     # parsing options
     options.validate_options! :default_class_name, :class_to_resource, :resource_to_class, :id_to_class, :url_root, :prefix
     self.default_class_name     = options[:default_class_name] || raise(':default_class_name not provided!')
     self.class_to_resource = options[:class_to_resource] if options.include? :class_to_resource
     self.resource_to_class = options[:resource_to_class] if options.include? :resource_to_class
     self.id_to_class       = options[:id_to_class]       if options.include? :id_to_class
     self.url_root = parse_url_root options
     self.prefix   = parse_prefix options
   end
   def encode klass, method, params
     return nil unless configured?
-    id = params[:id]
+    id = params[:id]
     # id and resource
     path = if id
       raise ":id can be used with :default_class only (#{klass}, '#{id}')!" if klass != default_class
       params.delete :id
-      raise ":id must not start from capital letter ('#{id}')!" if id =~ /^[A-Z]/
+      raise ":id must not start from capital letter ('#{id}')!" if id =~ /^[A-Z]/
       path = if !method or method == default_object_method
         "/#{id}"
       else
         "/#{id}/#{method}"
       end
-    else
-      resource = cached_class_to_resource klass
-      raise "no resource for #{klass}!" unless resource
+    else
+      resource = cached_class_to_resource klass
+      raise "no resource for #{klass}!" unless resource
       raise "resource must start from capital letter (class: #{klass}, resource: '#{resource}')!" unless resource =~ /^[A-Z]/
       path = if !method or method == default_class_method
         "/#{resource}"
       else
         "/#{resource}/#{method}"
-      end
+      end
     end
     # prefix
     path = encode_prefix_params! path, params, prefix if prefix
     # url_root
     params[:url_root] = url_root if url_root
     [path, params]
   end
-  def decode path, params
+  def decode path, params
     return nil unless configured?
     parts = path[1..-1].split('/')
     # checking 'size' of path
@@ -89,13 +89,13 @@ class Rad::Router::ObjectRouter
     # id, resource and method
     if parts.first =~ /^[A-Z]/
       resource, method = parts
-      method ||= default_class_method
+      method ||= default_class_method
       method = method.to_sym
       raise "resource must be in plural form ('#{resource}')!" unless resource.pluralize == resource
-      klass = cached_resource_to_class resource
+      klass = cached_resource_to_class resource
       raise "no class for '#{resource}' resource!" unless klass
     else
       id, method = parts
@@ -103,35 +103,35 @@ class Rad::Router::ObjectRouter
       method ||= default_object_method
       method = method.to_sym
-      # sometimes we need params inside of :id_to_class block,
+      # sometimes we need params inside of :id_to_class block,
       # for example to find out Space before finding Item
       klass = id_to_class.call id, params
       raise "no class for '#{id}' id!" unless klass
       params[:id] = id
-    end
+    end
     klass.must_be.a Class
     return klass, method, params
-  end
-  def encode_method route_method, has_id
+  end
+  def encode_method route_method, has_id
     return nil unless configured?
     token = route_method.sub(/_?path$/, '')
     if has_id
       method = token.empty? ? default_object_method : token
       method = method.to_sym
       return [default_class, method]
     else
       token = route_method.sub(/_path$/, '')
       parts = token.split '_'
       resource = parts.pop
       method = parts.empty? ? default_class_method : parts.join('_')
       # class
       resource = resource.pluralize.camelize
       klass = cached_resource_to_class resource
@@ -140,7 +140,7 @@ class Rad::Router::ObjectRouter
       # method
       method = method.to_sym if method
       return [klass, method]
     end
   end
@@ -148,13 +148,13 @@ class Rad::Router::ObjectRouter
   protected
     attr_accessor :class_to_resource, :resource_to_class, :id_to_class, :default_class_method, :default_object_method,
       :prefix, :url_root, :configured, :default_class_name
     def default_class
       @default_class ||= default_class_name.constantize
     end
     def configured?; !!@configured end
     def cached_class_to_resource klass
       unless @cached_class_to_resource.include? klass
         resource = class_to_resource.call klass
@@ -164,7 +164,7 @@ class Rad::Router::ObjectRouter
       end
       @cached_class_to_resource[klass]
     end
     def cached_resource_to_class resource
       unless @cached_resource_to_class.include? resource
         klass = resource_to_class.call resource
@@ -174,11 +174,11 @@ class Rad::Router::ObjectRouter
     end
 end
 Rad::Router::Configurator.class_eval do
   def objects *args, &block
-    object_router = @router.routers[:object_router]
-    raise "There's no ObjectRouter (use config to add it)!" unless object_router
+    object_router = @router.routers[:object_router]
+    raise "There's no ObjectRouter (use config to add it)!" unless object_router
     object_router.configure *args, &block
   end
 end

data/lib/rad/router/_require.rb CHANGED

@@ -1,31 +1,31 @@
 class Rad::Router
 end
-#
+#
 # Libraries
-#
+#
 %w(
   _configurator
   _simple_router
   _router
-  _default_format_processor
+  _default_format_processor
   _core_routing_helper
 ).each{|f| require "rad/router/#{f}"}
-#
+#
 # Routers
-#
+#
 %w(
   _abstract_router
   _basic_router
   _alias_router
   _restful_router
-  _object_router
+  _object_router
 ).each{|f| require "rad/router/#{f}"}
-#
+#
 # Helpers
 #

data/lib/rad/router/_restful_router.rb CHANGED

@@ -9,24 +9,24 @@ class Rad::Router::RestfulRouter
     # parsing options
     options.validate_options! :class_name, :url_root, :prefix
     resource = resource.to_s
-    resource.must_not =~ /\//
+    resource.must_not =~ /\//
     raise "resource should be in plural form!" unless resource.pluralize == resource
     class_name = options.delete(:class_name) || raise("no class name!")
     class_name.must_be.a String
     url_root = parse_url_root options
     prefix = parse_prefix options
     # logic
     meta = Meta.new
     meta.merge!(
-      class_name: class_name,
-      resource: resource,
-      url_root: url_root,
+      class_name: class_name,
+      resource: resource,
+      url_root: url_root,
       prefix: prefix
-    )
+    )
     resources.must_not.include(resource.pluralize)
-    class_names.must_not.include(class_name)
+    class_names.must_not.include(class_name)
     resources[resource.pluralize] = meta
     resources[resource.singularize] = meta
     class_names[class_name] = meta
@@ -35,7 +35,7 @@ class Rad::Router::RestfulRouter
   def encode klass, method, params
     meta = class_names[klass.name]
     return nil unless meta
     path = if id = params.delete(:id)
       "/#{meta[:resource]}/#{id}/#{method}"
     else
@@ -44,16 +44,16 @@ class Rad::Router::RestfulRouter
     prefix = meta[:prefix]
     path = encode_prefix_params! path, params, prefix if prefix
     url_root = meta[:url_root]
     params[:url_root] = url_root if url_root
     [path, params]
   end
   def decode path, params
     decode_as_object_resource(path, params) || decode_as_static_resource(path, params)
-  end
+  end
   def encode_method route_method, has_id
     token = route_method.sub(/_path$/, '')
@@ -64,52 +64,52 @@ class Rad::Router::RestfulRouter
         return meta.get_class, route_method[0..(i-2)].to_sym
       end
     end
     return nil
   end
   protected
     attr_accessor :resources, :class_names
     def decode_as_object_resource path, params
       parts = path[1..-1].split('/')
       return nil unless parts.size >= 3
       method, id, resource = parts.pop.to_sym, parts.pop, parts.pop
       meta = resources[resource]
       return nil unless meta
       # url_root
       url_root = meta[:url_root]
-      return nil if url_root and "/#{parts.shift}" != url_root
+      return nil if url_root and "/#{parts.shift}" != url_root
       # prefix
       return nil if parts.size != (meta[:prefix] ? meta[:prefix].size : 0)
       prefix = meta[:prefix]
       decode_prefix_params! parts, params, prefix if prefix
       params[:id] = id
       return meta.get_class, method, params
     end
     def decode_as_static_resource path, params
-      parts = path[1..-1].split('/')
+      parts = path[1..-1].split('/')
       return nil unless parts.size >= 2
       # method & class
       method, resource = parts.pop.to_sym, parts.pop
       meta = resources[resource]
       return nil unless meta
       # url_root
       url_root = meta[:url_root]
-      return nil if url_root and "/#{parts.shift}" != url_root
+      return nil if url_root and "/#{parts.shift}" != url_root
       # prefix
       return nil if parts.size != (meta[:prefix] ? meta[:prefix].size : 0)
       prefix = meta[:prefix]
-      decode_prefix_params! parts, params, prefix if prefix
+      decode_prefix_params! parts, params, prefix if prefix
       return meta.get_class, method, params
     end