uniqable 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b68f76b3b88795ba68de78138fd7aca5afe838f0
-  data.tar.gz: c3f5d75e44f0f96c532d4a6c73df7986f8921fec
+  metadata.gz: 614ad5000574685a9eae9222e26c04898a03b22e
+  data.tar.gz: ff0f29efadbf39c75d7b2340af4a3cf628fc3e78
 SHA512:
-  metadata.gz: 3764a994583ea2e219f746f55671e224ea58ed0bd9cdb710621d780f064771bbfd4f88ffd7a8cdfc8dbb742e04c989b52225f52b212b73b20fe70805654b95f7
-  data.tar.gz: 6d337e6ef441ac0a7db557aea799fea790c8b3ba40e2bbc279ac57b78ed1fe3f2aa0a23be731b5ac9701bbb5dc1892634ff8230d569ed0666b2db50eef143a25
+  metadata.gz: ae466818b9f47c24b1a9a0d5359f37cbde6e189a6ac602c72204d585778323b75a32b02ffa97bbca00ec20f08f8ea7c1284936463043659801ec45dd832a38e0
+  data.tar.gz: c34d784116d1c532248f3aed6884a4ddc5cd8008f2fe2d08ce81f8ce67c3ec93c800fc963ff7b452d635c0ab34521878be3cf12b0e7c477304a1c2fa01d586ef

data/Gemfile

@@ -9,4 +9,4 @@ gemspec
 
 group :test do
   gem 'rspec_junit_formatter'
-end
+end

data/Gemfile.lock

@@ -21,6 +21,7 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     ast (2.4.0)
+    awesome_print (1.8.0)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
@@ -57,6 +58,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
+    sqlite3 (1.3.13)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -67,11 +69,13 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.1.14.1)
+  awesome_print
   bundler (~> 1.16)
   rake (~> 10.0)
   rspec (~> 3.0)
   rspec_junit_formatter
   rubocop (~> 0.49)
+  sqlite3
   uniqable!
 
 BUNDLED WITH

data/README.md

@@ -41,6 +41,8 @@ if you want you can use `:to_param` option to generate automatically `#to_param`
 anyway you have one more method `.find_uniqable` which one you can use to find your model record
 ```ruby
   MyModel.find_uniqable params[:uid]
+  # or
+ MyModel.find_uniqable! params[:uid] # this will raise exception ActiveRecord::RecordNotFound if record is absent 
 ```
 and another one is `.uniqable_fields`
 ```ruby

data/lib/uniqable.rb

@@ -8,10 +8,12 @@ module Uniqable
     base.extend ClassMethods
   end
 
+  # Methods going to be AR model's methods
   module ClassMethods
     # Uniqable fields and options declaration
     # @example:
     #   uniqable :uid, :slug, to_param: :uid
+    # rubocop:disable Metrics/MethodLength
     def uniqable(*fields, to_param: nil)
       fields = [:uid] if fields.blank?
       fields.each do |name|
@@ -21,12 +23,18 @@ module Uniqable
         fields
       end
 
-      if to_param # :to_param option
-        define_method :to_param do
-          public_send(to_param)
-        end
+      return if to_param.blank? # :to_param option
+      define_method :to_param do
+        public_send(to_param)
       end
     end
+    # rubocop:enable Metrics/MethodLength
+
+    # @return [self]
+    def where_uniqable(uid)
+      where_sql = uniqable_fields.map { |r| "#{table_name}.#{r} = :uid" }.join(' OR ')
+      where(where_sql, uid: uid)
+    end
 
     # Find record by one of the uniq field
     # usage @example:
@@ -35,8 +43,13 @@ module Uniqable
     #   MyModel.find_uniqable params[:uid] # can be uid or slug column
     # @return [self]
     def find_uniqable(uid)
-      where_sql = uniqable_fields.map{ |r| "#{table_name}.#{r} = :uid"}.join(' OR ')
-      self.where(where_sql, uid: uid).take
+      where_uniqable(uid).take
+    end
+
+    # Same as method above just raise exception if nothing is there
+    # @return [self]
+    def find_uniqable!(uid)
+      where_uniqable(uid).take!
     end
   end
 

data/lib/uniqable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uniqable
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/uniqable.gemspec

@@ -23,8 +23,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'activerecord', '~> 4.1.14.1'
+  spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.49'
+  spec.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uniqable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Renat "MpaK" Ibragimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.14.1
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.49'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
 description: Generate a unique, random token for ActiveRecord models.
 email:
 - mrak69@gmail.com