ajaxlibs 0.1.4 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/lib/ajaxlibs/includes_helper.rb

@@ -6,7 +6,6 @@ module Ajaxlibs::IncludesHelper
   # == Options
   # * <tt>version</tt> : specify the version to use for each library
   # * <tt>local</tt> : if true, always serve file locally, if false, use Google CDN
-  # * <tt>remote</tt> : if false, always serve file locally, if true, use Google CDN
   #
   # == Exceptions
   # * <tt>Ajaxlibs::Exception::LibraryNotFound</tt> : raised if one or more of the given library is not available
@@ -50,8 +49,9 @@ module Ajaxlibs::IncludesHelper
   def javascript_include_library(library, options)
     library = library.to_sym
     version = options.delete(:version)
-    source  = (options[:local] === true or RAILS_ENV != 'production') ? :local : :remote
-    ajaxlib = Ajaxlibs::Library.by_name(library, :version => version, :source => source)
+    local   = options.delete(:local)
+    options[:source] ||= (local === true or (local.nil? and RAILS_ENV != 'production')) ? :local : :remote
+    ajaxlib = Ajaxlibs::Library.by_name(library, options.merge({:version => version}))
 
     @included_javascript_libraries ||= []
     
@@ -61,7 +61,7 @@ module Ajaxlibs::IncludesHelper
     result = []
     
     ajaxlib.requires.each do |required_library, required_version|
-      result << javascript_include_library(required_library, :version => required_version)
+      result << javascript_include_library(required_library, options.merge({:version => required_version}))
     end
     
     result << ajaxlib

data/spec/includes_helper_spec.rb

@@ -69,6 +69,15 @@ describe "Ajaxlibs::IncludesHelper" do
         end
       end # end of context "while specifying a specific version number"
     end # end of context "should call javascript_include_tag to include local javascript library file"
+    
+    example "should call javascript_include_tag with google cdn include path if specified source is remote" do
+      @fake_action_view.should_receive(:javascript_include_tag).
+                        with(Ajaxlibs::Library.by_name(:prototype).google_cdn_include_path).
+                        once
+
+      @fake_action_view.ajaxlibs_include :prototype, :local => false
+    end
+    
   end # end of context "in development environment"
   
   context "in production environment" do
@@ -108,7 +117,15 @@ describe "Ajaxlibs::IncludesHelper" do
                           once
                           
         @fake_action_view.ajaxlibs_include :prototype, :prototype
-      end      
+      end
+      
+      example "using a secured connection if secured was specified" do
+        @fake_action_view.should_receive(:javascript_include_tag).
+                          with(Ajaxlibs::Library.by_name(:prototype, :secure => true).google_cdn_include_path).
+                          once
+                          
+        @fake_action_view.ajaxlibs_include :prototype, :secure => true
+      end
       
       context "while specifying a specific version number" do
         example "once if one library was specified" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Fabien Jakimowicz