mongoid_translate 0.1.0 → 0.1.1

data/lib/mongoid/translate.rb

@@ -21,32 +21,29 @@ module Mongoid
       index 'translations.language'
     end
 
-    module InstanceMethods
-      # Return list of existing languages
-      #
-      # @return [ Array ]
-      #
-      def languages
-        translations.map(&:language)
-      end
+    # Return list of existing languages
+    #
+    # @return [ Array ]
+    #
+    def languages
+      translations.map(&:language)
+    end
 
-      # Return main translation object
-      #
-      # @return [ Document ]
-      #
-      def main_translation
-        translations.where(language: main_language).one
-      end
+    # Return main translation object
+    #
+    # @return [ Document ]
+    #
+    def main_translation
+      translations.where(language: main_language).one
+    end
 
-      def method_missing(method, *args, &block)
-        if self.languages.include?(method)
-          translations.where(language: method).one
-        else
-          super(method, *args, &block)
-        end
+    def method_missing(method, *args, &block)
+      if self.languages.include?(method)
+        translations.where(language: method).one
+      else
+        super(method, *args, &block)
       end
-
-    end # InstanceMethods
+    end
 
     module ClassMethods
       attr_accessor :translated_fields

data/lib/mongoid/translate/slug.rb

@@ -9,23 +9,30 @@ module Mongoid
       #
       included do
         scope :by_slug, lambda {|slug| where('translations.slug' => slug )}
+        validate :slug_uniqueness
         index 'translations.slug'
       end
 
-      module InstanceMethods
-        # Return slug.
-        # Didn't want to mess with to_param.
-        #
-        # @example
-        #   document.to_slug
-        #
-        # @return [ String ]
-        #
-        def to_slug
-          locale = languages.include?(I18n.locale) ? I18n.locale : main_language
-          translations.where(language: locale).one.slug
+      # Return slug.
+      # Didn't want to mess with to_param.
+      #
+      # @example
+      #   document.to_slug
+      #
+      # @return [ String ]
+      #
+      def to_slug
+        locale = languages.include?(I18n.locale) ? I18n.locale : main_language
+        translations.where(language: locale).one.slug
+      end
+
+      private
+
+      def slug_uniqueness
+        if self.class.excludes(id: self.id).any_in('translations.slug' => self.translations.map(&:slug)).exists?
+          errors.add(:translations, :slug_uniqueness)
         end
-      end # InstanceMethods
+      end
 
       module ClassMethods
         attr_accessor :slugged

data/lib/mongoid/translate/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
   module Translate
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/mongoid/translation.rb

@@ -19,15 +19,13 @@ module Mongoid
       embedded_in  name.underscore.to_sym, class_name: class_name
     end
 
-    module InstanceMethods
-      # Check if current translation is main_translation.
-      #
-      # @return [ Boolean ]
-      #
-      def main_translation?
-        parent = self.class.to_s.sub(/^.*::/, '').underscore
-        self.send(parent).main_language == self.language
-      end
-    end # InstanceMethods
+    # Check if current translation is main_translation.
+    #
+    # @return [ Boolean ]
+    #
+    def main_translation?
+      parent = self.class.to_s.sub(/^.*::/, '').underscore
+      self.send(parent).main_language == self.language
+    end
   end # Translation
 end # Mongoid

data/lib/mongoid/translation/slug.rb

@@ -12,47 +12,45 @@ module Mongoid
         after_validation :set_slug
       end
 
-      module InstanceMethods
-        # Slug creation.
-        #
-        # @return [ Object ]
-        #
-        def set_slug
-          if self.slug.blank? && slugged_field.present?
-            if translation_parent_class.send(:by_slug, slugged).one
-              self.slug = slugged_with_token
-            else
-              self.slug = slugged
-            end
+      # Slug creation.
+      #
+      # @return [ Object ]
+      #
+      def set_slug
+        if self.slug.blank? && slugged_field.present?
+          if translation_parent_class.send(:by_slug, slugged).one
+            self.slug = slugged_with_token
+          else
+            self.slug = slugged
           end
         end
+      end
 
-        private
+      private
 
-        def slugged_field
-          @slugged_field ||= self.send(translation_parent_class.slugged)
-        end
+      def slugged_field
+        @slugged_field ||= self.send(translation_parent_class.slugged)
+      end
 
-        def slugged
-          @slugged ||= slugged_field.parameterize.blank? ? slugged_field : slugged_field.parameterize
-        end
+      def slugged
+        @slugged ||= slugged_field.parameterize.blank? ? slugged_field : slugged_field.parameterize
+      end
 
-        def slugged_with_token
-          @slugged_with_token ||= [slugged, generate_token].join('-')
-        end
+      def slugged_with_token
+        @slugged_with_token ||= [slugged, generate_token].join('-')
+      end
 
-        def translation_parent_class
-          self.class.to_s.sub('Translation::', '').constantize
-        end
+      def translation_parent_class
+        self.class.to_s.sub('Translation::', '').constantize
+      end
 
-        def translation_parent
-          self.send(self.class.to_s.sub(/^.*::/, '').underscore)
-        end
+      def translation_parent
+        self.send(self.class.to_s.sub(/^.*::/, '').underscore)
+      end
 
-        def generate_token
-          SecureRandom.base64(4).tr('+/=', '-_ ').strip.delete("\n")
-        end
+      def generate_token
+        SecureRandom.base64(4).tr('+/=', '-_ ').strip.delete("\n")
+      end
       end
-    end # InstanceMethods
   end # Translation
 end # Mongoid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_translate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76394790 !ruby/object:Gem::Requirement
+  requirement: &10000200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *76394790
+  version_requirements: *10000200
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &76394330 !ruby/object:Gem::Requirement
+  requirement: &9999380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *76394330
+  version_requirements: *9999380
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &76393870 !ruby/object:Gem::Requirement
+  requirement: &9998880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *76393870
+  version_requirements: *9998880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76393200 !ruby/object:Gem::Requirement
+  requirement: &9998420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *76393200
+  version_requirements: *9998420
 description: Translate mongoid models.
 email: jboyer@af83.com
 executables: []
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Translate mongoid models.
 test_files: []
-has_rdoc: