rad_core 0.2.6 → 0.2.7

data/Rakefile

@@ -2,10 +2,10 @@ require 'rake_ext'
 
 project(
   name: 'rad',
-  official_name: 'rad_core',  
+  official_name: 'rad_core',
   gem: true,
   summary: 'Simple and highly customizable Web Framework encouraging to build an app as a set of low-coupled components instead of monolith',
-  
+
   bin: 'bin',
   executables: ['rad'],
   dirs: %w(bin views),

data/bin/rad

@@ -1,34 +1,29 @@
 #!/usr/bin/env ruby
-# sadly it's impossible to pass '-Ku' argument to ruby via shebang, use RUBYOPT to set it, something like:
-# $ export RUBYOPT="-Ku -rrubygems"        
 
 require 'rad'
 require 'rad/cli/helper'
 
-# version
-if ARGV.first =~ /-v|version|-version/
-  puts "Rad #{Rad::VERSION}"
-  exit
-end
+require 'optparse'
+OptionParser.new do |opts|
+  opts.banner =  <<-TEXT
+Rad Application Framework
 
-# mode and environment
-mode = (%w(server console).include? ARGV.first) ? ARGV.shift : 'server'
-environment = (%w(production development test).include? ARGV.first) ? ARGV.shift : :development
-rad.mode = environment
+Usage:
+  $ rad
+  $ rad production
+  $ rad console production
 
-warn 'update options'
-# config options
-ARGV.each do |expression|
-  name, value = expression.split('=')
-  name.sub!(/^-+/, '')
-  if name =~ /\./
-    component_name, key = name.split('.').collect{|s| s.to_sym}
-    rad.config[component_name] ||= {}
-    rad.config[component_name][key] = value
-  else
-    rad.config[name.to_sym] = value
+TEXT
+
+  opts.on('-v', "--version", "Version.") do |v|
+    puts "Rad Application Framework #{Rad::VERSION}"
+    exit
   end
-end
-  
+end.parse!
+
+# runner and mode
+runner = (%w(server console).include? ARGV.first) ? ARGV.shift : 'server'
+rad.mode = (%w(production development test).include? ARGV.first) ? ARGV.shift : :development
+
 # running
-Rad::Cli::Helper.send "run_#{mode}"
+Rad::Cli::Helper.send "run_#{runner}"

data/lib/components/config.rb

@@ -1,6 +1,6 @@
 rad.register :config do
   require 'rad/environment/_require'
-  
+
   config = Rad::Config.new
   config
 end

data/lib/components/configurators.rb

@@ -1,5 +1,5 @@
-rad.register :configurators, depends_on: :environment do  
+rad.register :configurators, depends_on: :environment do
   require 'rad/configurators/_require'
-  
+
   Rad::Conveyors.new
 end

data/lib/components/controller.rb

@@ -1,5 +1,5 @@
 rad.register :controller, depends_on: [:conveyors, :template, :http] do
-  require 'rad/controller/_require'  
-  
+  require 'rad/controller/_require'
+
   Rad::Controller.new
 end

data/lib/components/conveyors.rb

@@ -1,7 +1,7 @@
 # Conveyor is the heart of Rad, it allows for Processors to process request and build responce.
 
-rad.register :conveyors, depends_on: :environment do  
+rad.register :conveyors, depends_on: :environment do
   require 'rad/conveyors/_require'
-  
+
   Rad::Conveyors.new
 end

data/lib/components/environment.rb

@@ -1,5 +1,5 @@
 rad.register :environment, depends_on: [:config, :logger] do
-  require 'rad/environment/_require'  
+  require 'rad/environment/_require'
   rad.logger.info "RAD #{Rad::VERSION} starting in :#{rad.mode} mode (at #{Time.now.to_s})" unless rad.test?
   Rad::Environment.new
 end

data/lib/components/environment.yml

@@ -2,31 +2,31 @@ available_languages:
   - :en
 language: :en
 
-# backtrace_filters:
-#   - /timeout.rb
-#   - rubygems/custom_require
-#   - /bin/spec
-#   - /monitor
-#   - /synchronize
-#   - internal:lib/
-#         
-#   - /gems/haml
-#   - /gems/tilt
-#   - /gems/rack
-#   - /gems/rspec
-#   - /gems/thin
-#   - /gems/eventmachine
-#   - /gems/mongoid
-# 
-#   - lib/fake_gem
-#   - /class_loader
-#   - /micon
-#       
-#   - /kit/
-#   - /rad/
-#   - /face/
-#   
-#   # - /rad/template
-#   # - /rad/_support
-#   # - /face/view_builder
-#   # - /face/view_helper
+backtrace_filters:
+  - /timeout.rb
+  - rubygems/custom_require
+  - /bin/spec
+  - /monitor
+  - /synchronize
+  - internal:lib/
+
+  - /gems/haml
+  - /gems/tilt
+  - /gems/rack
+  - /gems/rspec
+  - /gems/thin
+  - /gems/eventmachine
+
+  - lib/fake_gem
+  - /class_loader
+  - /micon
+
+  # - /kit/
+  # - /rad/
+  # - /face/
+
+  - /rad/template
+  - /rad/_support
+  - /ruby_ext/more/callbacks
+  - /face/view_builder
+  - /face/view_helper

data/lib/components/flash.rb

@@ -1,5 +1,5 @@
 rad.register :flash, scope: :cycle, depends_on: [:html] do
   workspace = rad.workspace
-  workspace.params.must_be.defined  
+  workspace.params.must_be.defined
   Rad::Html::Flash.new workspace.params.format
 end

data/lib/components/html.rb

@@ -1,4 +1,4 @@
 rad.register :html, depends_on: [:http, :template] do
-  require 'rad/html/_require'  
+  require 'rad/html/_require'
   Rad::Html.new
 end

data/lib/components/http.rb

@@ -1,6 +1,6 @@
 # Http provides support for Http protocol (via Rack)
 
 rad.register :http, depends_on: :conveyors do
-  require 'rad/http/_require'    
+  require 'rad/http/_require'
   http = Rad::Http.new
 end

data/lib/components/http.yml

@@ -10,7 +10,7 @@ browser_generated_types:
   - text/plain
   - text/javascript
   - application/x-www-form-urlencoded
-  - multipart/form-data  
+  - multipart/form-data
 browser_generated_formats:
   - html
   - js

data/lib/components/logger.rb

@@ -1,5 +1,5 @@
-rad.register :logger do  
+rad.register :logger do
   require 'rad/environment/_require'
-  
+
   Rad::Logger.new
 end

data/lib/components/mailer.rb

@@ -1,9 +1,9 @@
 rad.register :mailer, depends_on: [:controller, :template] do
   require 'rad/mailer/_require'
-  
+
   rad.development do
     Mail.defaults{delivery_method :test}
   end
-  
+
   Rad::Mailer.new
 end

data/lib/components/remote.rb

@@ -1,4 +1,4 @@
 rad.register :remote, depends_on: :conveyors do
-  require 'rad/remote/_require'  
+  require 'rad/remote/_require'
   Rad::Remote.new
 end

data/lib/components/router.rb

@@ -1,11 +1,11 @@
 rad.register :router, depends_on: [:conveyors, :http] do
   require 'rad/router/_require'
-  
+
   Rad::Router.new(
-    :class, 
+    :class,
     [
       [:alias_router, Rad::Router::AliasRouter.new],
-      [:basic_router, Rad::Router::BasicRouter.new],      
+      [:basic_router, Rad::Router::BasicRouter.new],
       [:restful_router, Rad::Router::RestfulRouter.new],
       [:simple_router, Rad::Router::SimpleRouter.new]
     ]

data/lib/components/template.rb

@@ -1,8 +1,8 @@
 rad.register :template do
   require 'rad/template/_require'
-  
+
   template = Rad::Template.new
   rad_dir = "#{__FILE__}/../../../..".dirname
-  template.paths << "#{rad_dir}/views"  
+  template.paths << "#{rad_dir}/views"
   template
 end

data/lib/components/web.rb

@@ -1,8 +1,8 @@
-rad.register :web, depends_on: [:html, :router, :controller, :http, :configurators] do  
+rad.register :web, depends_on: [:html, :router, :controller, :http, :configurators] do
   require 'rad/web/_require'
-  
+
   load 'rad/profiles/web.rb'
   load 'rad/profiles/mailer.rb'
-  
+
   true
 end

data/lib/rad.rb

@@ -4,5 +4,5 @@ end
 
 require 'rad/_support/require'
 
-# Environment is the basic component of Rad 
+# Environment is the basic component of Rad
 # it prepares and assembles your app ($LOAD_PATH, plugins and config files)

data/lib/rad/_support/active_support.rb

@@ -1,6 +1,6 @@
-# 
+#
 # Some features of ActiveSupport conflicting with Rad, skipping it
-# 
+#
 %w(
   active_support/dependencies.rb
 ).each do |relative_path|
@@ -13,11 +13,11 @@ end
 require 'active_support/all'
 
 # gem 'activesupport' #, '= 2.3.5'
-# 
+#
 # # autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
 # autoload :Base64, 'active_support/base64'
 # # autoload :BasicObject, 'active_support/basic_object' we use our own implementation
-# 
+#
 # # autoload :BufferedLogger, 'active_support/buffered_logger'
 # # autoload :Cache, 'active_support/cache'
 # # autoload :Callbacks, 'active_support/callbacks'
@@ -38,16 +38,16 @@ require 'active_support/all'
 # autoload :TimeWithZone, 'active_support/time_with_zone'
 # autoload :TimeZone, 'active_support/values/time_zone'
 # # autoload :XmlMini, 'active_support/xml_mini'
-# 
+#
 # # require 'active_support/vendor'
 # require 'active_support/core_ext'
 # # require 'active_support/dependencies'
 # # require 'active_support/json'
 
 
-# 
+#
 # Hacks
-# 
+#
 %w(
   miscellaneous
   time

data/lib/rad/_support/active_support/locales/ru/actionview.yml

@@ -12,7 +12,7 @@ ru:
       delimiter: " "
       # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
       precision: 3
-      
+
     # Used in number_to_currency()
     currency:
       format:
@@ -26,14 +26,14 @@ ru:
         separator: "."
         delimiter: " "
         precision: 2
-        
+
     # Used in number_to_percentage()
     percentage:
       format:
         # These three are to override number.format and are optional
-        # separator: 
+        # separator:
         delimiter: ""
-        
+
     # Used in number_to_precision()
     precision:
       format:
@@ -41,18 +41,18 @@ ru:
         # separator:
         delimiter: ""
         # precision:
-        
+
     # Used in number_to_human_size()
     human:
       format:
         # These three are to override number.format and are optional
-        # separator: 
+        # separator:
         delimiter: ""
         precision: 1
-      
+
       # Rails 2.2
       # storage_units: [байт, КБ, МБ, ГБ, ТБ]
-      
+
       # Rails 2.3
       storage_units:
         # Storage units output formatting.

data/lib/rad/_support/active_support/locales/ru/activesupport.yml

@@ -1,16 +1,16 @@
 ru:
 # Используется в array.to_sentence
-#  
-#  
+#
+#
 # Used in array.to_sentence.
   support:
     array:
       # Rails 2.2
       sentence_connector: "и"
       skip_last_comma: true
-      
+
       # Rails 2.3
       words_connector: ", "
       two_words_connector: " и "
       last_word_connector: " и "
-      
+

data/lib/rad/_support/active_support/locales/ru/datetime.yml

@@ -12,7 +12,7 @@ ru:
       default: "%d.%m.%Y"
       short: "%d %b"
       long: "%d %B %Y"
-    
+
     # Названия дней недели -- контекстные и отдельностоящие
     day_names: [воскресенье, понедельник, вторник, среда, четверг, пятница, суббота]
     standalone_day_names: [Воскресенье, Понедельник, Вторник, Среда, Четверг, Пятница, Суббота]
@@ -20,19 +20,19 @@ ru:
 
     # Названия месяцев -- сокращенные и полные, плюс отдельностоящие.
     # Не забудьте nil в начале массиве (~)
-    # 
+    #
     #
     # Don't forget the nil at the beginning; there's no such thing as a 0th month
     month_names: [~, января, февраля, марта, апреля, мая, июня, июля, августа, сентября, октября, ноября, декабря]
     standalone_month_names: [~, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь]
     abbr_month_names: [~, янв., февр., марта, апр., мая, июня, июля, авг., сент., окт., нояб., дек.]
     standalone_abbr_month_names: [~, янв., февр., март, апр., май, июнь, июль, авг., сент., окт., нояб., дек.]
-    
+
     # Порядок компонентов даты для хелперов
     #
     #
     # Used in date_select and datime_select.
-    order: 
+    order:
       - :day
       - :month
       - :year
@@ -43,7 +43,7 @@ ru:
       default: "%a, %d %b %Y, %H:%M:%S %z"
       short: "%d %b, %H:%M"
       long: "%d %B %Y, %H:%M"
-    
+
     # am/pm решено перевести как "утра/вечера" :)
     am: "утра"
     pm: "вечера"

data/lib/rad/_support/active_support/time.rb

@@ -47,7 +47,7 @@ class Time
   #
   def distance_of_time_in_words(to_time = 0, include_seconds = false, options = {})
     from_time = self
-    
+
     from_time = from_time.to_time if from_time.respond_to?(:to_time)
     to_time = to_time.to_time if to_time.respond_to?(:to_time)
     distance_in_minutes = (((to_time - from_time).abs)/60).round
@@ -90,7 +90,7 @@ class Time
       end
     end
   end
-    
+
   # Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
   #
   # ==== Examples