recurring_select 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWJkOGI0NDIxNzQ1MzU4MTBmOGI1MGM4OTI3YThlZTQxNzQyNTIyMg==
+  data.tar.gz: !binary |-
+    NTM0NDE2OGRiZDYxOWFiZWM4ZjM4OTVhNDBiNGNmZGUzMGQ2NTNiYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGJhMzZhZTA3ZWFlNTg1OWQwNTVhMWE0MDIyYzJmYjQwM2NkNDllNDhlZGU0
+    NDA5ZjhjNzBhYWRhMGZhNzkwYmExMTkwYTgwMDIzOWM4ZjQwNjk5ZGJjMWE4
+    YzFkM2M4NWJhZjNmYWIxZTk2MDEzYjBhYjU3ZmUyM2QyMTY5M2U=
+  data.tar.gz: !binary |-
+    MmY2OGVhNzFlNWQ0NDgzOGZiYTAyN2NmNzk1OTA5NzkzOGQyY2Q5NDFmYzJl
+    OTkxZDhmYWU1MTJhOGM3OWQxMTk5ZWZiOTIwMzU2Njk4YzRmZTM1NjJiYTMz
+    Y2Q3ODRjNDc5ZDM2ZWMyYmNmNzkzYzA3ZDIwMGQwODYxODYyN2Y=

data/README.md

@@ -1,14 +1,14 @@
 RecurringSelect
 =============
 
