active_hash 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a92e60195ef8ad5fbd50981978f78755d5f670ba04dd3b97604454e9c466e14
-  data.tar.gz: a00b0870924b1cc46e5f0fc63a75847bcd54532f4f6e8c9c0367c7058ec079e1
+  metadata.gz: 88911736a7baf25f50316f0f8cff64da3d75b0cf4e5ec4da716acae358390308
+  data.tar.gz: aec89dbc9f68f10e86b2e2b7ea4bdecfd42043a917baf7e3aa7a0c85f15969e3
 SHA512:
-  metadata.gz: 1419297eb2d3427cad33b04bf4a29c646b9852e89008df56269128635fabe55a16742a9c9f4a0de4cd8fd398bddfb1dcd36730f3fd63283ba92764c1f83260e4
-  data.tar.gz: a89ca9f078a9258d5c6f079505abffe438250444e2afa45f2f9d0934afa4ed29cbb06de211a6e392905887c5770724f873541a8f84e58253385dc93d00a35ef1
+  metadata.gz: 80a28ac67124190ca5dcff815a0e0dc923f3cc5a8401965de64ae53e0feb8901fd3bc6bfcedd4deb8c86b83ba4b16190b2e098eee0a2ee3e5db6b07bd1ad0815
+  data.tar.gz: 25de0710d0f570a6486153f46a987d8f95187b71f95338b5e54ce0a1e529df4cd6d91e7097c3ed45f80072f38647a3821fbcd7354e06b9d0c415e48b7fcb7487

data/CHANGELOG

@@ -1,3 +1,7 @@
+2018-11-22 (v2.2.0)
+  - Support pluck method [#164](https://github.com/zilkey/active_hash/pull/164) Thanks, @ihatov08
+  - Support where.not method [#167](https://github.com/zilkey/active_hash/pull/167) Thanks, @DialBird
+
 2018-04-05 (v2.1.0)
   - Allow to use ERB (embedded ruby) in yml files [#160](https://github.com/zilkey/active_hash/pull/160) Thanks, @UgoMare
   - Add `ActiveHash::Base.polymorphic_name` [#162](https://github.com/zilkey/active_hash/pull/162)

data/README.md

@@ -207,7 +207,7 @@ Country#save!
 Country.create
 Country.create!
 ```
-As such, ActiveHash::Base and its descendants should work with Fixjour or FactoryGirl, so you can treat ActiveHash records the same way you would any other ActiveRecord model in tests.
+As such, ActiveHash::Base and its descendants should work with Fixjour or FactoryBot, so you can treat ActiveHash records the same way you would any other ActiveRecord model in tests.
 
 To clear all records from the in-memory array, call delete_all:
 ```ruby

data/lib/active_file/base.rb

@@ -3,11 +3,7 @@ module ActiveFile
   class Base < ActiveHash::Base
     extend ActiveFile::MultipleFiles
 
-    if respond_to?(:class_attribute)
-      class_attribute :filename, :root_path, :data_loaded, instance_reader: false, instance_writer: false
-    else
-      class_inheritable_accessor :filename, :root_path, :data_loaded
-    end
+    class_attribute :filename, :root_path, :data_loaded, instance_reader: false, instance_writer: false
 
     class << self
 

data/lib/active_file/multiple_files.rb

@@ -5,11 +5,7 @@ module ActiveFile
     end
 
     def use_multiple_files
-      if respond_to?(:class_attribute)
-        class_attribute :filenames, instance_reader: false, instance_writer: false
-      else
-        class_inheritable_accessor :filenames
-      end
+      class_attribute :filenames, instance_reader: false, instance_writer: false
 
       def self.set_filenames(*filenames)
         self.filenames = filenames

data/lib/active_hash/base.rb

@@ -14,10 +14,46 @@ module ActiveHash
 
   class Base
 
-    if respond_to?(:class_attribute)
-      class_attribute :_data, :dirty, :default_attributes
-    else
-      class_inheritable_accessor :_data, :dirty, :default_attributes
+    class_attribute :_data, :dirty, :default_attributes
+
+    class WhereChain
+      def initialize(scope)
+        @scope = scope
+        @records = @scope.all
+      end
+
+      def not(options)
+        return @records if options.blank?
+
+        # use index if searching by id
+        if options.key?(:id) || options.key?("id")
+          ids = @scope.pluck(:id) - Array.wrap(options.delete(:id) || options.delete("id"))
+          candidates = ids.map { |id| @scope.find_by_id(id) }.compact
+        end
+        return candidates if options.blank?
+
+        (candidates || @records || []).reject do |record|
+          match_options?(record, options)
+        end
+      end
+
+      def match_options?(record, options)
+        options.all? do |col, match|
+          if match.kind_of?(Array)
+            match.any? { |v| normalize(v) == normalize(record[col]) }
+          else
+            normalize(record[col]) == normalize(match)
+          end
+        end
+      end
+
+      private :match_options?
+
+      def normalize(v)
+        v.respond_to?(:to_sym) ? v.to_sym : v
+      end
+
+      private :normalize
     end
 
     if Object.const_defined?(:ActiveModel)
@@ -154,8 +190,12 @@ module ActiveHash
         end
       end
 
-      def where(options)
-        return @records if options.blank?
+      def where(options = :chain)
+        if options == :chain
+          return WhereChain.new(self)
+        elsif options.blank?
+          return @records
+        end
 
         # use index if searching by id
         if options.key?(:id) || options.key?("id")
@@ -199,6 +239,10 @@ module ActiveHash
         all.length
       end
 
+      def pluck(*column_names)
+        column_names.map { |column_name| all.map(&column_name.to_sym) }.inject(&:zip)
+      end
+
       def transaction
         yield
       rescue LocalJumpError => err

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jeff Dean
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord-like model that uses a hash or file as a datasource