combined_time_select 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59ca05dd103f66077ca5ee159ac848c1894ba33
-  data.tar.gz: dda8d36fb1d46b1170f2f15a287271216b13473d
+  metadata.gz: 5df1e72bff11080a5c031e5f4fb0517ab42834be
+  data.tar.gz: 14f8139529a2c494321c5b6ab3ae825f4569f291
 SHA512:
-  metadata.gz: dcf0ce0f2c2a7d8b291847550c2e4501c5ecad7856f9acdbc3eb829b14fd81d7116645b9bb01b2692df88328511fc0c36234fb981381d3a9dc10492f0f68663c
-  data.tar.gz: cb5b09666cc7ee7b3fa01c22cc2cf5dd27fb507e63effd4e26fd3eb4806dd23e6162050dfc354df5dcc75485cd846a255253a04720c9ee889de662c1ba085102
+  metadata.gz: 6e1eea77be8282504e903895de1ac18e81118dc588589ff61963debd08e8a58bcef6a9ec18683b8e45dcc483a8aba1e1d88032eaadbc496d19afc71291e194c1
+  data.tar.gz: f713604c08235aa016fef23176055842433aa917c391986f94cde57b828d1bd3c6cb473f39a0135bb7416c3b9e13e585b7a90f71c588e46e017af7135ad3c598

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v2.0.0
+
+* Updated for Rails 5.x compatibility, older versions of Rails are not supported.
+
 ## v0.0.1
 
 * initial release

data/README.md

@@ -1,10 +1,12 @@
 Combined Time Select
 ====================
 
