mobility 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118e3d6777198cb2f765275f22636876be026bc6
-  data.tar.gz: f30e14ab8bbf9e3123494232c26fc41d5daa3901
+  metadata.gz: 94e0c57f9d1cfb688811e00504ad03d685752867
+  data.tar.gz: d6a95ba806b2f5773616ddb8203fd3c9645ced61
 SHA512:
-  metadata.gz: 866b6af79e61063c29ee5b4791cbf47433fb82f53c40f7603b466e7941c43444804eb4bbda197105be8d1572a6d6dfa03d427386a38867672837ce73c85d56cb
-  data.tar.gz: a90b4deb486ff6e23cc9d83ba6e068460cfb394cecc9c651c19ebe65b8493d1cdee01b83570de6e1d9c1d0d091fd84ee8fed4591abd4d3bd2e32ebe49ae99cf7
+  metadata.gz: 04691839710e519cd7a85b15419ed85a2f1f7cdacfa290248b6d4ea2010af2f46e360ae575e238eabc220910f5e2b8dc493690b8605668e70e18b9df3e296f4a
+  data.tar.gz: 587a828deb6b91d7de8bf4021be37ca0726907e5957f59e0638064eeb34bef48f8b2618e1a51c3a07686b7ac78df1478966162f0830de35fd012c69157e49c8b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.1
 
+### 0.1.15 (May 21, 2017)
+* Add support for uniqueness validation ([#28](https://github.com/shioyama/mobility/pull/28))
+* Inherit translated attributes in subclasses ([#30](https://github.com/shioyama/mobility/pull/30))
+
 ### 0.1.14 (April 27, 2017)
 * Reset memoized backends when duplicating ([#26](https://github.com/shioyama/mobility/issues/25))
 

data/Gemfile

@@ -10,7 +10,8 @@ group :development, :test do
   end
 
   if ENV['ORM'] == 'sequel'
-    gem 'sequel', '>= 4.0.0', '< 5.0'
+    # some interal API changes are breaking specs, limit to 4.45.x for now
+    gem 'sequel', '>= 4.41.0', '< 4.46.0'
   end
 
   platforms :ruby do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.1.13)
+    mobility (0.1.14)
       i18n (>= 0.6.10, < 0.9)
       request_store (~> 1.0)
 
@@ -10,7 +10,7 @@ GEM
   specs:
     byebug (9.0.6)
     coderay (1.1.1)
-    database_cleaner (1.5.3)
+    database_cleaner (1.6.0)
     diff-lcs (1.3)
     ffi (1.9.18)
     formatador (0.2.5)
@@ -33,7 +33,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.11)
+    lumberjack (1.0.12)
     method_source (0.8.2)
     mysql2 (0.3.21)
     nenv (0.3.0)
@@ -53,25 +53,25 @@ GEM
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     request_store (1.3.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     slop (3.6.0)
     sqlite3 (1.3.13)
     thor (0.19.4)
-    yard (0.9.8)
+    yard (0.9.9)
 
 PLATFORMS
   ruby

data/README.md

@@ -46,7 +46,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.1.14'
+gem 'mobility', '~> 0.1.15'
 ```
 
 To translate attributes on a model, include (or extend) `Mobility`, then call

data/lib/mobility.rb

@@ -92,19 +92,11 @@ module Mobility
         end
 
         class << self
-          include Translates
+          include ClassMethods
 
           if translates = Mobility.config.accessor_method
             alias_method translates, :mobility_accessor
           end
-
-          def mobility
-            @mobility ||= Mobility::Wrapper.new(self)
-          end
-
-          def translated_attribute_names
-            mobility.translated_attribute_names
-          end
         end
       end
 
@@ -244,6 +236,22 @@ module Mobility
     end
   end
 
+  module ClassMethods
+    include Translates
+
+    def mobility
+      @mobility ||= Mobility::Wrapper.new(self)
+    end
+
+    def translated_attribute_names
+      mobility.translated_attribute_names
+    end
+
+    def inherited(subclass)
+      subclass.instance_variable_set(:@mobility, @mobility)
+    end
+  end
+
   class BackendRequired < ArgumentError; end
   class InvalidLocale < I18n::InvalidLocale; end
 end

data/lib/mobility/active_record.rb

@@ -5,11 +5,12 @@ Module loading ActiveRecord-specific classes for Mobility models.
 
 =end
   module ActiveRecord
-    autoload :BackendResetter,   "mobility/active_record/backend_resetter"
-    autoload :ModelTranslation,  "mobility/active_record/model_translation"
-    autoload :StringTranslation, "mobility/active_record/string_translation"
-    autoload :TextTranslation,   "mobility/active_record/text_translation"
-    autoload :Translation,       "mobility/active_record/translation"
+    autoload :BackendResetter,     "mobility/active_record/backend_resetter"
+    autoload :ModelTranslation,    "mobility/active_record/model_translation"
+    autoload :StringTranslation,   "mobility/active_record/string_translation"
+    autoload :TextTranslation,     "mobility/active_record/text_translation"
+    autoload :Translation,         "mobility/active_record/translation"
+    autoload :UniquenessValidator, "mobility/active_record/uniqueness_validator"
 
     def changes_applied
       @previously_changed = changes
@@ -27,6 +28,8 @@ Module loading ActiveRecord-specific classes for Mobility models.
 
     def self.included(model_class)
       model_class.extend(ClassMethods)
+      model_class.const_set(:UniquenessValidator,
+                            Class.new(::Mobility::ActiveRecord::UniquenessValidator))
     end
 
     module ClassMethods

data/lib/mobility/active_record/uniqueness_validator.rb

@@ -0,0 +1,35 @@
+module Mobility
+  module ActiveRecord
+    class UniquenessValidator < ::ActiveRecord::Validations::UniquenessValidator
+      def validate_each(record, attribute, value)
+        klass = record.class
+
+        if ((Array(options[:scope]) + [attribute]).map(&:to_s) & klass.translated_attribute_names).present?
+          return unless value.present?
+          relation = klass.send(Mobility.query_method).where(attribute => value)
+          relation = relation.where.not(klass.primary_key => record.id) if record.persisted?
+          relation = mobility_scope_relation(record, relation)
+          relation = relation.merge(options[:conditions]) if options[:conditions]
+
+          if relation.exists?
+            error_options = options.except(:case_sensitive, :scope, :conditions)
+            error_options[:value] = value
+
+            record.errors.add(attribute, :taken, error_options)
+          end
+        else
+          super
+        end
+      end
+
+      private
+
+      def mobility_scope_relation(record, relation)
+        Array(options[:scope]).each do |scope_item|
+          relation = relation.where(scope_item => record.send(scope_item))
+        end
+        relation
+      end
+    end
+  end
+end

data/lib/mobility/backend/active_record/hash_valued.rb

@@ -32,9 +32,6 @@ Internal class used by ActiveRecord backends that store values as a hash.
 
       setup do |attributes, options|
         attributes.each { |attribute| store attribute, coder: Coder }
-        before_validation do
-          attributes.each { |attribute| self.send(:"#{attribute}=", {}) if send(attribute).nil? }
-        end
       end
 
       class Coder

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -157,6 +157,7 @@ files:
 - lib/mobility/active_record/string_translation.rb
 - lib/mobility/active_record/text_translation.rb
 - lib/mobility/active_record/translation.rb
+- lib/mobility/active_record/uniqueness_validator.rb
 - lib/mobility/attributes.rb
 - lib/mobility/backend.rb
 - lib/mobility/backend/active_model.rb
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Pluggable Ruby translation framework