-[![Build Status](https://travis-ci.org/GetJobber/recurring_select.png)](https://travis-ci.org/GetJobber/recurring_select)
+[![Build Status](https://travis-ci.org/GetJobber/recurring_select.png?branch=master)](https://travis-ci.org/GetJobber/recurring_select) [![Code Climate](https://codeclimate.com/github/GetJobber/recurring_select.png)](https://codeclimate.com/github/GetJobber/recurring_select)
 
 This is a gem to add a number of selectors and helpers for working with recurring schedules in a rails app.
 It uses the [IceCube](https://github.com/seejohnrun/ice_cube) recurring scheduling gem.
 
 Created by the [Jobber](http://getjobber.com) team for Jobber, the leading business management tool for field service companies.
 
-Check out the [live demo](http://recurring-select-demo.herokuapp.com/)
+Check out the [live demo](http://recurring-select-demo.herokuapp.com/) (code in [spec\dummy](https://github.com/GetJobber/recurring_select/tree/master/spec/dummy) folder)
 
 
 Usage
@@ -19,18 +19,18 @@ Basic selector:
 Load the gem:
 `gem 'recurring_select`
 
-Require assets  
-  Desktop view  
-    application.js  
-      `//= require recurring_select`  
-    application.css  
-      `//= require recurring_select`  
+Require assets
+  Desktop view
+    application.js
+      `//= require recurring_select`
+    application.css
+      `//= require recurring_select`
 
-  or jQueryMobile interface  
-    application.js  
-      `//= require jquery-mobile-rs`  
-    application.css  
-      `//= require jquery-mobile-rs`  
+  or jQueryMobile interface
+    application.js
+      `//= require jquery-mobile-rs`
+    application.css
+      `//= require jquery-mobile-rs`
 
 
 In the form view call the helper:
@@ -78,6 +78,13 @@ Start the dummy server for clicking around the interface:
 Use [Guard](https://github.com/guard/guard) and RSpec for all tests. I'd
 love to get jasmine running also, but haven't had time yet.
 
+Tests can be ran against different versions of Rails like so:
+
+```
+rake appraisal:install
+rake appraisal
+```
+
 Feel free to open issues or send pull requests.
 
 Licensing

data/Rakefile

@@ -1,17 +1,16 @@
 #!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+require 'rubygems'
+require 'bundler/setup'
+require 'appraisal'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
 
+require 'rubygems/package_task'
+Bundler::GemHelper.install_tasks
+
+require 'rdoc/task'
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'RecurringSelect'
@@ -20,20 +19,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test

data/app/assets/javascripts/recurring_select.js.coffee

@@ -49,10 +49,10 @@ methods =
 
 
   insert_option: (new_rule_str, new_rule_json) ->
-    seperator = @find("option:disabled")
-    if seperator.length == 0
-      seperator = @find("option")
-    seperator = seperator.last()
+    separator = @find("option:disabled")
+    if separator.length == 0
+      separator = @find("option")
+    separator = separator.last()
 
     new_option = $(document.createElement("option"))
     new_option.attr "data-custom", true
@@ -62,7 +62,7 @@ methods =
 
     new_option.text new_rule_str
     new_option.val new_rule_json
-    new_option.insertBefore seperator
+    new_option.insertBefore separator
 
   methods: ->
     methods

data/app/helpers/recurring_select_helper.rb

@@ -1,97 +1,17 @@
 require "ice_cube"
+require_relative "utilities/form_options_ext"
+require_relative "utilities/tag_ext"
 
 module RecurringSelectHelper
   module FormHelper
     def select_recurring(object, method, default_schedules = nil, options = {}, html_options = {})
-      InstanceTag.new(object, method, self, options.delete(:object)).to_recurring_select_tag(default_schedules, options, html_options)
-    end
-  end
-
-  module FormOptionsHelper
-    def recurring_options_for_select(currently_selected_rule = nil, default_schedules = nil, options = {})
-
-      options_array = []
-      blank_option_label = options[:blank_label] || "- not recurring -"
-      blank_option = [blank_option_label, "null"]
-      seperator = ["or", {:disabled => true}]
-
-      if default_schedules.blank?
-        if currently_selected_rule
-          options_array << blank_option if options[:allow_blank]
-          options_array << ice_cube_rule_to_option(currently_selected_rule)
-          options_array << seperator
-          options_array << ["Change schedule...", "custom"]
-        else
-          options_array << blank_option
-          options_array << ["Set schedule...", "custom"]
-        end
-      else
-        options_array << blank_option if options[:allow_blank]
-
-        options_array += default_schedules.collect{|dc|
-          ice_cube_rule_to_option(dc)
-        }
-
-        if currently_selected_rule and not current_rule_in_defaults?(currently_selected_rule, default_schedules)
-          options_array << ice_cube_rule_to_option(currently_selected_rule, true)
-          custom_label = ["New custom schedule...", "custom"]
-        else
-          custom_label = ["Custom schedule...", "custom"]
-        end
-
-        options_array << seperator
-        options_array << custom_label
-      end
-
-      options_for_select(options_array, currently_selected_rule.to_json)
-    end
-
-    private
-
-    def ice_cube_rule_to_option(supplied_rule, custom = false)
-      return supplied_rule unless RecurringSelect.is_valid_rule?(supplied_rule)
-
-      rule = RecurringSelect.dirty_hash_to_rule(supplied_rule)
-      ar = [rule.to_s, rule.to_hash.to_json]
-
-      if custom
-        ar[0] << "*"
-        ar << {"data-custom" => true}
+      if defined?(RecurringSelectHelper::RecurringSelectTag)
+        # === Rails 4
+        RecurringSelectTag.new(object, method, self, default_schedules, options, html_options).render
+      elsif defined?(RecurringSelectHelper::InstanceTag)
+        # === Rails 3
+        InstanceTag.new(object, method, self, options.delete(:object)).to_recurring_select_tag(default_schedules, options, html_options)
       end
-
-      ar
-    end
-
-    def current_rule_in_defaults?(currently_selected_rule, default_schedules)
-      default_schedules.any?{|option|
-        option == currently_selected_rule or
-          (option.is_a?(Array) and option[1] == currently_selected_rule)
-      }
-    end
-
-  end
-
-  class InstanceTag < ActionView::Helpers::InstanceTag
-    include FormOptionsHelper
-
-    def to_recurring_select_tag(default_schedules, options, html_options)
-      html_options = recurring_select_html_options(html_options)
-      add_default_name_and_id(html_options)
-      value = value(object)
-      content_tag("select",
-                  add_options(
-                    recurring_options_for_select(value, default_schedules, options),
-                    options, value
-      ), html_options
-                 )
-    end
-
-    private
-
-    def recurring_select_html_options(html_options)
-      html_options = html_options.stringify_keys
-      html_options["class"] = ((html_options["class"] || "").split() + ["recurring_select"]).join(" ")
-      html_options
     end
   end
 

data/app/helpers/utilities/form_options_ext.rb

@@ -0,0 +1,64 @@
+module RecurringSelectHelper
+  module FormOptionsHelper
+    def recurring_options_for_select(currently_selected_rule = nil, default_schedules = nil, options = {})
+
+      options_array = []
+      blank_option_label = options[:blank_label] || "- not recurring -"
+      blank_option = [blank_option_label, "null"]
+      separator = ["or", {:disabled => true}]
+
+      if default_schedules.blank?
+        if currently_selected_rule
+          options_array << blank_option if options[:allow_blank]
+          options_array << ice_cube_rule_to_option(currently_selected_rule)
+          options_array << separator
+          options_array << ["Change schedule...", "custom"]
+        else
+          options_array << blank_option
+          options_array << ["Set schedule...", "custom"]
+        end
+      else
+        options_array << blank_option if options[:allow_blank]
+
+        options_array += default_schedules.collect{|dc|
+          ice_cube_rule_to_option(dc)
+        }
+
+        if currently_selected_rule and not current_rule_in_defaults?(currently_selected_rule, default_schedules)
+          options_array << ice_cube_rule_to_option(currently_selected_rule, true)
+          custom_label = ["New custom schedule...", "custom"]
+        else
+          custom_label = ["Custom schedule...", "custom"]
+        end
+
+        options_array << separator
+        options_array << custom_label
+      end
+
+      options_for_select(options_array, currently_selected_rule.to_json)
+    end
+
+    private
+
+    def ice_cube_rule_to_option(supplied_rule, custom = false)
+      return supplied_rule unless RecurringSelect.is_valid_rule?(supplied_rule)
+
+      rule = RecurringSelect.dirty_hash_to_rule(supplied_rule)
+      ar = [rule.to_s, rule.to_hash.to_json]
+
+      if custom
+        ar[0] << "*"
+        ar << {"data-custom" => true}
+      end
+
+      ar
+    end
+
+    def current_rule_in_defaults?(currently_selected_rule, default_schedules)
+      default_schedules.any?{|option|
+        option == currently_selected_rule or
+          (option.is_a?(Array) and option[1] == currently_selected_rule)
+      }
+    end
+  end
+end

data/app/helpers/utilities/tag_ext.rb

@@ -0,0 +1,53 @@
+module RecurringSelectHelper
+  module SelectHTMLOptions
+    private
+
+    def recurring_select_html_options(html_options)
+      html_options = html_options.stringify_keys
+      html_options["class"] = (html_options["class"].to_s.split + ["recurring_select"]).join(" ")
+      html_options
+    end
+  end
+
+  if defined?(ActionView::Helpers::Tags::Base)
+    # === Rails 4
+    class RecurringSelectTag < ActionView::Helpers::Tags::Base
+      include RecurringSelectHelper::FormOptionsHelper
+      include SelectHTMLOptions
+
+      def initialize(object, method, template_object, default_schedules = nil, options = {}, html_options = {})
+        @default_schedules = default_schedules
+        @choices = @choices.to_a if @choices.is_a?(Range)
+        @method_name = method.to_s
+        @object_name = object.to_s
+        @html_options = recurring_select_html_options(html_options)
+        add_default_name_and_id(@html_options)
+
+        super(object, method, template_object, options)
+      end
+
+      def render
+        option_tags = add_options(recurring_options_for_select(value(object), @default_schedules, @options), @options, value(object))
+        select_content_tag(option_tags, @options, @html_options)
+      end
+    end
+
+  elsif defined?(ActionView::Helpers::InstanceTag)
+    # === Rails 3
+    class InstanceTag < ActionView::Helpers::InstanceTag
+      include RecurringSelectHelper::FormOptionsHelper
+      include SelectHTMLOptions
+
+      def to_recurring_select_tag(default_schedules, options, html_options)
+        html_options = recurring_select_html_options(html_options)
+        add_default_name_and_id(html_options)
+        value = value(object)
+        options = add_options(
+          recurring_options_for_select(value, default_schedules, options),
+          options, value
+        )
+        content_tag("select", options, html_options)
+      end
+    end
+  end
+end

data/lib/recurring_select/version.rb

@@ -1,3 +1,3 @@
 module RecurringSelect
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recurring_select
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Jobber
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -88,15 +78,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,11 +92,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 description: This gem provides a useful interface for creating recurring rules for
   the ice_cube gem.
 email:
@@ -127,6 +128,8 @@ files:
 - app/assets/stylesheets/utilities.scss
 - app/assets/templates/recurring_select/dialog_template.html
 - app/helpers/recurring_select_helper.rb
+- app/helpers/utilities/form_options_ext.rb
+- app/helpers/utilities/tag_ext.rb
 - app/middleware/recurring_select_middleware.rb
 - config/routes.rb
 - lib/recurring_select/engine.rb
@@ -137,27 +140,25 @@ files:
 - README.md
 homepage: http://github.com/getjobber/recurring_select
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A select helper which gives you magical powers to generate ice_cube rules.
 test_files: []
-has_rdoc: