jquery_tag 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,42 +1,27 @@
 PATH
   remote: .
   specs:
-    jquery_tag (0.0.1)
+    jquery_tag (0.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.0)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.4.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    tzinfo (0.3.23)
+    diff-lcs (1.1.2)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack
   bundler (>= 1.0.0)
   jquery_tag!
+  rspec (>= 2.0.0)

data/Rakefile

@@ -1,12 +1,10 @@
 require 'bundler'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
 
-desc 'Run tests.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+desc "Run specs"
+RSpec::Core::RakeTask.new do |task|
+  task.rspec_opts = ["-c"]
 end
 
-task :default => :test
+task :default => :spec

data/jquery_tag.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "actionpack"
+  s.add_development_dependency "rspec", ">= 2.0.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/jquery_tag/version.rb

@@ -1,5 +1,5 @@
 module Jquery
   module Tag
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/jquery_tag/view_helpers.rb

@@ -1,17 +1,27 @@
 module Jquery
   module Tag
     module ViewHelpers
+      def jquery_tag(*args)
+        
+        options = args.first.is_a?(Hash) ? args.pop : {}
 
-      def jquery_tag(options = {})
-        arguments = options.delete(:args) || []
-        path = options.delete(:file) || "jquery.js"
-        version = options.delete(:version) || "1.4.2"
+        args.unshift(jquery_ui_file(options[:ui])) if options[:ui]
+        args.unshift(jquery_file(options[:file], options[:version]))
 
-        path = "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js" if Rails.env.production?
-
-        arguments.unshift(path)
-       javascript_include_tag arguments
-        end
+        javascript_include_tag args
+     end
+     
+     private
+     def jquery_file(path, version)
+       path ||= 'jquery.js'
+       version ||= '1.4.3'
+       Rails.env.production? ? "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js" : path
+     end
+     
+     def jquery_ui_file(path)
+       path = path.is_a?(String) ? path : "jquery-ui.js"
+       Rails.env.production? ? 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js' : path       
+     end
     end
   end
 end

data/spec/jquery_tag_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Jquery::Tag::ViewHelpers do
+  include Jquery::Tag::ViewHelpers
+  
+  context "development" do
+    before { development! }
+
+    it "renders a local jquery.js file" do
+      expects_include_with ['jquery.js']
+      jquery_tag
+    end
+    
+    it "delegates any other arguments" do
+      expects_include_with ['jquery.js', 'application.js']
+      jquery_tag 'application.js'
+    end
+    
+    it "accepts a different path for the local jquery file" do
+      expects_include_with ['frameworks/jquery.min.js']
+      jquery_tag :file => "frameworks/jquery.min.js"
+    end
+    
+    it "renders the jquery-ui.js file" do
+      expects_include_with ['jquery.js', 'jquery-ui.js']
+      jquery_tag :ui => true
+    end
+
+    it "receives a path to the jquery-ui.js file" do
+      expects_include_with ['jquery.js', 'frameworks/jquery-ui.js']
+      jquery_tag :ui => 'frameworks/jquery-ui.js'
+    end
+  end
+  
+  context "production" do
+    before { production! }
+    
+    it "uses the google CDN path" do
+      expects_include_with ['http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js']
+      jquery_tag
+    end
+    
+    it "accepts a different version for the jquery script" do
+      expects_include_with ['http://ajax.googleapis.com/ajax/libs/jquery/1.0.0/jquery.min.js']
+      jquery_tag :version => '1.0.0'
+    end
+    
+    it "uses the google CDN path for the jquery ui script" do
+      expects_include_with ['http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js']
+      jquery_tag :ui => true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'jquery_tag/view_helpers'
+
+module Rails
+end
+
+module SpecHelper
+  def production!
+    Rails.stub_chain(:env, :production?) { true }
+  end
+  
+  def development!
+    Rails.stub_chain(:env, :production?) { false }
+  end
+  
+  def expects_include_with(*args)
+    should_receive(:javascript_include_tag).with(*args)
+  end
+end
+
+RSpec.configure do |config|
+  config.include SpecHelper
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jquery_tag
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Lucas Mazza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -03:00
+date: 2010-10-18 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,17 +35,19 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 description: Helper gem that toggles between local jquery script and Google CDN version based on your app environment
@@ -67,9 +69,8 @@ files:
 - lib/jquery_tag.rb
 - lib/jquery_tag/version.rb
 - lib/jquery_tag/view_helpers.rb
-- test/jquery_tag_test.rb
-- test/support.rb
-- test/test_helper.rb
+- spec/jquery_tag_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/jquery_tag
 licenses: []

data/test/jquery_tag_test.rb

@@ -1,31 +0,0 @@
-require 'test_helper'
-class HelperTest < ActionView::TestCase
-  tests Jquery::Tag::ViewHelpers
-
-  test "should render a script tag for a local jquery.js file" do
-    environment :development do
-      assert_match /\/javascripts\/jquery.js/, jquery_tag
-    end
-  end
-
-  test "should accept a different path for the local script file" do
-    environment :development do
-      assert_match /\/javascripts\/frameworks\/jquery.min.js/, jquery_tag(:file => "frameworks/jquery.min.js")
-    end
-  end
-
-  test "should use the Google CDN url when in production environment" do
-    environment :production do
-      assert_match /ajax.googleapis.com\/\S*\/1.4.2\/jquery.min.js/, jquery_tag
-    end
-  end
-
-  test "should accept another jquery version for the Google CDN" do
-    environment :production do
-      assert_match /ajax.googleapis.com\/\S*\/1.4.1\/jquery.min.js/, jquery_tag(:version => "1.4.1")
-    end
-  end
-
-end
-
-

data/test/support.rb

@@ -1,25 +0,0 @@
-Jquery::Routes = ActionDispatch::Routing::RouteSet.new
-Jquery::Routes.draw do
-  match ':controller(/:action(/:id(.:format)))'
-end
-
-class ApplicationController < ActionController::Base; end
-ActionController::Base.send :include, Jquery::Routes.url_helpers
-
-# Here we have some lame workarounds for testing.
-ENV["RAILS_ASSET_ID"] = ""
-
-module Rails
-  def self.env
-    @_env ||= ActiveSupport::StringInquirer.new("development")
-  end
-
-  def self.env=(env)
-    @_env = env
-  end
-end
-
-def environment(env)
-  Rails.env = ActiveSupport::StringInquirer.new(env.to_s)
-  yield
-end

data/test/test_helper.rb

@@ -1,10 +0,0 @@
-require "test/unit"
-require "rubygems"
-require "bundler/setup"
-
-require "action_controller"
-require "action_view"
-require "support"
-
-#$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'jquery_tag'