right-rails 1.0.12 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+2011-03-01 Nikolay Nemshilov
+  o Version 1.1.0
+    * RightJS CDN Server support
+    * RightJS 2.2.2 builds
+
 2010-10-24 Nikolay Nemshilov
   o Version 1.0.10
     * RightJS builds update

data/Rakefile

@@ -1,34 +1,26 @@
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc 'Default: run rspec tests.'
 task :default => :spec
 
 desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--options', "spec/spec.opts"]
+  t.pattern    = 'spec/**/*_spec.rb'
 end
 
 namespace :spec do
   desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "spec/spec.opts"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_dir = 'coverage'
-    t.rcov_opts = lambda do
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.rspec_opts = ['--options', "spec/spec.opts"]
+    t.pattern    = 'spec/**/*_spec.rb'
+    t.rcov       = true
+    t.rcov_opts  = lambda do
       IO.readlines("spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
     end
   end
-
-#  desc "Print Specdoc for all specs"
-#  Spec::Rake::SpecTask.new(:doc) do |t|
-#    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-#    t.spec_files = FileList['spec/**/*_spec.rb']
-#  end
 end
 
 desc 'Generate documentation for the right_rails plugin.'

data/lib/right_rails/config.rb

@@ -11,23 +11,27 @@
 # - RightRails::Config.include_rails_module           +true+ or +false+
 # - RightRails::Config.swap_builds_and_sources        +true+ or +false+
 # - RightRails::Config.include_scripts_automatically  +true+ or +false+
+# - RightRails::Config.use_cdn_in_production          +false+ or +true+
+# - RigthRails::Config.cdn_url                        'http://cdn.rightjs.org'
 #
 # When you set a property in _auto_ then the script will try to figure the
 # parameters out by the current environment and the content of the
 # public/javascript/right.js file
 #
 module RightRails::Config
-  
+
   DEFAULT_PUBLIC_PATH      = 'auto' #  'auto' or some path
   DEFAULT_SAFE_MODE        = 'auto' #  'auto', true or false
   DEFAULT_RIGHTJS_VERSION  = 'auto' #  'auto', 2 or 1
   DEFAULT_ENVIRONMENT      = 'auto' #  'auto', 'production' or 'development'
   DEFAULT_RIGHTJS_LOCATION = 'javascripts/right.js'
   DEFAULT_LOCALES_LOCATION = 'javascripts/right/i18n'
+  DEFAULT_CDN_URL          = 'http://cdn.rightjs.org'
+  DEFAULT_USE_CDN          = false  # false or true
   DEFAULT_INCLUDE_RAILS    = true   # true or false
   DEFAULT_AUTO_INCLUDES    = true   # true or false
   DEFAULT_SWAP_BUILDS      = true   # true or false
-  
+
   class << self
     #
     # Resetting the configuration to the defaults
@@ -41,8 +45,10 @@ module RightRails::Config
       remove_instance_variable(:@include_rails)   if defined?(@include_rails)
       remove_instance_variable(:@auto_includes)   if defined?(@auto_includes)
       remove_instance_variable(:@swap_builds)     if defined?(@swap_builds)
+      remove_instance_variable(:@use_cdn)         if defined?(@use_cdn)
+      remove_instance_variable(:@cdn_url)         if defined?(@cdn_url)
     end
-    
+
     #
     # Returns the currently used environment
     #
@@ -52,10 +58,10 @@ module RightRails::Config
       unless defined?(@environment)
         self.env = DEFAULT_ENVIRONMENT
       end
-      
+
       @environment
     end
-    
+
     #
     # Sets the current environment, which will effectively make
     # RightRails to switch between the builds and src versions of
@@ -71,17 +77,17 @@ module RightRails::Config
           "production"
         end
       end
-      
+
       @environment = value.to_s == 'production' ? 'production' : 'development'
     end
-    
+
     #
     # Returns a marker if we are in the _development_ environment
     #
     def dev_env?
       env == 'development'
     end
-    
+
     #
     # Returns the public_html directory path
     #
@@ -91,10 +97,10 @@ module RightRails::Config
       unless defined?(@public_path)
         self.public_path = DEFAULT_PUBLIC_PATH
       end
-      
+
       @public_path
     end
-    
+
     #
     # If you have your public_html somewhere else
     # this is the place where you can define it
@@ -108,15 +114,15 @@ module RightRails::Config
           "public"
         end
       end
-      
+
       # getting rid of the trailing slash
       if path.slice(path.size-1, path.size) == '/'
-        path = path.slice(0, path.size-1) 
+        path = path.slice(0, path.size-1)
       end
-      
+
       @public_path = path.dup
     end
-    
+
     #
     # Returns a full-path to the localization modules directory
     #
@@ -124,22 +130,22 @@ module RightRails::Config
       unless defined?(@locales_path)
         self.locales_path = "#{public_path}/#{DEFAULT_LOCALES_LOCATION}"
       end
-      
+
       @locales_path
     end
-    
+
     #
     # Sets the RightJS localilzation modules directory path
     #
     def locales_path=(path)
       # getting rid of the trailing slash
       if path.slice(path.size-1, path.size) == '/'
-        path = path.slice(0, path.size-1) 
+        path = path.slice(0, path.size-1)
       end
-      
+
       @locales_path = path
     end
-    
+
     #
     # Checks if the RightJS is used in the safe-mode
     #
@@ -147,10 +153,10 @@ module RightRails::Config
       unless defined?(@safe_mode)
         self.safe_mode = DEFAULT_SAFE_MODE
       end
-      
+
       @safe_mode
     end
-    
+
     #
     # Setup whether RightJS is used in the safe-mode or not
     #
@@ -161,7 +167,7 @@ module RightRails::Config
     def safe_mode=(value)
       @safe_mode = !!(value == 'auto' ? read_rightjs_file =~ /\.safe\s*=\s*true/ : value)
     end
-    
+
     #
     # Returns the RightJS version (2 or 1)
     #
@@ -169,10 +175,10 @@ module RightRails::Config
       unless defined?(@rightjs_version)
         self.rightjs_version = DEFAULT_RIGHTJS_VERSION
       end
-      
+
       @rightjs_version
     end
-    
+
     #
     # With this method you can set up which version of RightJS do you use
     # 2 or 1. You also can set it to a string 'auto' (by default) in which
@@ -183,10 +189,10 @@ module RightRails::Config
       if value == 'auto'
         value = read_rightjs_file =~ /version\s*(:|=)\s*("|')1/ ? 1 : 2
       end
-      
+
       @rightjs_version = value < 2 ? 1 : 2
     end
-    
+
     #
     # Returns a marker if the script should automatically include
     # the ruby-on-rails module for RightJS
@@ -195,10 +201,10 @@ module RightRails::Config
       unless defined?(@include_rails)
         self.include_rails_module = DEFAULT_INCLUDE_RAILS
       end
-      
+
       @include_rails
     end
-    
+
     #
     # Sets the marker if the plugin should automatically include
     # the ruby-on-rails module for RightJS
@@ -206,7 +212,7 @@ module RightRails::Config
     def include_rails_module=(value)
       @include_rails = !! value
     end
-    
+
     #
     # Checks if the plugin should automatically swap between
     # the builds and the source-versions of JavaScript files
@@ -216,10 +222,10 @@ module RightRails::Config
       unless defined?(@swap_builds)
         self.swap_builds_and_sources = DEFAULT_SWAP_BUILDS
       end
-      
+
       @swap_builds
     end
-    
+
     #
     # Sets the marker if the plugin should automatically
     # swap between source and builds of JavaScript files
@@ -227,7 +233,7 @@ module RightRails::Config
     def swap_builds_and_sources=(value)
       @swap_builds = !! value
     end
-    
+
     #
     # Checks if the plugin should include JavaScript modules
     # automatically when they needed
@@ -236,10 +242,10 @@ module RightRails::Config
       unless defined?(@auto_includes)
         self.include_scripts_automatically = DEFAULT_AUTO_INCLUDES
       end
-      
+
       @auto_includes
     end
-    
+
     #
     # Sets the marker if the plugin should automatically include
     # all the JavaScript files on the page when they needed
@@ -247,15 +253,55 @@ module RightRails::Config
     def include_scripts_automatically=(value)
       @auto_includes = !! value
     end
-    
+
+    #
+    # Checks if the plugin going to automatically use
+    # CDN Server in production instead of local files
+    #
+    def use_cdn_in_production
+      unless defined?(@use_cdn)
+        self.use_cdn_in_production = DEFAULT_USE_CDN
+      end
+
+      @use_cdn
+    end
+
+    #
+    # Sets the marker if the plugin should automatically use
+    # CDN Server in production instead of the local files
+    #
+    def use_cdn_in_production=(value)
+      @use_cdn = !! value
+    end
+
+    #
+    # Returns the current CDN Server URL address
+    #
+    def cdn_url
+      unless defined?(@cdn_url)
+        self.cdn_url = DEFAULT_CDN_URL
+      end
+
+      @cdn_url
+    end
+
+    #
+    # Sets a new CDN Server url address
+    #
+    def cdn_url=(value)
+      @cdn_url = value
+    end
+
+
     # boolean methods aliases
     alias_method :safe_mode?,                     :safe_mode
     alias_method :include_rails_module? ,         :include_rails_module
+    alias_method :use_cdn_in_production?,         :use_cdn_in_production
     alias_method :swap_builds_and_sources? ,      :swap_builds_and_sources
     alias_method :include_scripts_automatically?, :include_scripts_automatically
-    
+
   private
-    
+
     #
     # reading the `public/javascripts/right.js` file for the purposes
     # of the automatic configuration
@@ -267,7 +313,7 @@ module RightRails::Config
     rescue
       ''
     end
-    
+
     #
     # Checking if we are in the Ruby-on-Rails environment
     #

data/lib/right_rails/helpers/rails.rb

@@ -9,20 +9,20 @@ module RightRails::Helpers::Rails
   #
   def javascript_include_tag(first, *others)
     if (first == :defaults)
-      options = others.last.is_a?(Hash) ? modules.pop : nil
+      options = others.last.is_a?(Hash) ? others.pop : nil
 
       rightjs_require_module *others
 
       scripts = RightRails::Helpers.required_js_files(self)
       scripts << 'application'
       scripts << options unless options.nil?
-      
-      super scripts
+
+      super *scripts
     else
       super first, *others
     end
   end
-  
+
   #
   # Overloading the `remote_function` helper so it used the RightJS semantics
   #
@@ -31,18 +31,18 @@ module RightRails::Helpers::Rails
     url = options[:url]
     url = url.merge(:escape => false) if url.is_a?(Hash)
     options[:url] = escape_javascript(url_for(url))
-    
+
     cmd = RightRails::Helpers.build_xhr_request(options)
-    
+
     cmd =  "#{options[:before]};#{cmd}" if options[:before]
     cmd << ";#{options[:after]}"        if options[:after]
-    
+
     cmd = "if(#{options[:condition]}){#{cmd}}" if options[:condition]
     cmd = "if(confirm('#{escape_javascript(options[:confirm])}')){#{cmd}}" if options[:confirm]
-    
+
     cmd
   end
-  
+
   #
   # Overloading the `submit_to_remote` so it used RightJS instead
   #
@@ -54,7 +54,7 @@ module RightRails::Helpers::Rails
 
     button_to_remote(value, options, html_options)
   end
-  
+
   #
   # Replacing `periodically_call_remote` method
   #
@@ -63,41 +63,41 @@ module RightRails::Helpers::Rails
     code = "function(){#{remote_function(options)}}.periodical(#{frequency * 1000})"
     javascript_tag(code)
   end
-  
+
   #
   # replacing the draggables generator to make our autoscripts stuff working
   #
   def draggable_element_js(*args)
     rightjs_require_module 'dnd'
-    
+
     super *args
   end
-  
+
   #
   # replace the droppables generator to be used with RightJS
   #
   def drop_receiving_element_js(*args)
     rightjs_require_module 'dnd'
-    
+
     super(*args).gsub!('Droppables.add', 'new Droppable'
       ).gsub!('element.id', 'draggable.element.id'
       ).gsub!('(element)', '(draggable)')
   end
-  
+
   #
   # catching the sortables generator
   #
   def sortable_element_js(id, options={})
     rightjs_require_module 'dnd', 'sortable'
-    
+
     script = "new Sortable('#{id}'"
-    
+
     # processing the options
     options[:url] = escape_javascript(url_for(options[:url])) if options[:url]
     s_options = RightRails::Helpers.unit_options(options, 'sortable')
     script << ",#{s_options}" unless s_options == '{}'
-    
+
     script << ")"
   end
-  
+
 end

data/lib/right_rails/helpers.rb

@@ -2,12 +2,12 @@
 # There is the namespace for the helpers and some private methods
 #
 module RightRails::Helpers
-  
+
   autoload :Basic, 'right_rails/helpers/basic'
   autoload :Rails, 'right_rails/helpers/rails'
   autoload :Forms, 'right_rails/helpers/forms'
   autoload :Misc,  'right_rails/helpers/misc'
-  
+
   ##########################################################################
   #  Varios RightJS unit keys
   ##########################################################################
@@ -24,7 +24,7 @@ module RightRails::Helpers
     spinnerFx
     params
   }
-  
+
   CALENDAR_OPTION_KEYS = %w{
     format
     showTime
@@ -86,7 +86,7 @@ module RightRails::Helpers
     fxName
     fxDuration
   }
-  
+
   TABS_OPTION_KEYS = %w{
     idPrefix
     tabsElement
@@ -104,7 +104,7 @@ module RightRails::Helpers
     Xhr
     Cookie
   }
-  
+
   LIGHTBOX_OPTION_KEYS = %w{
     group
     endOpacity
@@ -116,14 +116,14 @@ module RightRails::Helpers
     mediaWidth
     mediaHeight
   }
-  
+
   RESIZABLE_OPTION_KEYS = %w{
     minWidth
     maxWidth
     minHeight
     maxHeight
   }
-  
+
   SORTABLE_OPTION_KEYS = %w{
     url
     direction
@@ -137,7 +137,7 @@ module RightRails::Helpers
     accept
     minLength
   }
-  
+
 protected
 
   class << self
@@ -147,7 +147,7 @@ protected
     def prefix
       RightRails::Config.safe_mode? ? 'RightJS.' : ''
     end
-    
+
     #
     # Switches between the css class-names prefixes
     # depending on current RightJS version
@@ -155,7 +155,7 @@ protected
     def css_prefix
       RightRails::Config.rightjs_version < 2 ? 'right' : 'rui'
     end
-    
+
     #
     # Converting the string into an html-safe eqivalent
     # regardless of the current environment
@@ -169,7 +169,7 @@ protected
         string
       end
     end
-    
+
     #
     # Tells the script that the user needs this module
     #
@@ -177,50 +177,71 @@ protected
     #
     def require_js_module(context, *list)
       registry = modules_registry_for(context)
-      
+
       list.each do |name|
         unless registry.include?(name.to_s)
           registry << name.to_s
         end
       end
     end
-    
+
     #
     # Returns a list of required JavaScript files for RightJS
     #
     def required_js_files(context)
       scripts = ['right']
-      
-      
-      if RightRails::Config.include_scripts_automatically?
+      config  = RightRails::Config
+
+
+      if config.include_scripts_automatically?
         # hooking up the 'rails' javascript module if required
-        scripts << 'right/rails' if RightRails::Config.include_rails_module?
-        
+        scripts << 'right/rails' if config.include_rails_module?
+
         # adding the modules if needed
         scripts += modules_registry_for(context).collect do |package|
           "right/#{package}"
         end
-        
+
         # swapping to the sources in the development mode
-        if RightRails::Config.swap_builds_and_sources? && RightRails::Config.dev_env?
+        if config.swap_builds_and_sources? && config.dev_env?
           scripts = scripts.collect do |package|
             "#{package}-src"
           end
         end
-        
+
         # loading up the locales if available
         if defined?(I18n)
-          locale_file = "#{RightRails::Config.locales_path}/#{I18n.locale.to_s.downcase}"
+          locale_file = "#{config.locales_path}/#{I18n.locale.to_s.downcase}"
 
           if File.exists? "#{locale_file}.js"
-            scripts << locale_file.slice(RightRails::Config.public_path.size + "/javascript/".size + 1, locale_file.size) 
+            scripts << locale_file.slice(config.public_path.size + "/javascripts/".size, locale_file.size)
           end
         end
       end
-      
+
+      # switching to CDN server if asked
+      if !config.dev_env? && config.use_cdn_in_production?
+        scripts.map! do |script|
+          header  = File.read("#{config.public_path}/javascripts/#{script}.js", 100)
+
+          if version = header[/\d+\.\d+\.\d+/]
+            script += "-#{version}"
+          end
+
+          if script.slice(0, 6) == 'right/' # plugins and modules
+            script.gsub! 'right/', (
+              header.include?('/ui/') ? 'ui/' : 'plugins/'
+            )
+            script.gsub! 'plugins/', '' if script.include?('/i18n/')
+          end
+
+          "#{config.cdn_url}/#{script}.js"
+        end
+      end
+
       scripts
     end
-    
+
     #
     # Returns the rightjs-modules registry for the context
     #
@@ -229,7 +250,7 @@ protected
         return @___rightjs_modules_registry ||= []
       end
     end
-    
+
     #
     # Collects the RightJS unit options out of the given list of options
     #
@@ -261,22 +282,22 @@ protected
 
       "{#{unit_options.sort.join(',')}}"
     end
-    
+
     #
     # Adds the unit options to the options list
     #
     def add_unit_options(options, unit)
       options_string = unit_options(options, unit)
-      
+
       if RightRails::Config.rightjs_version > 1
         options["data-#{unit}"] = options_string
       elsif options_string != '{}'
-        options["data-#{unit}-options"] = options_string 
+        options["data-#{unit}-options"] = options_string
       end
-      
+
       options
     end
-    
+
     #
     # Removes the unit option keys out of the given options
     #
@@ -284,12 +305,12 @@ protected
       unit_keys = get_keys_for(unit)
       options.reject{ |k, v| unit_keys.include?(k.to_s) }
     end
-    
+
     # returns a list of keys for the unit
     def get_keys_for(unit)
       const_get("#{unit.to_s.upcase}_OPTION_KEYS") || []
     end
-    
+
     #
     # Builds a RightJS based Xhr request call
     #
@@ -297,9 +318,9 @@ protected
       xhr = options[:submit] ?
         "new #{RightRails::Helpers.prefix}Xhr(" :
         "#{RightRails::Helpers.prefix}Xhr.load("
-      
+
       xhr << "'#{options[:url]}'"
-      
+
       # building the options
       xhr_options = { :onSuccess => '',  :onFailure => '', :onComplete => '' }
 
@@ -362,7 +383,7 @@ protected
 
       xhr
     end
-    
+
   end
-  
+
 end

data/lib/right_rails.rb

@@ -2,7 +2,7 @@
 # The RightRails module. Just a namespace
 #
 module RightRails
-  VERSION = '1.0.11'
+  VERSION = '1.1.0'
 
   autoload :Config,               'right_rails/config'
   autoload :JavaScriptGenerator,  'right_rails/java_script_generator'

data/spec/lib/right_rails/config_spec.rb

@@ -5,54 +5,62 @@ describe RightRails::Config do
     @config = RightRails::Config
     @config.reset!
   end
-  
+
   describe "by default" do
     it "should use the Rails.env by default" do
       Rails.should_receive(:env).and_return('production')
       @config.env.should == 'production'
     end
-    
+
     it "should use the Rails.public_path" do
       Rails.should_receive(:public_path).and_return("/rails/public")
       @config.public_path.should == "/rails/public"
     end
-    
+
     it "should return correct locales_path" do
       @config.locales_path.should == "#{@config.public_path}/#{@config::DEFAULT_LOCALES_LOCATION}"
     end
-    
+
     it "should be in the normal mode" do
       @config.safe_mode.should == false
     end
-    
+
     it "should be in RightJS 2 mode" do
       @config.rightjs_version.should == 2
     end
-    
+
     it "should require rails module" do
       @config.include_rails_module.should == true
     end
-    
+
     it "should swap builds and sources" do
       @config.swap_builds_and_sources.should == true
     end
-    
+
     it "should include scripts automatically" do
       @config.include_scripts_automatically.should == true
     end
-    
+
+    it "should not use CDN server in production" do
+      @config.use_cdn_in_production.should == false
+    end
+
+    it "should refer to the default RightJS CDN Server" do
+      @config.cdn_url.should == @config::DEFAULT_CDN_URL
+    end
+
     describe "with non-standard right.js" do
       before :each do
         rightjs_source_mock = %Q{
           RightJS={version: "1.5.6"};
           RightJS.safe = true;
         }
-        
+
         File.should_receive(:read).with(
           "#{@config.public_path}/#{@config::DEFAULT_RIGHTJS_LOCATION}"
         ).and_return(rightjs_source_mock)
       end
-      
+
       it "should be in safe-mode" do
         @config.safe_mode.should == true
       end
@@ -61,70 +69,80 @@ describe RightRails::Config do
         @config.rightjs_version.should == 1
       end
     end
-    
+
     describe "without Rails" do
-      before :each do 
+      before :each do
         Object.should_receive(:const_get).with(:Rails).and_return(nil)
       end
-      
+
       it "should fall in 'production' env" do
         @config.env.should == 'production'
       end
-      
+
       it "should use a different path when there is no Rails" do
         @config.public_path.should == "public"
       end
     end
   end
-  
+
   describe "with custom settings" do
     it "should be in a development environment when told" do
       @config.env = 'development'
       @config.env.should == 'development'
     end
-    
+
     it "should allow to change the public_path" do
       @config.public_path = 'some/place/'
       @config.public_path.should == 'some/place'
     end
-    
+
     it "should allow to change the locales location" do
       @config.locales_path = "boo/hoo"
       @config.locales_path.should == 'boo/hoo'
     end
-    
+
     it "should be in safe mode when said so" do
       @config.safe_mode = true
       @config.safe_mode.should == true
     end
-    
+
     it "should remain in RightJS 1 mode if said so" do
       @config.rightjs_version = 1
       @config.rightjs_version.should == 1
     end
-    
+
     it "should not include rails module if asked" do
       @config.include_rails_module = false
       @config.include_rails_module.should == false
     end
-    
+
     it "should not swap between builds and sources if asked" do
       @config.swap_builds_and_sources = false
       @config.swap_builds_and_sources.should == false
     end
-    
+
     it "should not include files automatically if asked" do
       @config.include_scripts_automatically = false
       @config.include_scripts_automatically.should == false
     end
+
+    it "should use CDN Server in production if asked" do
+      @config.use_cdn_in_production = true
+      @config.use_cdn_in_production.should == true
+    end
+
+    it "should allow to change the CDN Server url" do
+      @config.cdn_url = 'http://some.other.place'
+      @config.cdn_url.should == 'http://some.other.place'
+    end
   end
-  
+
   describe ".dev_env? method" do
     it "should return true in the 'development' environment" do
       @config.env = 'development'
       @config.dev_env?.should == true
     end
-    
+
     it "should return false in the 'production' environment" do
       @config.env = 'production'
       @config.dev_env?.should == false

data/spec/lib/right_rails/helpers_spec.rb

@@ -7,119 +7,198 @@ describe RightRails::Helpers do
   before :each do
     @config = RightRails::Config
     @config.reset!
-    
+
     @helper = RightRails::Helpers
     @context = {}
   end
-  
+
   def require_js_module(*list)
     @helper.require_js_module  @context, *list
   end
-  
+
   def required_js_files
     @helper.required_js_files @context
   end
-  
+
   def modules_registry
     @helper.send(:modules_registry_for, @context)
   end
-  
+
   describe ".prefix" do
     it "should be empty in normal mode" do
       @config.safe_mode = false
       @helper.prefix.should == ''
     end
-    
+
     it "should return 'RightJS.' in safe-mode" do
       @config.safe_mode = true
       @helper.prefix.should == 'RightJS.'
     end
   end
-  
+
   describe ".html_safe" do
     it "should always return normal strings" do
       @helper.html_safe('<b>boo!</b>').should == '<b>boo!</b>'
     end
   end
-  
+
   describe ".require_js_module" do
     it "should require files one by one" do
       require_js_module 'one'
       require_js_module :two
-      
+
       modules_registry.should == ['one', 'two']
     end
-    
+
     it "should skip duplicates" do
       require_js_module 'one'
       require_js_module :one
-      
+
       modules_registry.should == ['one']
     end
-    
+
     it "should accept several modules" do
       require_js_module 'one', 'two', 'two'
       modules_registry.should == ['one', 'two']
     end
   end
-  
+
   describe ".required_js_files" do
     before :each do
       @config.swap_builds_and_sources = false
     end
-    
+
     it "should include 'right' module first even when nothing set" do
       required_js_files.first.should == 'right'
     end
-    
+
     it "should include the 'right/rails' module when config says so" do
       @config.include_rails_module = true
       required_js_files[1].should == 'right/rails'
     end
-    
+
     it "should not include the 'right/rails' module if the config doesn't want it" do
       @config.include_rails_module = false
       required_js_files.should_not include('right/rails')
     end
-    
+
     it "should add the registered modules" do
       require_js_module 'one', 'two'
       required_js_files.should == ['right', 'right/rails', 'right/one', 'right/two']
     end
-    
+
     it "should swap to the source-files if config asks that and we are in the development-module" do
       @config.env = 'development'
       @config.swap_builds_and_sources = true
       required_js_files.should == ['right-src', 'right/rails-src']
     end
-    
+
     it "should not swap to the source files in non-development environments" do
       @config.env = 'production'
       @config.swap_builds_and_sources = true
       required_js_files.should == ['right', 'right/rails']
     end
-    
+
     it "should not include nothing but 'right' if config disabled auto-including" do
       @config.include_scripts_automatically = false
       require_js_module 'one', 'two'
       required_js_files.should == ['right']
     end
-    
+
     it "should try to include locales when available" do
       I18n.should_receive(:locale).and_return('boo')
       @config.should_receive(:public_path).and_return('/public')
       @config.should_receive(:locales_path).and_return('/public/javascripts/right/i18n')
       File.should_receive(:exists?).with('/public/javascripts/right/i18n/boo.js').and_return(true)
-      
+
       required_js_files.should == ['right', 'right/rails', 'right/i18n/boo']
     end
-    
+
     it "should not include locales if there are not files for them" do
       I18n.should_receive(:locale).and_return('boo')
       @config.should_receive(:locales_path).and_return('/public/javascripts/right/i18n')
       File.should_receive(:exists?).with('/public/javascripts/right/i18n/boo.js').and_return(false)
-      
+
       required_js_files.should == ['right', 'right/rails']
     end
+
+    describe "with CDN option" do
+      before :each do
+        @config.env = 'production'
+        @config.use_cdn_in_production = true
+        @scripts_path = 'rails-root/public/javascripts'
+      end
+
+      def stub_file(name, content='')
+        File.should_receive(:read).with("#{@scripts_path}/#{name}", 100).and_return(content)
+      end
+
+      it "should include RightJS core and plugins with CDN urls" do
+        stub_file('right.js')
+        stub_file('right/rails.js')
+        stub_file('right/one.js')
+        stub_file('right/two.js')
+
+        require_js_module 'one', 'two'
+        required_js_files.should == [
+          "#{@config::DEFAULT_CDN_URL}/right.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/rails.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/one.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/two.js"
+        ]
+      end
+
+      it "should include urls with versions when available" do
+        stub_file('right.js',       '/** some header v2.22.222')
+        stub_file('right/rails.js', '/** some header v3.33.333')
+        stub_file('right/one.js',   'no version in here')
+
+        require_js_module 'one'
+        required_js_files.should == [
+          "#{@config::DEFAULT_CDN_URL}/right-2.22.222.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/rails-3.33.333.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/one.js"
+        ]
+      end
+
+      it "should automatically distinct between plugins and UI modules" do
+        stub_file('right.js',        'version 2.22.222 something')
+        stub_file('right/rails.js',  'version 3.33.333 something')
+        stub_file('right/widget.js', 'v4.44.444 see http://rightjs.org/ui/widget')
+
+        require_js_module 'widget'
+        required_js_files.should == [
+          "#{@config::DEFAULT_CDN_URL}/right-2.22.222.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/rails-3.33.333.js",
+          "#{@config::DEFAULT_CDN_URL}/ui/widget-4.44.444.js"
+        ]
+      end
+
+      it "should correctly refer the i18n modules" do
+        I18n.should_receive(:locale).and_return('boo')
+        File.should_receive(:exists?).with("#{@scripts_path}/right/i18n/boo.js").and_return(true)
+
+        stub_file('right.js')
+        stub_file('right/rails.js')
+        stub_file('right/i18n/boo.js')
+
+        required_js_files.should == [
+          "#{@config::DEFAULT_CDN_URL}/right.js",
+          "#{@config::DEFAULT_CDN_URL}/plugins/rails.js",
+          "#{@config::DEFAULT_CDN_URL}/i18n/boo.js"
+        ]
+      end
+
+      it "should use different cdn-url when asked" do
+        stub_file('right.js')
+        stub_file('right/rails.js')
+
+        @config.cdn_url = 'http://some.url/dir'
+        required_js_files.should == [
+          'http://some.url/dir/right.js',
+          'http://some.url/dir/plugins/rails.js'
+        ]
+      end
+    end
   end
 end

data/spec/spec.opts

@@ -1,5 +1 @@
---colour
---diff
---format progress
---loadby mtime
---reverse
+--color

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'rspec'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
@@ -12,17 +12,17 @@ module Rails
     def env
       'production'
     end
-    
+
     def root
       'rails-root'
     end
-    
+
     def public_path
       "#{root}/public"
     end
   end
-  
+
   module VERSION
-    MAJOR = 2 
+    MAJOR = 2 unless defined?(MAJOR)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right-rails
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 12
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nikolay Nemshilov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +03:00
+date: 2011-03-01 00:00:00 +03:00
 default_executable: 
 dependencies: []