jquerypp-rails 1.0 → 1.0.1.1.rc1

data/Gemfile.lock

@@ -0,0 +1,14 @@
+PATH
+  remote: .
+  specs:
+    jquerypp-rails (1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jquerypp-rails!

data/README.markdown

@@ -0,0 +1,61 @@
+# jquerypp-rails
+
+jQuery++! For Rails! So great.
+
+jQuery++ is a collection of all the DOM utilities and special events jQuery forgot about. Come learn about jQuery++ and how it can be useful to your project.
+
+This gem provides:
+
+  * jQuery++
+
+## Installation
+
+Apps generated with Rails 3.1 or later include jquery-rails in the Gemfile by default. So just make a new app:
+
+```sh
+rails new myapp
+```
+
+If upgrading from an older version of rails, or for rails 3.0 apps,
+add the jquery-rails gem to your Gemfile.
+
+```ruby
+gem "jquerypp-rails"
+```
+
+And run `bundle install`. The rest of the installation depends on
+whether the asset pipeline is being used.
+
+### Rails 3.1 or greater (with asset pipeline *enabled*)
+
+The jquery and jquery-ujs files will be added to the asset pipeline and available for you to use. If they're not already in `app/assets/javascripts/application.js` by default, add these lines:
+
+```js
+//= require jquerypp
+```
+
+In order to use the themed parts of jQuery UI, you will also need to supply [your own theme CSS](http://jqueryui.com) (or use the jquery-ui-rails gem mentioned above).
+
+### Rails 3.0 (or greater with asset pipeline *disabled*)
+
+This gem adds a single generator: `jquery:install`. Running the generator will remove any Prototype JS files you may happen to have, and copy jQuery++ to the `public/javascripts` directory.
+
+This gem will also hook into the Rails configuration process, removing Prototype and adding jQuery to the javascript files included by the `javascript_include_tag(:defaults)` call. While this gem contains the minified and un-minified versions of jQuery and jQuery UI, only the minified versions are included in `:defaults`.
+
+To invoke the generator, run:
+
+```sh
+rails generate jquery:install
+```
+
+You're done!
+
+## Contributing
+
+Feel free to open an issue ticket if you find something that could be improved. A couple notes:
+
+## Acknowledgements
+
+Many thanks are due to all of [the jquery-rails contributors](https://github.com/rails/jquery-rails/graphs/contributors). Special thanks to [JangoSteve](http://github.com/JangoSteve) for tirelessly answering questions and accepting patches, and the [Rails Core Team](https://github.com/organizations/rails/teams/617) for making jquery-rails an official part of Rails 3.1.
+
+Copyright [André Arko](http://arko.net), released under the MIT License.

data/jquerypp-rails.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "jquerypp-rails"
 
+  s.add_dependency "jquery-rails",     "~> 2.0"
+
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path = 'lib'

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

@@ -1,6 +1,5 @@
 require 'rails'
 
-# Supply generator for Rails 3.0.x or if asset pipeline is not enabled
 if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
   module Jquerypp
     module Generators
@@ -23,7 +22,11 @@ if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
 
         def copy_jquerypp_lib
           say_status("copying", "jQuery++ lib (#{Jquerypp::Rails::JQUERY_VERSION})", :green)
+<<<<<<< Updated upstream
           copy_file "lib/.*", "public/javascripts/lib"
+=======
+          copy_entry "lib/", "public/javascripts/lib"
+>>>>>>> Stashed changes
         end
         
       end

data/lib/jquerypp/rails/version.rb

@@ -1,6 +1,6 @@
 module Jquerypp
   module Rails
-    VERSION = "1.0"
+    VERSION = "1.0.1.1.rc1"
     JQUERYPP_VERSION = "1.0b2"
   end
 end

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: jquerypp-rails
 version: !ruby/object:Gem::Version
-  version: '1.0'
-  prerelease: 
+  version: 1.0.1.1.rc1
+  prerelease: 8
 platform: ruby
 authors:
 - Jonathan Tapia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
-dependencies: []
+date: 2012-06-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: This gem provides jQuery++ for your Rails 3 application.
 email:
 - jonathan.tapia@crowdint.com
@@ -21,8 +37,9 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.markdown
 - Rakefile
 - jquerypp-rails.gemspec
 - lib/jquerypp-rails.rb

data/README.rdoc

@@ -1,24 +0,0 @@
-# jquerypp-rails
-
-jQuery++! For Rails! So great.
-
-This gem provides:
-
-  * jQuery++
-
-## Installation
-
-```ruby
-gem "jquerypp-rails"
-```
-
-And run `bundle install`. The rest of the installation depends on
-whether the asset pipeline is being used.
-
-### Rails 3.1 or greater (with asset pipeline *enabled*)
-
-The jquery and jquery-ujs files will be added to the asset pipeline and available for you to use. If they're not already in `app/assets/javascripts/application.js` by default, add these lines:
-
-```js
-//= require jquerypp
-```