taksi 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e57c4a5876a120b859b3642f790bf13d7f45a691ca74e2a3967d094589b2605a
-  data.tar.gz: da96e2c711489b11c4d24f88cb8e3ae738774c484772e3a9c5e0106ab13f5573
+  metadata.gz: 2bf8909dd9e8de12aa8fe7a7f93fcf3a414f8c8bc850bea7ff032bfcfd150d3e
+  data.tar.gz: 02ac2b0dccafc25969a9fc861a88bbaba468b932c014fe898c14e31f42db177d
 SHA512:
-  metadata.gz: 1f52db226be934f1c70c127f2c75b105c1cdc65efd8443a76e338cb62769c95f2511e3b282521d753d6e34cc8791282889b7ef8d05bc471e3ad6b0fc87f8c316
-  data.tar.gz: 229d3fbd97e55eaa3e70a3dd735e2e3b6f4947d9b3b91a962d73a2680c8bccd0c9d04af2a63bff3fcd37810519e65af3c52adb37111c801b8098d2ebdec793e9
+  metadata.gz: 38cc7864f7dc6435e1b48d21f9f1d65b5f4d8ebb06c509d1101742d79e494f8b164fe0c133e873fd52f38570da9c21fd20c2e9ee632330a4f6e39777d70d3350
+  data.tar.gz: c9c0521ad137a949a57686e773eb04aedce5cefcf95e0bf79fe4fa05b89c4ef5f921c6596ec25ce6687bdaf7897b4e82372af84378139bbe5f224a14f51767f0

data/README.md

@@ -22,12 +22,13 @@ class Components::Users::ProfileResume
   include Taksi::Component.new('users/profile_resume')
 
   content do
-    name Taksi::Dynamic
-    profile_kind Taksi::Static, 'resume'
+    static :profile_kind, 'resume' # same as `field :profile_kind, Taksi::Static`
 
-    details do
-      age Taksi::Dynamic
-      email Taksi::Dynamic
+    dynamic :name
+
+    field :details do
+      field :age Taksi::Dynamic # same as `dynamic :age`
+      field :email Taksi::Dynamic
     end
   end
 end

data/lib/taksi/component.rb

@@ -73,7 +73,6 @@ module Taksi
       def load_data_from_key_to_object(data, field, obj)
         splitted_full_path = field.key.to_s.split('.')
         setter_key = splitted_full_path.pop
-        splitted_full_path.shift # remove content root key, as it makes no sense in data object
 
         relative_object = splitted_full_path.reduce(obj) do |memo, path_part|
           memo[path_part.to_sym] ||= {}

data/lib/taksi/components/field.rb

@@ -18,25 +18,24 @@ module Taksi
         @nested_fields = []
 
         instance_exec(&block) if block_given?
-        @defined = true
       end
 
       def key
         return name if parent.nil? || parent.root?
 
-        "#{parent.name}.#{name}"
+        "#{parent.key}.#{name}"
       end
 
       # Fetches the data for in `data` for the current field
       # @return any
       def fetch_from(data)
-        return value.as_json if value.static?
+        return value.as_json if value&.static?
 
-        return data[name] if parent.nil? || parent.root?
+        return data.fetch(name) if parent.nil? || parent.root?
 
-        parent.fetch_from(data)[name]
-      rescue NoMethodError
-        raise NameError, "Couldn't fetch #{key.inspect} from data: #{data.inspect}"
+        parent.fetch_from(data).fetch(name)
+      rescue ::KeyError
+        raise ::KeyError, "Couldn't fetch #{key.inspect} from data: #{data.inspect}"
       end
 
       # Turns the field into his json representation
@@ -76,16 +75,22 @@ module Taksi
         @value.dynamic?
       end
 
-      def method_missing(name, *args, &block)
-        return super if @defined
+      def field(name, *args, &block)
+        self.class.new(skeleton, name, *args, parent: self, &block).tap do |new_field|
+          @nested_fields << new_field
+        end
+      end
 
-        @nested_fields << self.class.new(skeleton, name, *args, parent: self, &block)
+      def nested(name, &block)
+        field(name, &block)
       end
 
-      def respond_to_missing?(name, *)
-        return super if @defined
+      def static(name, value)
+        field(name, ::Taksi::Values::Static, value)
+      end
 
-        true
+      def dynamic(name)
+        field(name, ::Taksi::Values::Dynamic)
       end
     end
   end

data/lib/taksi/registry.rb

@@ -4,6 +4,8 @@ module Taksi
   class Registry
     include ::Singleton
 
+    NAME_REGEX = %r{^[a-z\-_/]{1,80}$}i
+
     class << self
       extend ::Forwardable
 
@@ -18,6 +20,11 @@ module Taksi
     end
 
     def add(klass, name)
+      unless name.to_s.match?(NAME_REGEX)
+        raise StandardError,
+              "Invalid interface name '#{name}', it must to match regex '#{NAME_REGEX.inspect}'"
+      end
+
       sym_name = name.to_sym
 
       @interfaces[sym_name] ||= []

data/lib/taksi/values/dynamic.rb

@@ -3,18 +3,11 @@
 module Taksi
   module Values
     class Dynamic
-      attr_reader :component, :name, :field
+      attr_reader :component, :name
 
-      def initialize(component, name, field = nil)
+      def initialize(component, name)
         @component = component
         @name = name
-        @field = field
-      end
-
-      def path
-        return field if field
-
-        "#{component.id}.#{name}"
       end
 
       def as_json

data/lib/taksi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Taksi
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taksi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Israel Trindade