time_splitter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e95cb957e2b377227f2267ded2a018b24ec88aa9
-  data.tar.gz: 8a56421b51019ea0a86a494f071b47e4d953c8f2
+  metadata.gz: 0e9f28853c1647a7fafd682ebcda847bc8a81753
+  data.tar.gz: b791b89d4b08f3612c6d7276d4ffe5fd88267ac3
 SHA512:
-  metadata.gz: 2846d29799635f3d33faaa61678c6e8fb04034a7b0e7f0cddaa896da92cbf6f4ddf9e79bbed2f7200ac7ae6f87dffb4736974439c5e8152096f778df8f001dd9
-  data.tar.gz: 12ebd84275f87d033f08c1c78d36b64d6e92938db113deeb2e6bc01499f718445b22b9b3239123587d46572af101a23105218c21b3e466e3b747f3a8ae471ba1
+  metadata.gz: 2dbb0a180afa136483c6a7130217fd5790d605e3a7887470763d7e116f0662609ed2ffd6bd4b87af69b90cbf6ca4bde8cb3ba9c811921c53ba92d989f5b09836
+  data.tar.gz: 5e69333f8465f15f41a62d51973578b8fab4f6709739ff7ac2d5488c8bdb5bab22a1725cf9a5d95c0f34f3cb77949e945556f309ade65e903a4da3f39211eeca

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.0.0
+  - '2.2'
+  - '2.1'
+  - '2.0'
   - 1.9.3
 
 script: bundle exec rspec spec

data/README.md

@@ -45,7 +45,7 @@ In your view:
 
 Add your js datepicker and you're good to go. (Of course, this also works with standard Rails form helpers).
 
-If you are using Rails < 4.0 and/or are not using StrongParameters, you must add the `attr_accessor` for any of the split attributes you want to permit mass-assignment. TimeSplitter provides the methods that can be directly accessed, but will not automatically whitelist any of them for mass-assignment.
+If you are using Rails < 4.0 and/or are not using StrongParameters, you must add `attr_accessible` for any of the split attributes you want to permit mass-assignment. TimeSplitter provides the methods that can be directly accessed, but will not automatically whitelist any of them for mass-assignment.
 
 ## Options
 

data/lib/time_splitter/accessors.rb

@@ -19,7 +19,13 @@ module TimeSplitter
 
         define_method("#{attr}_date=") do |date|
           return unless date.present?
-          date = Date.parse(date.to_s)
+          unless date.is_a?(Date) || date.is_a?(Time)
+            if options[:date_format]
+              date = Date.strptime(date.to_s, options[:date_format])
+            else
+              date = Date.parse(date.to_s)
+            end
+          end
           self.send("#{attr}=", self.send("#{attr}_or_new").change(year: date.year, month: date.month, day: date.day))
         end
 
@@ -35,7 +41,14 @@ module TimeSplitter
 
         define_method("#{attr}_time=") do |time|
           return unless time.present?
-          time = Time.parse(time) unless time.is_a?(Date) || time.is_a?(Time)
+
+          unless time.is_a?(Date) || time.is_a?(Time)
+            if options[:time_format]
+              time = Time.strptime(time, options[:time_format])
+            else
+              time = Time.parse(time)
+            end
+          end
           self.send("#{attr}=", self.send("#{attr}_or_new").change(hour: time.hour, min: time.min))
         end
 

data/lib/time_splitter/version.rb

@@ -1,3 +1,3 @@
 module TimeSplitter
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/time_splitter/accessors_spec.rb

@@ -71,6 +71,18 @@ describe TimeSplitter::Accessors do
           expect(model.starts_at).to eq Time.new(1111, 1, 1, 0, 0, 0, '+00:00')
         end
 
+        it "can set from a string when format is modified" do
+          Model.split_accessor(:starts_at, date_format: "%m-%d-%Y")
+          model.starts_at_date = "12-31-1111"
+          expect(model.starts_at).to eq Time.new(1111, 12, 31, 0, 0, 0, '+00:00')
+        end
+
+        it "can set from a date when format is modified" do
+          Model.split_accessor(:starts_at, date_format: "%m-%d-%Y")
+          model.starts_at_date = Time.new(1111, 12, 31, 0, 0, 0, '+00:00')
+          expect(model.starts_at).to eq Time.new(1111, 12, 31, 0, 0, 0, '+00:00')
+        end
+
         it "is nil if the string is empty" do
           model.starts_at_date = ""
           expect(model.starts_at).to be_nil
@@ -202,6 +214,12 @@ describe TimeSplitter::Accessors do
           expect(model.starts_at_time).to eq "01:44PM"
         end
 
+        it "can set from a string when format is modified" do
+          Model.split_accessor(:starts_at, time_format: "%k-%M")
+          model.starts_at_time = "23-59"
+          expect(model.starts_at).to eq Time.new(2222, 12, 22, 23, 59, 0, '+00:00')
+        end
+
         it 'sets the hour and minute of #starts_at' do
           model.starts_at_time = '08:33'
           expect(model.starts_at).to eq Time.new(2222, 12, 22, 8, 33, 0, '+00:00')

data/time_splitter.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'activesupport'
-  s.add_development_dependency 'rspec', '~> 2.11'
+  s.add_development_dependency 'rspec', '~> 3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_splitter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michi Huber
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.2'
 description: Add split accessors for Date/Time/DateTime objects to easily set the
   date, time, hour, or minute.
 email:
@@ -48,8 +48,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -69,17 +69,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: 
-rubygems_version: 2.1.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Use `datetime_accessor :starts_at` to provide `starts_at_date`, `starts_at_time`,