mobility 0.1.20 → 0.2.0

data/lib/mobility/sequel.rb

@@ -5,22 +5,13 @@ Module loading Sequel-specific classes for Mobility models.
 
 =end
   module Sequel
-    autoload :BackendResetter,   "mobility/sequel/backend_resetter"
-    autoload :ColumnChanges,     "mobility/sequel/column_changes"
-    autoload :ModelTranslation,  "mobility/sequel/model_translation"
-    autoload :StringTranslation, "mobility/sequel/string_translation"
-    autoload :TextTranslation,   "mobility/sequel/text_translation"
-    autoload :Translation,       "mobility/sequel/translation"
-
     def self.included(model_class)
-      model_class.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      # @return [Sequel::Dataset] dataset extended with Mobility query methods.
-      define_method ::Mobility.query_method do
-        dataset
+      query_method = Module.new do
+        define_method Mobility.query_method do
+          dataset
+        end
       end
+      model_class.extend query_method
     end
   end
 end

data/lib/mobility/sequel/backend_resetter.rb

@@ -12,14 +12,12 @@ method is called.
       def included(model_class)
         model_reset_method = @model_reset_method
 
-        model_class.class_eval do
-          mod = Module.new do
-            define_method :refresh do
-              super().tap { instance_eval(&model_reset_method) }
-            end
+        mod = Module.new do
+          define_method :refresh do
+            super().tap { instance_eval(&model_reset_method) }
           end
-          include mod
         end
+        model_class.include mod
       end
     end
   end

data/lib/mobility/sequel/column_changes.rb

@@ -2,8 +2,8 @@ module Mobility
   module Sequel
 =begin
 
-Internal class used to force Sequel model to notice changes when +mobility_set+
-is called.
+Internal class used to force Sequel model to notice changes when mobility
+setter method is called.
 
 =end
     class ColumnChanges < Module
@@ -12,8 +12,8 @@ is called.
         @attributes = attributes
 
         attributes.each do |attribute|
-          define_method "#{attribute}=" do |value, **options|
-            if send(attribute) != value
+          define_method "#{attribute}=".freeze do |value, **options|
+            if !options[:super] && send(attribute) != value
               locale = options[:locale] || Mobility.locale
               column = attribute.to_sym
               column_with_locale = :"#{attribute}_#{Mobility.normalize_locale(locale)}"

data/lib/mobility/sequel/model_translation.rb

@@ -3,7 +3,7 @@ module Mobility
 =begin
 
 Module included in translation class dynamically generated by
-{Backend::Sequel::Table} backend.
+{Backends::Sequel::Table} backend.
 
 =end
     module ModelTranslation

data/lib/mobility/sequel/string_translation.rb

@@ -1,3 +1,5 @@
+require "mobility/sequel/translation"
+
 module Mobility
   module Sequel
     class StringTranslation < ::Sequel::Model(:mobility_string_translations)

data/lib/mobility/sequel/text_translation.rb

@@ -1,3 +1,5 @@
+require "mobility/sequel/translation"
+
 module Mobility
   module Sequel
     class TextTranslation < ::Sequel::Model(:mobility_text_translations)

data/lib/mobility/translates.rb

@@ -61,12 +61,8 @@ passed to accessors to configure backend (see example below).
     %w[accessor reader writer].each do |method|
       class_eval <<-EOM, __FILE__, __LINE__ + 1
         def mobility_#{method}(*args, **options, &block)
-          attributes = Attributes.new(:#{method}, *args, options.merge(model_class: self))
+          attributes = Attributes.new(*args, method: :#{method}, **options)
           attributes.backend.instance_eval(&block) if block_given?
-          attributes.each do |attribute|
-            alias_method "\#{attribute}_before_mobility",  attribute        if method_defined?(attribute)        && #{%w[accessor reader].include? method}
-            alias_method "\#{attribute}_before_mobility=", "\#{attribute}=" if method_defined?("\#{attribute}=") && #{%w[accessor writer].include? method}
-           end
           include attributes
         end
       EOM

data/lib/mobility/util.rb

@@ -0,0 +1,126 @@
+require "singleton"
+
+module Mobility
+=begin
+
+Some useful methods on strings, borrowed in parts from Sequel and ActiveSupport.
+
+@example With no methods defined on String
+  "foos".respond_to?(:singularize)
+  #=> false
+
+  class A
+    include Mobility::Util
+  end
+
+  A.new.singularize("foos")
+  #=> "foo"
+  A.new.singularize("bunnies")
+  #=> "bunnie"
+
+@example With methods on String
+  require "active_support"
+  "foos".respond_to?(:singularize)
+  #=> true
+
+  class A
+    include Mobility::Util
+  end
+
+  A.new.singularize("bunnies")
+  #=> "bunny"
+=end
+  module Util
+    VALID_CONSTANT_NAME_REGEXP = /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/.freeze
+
+    def self.included(klass)
+      klass.extend(self)
+    end
+
+    # Converts strings to UpperCamelCase.
+    # @param [String] str
+    # @return [String]
+    def camelize(str)
+      call_or_yield str do
+        str.to_s.sub(/^[a-z\d]*/) { $&.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/'.freeze, '::'.freeze)
+      end
+    end
+
+    # Tries to find a constant with the name specified in the argument string.
+    # @param [String] str
+    # @return [Object]
+    def constantize(str)
+      str = str.to_s
+      call_or_yield str do
+        raise(NameError, "#{s.inspect} is not a valid constant name!") unless m = VALID_CONSTANT_NAME_REGEXP.match(str)
+        Object.module_eval("::#{m[1]}", __FILE__, __LINE__)
+      end
+    end
+
+    # Returns the singular form of a word in a string.
+    # @param [String] str
+    # @return [String]
+    # @note If +singularize+ is not defined on +String+, falls back to simply
+    #   stripping the trailing 's' from the string.
+    def singularize(str)
+      call_or_yield str do
+        str.to_s.gsub(/s$/, '')
+      end
+    end
+
+    # Removes the module part from the expression in the string.
+    # @param [String] str
+    # @return [String]
+    def demodulize(str)
+      call_or_yield str do
+        str.to_s.gsub(/^.*::/, '')
+      end
+    end
+
+    # Creates a foreign key name from a class name
+    # @param [String] str
+    # @return [String]
+    def foreign_key(str)
+      call_or_yield str do
+        "#{underscore(demodulize(str))}_id"
+      end
+    end
+
+    # Makes an underscored, lowercase form from the expression in the string.
+    # @param [String] str
+    # @return [String]
+    def underscore(str)
+      call_or_yield str do
+        str.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase
+      end
+    end
+
+    def present?(object)
+      !blank?(object)
+    end
+
+    def blank?(object)
+      return true if object.nil?
+      object.respond_to?(:empty?) ? !!object.empty? : !object
+    end
+
+    def presence(object)
+      object if present?(object)
+    end
+
+    private
+
+    # Calls caller method on object if defined, otherwise yields to block
+    def call_or_yield(object)
+      caller_method = caller_locations(1,1)[0].label
+      if object.respond_to?(caller_method)
+        object.public_send(caller_method)
+      else
+        yield
+      end
+    end
+
+    extend self
+  end
+end

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.1.20"
+  VERSION = "0.2.0"
 end

data/lib/mobility/wrapper.rb

@@ -19,7 +19,7 @@ simple delegator, so any missing method will be delegated to the model class.
 
     # @return [Array<String>] Translated attributes defined on model
     def translated_attribute_names
-      modules.map(&:attributes).flatten
+      modules.map(&:names).flatten
     end
 
     # Appends backend module to +modules+ array for later reference.

data/lib/rails/generators/mobility/translations_generator.rb

@@ -52,10 +52,14 @@ Other backends are not supported, for obvious reasons:
         if SUPPORTED_BACKENDS.include?(value)
           require_relative "./backend_generators/#{value}_backend".freeze
           Mobility::BackendGenerators.const_get("#{value}_backend".camelcase.freeze)
-        elsif Mobility::Backend.const_get(value.to_s.camelize.gsub(/\s+/, ''.freeze))
-          raise Thor::Error, "The #{value} backend does not have a translations generator."
         else
-          raise Thor::Error, "#{value} is not a Mobility backend."
+          begin
+            require "mobility/backends/#{value}"
+            raise Thor::Error, "The #{value} backend does not have a translations generator."
+          rescue LoadError => e
+            raise unless e.message =~ /#{value}/
+            raise Thor::Error, "#{value} is not a Mobility backend."
+          end
         end
       else
         super

metadata

@@ -1,14 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
-cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ4wDAYDVQQDDAVjaHJp
+  czEYMBYGCgmSJomT8ixkARkWCGRlamltYXRhMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE3MDgxMTE0NDU0N1oXDTE4MDgxMTE0NDU0N1owPzEOMAwGA1UEAwwFY2hy
+  aXMxGDAWBgoJkiaJk/IsZAEZFghkZWppbWF0YTETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4/1rb97IE2+aDbwqO0
+  BdbiS9QONr9mZRyTCSVkKh4XY+Ex3XzoJSK/qj0E6eRb2K8Lsc8JNZra+1h6do8H
+  dkl+GfFcHnWVuDkt17YcZuK/uAaxFOlWGVbFIdGxYz94rBddWGh3bOxqQGr3YtdD
+  Ajj1foUnsPmxQ0j8p8vAJhHM0h0MTyphFxMT5xTDJkprVQOiktfWQBL+76jx/UQ4
+  UXczbSgaObaUzvNM7ggi7+PPNG4S39SafjQ0MM/QvBZ31B6tN1KuzluKFhAMC+sH
+  NofRUmYbrjZiCId6WCepJz48/fel6BtQ8CQGcQShx+eYOKEWRBiDkhpIil5JVaxi
+  NucCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFAzG
+  77899+wndUmwUTLUD8z+YnnwMB0GA1UdEQQWMBSBEmNocmlzQGRlamltYXRhLmNv
+  bTAdBgNVHRIEFjAUgRJjaHJpc0BkZWppbWF0YS5jb20wDQYJKoZIhvcNAQEFBQAD
+  ggEBAGP58/sXe/VX8dZ74Ih5VscaWOHZqfT5VzsremZS2899Mf+MaSDhMmdYx8b7
+  e8Muzpi0V7EIbP0+QeocepYHugyodeoKerqaLEPQ0yCbUbfNAZd9HwkpFbd8hA/J
+  Nt2Az+BsBS0COBZKnruEqXA2AbrDua/ifSAjQMPBKCJ8nPQqRQf5A1hcP71yO3du
+  8t13MBd1vS8/4nYUoCQnOCTA8A1Lj6RSbQWyS1zZHq7hDm9hmgvvcIMGOkBCcFhy
+  eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
+  SZBPXjzrHdyOFLBYXB+PG7s3F/4=
+  -----END CERTIFICATE-----
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -129,6 +151,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -148,60 +171,66 @@ files:
 - lib/mobility/active_record/uniqueness_validator.rb
 - lib/mobility/attributes.rb
 - lib/mobility/backend.rb
-- lib/mobility/backend/active_model.rb
-- lib/mobility/backend/active_model/dirty.rb
-- lib/mobility/backend/active_record.rb
-- lib/mobility/backend/active_record/column.rb
-- lib/mobility/backend/active_record/column/query_methods.rb
-- lib/mobility/backend/active_record/dirty.rb
-- lib/mobility/backend/active_record/hash_valued.rb
-- lib/mobility/backend/active_record/hstore.rb
-- lib/mobility/backend/active_record/hstore/query_methods.rb
-- lib/mobility/backend/active_record/jsonb.rb
-- lib/mobility/backend/active_record/jsonb/query_methods.rb
-- lib/mobility/backend/active_record/key_value.rb
-- lib/mobility/backend/active_record/key_value/query_methods.rb
-- lib/mobility/backend/active_record/query_methods.rb
-- lib/mobility/backend/active_record/serialized.rb
-- lib/mobility/backend/active_record/serialized/query_methods.rb
-- lib/mobility/backend/active_record/table.rb
-- lib/mobility/backend/active_record/table/query_methods.rb
-- lib/mobility/backend/cache.rb
-- lib/mobility/backend/column.rb
-- lib/mobility/backend/dirty.rb
-- lib/mobility/backend/fallbacks.rb
-- lib/mobility/backend/hstore.rb
-- lib/mobility/backend/jsonb.rb
-- lib/mobility/backend/key_value.rb
-- lib/mobility/backend/null.rb
 - lib/mobility/backend/orm_delegator.rb
-- lib/mobility/backend/presence.rb
-- lib/mobility/backend/sequel.rb
-- lib/mobility/backend/sequel/column.rb
-- lib/mobility/backend/sequel/column/query_methods.rb
-- lib/mobility/backend/sequel/dirty.rb
-- lib/mobility/backend/sequel/hash_valued.rb
-- lib/mobility/backend/sequel/hstore.rb
-- lib/mobility/backend/sequel/hstore/query_methods.rb
-- lib/mobility/backend/sequel/jsonb.rb
-- lib/mobility/backend/sequel/jsonb/query_methods.rb
-- lib/mobility/backend/sequel/key_value.rb
-- lib/mobility/backend/sequel/key_value/query_methods.rb
-- lib/mobility/backend/sequel/postgres_query_methods.rb
-- lib/mobility/backend/sequel/query_methods.rb
-- lib/mobility/backend/sequel/serialized.rb
-- lib/mobility/backend/sequel/serialized/query_methods.rb
-- lib/mobility/backend/sequel/table.rb
-- lib/mobility/backend/sequel/table/query_methods.rb
-- lib/mobility/backend/serialized.rb
-- lib/mobility/backend/table.rb
+- lib/mobility/backend/stringify_locale.rb
 - lib/mobility/backend_resetter.rb
+- lib/mobility/backends.rb
+- lib/mobility/backends/active_record.rb
+- lib/mobility/backends/active_record/column.rb
+- lib/mobility/backends/active_record/column/query_methods.rb
+- lib/mobility/backends/active_record/hstore.rb
+- lib/mobility/backends/active_record/hstore/query_methods.rb
+- lib/mobility/backends/active_record/jsonb.rb
+- lib/mobility/backends/active_record/jsonb/query_methods.rb
+- lib/mobility/backends/active_record/key_value.rb
+- lib/mobility/backends/active_record/key_value/query_methods.rb
+- lib/mobility/backends/active_record/pg_hash.rb
+- lib/mobility/backends/active_record/query_methods.rb
+- lib/mobility/backends/active_record/serialized.rb
+- lib/mobility/backends/active_record/serialized/query_methods.rb
+- lib/mobility/backends/active_record/table.rb
+- lib/mobility/backends/active_record/table/query_methods.rb
+- lib/mobility/backends/column.rb
+- lib/mobility/backends/hash_valued.rb
+- lib/mobility/backends/hstore.rb
+- lib/mobility/backends/jsonb.rb
+- lib/mobility/backends/key_value.rb
+- lib/mobility/backends/null.rb
+- lib/mobility/backends/sequel.rb
+- lib/mobility/backends/sequel/column.rb
+- lib/mobility/backends/sequel/column/query_methods.rb
+- lib/mobility/backends/sequel/hstore.rb
+- lib/mobility/backends/sequel/hstore/query_methods.rb
+- lib/mobility/backends/sequel/jsonb.rb
+- lib/mobility/backends/sequel/jsonb/query_methods.rb
+- lib/mobility/backends/sequel/key_value.rb
+- lib/mobility/backends/sequel/key_value/query_methods.rb
+- lib/mobility/backends/sequel/pg_hash.rb
+- lib/mobility/backends/sequel/postgres_query_methods.rb
+- lib/mobility/backends/sequel/query_methods.rb
+- lib/mobility/backends/sequel/serialized.rb
+- lib/mobility/backends/sequel/serialized/query_methods.rb
+- lib/mobility/backends/sequel/table.rb
+- lib/mobility/backends/sequel/table/query_methods.rb
+- lib/mobility/backends/serialized.rb
+- lib/mobility/backends/table.rb
 - lib/mobility/configuration.rb
-- lib/mobility/core_ext/object.rb
-- lib/mobility/core_ext/string.rb
-- lib/mobility/fallthrough_accessors.rb
-- lib/mobility/locale_accessors.rb
-- lib/mobility/orm.rb
+- lib/mobility/loaded.rb
+- lib/mobility/plugins.rb
+- lib/mobility/plugins/active_model.rb
+- lib/mobility/plugins/active_model/dirty.rb
+- lib/mobility/plugins/active_record.rb
+- lib/mobility/plugins/active_record/dirty.rb
+- lib/mobility/plugins/cache.rb
+- lib/mobility/plugins/cache/translation_cacher.rb
+- lib/mobility/plugins/default.rb
+- lib/mobility/plugins/dirty.rb
+- lib/mobility/plugins/fallbacks.rb
+- lib/mobility/plugins/fallthrough_accessors.rb
+- lib/mobility/plugins/locale_accessors.rb
+- lib/mobility/plugins/presence.rb
+- lib/mobility/plugins/sequel.rb
+- lib/mobility/plugins/sequel/dirty.rb
 - lib/mobility/sequel.rb
 - lib/mobility/sequel/backend_resetter.rb
 - lib/mobility/sequel/column_changes.rb
@@ -210,6 +239,7 @@ files:
 - lib/mobility/sequel/text_translation.rb
 - lib/mobility/sequel/translation.rb
 - lib/mobility/translates.rb
+- lib/mobility/util.rb
 - lib/mobility/version.rb
 - lib/mobility/wrapper.rb
 - lib/rails/generators/mobility/active_record_migration_compatibility.rb
@@ -238,7 +268,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="