ajaxlibs 0.1.7 → 0.1.8

data/README.rdoc

@@ -17,6 +17,17 @@ In development environment, it provides local javascript files for the developme
 
 You can specify a specific version of each library to use, or the latest available.
 
+== Supported Libraries
+
+* dojo
+* ext-core (use <tt>:extcore</tt> to load it)
+* jquery
+* jquery-ui
+* jrails
+* mootools
+* prototype
+* scriptaculous
+
 == Examples
 
 === simple library load, under the development environment
@@ -25,11 +36,11 @@ You can specify a specific version of each library to use, or the latest availab
 
 will produce, under the development environment :
 
- <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.js?1267013480" type="text/javascript"></script>
+ <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.min.js?1267013480" type="text/javascript"></script>
 
 and in production :
 
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery,min.js" type="text/javascript"></script>
 
 === multiple libraries load
 
@@ -37,13 +48,13 @@ and in production :
 
 in development environment :
 
- <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.js?1267013480" type="text/javascript"></script> 
- <script src="/javascripts/ajaxlibs/jqueryui/1.7.2/jqueryui.js?1267013480" type="text/javascript"></script>
+ <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.min.js?1267013480" type="text/javascript"></script> 
+ <script src="/javascripts/ajaxlibs/jqueryui/1.7.2/jqueryui.min.js?1267013480" type="text/javascript"></script>
 
 this time in production :
 
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript"></script>
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.js" type="text/javascript"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js" type="text/javascript"></script>
 
 === forcing a version
 
@@ -59,7 +70,17 @@ will produce :
 
 used in production, will produce :
 
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
+
+=== minified / non-minified
+
+By default, each javascript are the minified version. But you can ask for a plain version :
+
+ <%= ajaxlibs_include :jquery, :minified => false %>
+
+will produce
+
+ <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.js?1267013480" type="text/javascript"></script>
 
 === automatic dependencies
 
@@ -91,7 +112,6 @@ Finally, include some javascript libraries to your views or layouts :
 == TODO
 
 * support more javascript libraries : available though Google CDN (mootools, ...), not available through Google CDN (jrails, ...), available only from google (google maps, ...).
-* support plain/minified versions.
 * provide a rake task to copy only required javascript libraries.
 * automatic support for jrails.
 

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/ajaxlibs.rb

@@ -3,6 +3,7 @@ require 'ajaxlibs/exceptions'
 require 'ajaxlibs/versions_tools'
 require 'ajaxlibs/library'
 require 'ajaxlibs/libraries/dojo'
+require 'ajaxlibs/libraries/ext_core'
 require 'ajaxlibs/libraries/jquery'
 require 'ajaxlibs/libraries/jqueryui'
 require 'ajaxlibs/libraries/jrails'

data/lib/ajaxlibs/includes_helper.rb

@@ -6,6 +6,8 @@ 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>:secure</tt> : specify if the generated link should be secured (https) or not. Default is <tt>false</tt>.
+  # * <tt>:minified</tt> : <tt>true</tt> if you want a minified version of the javascript library, <tt>false</tt> otherwise. Default is <tt>true</tt>.
   #
   # == Exceptions
   # * <tt>Ajaxlibs::Exception::LibraryNotFound</tt> : raised if one or more of the given library is not available
@@ -14,24 +16,28 @@ module Ajaxlibs::IncludesHelper
   # == Examples
   # * Simple library load, under the development environment
   #  ajaxlibs_include :jquery
-  #    <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.js?1267013480" type="text/javascript"></script>
+  #    <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.min.js?1267013480" type="text/javascript"></script>
   #
   #  ajaxlibs_include :jquery, :jqueryui
-  #    <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.js?1267013480" type="text/javascript"></script> 
-  #    <script src="/javascripts/ajaxlibs/jqueryui/1.7.2/jqueryui.js?1267013480" type="text/javascript"></script>
+  #    <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.min.js?1267013480" type="text/javascript"></script> 
+  #    <script src="/javascripts/ajaxlibs/jqueryui/1.7.2/jquery-ui.min.js?1267013480" type="text/javascript"></script>
   #
   # * Same examples as above, this time in production
   #  ajaxlibs_include :jquery
-  #    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript"></script>
+  #    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
   #
   #  ajaxlibs_include :jquery, :jqueryui
-  #    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript"></script>
-  #    <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.js" type="text/javascript"></script>
+  #    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
+  #    <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js" type="text/javascript"></script>
   #
   # * Specifying version
   #  ajaxlibs_include :prototype, :version => '1.6.0.3'
   #    <script src="/javascripts/ajaxlibs/prototype/1.6.0.3/prototype.js?1267013480" type="text/javascript"></script>
   #
+  # * Ask for a non-minified version
+  #  ajaxlibs_include :jquery, :minified => false
+  #    <script src="/javascripts/ajaxlibs/jquery/1.4.2/jquery.js?1267013480" type="text/javascript"></script>
+  #
   # * Automatic dependencies
   #  ajaxlibs_include :scriptaculous
   #    <script src="/javascripts/ajaxlibs/prototype/1.6.1.0/prototype.js?1267013480" type="text/javascript"></script> 

data/lib/ajaxlibs/libraries/dojo.rb

@@ -9,6 +9,6 @@ class Ajaxlibs::Library::Dojo < Ajaxlibs::Library
               "1.4.1"]
   
   def file_name #:nodoc:
-    "dojo.xd.js.uncompressed"
+    @minified ? 'dojo.xd' : 'dojo.xd.js.uncompressed'
   end
 end

data/lib/ajaxlibs/libraries/ext_core.rb

@@ -7,6 +7,6 @@ class Ajaxlibs::Library::ExtCore < Ajaxlibs::Library
   end
   
   def file_name #:nodoc:
-    "ext-core-debug"
+    @minified ? 'ext-core' : 'ext-core-debug'
   end
 end

data/lib/ajaxlibs/libraries/jquery.rb

@@ -7,4 +7,8 @@ class Ajaxlibs::Library::Jquery < Ajaxlibs::Library
               '1.4.0',
               '1.4.1',
               '1.4.2']
+  
+  def file_name #:nodoc:
+    @minified ? 'jquery.min' : 'jquery'
+  end
 end

data/lib/ajaxlibs/libraries/jqueryui.rb

@@ -10,6 +10,6 @@ class Ajaxlibs::Library::Jqueryui < Ajaxlibs::Library
   Requirements = {:all => {:jquery => nil}}
 
   def file_name #:nodoc:
-    "jquery-ui"
+    @minified ? 'jquery-ui.min' : 'jquery-ui'
   end
 end

data/lib/ajaxlibs/libraries/jrails.rb

@@ -1,5 +1,6 @@
 # JRails library, local support only.
 # This is only the javascript support of JRails, you must install JRails plugin to have a full support.
+# TODO : require jrails gem (or fail) if included
 class Ajaxlibs::Library::Jrails < Ajaxlibs::Library
   Versions = ['0.5.0']
 
@@ -8,4 +9,12 @@ class Ajaxlibs::Library::Jrails < Ajaxlibs::Library
   def local_only?
     true
   end
+  
+  def initialize(options = {})
+    require 'rubygems'
+    require 'jrails' # Check if we have jrails support before trying to load it
+    super
+  rescue LoadError
+    raise "jrails gem is missing, you must install it."
+  end
 end

data/lib/ajaxlibs/libraries/mootools.rb

@@ -5,4 +5,8 @@ class Ajaxlibs::Library::Mootools < Ajaxlibs::Library
               "1.2.2",
               "1.2.3",
               "1.2.4"]
+  
+  def file_name #:nodoc:
+    @minified ? 'mootools-yui-compressed' : 'mootools'
+  end
 end

data/lib/ajaxlibs/library.rb

@@ -40,9 +40,11 @@ class Ajaxlibs::Library
   # * <tt>:version</tt> : specify a version (ex: "1.8.1").
   # * <tt>:source</tt> : force the source to use, default to <tt>:local</tt>.
   # * <tt>:secure</tt> : specify if the generated link should be secured (https) or not. Default is <tt>false</tt>.
+  # * <tt>:minified</tt> : <tt>true</tt> if you want a minified version of the javascript library, <tt>false</tt> otherwise. Default is <tt>true</tt>.
   def initialize(options = {})
     @version  = check_version_or_latest_version(options[:version])
     @source   = options[:source] || :local
+    @minified = options[:minified].nil? ? true : options[:minified]
     @secure   = options[:secure] || false
   end
   

data/spec/includes_helper_spec.rb

@@ -17,6 +17,15 @@ describe "Ajaxlibs::IncludesHelper" do
       Object.send(:remove_const, 'RAILS_ENV') if Object.const_defined?('RAILS_ENV')
       RAILS_ENV = 'development'
     end
+    
+    it "should follow options to Ajaxlibs::Library class" do
+      Ajaxlibs::Library.should_receive(:by_name).
+                        with(:prototype, hash_including(:minified => false, :secure => true)).
+                        once.
+                        and_return(Ajaxlibs::Library::Prototype.new)
+      
+      @fake_action_view.ajaxlibs_include :prototype, :minified => false, :secure => true
+    end
 
     context "should call javascript_include_tag to include local javascript library file" do
       example "once if only one library was specified" do
@@ -68,6 +77,25 @@ describe "Ajaxlibs::IncludesHelper" do
           @fake_action_view.ajaxlibs_include :prototype, :version => '1.6.0.3'
         end
       end # end of context "while specifying a specific version number"
+      
+      context "while asking for a uncompressed version" do
+        example "with a filename to the uncompressed version" do
+          @fake_action_view.should_receive(:javascript_include_tag).
+                            with(Ajaxlibs::Library.by_name(:jquery, :minified => false).local_path).
+                            once
+          
+          @fake_action_view.ajaxlibs_include :jquery, :minified => false
+        end
+      end # end of context "while asking for a uncompressed version"
+      
+      example "with a minified version by default" do
+        @fake_action_view.should_receive(:javascript_include_tag).
+                          with(Ajaxlibs::Library.by_name(:jquery, :minified => true).local_path).
+                          once
+        
+        @fake_action_view.ajaxlibs_include :jquery
+      end
+      
     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
@@ -147,6 +175,25 @@ describe "Ajaxlibs::IncludesHelper" do
           @fake_action_view.ajaxlibs_include :prototype, :version => '1.6.0.3'
         end
       end # end of context "while specifying a specific version number"
+      
+      context "while asking for a uncompressed version" do
+        example "with a filename to the uncompressed version" do
+          @fake_action_view.should_receive(:javascript_include_tag).
+                            with(Ajaxlibs::Library.by_name(:jquery, :minified => false).google_cdn_include_path).
+                            once
+          
+          @fake_action_view.ajaxlibs_include :jquery, :minified => false
+        end
+      end # end of context "while asking for a uncompressed version"
+      
+      example "with a minified version by default" do
+        @fake_action_view.should_receive(:javascript_include_tag).
+                          with(Ajaxlibs::Library.by_name(:jquery, :minified => true).google_cdn_include_path).
+                          once
+        
+        @fake_action_view.ajaxlibs_include :jquery
+      end
+      
     end # end of context "should call javascript_include_tag with google cdn include path"
   end # end of context "in production environment"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Fabien Jakimowicz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency