jquery_rails3 1.4.2.b2 → 1.4.3

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'jquery_rails3'
-  s.version = '1.4.2.b2'
+  s.version = '1.4.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Jquery generator for rails 3'

data/lib/generators/{jquery_install → jquery/install}/USAGE

@@ -2,8 +2,9 @@ Description:
     add Jquery files into a existing rails application
 
 Example:
-    rails generate jquery_install 
+    rails generate jquery:install 
 
     This will create:
-        public/javascripts/jquery-X.X.X.js
+        public/javascripts/jquery.js
         public/javascripts/rails.js
+        public/javascripts/jquery-ui.js (optional)

data/lib/generators/jquery/install/install_generator.rb

@@ -0,0 +1,40 @@
+module Jquery
+  class InstallGenerator < Rails::Generators::Base
+    PATH = source_root File.expand_path('../templates', __FILE__)
+    # Options
+    class_option :ui, :type => :boolean, :defalut => false, :desc => "Add jquery-ui components to application."
+    class_option :ui_version, :type => :string, :defalut => "1.8.5", :desc => "Version of jquery-ui components to application."
+    class_option :version, :type => :string, :defalut => "1.4.3", :desc => "Version of jquery used in application."
+    
+    
+    JS_DEST = "public/javascripts"
+    CSS_DEST = "public/stylesheets"
+    
+    def remove_prototype
+      old_scripts = %w(controls dragdrop effects prototype)
+      old_scripts.each do |script|
+        path = "#{JS_DEST}/#{script}.js"
+        remove_file path if File.exist? path 
+      end
+    end
+  
+    def install_jquery
+      version = (options[:version].nil?)? "1.4.3" :  options[:version]
+      ui_version = (options[:ui_version].nil?)? "1.8.5" :  options[:ui_version]
+      url = "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
+      #puts url
+      get url, "#{JS_DEST}/jquery.js"
+      
+      get "http://github.com/rails/jquery-ujs/raw/master/src/rails.js", "#{JS_DEST}/rails.js"
+      url = "http://ajax.googleapis.com/ajax/libs/jqueryui/#{ui_version}/jquery-ui.min.js"
+      #puts url
+      if options.ui?      
+        get url, "#{JS_DEST}/jquery-ui.js"  
+      end
+      
+    end
+  
+    
+  
+  end
+end

data/lib/jquery_rails3.rb

@@ -0,0 +1,11 @@
+module Jquery  
+    class Railtie < Rails::Railtie
+      config.before_initialize do
+        if Rails.root.join("public/javascripts/jquery-ui.js").exist?
+          config.action_view.javascript_expansions[:defaults] = %w(jquery jquery-ui rails)
+        else
+          config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+        end
+      end
+    end  
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jquery_rails3
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  - b2
-  version: 1.4.2.b2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Allan Davis
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -32,181 +31,9 @@ files:
 - LICENSE
 - README
 - Rakefile
-- lib/generators/jquery_install/USAGE
-- lib/generators/jquery_install/jquery_install_generator.rb
-- lib/generators/jquery_install/templates/ui/jquery-ui-1.8.4.custom.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.drop.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.mouse.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.sortable.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.progressbar.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.resizable.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.transfer.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.droppable.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.slider.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.dialog.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.widget.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.shake.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-de.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ko.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-pl.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-th.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-id.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-lt.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ru.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-is.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ca.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-et.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-cs.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-fi.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-bg.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-sv.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-vi.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-es.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-el.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-pt-BR.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-uk.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-sq.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-no.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-fr.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-nl.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-sk.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-az.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ja.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ar.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-it.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-af.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-hy.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-zh-HK.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-zh-TW.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-he.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-eu.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ta.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-zh-CN.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-bs.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-fr-CH.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-hr.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-en-GB.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-tr.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-sr-SR.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-fa.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-fo.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-sl.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-hu.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-da.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ms.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-lv.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-eo.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-sr.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery.ui.datepicker-ro.js
-- lib/generators/jquery_install/templates/ui/i18n/jquery-ui-i18n.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.core.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.autocomplete.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.tabs.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.datepicker.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.fold.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.draggable.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.position.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.selectable.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.accordion.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.clip.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.core.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.blind.js
-- lib/generators/jquery_install/templates/ui/jquery.ui.button.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.bounce.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.highlight.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.scale.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.pulsate.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.slide.js
-- lib/generators/jquery_install/templates/ui/jquery.effects.explode.js
-- lib/generators/jquery_install/templates/jquery-1.4.2.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.pulsate.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.tabs.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.slide.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.droppable.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.widget.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.position.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.core.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.resizable.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.bounce.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.fold.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.autocomplete.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.button.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.shake.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.selectable.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.transfer.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.dialog.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.draggable.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.drop.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.clip.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.explode.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.mouse.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.blind.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.sortable.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.highlight.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.progressbar.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.core.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.datepicker.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.accordion.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.effects.scale.min.js
-- lib/generators/jquery_install/templates/ui-min/jquery.ui.slider.min.js
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.slider.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.tabs.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.all.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.progressbar.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.dialog.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.autocomplete.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.selectable.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.button.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.theme.css
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-icons_454545_256x240.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-icons_222222_256x240.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-icons_cd0a0a_256x240.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-icons_2e83ff_256x240.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_glass_75_dadada_1x400.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-icons_888888_256x240.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
-- lib/generators/jquery_install/templates/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.resizable.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.base.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.accordion.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.core.css
-- lib/generators/jquery_install/templates/themes/base/jquery.ui.datepicker.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery-ui-1.8.4.custom.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.slider.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.tabs.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.all.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.progressbar.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.dialog.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.autocomplete.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.selectable.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.button.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.theme.css
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-icons_454545_256x240.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-icons_222222_256x240.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-icons_cd0a0a_256x240.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-icons_2e83ff_256x240.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-icons_888888_256x240.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- lib/generators/jquery_install/templates/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.resizable.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.base.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.accordion.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.core.css
-- lib/generators/jquery_install/templates/themes/smoothness/jquery.ui.datepicker.css
-- lib/generators/jquery_install/templates/jquery-1.4.2.js
-- lib/generators/jquery_install/templates/layout.html.erb
-- lib/generators/jquery_install/templates/rails.js
+- lib/jquery_rails3.rb
+- lib/generators/jquery/install/install_generator.rb
+- lib/generators/jquery/install/USAGE
 has_rdoc: true
 homepage: 
 licenses: []
