active_interaction 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eae8e946fb9ec93d0abfa2e2264a7a35b9e8d56
-  data.tar.gz: 7c976feedfef904516036479d67a789f147d8e4a
+  metadata.gz: 00f91c5498e12a8463f75e69ddc0b07f8b5b851e
+  data.tar.gz: 8336e72d5e12d0a793d3c7e188ab3eafb031df07
 SHA512:
-  metadata.gz: 79162f4100cf2618ec44bddee98714af4d0b5b01d13cc8188f57a847031ece8c1657223d098912bdaa4b3ba89996cc233955d57cbd9ed44f5910cf44afb03164
-  data.tar.gz: 30f668bd7172e2f5d45df36b38d4ecda7b00d0d5aa1ca1667c4b7fa13eb21c810d8260cd269763debc738614828a0314a941cbb6ad69b86950ac53e3ec3f008c
+  metadata.gz: 47efce81ccf4286b2906b5d79d438f6f69fc6ff76aecfb975544fb64599350d320c1728b9e43fde6ef59f976c95d577676d6b9cea8614eb8603b1b95e5f6c8ea
+  data.tar.gz: 2593157f8acc004d26a92b5c69fafb2034fd03abc6717034d34fcc0b34a69acf8f5e629716c905702d17421b815ab7152c8fa18ceb41491243afb1c4d4377d8c

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # [Master][]
 
