nobrainer 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f2246b107585644fff659c53223f7c821bbc628
-  data.tar.gz: 9c2b99c8969e58ac8a3e9c447a887ab30d6ee402
+  metadata.gz: c53755e5f9ec902612c417fcf053404cf114ca0b
+  data.tar.gz: 529fe4b627d366ba4813fd6ff750192caf0df316
 SHA512:
-  metadata.gz: 96d2a9de23fc93e7283618a61107043d02fdf4e04623201e654663e4973f248d20122bdfa79f6818580d71169f7d65f56b2dfb4b75dd26f554ed0094996fe6ff
-  data.tar.gz: 7c16007cb6fd8c4e1b0d9bb1b2a590f4cddb489f78c9215315870cfacea4cda86b6de1b63429a46d9641bb3c77216d0a5108c48f4b78459e06bdee174bbcfa4d
+  metadata.gz: 920d6b1c7bec9acd28b4a0e7f54a9967d068a01d31174396ca961eaf8cbfec31e3b8397ab2242ac87c73b9ca3789e80b47c8ca4b809d7a71b5fa80aeedb81f4b
+  data.tar.gz: 92144b91eb03ac14d2a01ea5244480b215286228691e5406a9f7bcf218499853ecfb0d1313f1380f62d509d97dc2bb1dac65ae8e97c0c2c3cc2b7b4c3835e1c2

data/lib/no_brainer/criteria.rb

@@ -3,6 +3,7 @@ require 'rethinkdb'
 class NoBrainer::Criteria
   extend NoBrainer::Autoload
   autoload_and_include :Core, :Raw, :AfterFind, :Where, :OrderBy, :Limit,
-                       :Pluck, :Count, :Delete, :Enumerable, :First, :Aggregate,
-                       :EagerLoad, :Update, :Cache, :Index, :Extend, :Scope
+                       :Pluck, :Count, :Delete, :Enumerable, :First, :Find,
+                       :Aggregate, :EagerLoad, :Update, :Cache, :Index,
+                       :Extend, :Scope
 end

data/lib/no_brainer/criteria/find.rb

@@ -0,0 +1,27 @@
+module NoBrainer::Criteria::Find
+  extend ActiveSupport::Concern
+
+  def find_by?(*args, &block)
+    where(*args, &block).first
+  end
+
+  def find_by(*args, &block)
+    find_by?(*args, &block).tap { |doc| raise_not_found(args) unless doc }
+  end
+  alias_method :find_by!, :find_by
+
+  def find?(pk)
+    without_ordering.find_by?(model.pk_name => pk)
+  end
+
+  def find(pk)
+    without_ordering.find_by(model.pk_name => pk)
+  end
+  alias_method :find!, :find
+
+  private
+
+  def raise_not_found(args)
+    raise NoBrainer::Error::DocumentNotFound, "#{model} #{args.inspect.gsub(/\[{(.*)}\]/, '\1')} not found"
+  end
+end

data/lib/no_brainer/document/criteria.rb

@@ -2,7 +2,8 @@ module NoBrainer::Document::Criteria
   extend ActiveSupport::Concern
 
   def selector
-    self.class.selector_for(pk_value)
+    # Used for writes
+    self.class.rql_table.get(pk_value)
   end
 
   included do
@@ -28,6 +29,7 @@ module NoBrainer::Document::Criteria
              :min, :max, :sum, :avg,         # Aggregate
              :update_all, :replace_all,      # Update
              :pluck, :without, :lazy_fetch, :without_plucking, # Pluck
+             :find_by?, :find_by, :find_by!, :find?, :find, :find!, # Find
              :to => :all
 
     def all
@@ -56,20 +58,6 @@ module NoBrainer::Document::Criteria
       super
     end
 
-    def selector_for(pk)
-      rql_table.get(pk)
-    end
-
-    def find?(pk)
-      attrs = NoBrainer.run { selector_for(pk) }
-      new_from_db(attrs).tap { |doc| doc.run_callbacks(:find) } if attrs
-    end
-
-    def find(pk)
-      find?(pk).tap { |doc| raise NoBrainer::Error::DocumentNotFound, "#{self} #{pk_name}: #{pk} not found" unless doc }
-    end
-    alias_method :find!, :find
-
     def disable_perf_warnings
       self.perf_warnings_disabled = true
     end

data/lib/no_brainer/document/persistance.rb

@@ -29,7 +29,7 @@ module NoBrainer::Document::Persistance
 
   def _reload(options={})
     attrs = NoBrainer.run { _reload_selector(options) }
-    raise NoBrainer::Error::DocumentNotFound, "#{self.class} #{self.class.pk_name}: #{pk_value} not found" unless attrs
+    raise NoBrainer::Error::DocumentNotFound, "#{self.class} :#{self.class.pk_name}=>\"#{pk_value}\" not found" unless attrs
 
     options = options.merge(:pristine => true, :from_db => true)
 
@@ -126,15 +126,15 @@ module NoBrainer::Document::Persistance
   alias_method :update_attributes!, :update!
 
   def update_attributes?(*args)
-    update?(*args).tap { STDERR.puts "[NoBrainer] update_attribute?() is deprecated. Please use update?() instead" }
+    update?(*args).tap { STDERR.puts "[NoBrainer] update_attributes?() is deprecated. Please use update?() instead" }
   end
 
   def update_attributes(*args)
-    update(*args).tap { STDERR.puts "[NoBrainer] update_attribute() is deprecated. Please use update() instead" }
+    update(*args).tap { STDERR.puts "[NoBrainer] update_attributes() is deprecated. Please use update() instead" }
   end
 
   def update_attributes!(*args)
-    update!(*args).tap { STDERR.puts "[NoBrainer] update_attribute!() is deprecated. Please use update() instead" }
+    update!(*args).tap { STDERR.puts "[NoBrainer] update_attributes!() is deprecated. Please use update() instead" }
   end
 
   def delete

data/lib/no_brainer/document/store_in.rb

@@ -16,13 +16,13 @@ module NoBrainer::Document::StoreIn
 
     def database_name
       db = self.store_in_options[:database]
-      db.is_a?(Proc) ? db.call : db
+      (db.is_a?(Proc) ? db.call : db).try(:to_s)
     end
 
     def table_name
       table = store_in_options[:table]
       table_name = table.is_a?(Proc) ? table.call : table
-      table_name || root_class.name.tableize.gsub('/', '__')
+      table_name.try(:to_s) || root_class.name.tableize.gsub('/', '__')
     end
 
     def rql_table

data/lib/no_brainer/document/types/binary.rb

@@ -4,7 +4,7 @@ class NoBrainer::Binary
   def self.to_s; inspect; end
   def self.name; inspect; end
 
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -14,5 +14,5 @@ class NoBrainer::Binary
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/boolean.rb

@@ -4,7 +4,7 @@ class NoBrainer::Boolean
   def self.to_s; inspect; end
   def self.name; inspect; end
 
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -20,5 +20,5 @@ class NoBrainer::Boolean
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/date.rb

@@ -1,5 +1,5 @@
 class Date
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -22,5 +22,5 @@ class Date
       value.is_a?(Date) ? Time.utc(value.year, value.month, value.day) : value
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/float.rb

@@ -1,5 +1,5 @@
 class Float
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -16,5 +16,5 @@ class Float
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/integer.rb

@@ -1,5 +1,5 @@
 class Integer
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -14,5 +14,5 @@ class Integer
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/set.rb

@@ -1,5 +1,5 @@
 class Set
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -19,5 +19,5 @@ class Set
     end
   end
 
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/string.rb

@@ -1,5 +1,5 @@
 class String
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -13,5 +13,5 @@ class String
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/symbol.rb

@@ -1,5 +1,5 @@
 class Symbol
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -17,5 +17,5 @@ class Symbol
       value.to_sym rescue (value.to_s.to_sym rescue value)
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/text.rb

@@ -4,7 +4,7 @@ class NoBrainer::Text
   def self.to_s; inspect; end
   def self.name; inspect; end
 
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -14,5 +14,5 @@ class NoBrainer::Text
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/types/time.rb

@@ -1,7 +1,7 @@
 require 'time'
 
 class Time
-  module NoBrainerExtentions
+  module NoBrainerExtensions
     InvalidType = NoBrainer::Error::InvalidType
 
     def nobrainer_cast_user_to_model(value)
@@ -37,5 +37,5 @@ class Time
       end
     end
   end
-  extend NoBrainerExtentions
+  extend NoBrainerExtensions
 end

data/lib/no_brainer/document/validation.rb

@@ -43,7 +43,11 @@ end
 
 class ActiveModel::EachValidator
   def should_validate_field?(record, attribute)
-    record.new_record? || record.__send__("#{attribute}_changed?")
+    return true unless record.is_a?(NoBrainer::Document)
+    return true if record.new_record?
+
+    attr_changed = "#{attribute}_changed?"
+    return record.respond_to?(attr_changed) ? record.__send__(attr_changed) : true
   end
 
   # XXX Monkey Patching :(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -103,6 +103,7 @@ files:
 - lib/no_brainer/criteria/eager_load.rb
 - lib/no_brainer/criteria/enumerable.rb
 - lib/no_brainer/criteria/extend.rb
+- lib/no_brainer/criteria/find.rb
 - lib/no_brainer/criteria/first.rb
 - lib/no_brainer/criteria/index.rb
 - lib/no_brainer/criteria/limit.rb