greenenvy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44d7ffe342cc58db10ea5d8a2ade17f2607bec6ef51362e08979ec1ca86e64b
-  data.tar.gz: 9ea1723669d2111ac53c01ae68729451f32b0a898b4801abe547ef6aa9e1a01a
+  metadata.gz: fb560ddc1e83c96b74f608f32afd390ea13276e1a4b0ef92c11dfedcd75ba3eb
+  data.tar.gz: 1061c2c034186f8dfd706a6ae80451097becaa3a4ba119fb021058b0ae155c6f
 SHA512:
-  metadata.gz: a7773d0521273e17a293b0869b74ac8976e896bb54a95a76ac3aba987e8310222bbd589de5092b51c518cf0eec617415279c57b6c2c7150628f6db7df0c6e719
-  data.tar.gz: da063579e5110454fc0d8cffe812396a67b90929e989794eab879b65d1af8a9fa72d869d79acf8f721f5e16b8246314fdeab339250f8ce0e35486b58be36715a
+  metadata.gz: 8811bfada6f513a77d81ff91663b8ae03fcd2685c84fdba78094d6c190b422cbf10cda652e871eb49ced38d45966db9d81810ab6ee2914606b0e3e2b174896ea
+  data.tar.gz: fedb8fb3fe9acafc17680fc05bf9f63bc4a11a4911596d6e8e929238b30fa542dbb924c56f8d9036a1bc609993bd63ef3a93be21de0da45ac9f448ba118ede78

data/lib/greenenvy.rb

@@ -1,15 +1,15 @@
+# frozen_string_literal: true
 require "greenenvy/context"
 require "greenenvy/exceptions"
 require "greenenvy/loader"
-require "greenenvy/name_checker"
 require "greenenvy/name_validator"
-require "greenenvy/open_struct_like"
+require "greenenvy/container"
 require "greenenvy/version"
 
 module Greenenvy
   def self.load_env(env, dir)
-    name_validator = NameValidator.new(NameChecker.new)
+    name_validator = NameValidator.new(Container)
     loader = Loader.new(Context, name_validator, env, dir).load
-    OpenStructLike.new(loader)
+    Container.new(loader)
   end
 end

data/lib/greenenvy/{open_struct_like.rb → container.rb}

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Greenenvy
-  class OpenStructLike < BasicObject
+  class Container
     def initialize(hash)
       @hash = hash
       @method_missing_handler = MethodMissingHandler.new(hash)
@@ -9,8 +10,8 @@ module Greenenvy
       @method_missing_handler.call(name)
     end
 
-    def inspect
-      @hash.inspect
+    def respond_to?(name, _=false)
+      @method_missing_handler.respond?(name) || super
     end
 
     class MethodMissingHandler
@@ -19,24 +20,27 @@ module Greenenvy
       end
 
       def call(name)
-        name, predicate = process_predicate(name.to_s)
+        processed_name, predicate = process_predicate(name)
 
-        name = name.to_sym
-
-        if @hash.key?(name)
-          result_with_predicate(name, predicate)
+        if @hash.key?(processed_name)
+          result_with_predicate(processed_name, predicate)
         else
-          raise Exceptions::MissingKey, missing_key_message(name)
+          raise Exceptions::MissingKey, missing_key_message(processed_name)
         end
       end
 
+      def respond?(name)
+        processed_name, _ = process_predicate(name)
+        @hash.key?(processed_name)
+      end
+
       private
 
       def process_predicate(name)
         if name[-1] == "?"
-          [name[0..-2], true]
+          [name[0..-2].to_sym, true]
         else
-          [name, false]
+          [name.to_sym, false]
         end
       end
 

data/lib/greenenvy/context.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Greenenvy
   class Context
-    def initialize(name_validator, env, code, container_class=OpenStructLike)
+    def initialize(name_validator, env, code, container_class=Container)
       @name_validator = name_validator
       @env = env
       @code = code

data/lib/greenenvy/exceptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Greenenvy
   module Exceptions
     MissingKey = Class.new(StandardError)

data/lib/greenenvy/loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Greenenvy
   class Loader
     def initialize(context_class, name_validator, env, dir)

data/lib/greenenvy/name_validator.rb

@@ -1,13 +1,34 @@
+# frozen_string_literal: true
 module Greenenvy
   class NameValidator
-    def initialize(name_checker)
-      @name_checker = name_checker
+    REGEXP = %r{\A[A-Za-z]+\w+\z}.freeze
+
+    def initialize(klass)
+      @klass = klass
     end
 
     def validate!(name)
-      unless @name_checker.valid?(name)
+      name = name.to_sym
+      if reserved_method?(name) || !valid_pattern?(name)
         raise Exceptions::InvalidKey, "Invalid key, #{name}."
       end
+      name
+    end
+
+    private
+
+    def reserved_method?(name)
+      @klass.instance_methods.include?(name)
+    end
+
+    if String.instance_methods.include?(:match?)
+      def valid_pattern?(name)
+        REGEXP.match?(name)
+      end
+    else
+      def valid_pattern?(name)
+        name =~ REGEXP ? true : false
+      end
     end
   end
 end

data/lib/greenenvy/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Greenenvy
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenenvy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aaron Gibralter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,12 +72,11 @@ files:
 - bin/setup
 - greenenvy.gemspec
 - lib/greenenvy.rb
+- lib/greenenvy/container.rb
 - lib/greenenvy/context.rb
 - lib/greenenvy/exceptions.rb
 - lib/greenenvy/loader.rb
-- lib/greenenvy/name_checker.rb
 - lib/greenenvy/name_validator.rb
-- lib/greenenvy/open_struct_like.rb
 - lib/greenenvy/version.rb
 homepage: https://github.com/agibralter/greenenvy
 licenses:

data/lib/greenenvy/name_checker.rb

@@ -1,43 +0,0 @@
-module Greenenvy
-  class NameChecker
-    BASIC_OBJECT_METHODS = [
-        :!,
-        :!=,
-        :==,
-        :__id__,
-        :__send__,
-        :equal?,
-        :instance_eval,
-        :instance_exec,
-        :method_missing,
-        :singleton_method_added,
-        :singleton_method_removed,
-        :singleton_method_undefined,
-        :initialize,
-        :inspect,
-    ].freeze
-
-    REGEXP = %r{\A[A-Za-z]+\w+\z}.freeze
-
-    def valid?(name)
-      name = name.to_s
-      !reserved_method?(name) && valid_pattern?(name)
-    end
-
-    private
-
-    def reserved_method?(name)
-      BASIC_OBJECT_METHODS.include?(name)
-    end
-
-    if String.instance_methods.include?(:match?)
-      def valid_pattern?(name)
-        REGEXP.match?(name)
-      end
-    else
-      def valid_pattern?(name)
-        name =~ REGEXP ? true : false
-      end
-    end
-  end
-end