activeyaml 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b59e3eca883ff3ce07f8e5f6f5d1ddf3a2a10331987854a9c4137071573d684c
-  data.tar.gz: 80cc1a3fead0e93411a419633d5985eaaeda9eef88963695b05653ed105fee82
+  metadata.gz: f597f7a0892113b9d7c602f9cb76cc61da3d3a4b25650fa117088b58831202e5
+  data.tar.gz: d2dc072ff789b4916c944b55886efa32caaf3d0c533d28d1738fdf57c374a368
 SHA512:
-  metadata.gz: b5f0a3fa1e8dbb9d6446fdddd1da28c091287bf034db6b7bb507afe1f93fab4352279ed186895340272438ed83374e4339ac1f2e9ca8a78bcd6fbd8cea127524
-  data.tar.gz: 312629be17b050c0ddc705a927f58ea8ae56a0fa67b84ffb876284fcf59704e05d1fa895202e9c8f3bb51510d417de8fdc73be64d454479035bd1e014e83bb39
+  metadata.gz: fc6db90a8cfcd36a4861470b87d3d8f67c8753e7c5c1b2bdf931690838094ff07ebc476342e9409b74c5bf5bf669f08e0759e6ac9c672f6650fbff88587fc26c
+  data.tar.gz: a6dba19bcef8563aa8677914d6a8a96aab6cc8b5f9df4b7749d08d78fa75e95cbe0df76f27bb8a9326e9f40430949f21a4cdd01336407b991fc3eec1bb30cdae

data/lib/active_yaml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveYaml
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 end

data/lib/active_yaml/yaml_hash.rb

@@ -9,6 +9,8 @@ module ActiveYaml
       @hash = hash || {}
     end
 
+    # The main logic of this class is implemented in this method.
+    # Allows you to filter method calls and redirect them to a hash by key
     def method_missing(method, *args, &)
       value = hash[method.to_s]
 
@@ -21,6 +23,10 @@ module ActiveYaml
       end
     end
 
+    def respond_to_missing?(method, include_private = false)
+      hash.key?(method.to_s) || super
+    end
+
     def inspect
       hash
     end
@@ -28,9 +34,5 @@ module ActiveYaml
     def to_s
       hash.to_s
     end
-
-    def respond_to_missing?(method, include_private = false)
-      hash.key?(method.to_s) || super
-    end
   end
 end

data/lib/active_yaml.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'active_yaml/parser'
-require_relative 'active_yaml/method_redirection'
+require_relative 'active_yaml/yaml_hash'
 require_relative 'active_yaml/factory_hash'
 
 # The main module from which work with gem begins
@@ -9,13 +9,27 @@ module ActiveYaml
   extend FactoryHash
 
   # Base class to inherit from to create models
-  class Base
-    include MethodRedirection
-
+  class BaseModel
     def self.yaml(file_path)
       define_method(:yaml_data) do
         @yaml_data = Parser.parse(file_path)
       end
     end
+
+    def method_missing(method, *args, &)
+      value = yaml_data[method.to_s]
+
+      if value
+        return value unless value.is_a?(Hash)
+
+        YamlHash.new(value)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      yaml_data[method.to_s] || super
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeyaml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Kirill Leonov
@@ -32,7 +32,6 @@ extra_rdoc_files: []
 files:
 - lib/active_yaml.rb
 - lib/active_yaml/factory_hash.rb
-- lib/active_yaml/method_redirection.rb
 - lib/active_yaml/parser.rb
 - lib/active_yaml/version.rb
 - lib/active_yaml/yaml_hash.rb

data/lib/active_yaml/method_redirection.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'yaml_hash'
-
-module ActiveYaml
-  # A module with methods for implementing tracking methods.
-  # In the model in order to proxy them into a hash with YML data
-  module MethodRedirection
-    def method_missing(method, *args, &)
-      value = yaml_data[method.to_s]
-
-      if value
-        return value unless value.is_a?(Hash)
-
-        YamlHash.new(value)
-      else
-        super
-      end
-    end
-
-    def respond_to_missing?(method, include_private = false)
-      yaml_data[method.to_s] || super
-    end
-  end
-end