+# [1.2.5][] (2014-08-15)
+
+## Fixed
+
+- [#207][]: Fix a bug that incorrectly converted plural class names
+  to their singular form.
+- [#206][]: Fix a bug that caused an i18n deprecation warning.
+- [#201][]: Prevented time filters from being initialized with the
+  format option when time zones are available.
+
 # [1.2.4][] (2014-08-07)
 
 ## Fixed
@@ -328,7 +338,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.4...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.5...master
+  [1.2.5]: https://github.com/orgsync/active_interaction/compare/v1.2.4...v1.2.5
   [1.2.4]: https://github.com/orgsync/active_interaction/compare/v1.2.3...v1.2.4
   [1.2.3]: https://github.com/orgsync/active_interaction/compare/v1.2.2...v1.2.3
   [1.2.2]: https://github.com/orgsync/active_interaction/compare/v1.2.1...v1.2.2
@@ -429,4 +440,7 @@
   [#175]: https://github.com/orgsync/active_interaction/issues/175
   [#179]: https://github.com/orgsync/active_interaction/issues/179
   [#192]: https://github.com/orgsync/active_interaction/issues/192
+  [#201]: https://github.com/orgsync/active_interaction/issues/201
   [#203]: https://github.com/orgsync/active_interaction/issues/203
+  [#206]: https://github.com/orgsync/active_interaction/issues/206
+  [#207]: https://github.com/orgsync/active_interaction/issues/207

data/lib/active_interaction.rb

@@ -41,7 +41,6 @@ require 'active_interaction/backports'
 
 I18n.load_path += Dir[File.expand_path(
   File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))]
-I18n.default_locale = :en
 
 # Manage application specific business logic.
 #
@@ -50,5 +49,5 @@ I18n.default_locale = :en
 #
 # @since 1.0.0
 #
-# @version 1.2.4
+# @version 1.2.5
 module ActiveInteraction end

data/lib/active_interaction/filters/model_filter.rb

@@ -39,7 +39,7 @@ module ActiveInteraction
     #
     # @raise [InvalidClassError]
     def klass
-      klass_name = options.fetch(:class, name).to_s.classify
+      klass_name = options.fetch(:class, name).to_s.camelize
       Object.const_get(klass_name)
     rescue NameError
       raise InvalidClassError, klass_name.inspect

data/lib/active_interaction/filters/time_filter.rb

@@ -26,6 +26,14 @@ module ActiveInteraction
     alias_method :_klass, :klass
     private :_klass
 
+    def initialize(name, options = {}, &block)
+      if options.key?(:format) && klass != Time
+        fail InvalidFilterError, 'format option unsupported with time zones'
+      end
+
+      super
+    end
+
     def cast(value)
       case value
       when Numeric

data/lib/active_interaction/version.rb

@@ -5,5 +5,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('1.2.4')
+  VERSION = Gem::Version.new('1.2.5')
 end

data/spec/active_interaction/base_spec.rb

@@ -162,13 +162,15 @@ describe ActiveInteraction::Base do
       expect(described_class.desc).to be_nil
     end
 
-    it 'returns the description' do
-      expect(described_class.desc(desc)).to eql desc
-    end
+    context 'with a description' do
+      it 'returns the description' do
+        expect(described_class.desc(desc)).to eql desc
+      end
 
-    it 'saves the description' do
-      described_class.desc(desc)
-      expect(described_class.desc).to eql desc
+      it 'saves the description' do
+        described_class.desc(desc)
+        expect(described_class.desc).to eql desc
+      end
     end
   end
 

data/spec/active_interaction/filters/model_filter_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 class Model; end
+class Things; end
 
 describe ActiveInteraction::ModelFilter, :filter do
   include_context 'filters'
@@ -118,6 +119,16 @@ describe ActiveInteraction::ModelFilter, :filter do
       end
     end
 
+    context 'with a plural class' do
+      let(:value) { Things.new }
+
+      before { options[:class] = Things }
+
+      it 'returns the instance' do
+        expect(result).to eql value
+      end
+    end
+
     context 'with class as an invalid String' do
       before do
         options.merge!(class: 'invalid')

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -14,6 +14,26 @@ describe ActiveInteraction::TimeFilter, :filter do
     end
   end
 
+  describe '#initialize' do
+    context 'with a format' do
+      before { options[:format] = '%T' }
+
+      context 'with a time zone' do
+        before do
+          time_zone = double
+          allow(Time).to receive(:zone).and_return(time_zone)
+
+          time_with_zone = double
+          allow(time_zone).to receive(:at).and_return(time_with_zone)
+        end
+
+        it 'raises an error' do
+          expect { filter }.to raise_error(ActiveInteraction::InvalidFilterError)
+        end
+      end
+    end
+  end
+
   describe '#cast' do
     let(:result) { filter.cast(value) }
 

data/spec/active_interaction/i18n_spec.rb

@@ -54,8 +54,11 @@ describe I18nInteraction do
     include_examples 'translation'
 
     before do
+      @locale = I18n.locale
       I18n.locale = :en
     end
+
+    after { I18n.locale = @locale }
   end
 
   context 'hsilgne' do
@@ -75,7 +78,10 @@ describe I18nInteraction do
         }
       )
 
+      @locale = I18n.locale
       I18n.locale = 'hsilgne'
     end
+
+    after { I18n.locale = @locale }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,110 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -133,14 +133,14 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -165,10 +165,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- LICENSE.txt
-- README.md
-- lib/active_interaction.rb
 - lib/active_interaction/backports.rb
 - lib/active_interaction/base.rb
 - lib/active_interaction/concerns/active_modelable.rb
@@ -196,10 +192,10 @@ files:
 - lib/active_interaction/filters/symbol_filter.rb
 - lib/active_interaction/filters/time_filter.rb
 - lib/active_interaction/grouped_input.rb
-- lib/active_interaction/locale/en.yml
 - lib/active_interaction/modules/input_processor.rb
 - lib/active_interaction/modules/validation.rb
 - lib/active_interaction/version.rb
+- lib/active_interaction.rb
 - spec/active_interaction/base_spec.rb
 - spec/active_interaction/concerns/active_modelable_spec.rb
 - spec/active_interaction/concerns/hashable_spec.rb
@@ -245,6 +241,10 @@ files:
 - spec/support/concerns.rb
 - spec/support/filters.rb
 - spec/support/interactions.rb
+- CHANGELOG.md
+- LICENSE.txt
+- README.md
+- lib/active_interaction/locale/en.yml
 homepage: http://orgsync.github.io/active_interaction/
 licenses:
 - MIT
@@ -255,17 +255,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.