sequel-active_record 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60fa60644b0d5cf6f0a41428577babe904811485
-  data.tar.gz: 644201ffd082a9d8f9c048915b560dc94d014b3f
+  metadata.gz: 9ea3f5b9a5e7e8b4bf526da21bd8d5a84ed87172
+  data.tar.gz: fb8462d50560a2ac5b331b45e70c4552b026e542
 SHA512:
-  metadata.gz: ec02760204a2569dac9b2ae438d9e5eb03016b8242e7d5eb11f43572f5e97e54b1ec359686363d4a9216193e6d5711c61e89ac2b7562b29ea036e66de60c3eb0
-  data.tar.gz: 836b936c7919c6ff1208cf3d9c5e59ea11b6e56b2567fb016f5733479a1a7d449a8e0fc2f69e1d8fe61c3cac6647ce8dc3a79b0b4225a8c434e852aad1f890f8
+  metadata.gz: 252cad59e00087d05db382bb41f4b60cf3004694ebb07e9cbdc1dfb14bcc2cd05e2185cfd2903f67cc0249fa2999583c94b6bcf995308ac1fb67fe452f087837
+  data.tar.gz: a3ebbb924e3267b8878c9eb22b0875b0ff766155db51aa2daa43a70afd470ce7eff610629e580ee71dffddbbf9f83d41942b50858013d5cea0dbe553dd00d118

data/lib/sequel/plugins/active_record.rb

@@ -2,17 +2,12 @@ module Sequel
 	module Plugins
 		module ActiveRecord
 
-			DEFAULT_FEATURES = [
-				:first,
-				:last
-			].freeze
-
 			FEATURES = Dir[File.expand_path('../', __FILE__) + "/active_record/*.rb"].map{ |f|
 				File.basename(f, '.rb').to_sym
 			}
 
 			# Loads requested features as plugins on the model
-			def self.configure model, features: DEFAULT_FEATURES
+			def self.configure model, features: FEATURES
 
 				# Ensure an array
 				features = [features] unless Array === features

data/lib/sequel/plugins/active_record/finder_methods.rb

@@ -0,0 +1,42 @@
+module Sequel
+	module Plugins
+		module ActiveRecord
+			module FinderMethods
+
+				# Implements find_by methods
+				def method_missing(name, *args, **kwargs, &block)
+
+					strict = name.to_s.ends_with?("!")
+
+					case name
+
+					# Emulate find_by
+					when :find_by, :find_by!
+						dataset = self.where(*args)
+						result = dataset.[](**kwargs)
+						raise Sequel::NoMatchingRow.new(dataset) if strict && !result
+						result
+
+					# Emulate dynamic finders
+					when /^find_by_/
+						terms = name.to_s.sub("find_by_", "").chomp("!").split("_and_").map(&:to_sym)
+						raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected #{terms.count})" unless args.count == terms.count
+						dataset = self.where(terms.zip(args).to_h)
+						result = dataset.first
+						raise Sequel::NoMatchingRow.new(dataset) if strict && !result
+						result
+
+					# Move up the chain
+					else
+						super
+					end
+
+				end
+
+				DatasetMethods = FinderMethods
+				ClassMethods = FinderMethods
+
+			end
+		end
+	end
+end

data/lib/sequel/plugins/active_record/last.rb

@@ -2,14 +2,11 @@ module Sequel
 	module Plugins
 		module ActiveRecord
 			module Last
-				module DatasetMethods
-					def last!(*args, &block)
-					  last(*args, &block) || raise(Sequel::NoMatchingRow.new(dataset))
-					end
-				end
-				module ClassMethods
-					Sequel::Plugins.def_dataset_methods(self, :last!)
+				def last!(*args, &block)
+				  last(*args, &block) || raise(Sequel::NoMatchingRow.new(dataset))
 				end
+				DatasetMethods = Last
+				ClassMethods = Last
 			end
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kenaniah Cerny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sequel/plugins/active_record.rb
+- lib/sequel/plugins/active_record/finder_methods.rb
 - lib/sequel/plugins/active_record/first.rb
 - lib/sequel/plugins/active_record/last.rb
 homepage: https://github.com/kenaniah/sequel-active_record
@@ -143,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="