active_any 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279b90c6e9b262972d592a694e11c2c4cdf647d3
-  data.tar.gz: 0354d6970255d9a02d01f55cb96f39908f0a36ed
+  metadata.gz: e8f0f6be0c590ca667a1c62e6b24c2354597201c
+  data.tar.gz: 8895030ab834a80199bfd73dce24d33b86a21ad6
 SHA512:
-  metadata.gz: 593c783a30b4d63159dde062157b6c3fce66ab9f766c113c30c24eba4b35a7b9b90e75929a99a2ed57f91c7540b83dd9a7cf30ac87962eb5b767cd437b1504f2
-  data.tar.gz: 645c5cbdc4b3458f7df80dbef582d47d90523a0f707362c5110ee973f729c66fd8949731acdba30cab8a07b3e8821bf1608011b1f975d8c0256643fa3b337126
+  metadata.gz: b003bd481d71a28fff409b1bf50148ee1a1b026bc9a404570de84ded22769e42fadf81c96b5006e82b4ee68a254e15cf477a976feef36da68e3514e6f2032218
+  data.tar.gz: dfbf059cd768d49f45a23aa1bc36af8f2048067616b832e41d99d404fb712820914cb69f9009e51c40022f4ef54d38e742071208a234450f4c73833f9d528b68

data/lib/active_any.rb

@@ -15,7 +15,6 @@ require 'active_any/finders'
 require 'active_any/core'
 require 'active_any/base'
 require 'active_any/subscriber'
-require 'active_any/adapter'
 require 'active_any/adapters/abstract_adapter'
 require 'active_any/adapters/object_adapter'
 

data/lib/active_any/adapters/abstract_adapter.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
 module ActiveAny
-  class AbstractAdapter < Adapter
+  class AbstractAdapter
+    attr_reader :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+
     %i[base_hander regexp_handler range_handler array_handler].each do |method|
       define_method method do |_record, _key, value|
         raise NotImplementedError.new, "#{self.class.name} can not handle for #{value.class}"

data/lib/active_any/attribute.rb

@@ -59,12 +59,12 @@ module ActiveAny
 
       def define_reader_method(name)
         define_method name do
-          attributes.fetch(name)
+          attributes.fetch(name, nil)
         end
       end
 
       def has_attribute?(attribute)
-        attribute_names.key?(attribute)
+        attribute_names.include?(attribute)
       end
     end
   end

data/lib/active_any/base.rb

@@ -14,8 +14,10 @@ module ActiveAny
   end
 
   class Object < Base
+    self.abstract_class = true
+
     def self.inherited(child)
-      child.abstract_class = true
+      child.abstract_class = false
     end
 
     class << self
@@ -28,9 +30,7 @@ module ActiveAny
   end
 
   class Hash < Base
-    def self.inherited(child)
-      child.abstract_class = true
-    end
+    self.abstract_class = true
 
     class << self
       attr_reader :data
@@ -50,28 +50,33 @@ module ActiveAny
   end
 
   class CSV < Base
-    def self.inherited(child)
-      child.abstract_class = true
-    end
+    self.abstract_class = true
 
     class MissingFileError; end
 
     class << self
-      attr_accessor :file
+      attr_reader :file
+
+      def file=(file)
+        csv = ::CSV.new(file, headers: true)
+        headers = csv.first
+        headers.each { |header| attribute header }
+      end
 
       def data
         @data ||= begin
           raise MissingFileError unless file
 
           table = ::CSV.table(file)
-          table.headers.each do |header|
-            attribute header
-          end
-
           table.map { |row| new(row.to_h) }
         end
       end
 
+      def reload
+        @data = nil
+        data
+      end
+
       def adapter
         @adapter ||= ObjectAdapter.new(self)
       end

data/lib/active_any/relation/where_clause.rb

@@ -16,7 +16,7 @@ module ActiveAny
           register_handler(Array, :array_handler)
         end
 
-        def evaluate(adapter, record)
+        def evaluate(adapter, record = nil)
           adapter.public_send(handle_for(value), record, key, value)
         end
 
@@ -65,8 +65,10 @@ module ActiveAny
         end
       end
 
-      def all?(&block)
-        conditions.all?(&block)
+      include Enumerable
+
+      def each(&block)
+        conditions.each(&block)
       end
     end
   end

data/lib/active_any/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveAny
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_any
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - yuemori
@@ -199,7 +199,6 @@ files:
 - bin/console
 - bin/setup
 - lib/active_any.rb
-- lib/active_any/adapter.rb
 - lib/active_any/adapters/abstract_adapter.rb
 - lib/active_any/adapters/object_adapter.rb
 - lib/active_any/association_relation.rb

data/lib/active_any/adapter.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveAny
-  class Adapter
-    def initialize(klass)
-      @klass = klass
-    end
-
-    def query(_where_clause, _limit_value)
-      raise NotImplementedError
-    end
-  end
-end