+Compatible with Rails 5+
+
 Written by [Chris Oliver](http://excid3.com) [@excid3](https://twitter.com/excid3).
 
 This is a small gem for creating Google Calendar style 12 hour AM/PM
-time_select fields for Rails 3. It's based off of [simple_time_select](https://github.com/tamoyal/simple_time_select) by tamoyal.
+time_select fields for Rails. It's based off of [simple_time_select](https://github.com/tamoyal/simple_time_select) by tamoyal.
 
 ![combined_time_select](http://f.cl.ly/items/1945331M3W1h0f1K3I2v/Screen%20Shot%202011-12-23%20at%2012.08.37%20AM.png)
 
@@ -15,7 +17,7 @@ Installation
 
 Just add this into your Gemfile followed by a bundle install:
 
-    gem "combined_time_select", "~> 1.0.1"
+    gem "combined_time_select", "~> 2.0.0"
 
 Usage
 -----
@@ -45,6 +47,8 @@ This will create a combined time select starting at 10:30 AM and going till
 value for the start_time attribute on the object this form was created
 for.
 
+Because `combined_time_select` overrides the time_select method to provide you the combined time fields, there is no need to designate a method when using libraries such as Formtastic.  You will, however, need to disable the built in hour and minute labels by indicating `:labels => false` (though you can still give your individual field a label with `:label => "Label Name"`) and to add in the am/pm designation for a 12 hour clock by indicating `:ampm => true`.
+
 On the controller side, we need to parse this attribute before we create
 a new object. combined_time_select provides a nice method for this
 called parse_time_select!. You can use this in your create action just

data/combined_time_select.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "rails", ">= 5.0.0"
 end

data/lib/combined_time_select.rb

@@ -1,114 +1,102 @@
 require "combined_time_select/version"
 
 module CombinedTimeSelect
-  # Your code goes here...
-end
-
+  module DateTimeSelectorWithSimpleTimeSelect
+    def select_minute
+      return super unless @options[:combined].eql? true
 
-module ActiveSupport
-  class HashWithIndifferentAccess < Hash
-    def parse_time_select!(attribute)
-      self[attribute] = Time.zone.parse("#{self["#{attribute}(1i)"]}-#{self["#{attribute}(2i)"]}-#{self["#{attribute}(3i)"]} #{self["#{attribute}(5i)"]}")
-      (1..5).each { |i| self.delete "#{attribute}(#{i}i)" }
-      self
-    end
-  end
-end
+      # Although this is a datetime select, we only care about the time.  Assume that the date will
+      # be set by some other control, and the date represented here will be overriden
 
+      val_minutes = @datetime.kind_of?(Time) ? @datetime.min + @datetime.hour*60 : @datetime
 
-module ActionView::Helpers
-  class DateTimeSelector
-     def select_minute_with_simple_time_select
-        return select_minute_without_simple_time_select unless @options[:combined].eql? true
+      @options[:time_separator] = ""
 
-        # Although this is a datetime select, we only care about the time.  Assume that the date will
-        # be set by some other control, and the date represented here will be overriden
+      # Default is 15 minute intervals
+      minute_interval = @options.fetch(:minute_interval, 15)
 
-        val_minutes = @datetime.kind_of?(Time) ? @datetime.min + @datetime.hour*60 : @datetime
+      start_minute = 0
+      end_minute   = 1439
 
-        @options[:time_separator] = ""
-
-        # Default is 15 minute intervals
-        minute_interval = @options.fetch(:minute_interval, 15)
-
-        start_minute = 0
-        end_minute   = 1439
-
-        # @options[:start_hour] should be specified in military
-        # i.e. 0-23
-        if @options[:start_hour]
-          start_minute =  @options[:start_hour] * 60
-          start_minute += @options.fetch(:start_minute, 0)
-        end
+      # @options[:start_hour] should be specified in military
+      # i.e. 0-23
+      if @options[:start_hour]
+        start_minute =  @options[:start_hour] * 60
+        start_minute += @options.fetch(:start_minute, 0)
+      end
 
-        # @options[:end_hour] should be specified in military
-        # i.e. 0-23
-        if @options[:end_hour]
-          end_minute = (@options[:end_hour] * 60) + @options.fetch(:end_minute, 59)
-        end
+      # @options[:end_hour] should be specified in military
+      # i.e. 0-23
+      if @options[:end_hour]
+        end_minute = (@options[:end_hour] * 60) + @options.fetch(:end_minute, 59)
+      end
 
-        if @options[:use_hidden] || @options[:discard_minute]
-          build_hidden(:minute, val)
-        else
-          minute_options = []
-          start_minute.upto(end_minute) do |minute|
-            if minute%minute_interval == 0
-              ampm = minute < 720 ? ' AM' : ' PM'
-              hour = minute/60
-              minute_padded = zero_pad_num(minute%60)
-              hour_padded = zero_pad_num(hour)
-              ampm_hour = ampm_hour(hour)
-
-              val = "#{hour_padded}:#{minute_padded}:00"
-
-              option_text = @options[:ampm] ? "#{ampm_hour}:#{minute_padded}#{ampm}" : "#{hour_padded}:#{minute_padded}"
-              minute_options << ((val_minutes == minute) ?
-                %(<option value="#{val}" selected="selected">#{option_text}</option>\n) :
-                %(<option value="#{val}">#{option_text}</option>\n)
-              )
-            end
+      if @options[:use_hidden] || @options[:discard_minute]
+        build_hidden(:minute, val)
+      else
+        minute_options = []
+        start_minute.upto(end_minute) do |minute|
+          if minute%minute_interval == 0
+            ampm = minute < 720 ? ' AM' : ' PM'
+            hour = minute/60
+            minute_padded = zero_pad_num(minute%60)
+            hour_padded = zero_pad_num(hour)
+            ampm_hour = ampm_hour(hour)
+
+            val = "#{hour_padded}:#{minute_padded}:00"
+
+            option_text = @options[:ampm] ? "#{ampm_hour}:#{minute_padded}#{ampm}" : "#{hour_padded}:#{minute_padded}"
+            minute_options << ((val_minutes == minute) ?
+              %(<option value="#{val}" selected="selected">#{option_text}</option>\n) :
+              %(<option value="#{val}">#{option_text}</option>\n)
+            )
           end
-          build_select(:minute, minute_options.join(' '))
         end
+        build_select(:minute, minute_options.join(' '))
       end
-      alias_method_chain :select_minute, :simple_time_select
+    end
 
+    def select_hour
+      return super unless @options[:combined].eql? true
+      # Don't build the hour select
+      #build_hidden(:hour, val)
+    end
 
-      def select_hour_with_simple_time_select
-        return select_hour_without_simple_time_select unless @options[:combined].eql? true
-        # Don't build the hour select
-        #build_hidden(:hour, val)
-      end
-      alias_method_chain :select_hour, :simple_time_select
+    def select_second
+      return super unless @options[:combined].eql? true
+      # Don't build the seconds select
+      #build_hidden(:second, val)
+    end
 
-      def select_second_with_simple_time_select
-        return select_second_without_simple_time_select unless @options[:combined].eql? true
-        # Don't build the seconds select
-        #build_hidden(:second, val)
-      end
-      alias_method_chain :select_second, :simple_time_select
+    def select_year
+      return super unless @options[:combined].eql? true
+      # Don't build the year select
+      #build_hidden(:year, val)
+    end
 
-      def select_year_with_simple_time_select
-        return select_year_without_simple_time_select unless @options[:combined].eql? true
-        # Don't build the year select
-        #build_hidden(:year, val)
-      end
-      alias_method_chain :select_year, :simple_time_select
+    def select_month
+      return super unless @options[:combined].eql? true
+      # Don't build the month select
+      #build_hidden(:month, val)
+    end
 
-      def select_month_with_simple_time_select
-        return select_month_without_simple_time_select unless @options[:combined].eql? true
-        # Don't build the month select
-        #build_hidden(:month, val)
-      end
-      alias_method_chain :select_month, :simple_time_select
+    def select_day
+      return super unless @options[:combined].eql? true
+      # Don't build the day select
+      #build_hidden(:day, val)
+    end
+  end
+end
 
-      def select_day_with_simple_time_select
-        return select_day_without_simple_time_select unless @options[:combined].eql? true
-        # Don't build the day select
-        #build_hidden(:day, val)
-      end
-      alias_method_chain :select_day, :simple_time_select
+ActionView::Helpers::DateTimeSelector.send(:prepend, CombinedTimeSelect::DateTimeSelectorWithSimpleTimeSelect)
 
+module ActionController
+  class Parameters
+    def parse_time_select!(attribute)
+      self[attribute] = Time.zone.parse("#{self["#{attribute}(1i)"]}-#{self["#{attribute}(2i)"]}-#{self["#{attribute}(3i)"]} #{self["#{attribute}(5i)"]}")
+      (1..5).each { |i| self.delete "#{attribute}(#{i}i)" }
+      self
+    end
   end
 end
 

data/lib/combined_time_select/version.rb

@@ -1,3 +1,3 @@
 module CombinedTimeSelect
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: combined_time_select
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: Generates a time_select field like Google calendar.
 email:
 - excid3@gmail.com
@@ -31,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -49,17 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: combined_time_select
-rubygems_version: 2.0.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Rails time_select like Google Calendar with combined hour and minute time_select