@@ -217,6 +44,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -224,18 +52,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Jquery generator for rails 3

data/lib/generators/jquery_install/jquery_install_generator.rb

@@ -1,102 +0,0 @@
-class JqueryInstallGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-  # Options
-  class_option :ui, :type => :boolean, :defalut => false, :desc => "Add jquery-ui components to application."
-  class_option :effect, :type => :boolean, :default =>false, :desc =>"Add jquery-ui effect commponents to application"
-  class_option :min, :type => :boolean, :default => false, :desc => "Use min versions of jquery and ui components."
-  class_option :components, :type => :array, :default => [], :desc => "List the Jquery-ui Components to include. Leaving blank will include all components."
-  class_option :effects, :type => :array, :default =>[], :desc => "List of the Jquery-ui Effects to include. Leaving blank will include all effects."
-  class_option :theme, :type=>:string, :default => "base", :desc => "Name of the theme to apply to the components. Options are \"base\" or \"smoothness\"."
-
-  JQUERY_VERSION = "1.4.2"
-  JS_DEST = "public/javascripts"
-  CSS_DEST = "public/stylesheets"
-  EFFECTS =%w(blind bounce clip core drop explode fold highlight pulsate scale shake slide transfer)
-  COMPONENTS=%w(core accordion autocomplete button datepicker dialog draggable droppable mouse position progressbar resizable selectable slider sortable tabs widget custom)
-
-
-  def install_jquery
-    @javascripts = []
-    @stylesheets = []
-
-    copy_file "jquery-#{jquery_version}.js", "#{JS_DEST}/jquery-#{jquery_version}.js"
-    @javascripts <<  "\"jquery-#{jquery_version}\""
-    copy_file "rails.js", "#{JS_DEST}/rails.js"
-    @javascripts <<  "\"rails\""
-    if options.ui?      
-      copy_components
-      stylesheet
-    end
-    if options.effect?
-      copy_effects
-    end
-    #insted of rewriteing layout
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-    template "layout.html.erb", "app/views/layouts/application.html.erb"
-  end
-
-  private
-
-  def jquery_version
-    version = JQUERY_VERSION
-    version = version + ".min" if options.min?
-    return version
-  end
-
-  def javascripts
-    @javascripts.join(", ")
-  end
-
-  def stylesheets
-    @stylesheets.join(", ")
-  end
-
-  def copy_effects
-    effects = []
-    if options.effects.empty?
-      effects = EFFECTS
-    else
-      effects = options.effects
-    end
-    unless effects.include? "core"
-      effects << "core"
-    end
-    effects.each { |effect| copy_component("effect",effect)if EFFECTS.include?(effect) }
-  end
-
-
-  def copy_components
-    components = []
-    if options.components.empty?
-      components = COMPONENTS
-    else
-      components = options.components
-    end
-    unless components.include? "core"
-      components << "core"
-    end
-    components.each { |component| copy_component("ui",component) if COMPONENTS.include?(component)}
-
-  end
-  # Copy one of the components to
-  def copy_component(state, name)
-    name = "jquery.#{state}.#{name.downcase}"
-    name = name + ".min" if options.min?
-    @javascripts << "\"#{name}\""
-    folder=""
-    if options.min?
-      folder = "ui-min"
-    else
-      folder = "ui"
-    end
-    copy_file "#{folder}/#{name}.js", "#{JS_DEST}/#{name}.js"
-  end
-
-  def stylesheet
-    name = "jquery.ui.all"
-    @stylesheets << name
-    copy_file "themes/#{options.theme}/#{name}.css", "#{CSS_DEST}/#{name}.css"
-  end
-
-end