active_hash 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c4404df7bb2e1659918a3e599661a7639dd0a5ed4404a9934d114aa54c0393
-  data.tar.gz: 528d4a632658db0ef6f6a35a3abb8783b039b153bd0b728b026d0ce7d6052c98
+  metadata.gz: e84505bccf077a25c58e6e57c7fe5ed5e626a0990bf7018711936d4d40374d8a
+  data.tar.gz: c4da9c5f5c3af7b5eb55747a91ee292052cef9cb7cfb134337a91d901534dceb
 SHA512:
-  metadata.gz: 97f468d94928db136e9d76fd3e44e502e1e77ea2b764c1a070350d08d63fdc8ca524f81786035641681685f506dab94056b07bce05698a0a16a5a9f948e92e08
-  data.tar.gz: 5361a8ecb16cad65278e096ad58f80103f517043f422d26032c2c213370ebcf369dab9597cba21f372d42ad198d6c22ba06b2a7b611078e78aeb7fe99477f231
+  metadata.gz: b03cc2c6bf1826e6e95a4277434127bed837808bcfdf1f82bbd8ad888b05f9d11e248eff8577cd0e9d51c6d2ace1d1e7688be1ddf3e09dcb38bc161b622c81a8
+  data.tar.gz: fe93b20edaa8152c0448ce071c9d782edb3ded08b716708309678aba1a33b513c9bb9505693a9751a7497e3cd08f44fb18ec3f314c1d040a2b08262479eb1748

data/CHANGELOG

@@ -1,3 +1,8 @@
+2019-09-28 (v2.3.0)
+  - Add ::scope method (inspired by ActiveRecord) [#173](https://github.com/zilkey/active_hash/pull/173)
+  - Let `.find(nil)` raise ActiveHash::RecordNotFound (inspired by ActiveRecord) [#174](https://github.com/zilkey/active_hash/pull/174)
+  - `where` clause now works with range argument [#175](https://github.com/zilkey/active_hash/pull/175)
+
 2019-03-06 (v2.2.1)
   - Allow empty YAML [#171](https://github.com/zilkey/active_hash/pull/171) Thanks, @ppworks
 

data/README.md

@@ -169,6 +169,14 @@ Country.find_all_by_name "foo"                # => returns an array of the objec
 Country.find_by_id_and_name 1, "Germany"      # => returns the first object matching that id and name
 Country.find_all_by_id_and_name 1, "Germany"  # => returns an array of objects matching that name and id
 ```
+
+Furthermore, it allows to create custom scope query methods, similar to how it's possible with ActiveRecord:
+
+```ruby
+Country.scope :english, -> { where(language: 'English') } # Creates a class method Country.english performing the given query
+Country.scope :with_language, ->(language) { where(language: language) } # Creates a class method Country.with_language(language) performing the given query
+```
+
 ## Instance Methods
 
 ActiveHash objects implement enough of the ActiveRecord api to satisfy most common needs.  For example:

data/lib/active_hash/base.rb

@@ -200,6 +200,7 @@ module ActiveHash
         # use index if searching by id
         if options.key?(:id) || options.key?("id")
           ids = (options.delete(:id) || options.delete("id"))
+          ids = range_to_array(ids) if ids.is_a?(Range)
           candidates = Array.wrap(ids).map { |id| find_by_id(id) }.compact
         end
         return candidates if options.blank?
@@ -235,6 +236,15 @@ module ActiveHash
 
       private :normalize
 
+      def range_to_array(range)
+        return range.to_a unless range.end.nil?
+
+        e = data.last[:id]
+        (range.begin..e).to_a
+      end
+
+      private :range_to_array
+
       def count
         all.length
       end
@@ -261,14 +271,14 @@ module ActiveHash
 
       def find(id, * args)
         case id
-          when nil
-            nil
           when :all
             all
           when :first
             all(*args).first
           when Array
             id.map { |i| find(i) }
+          when nil
+            raise RecordNotFound.new("Couldn't find #{name} without an ID")
           else
             find_by_id(id) || begin
               raise RecordNotFound.new("Couldn't find #{name} with ID=#{id}")
@@ -465,6 +475,16 @@ module ActiveHash
       end
 
       private :mark_clean
+      
+      def scope(name, body)
+        raise ArgumentError, 'body needs to be callable' unless body.respond_to?(:call)
+        
+        the_meta_class.instance_eval do
+          define_method(name) do |*args|
+            instance_exec(*args, &body)
+          end
+        end
+      end
 
     end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "2.2.1"
+    VERSION = "2.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport