Merge remote-tracking branch 'origin/master'

Author: benzittlau

.gitignore

@@ -1,5 +1,5 @@
 *.gem
-Gemfile*.lock
+spec/gemfiles/Gemfile*.lock
 
 .bundle/
 tmp/*
@@ -14,4 +14,4 @@ spec/dummy/.sass-cache
 .DS_Store
 *.sublime-workspace
 
-.idea
+.idea

Gemfile

@@ -1,10 +1,10 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
-gem "pg", platform: :ruby
-gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
+gem 'pg', platform: :ruby
+gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
 
-gem "jquery-rails"
+gem 'jquery-rails'
 
-gem "rails", "4.0.2"
-gem "sass-rails"
+gem 'rails', '4.0.10'
+gem 'sass-rails', '~> 4.0.3'

Gemfile.lock

@@ -0,0 +1,132 @@
+PATH
+  remote: .
+  specs:
+    recurring_select (1.2.4)
+      coffee-rails (>= 3.1)
+      ice_cube (>= 0.11)
+      jquery-rails (>= 3.0)
+      rails (>= 3.2)
+      sass-rails (>= 3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.10)
+      actionpack (= 4.0.10)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.10)
+      activesupport (= 4.0.10)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.10)
+      activesupport (= 4.0.10)
+      builder (~> 3.1.0)
+    activerecord (4.0.10)
+      activemodel (= 4.0.10)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.10)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.10)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    builder (3.1.4)
+    coffee-rails (4.1.0)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    execjs (2.2.2)
+    hike (1.2.3)
+    i18n (0.6.11)
+    ice_cube (0.12.1)
+    jquery-rails (3.1.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.2)
+    minitest (4.7.5)
+    multi_json (1.10.1)
+    pg (0.17.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.10)
+      actionmailer (= 4.0.10)
+      actionpack (= 4.0.10)
+      activerecord (= 4.0.10)
+      activesupport (= 4.0.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.10)
+      sprockets-rails (~> 2.0)
+    railties (4.0.10)
+      actionpack (= 4.0.10)
+      activesupport (= 4.0.10)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    sass (3.2.19)
+    sass-rails (4.0.3)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
+    sprockets (2.11.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (0.3.41)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcpostgresql-adapter
+  bundler (>= 1.3.5)
+  jquery-rails
+  pg
+  rails (= 4.0.10)
+  rake (>= 0.9.6)
+  recurring_select!
+  rspec (>= 2.14)
+  rspec-rails (>= 2.14)
+  sass-rails (~> 4.0.3)

app/assets/stylesheets/jquery-mobile-rs.css.scss.erb renamed to app/assets/stylesheets/jquery-mobile-rs.css.scss

@@ -33,7 +33,7 @@ select {
               display:inline-block; min-width:200px; margin-left:-125px; overflow:hidden; position:relative;
     .rs_dialog_content { padding:10px;
       h1 { font-size:16px; padding:0px; margin:0 0 10px 0;
-        a {float:right; display:inline-block; height:16px; width:16px; background-image:url(<%=asset_path "recurring_select/cancel.png"%>); background-position:center; background-repeat:no-repeat;}
+        a {float:right; display:inline-block; height:16px; width:16px; background-image:image-url("recurring_select/cancel.png"); background-position:center; background-repeat:no-repeat;}
       }
 
       p { padding:5px 0; margin:0; line-height: 14px;
@@ -80,7 +80,7 @@ select {
       .rs_summary { padding:0px; margin-top:15px; border-top:1px solid #ccc;
         span {font-weight:bold; border-top:1px solid #fff; display:block; padding:10px 0 5px 0;}
         &.fetching {color:#999;
-          span {background-image:url(<%=asset_path "recurring_select/throbber_13x13.gif" %>); background-position:center; background-repeat:no-repeat; display:inline-block; height:13px; width:13px; margin-top:-4px; padding-right:5px;}
+          span {background-image:image-url("recurring_select/throbber_13x13.gif"); background-position:center; background-repeat:no-repeat; display:inline-block; height:13px; width:13px; margin-top:-4px; padding-right:5px;}
         }
         label {font-weight:normal;}
       }

app/assets/stylesheets/recurring_select.css.scss.erb renamed to app/assets/stylesheets/recurring_select.css.scss

@@ -4,7 +4,6 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require recurring_select
- *= require_tree .
 */