yuba 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 338f5b0c508bb1e8df93486999e6d06025f0efdd
-  data.tar.gz: 69e9080eeddb78312be8475bd71f078aaae6947c
+SHA256:
+  metadata.gz: 290adbd946ac8cad632dd7d5cb975a4d5c68d831e9cbbeb7e3f6e42b89fd1b26
+  data.tar.gz: 583c456070ce6dd43c470de3db139a4e8fc2c5753dc9a7dcd74021b33b4383c4
 SHA512:
-  metadata.gz: b5418fb02dd94930ed5b273bbbaf77cf4dad46d89c0bafb84bf4a2257d76266fb1987a19c8671aeed71bae4f78b068c991942a24797318ff59773a4880554fbf
-  data.tar.gz: 104a17016bbc0a247f03ff21a4e87eab9fcc7c2a4f86c0d10618cc8a32fb2b8d10d572805a8a938ce5932e44b51834e5834c8ac27f32f6f9ce9a9f3f72cb4f3c
+  metadata.gz: ba927cfa71760e4b4e59e2959678783eaea2c77b9cd9eb746cc78b091d85ad23300f99da6770c36cc6f4f3fe7c07cc5d7f118cbaee1bae3fbd863d3dbbda404c
+  data.tar.gz: bf0e9248993e20e124a6de98eeb7b5bce9fa629ac16d7d32702b3f167cfcc5f042477ea2bf789c2a70ca9e43a51280c196bd1c56191e80379d33460f78462801

data/lib/yuba.rb

@@ -5,9 +5,8 @@ module Yuba
   autoload :Form, 'yuba/form'
   autoload :Service, 'yuba/service'
   autoload :ViewModel, 'yuba/view_model'
-  autoload :Rendering, 'yuba/rendering'
 end
 
 ActiveSupport.on_load(:action_controller) do
-  ActionController::Base.include(Yuba::Rendering)
+  ActionController::Base.include(Yuba::ViewModel::Rendering)
 end

data/lib/yuba/version.rb

@@ -1,3 +1,3 @@
 module Yuba
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/yuba/view_model.rb

@@ -1,5 +1,7 @@
 module Yuba
   class ViewModel
+    autoload :Rendering, 'yuba/view_model/rendering'
+
     class_attribute :_properties
     self._properties = {}
 
@@ -13,27 +15,30 @@ module Yuba
       #   property :name, public: true
       #   property :email, optional: true
       def property(name, options = {})
-        _properties[name.to_sym] = options
+        self._properties = _properties.merge(name.to_sym => options)
       end
     end
 
     def initialize(**args)
-      validate_arguments(args)
-      define_accessors(args)
+      @_args = args
+      validate_arguments
+      define_accessors
     end
 
     private
 
-    def validate_arguments(args)
-      args.each_key do |key|
+    attr_reader :_args
+
+    def validate_arguments
+      _args.each_key do |key|
         if !_properties.has_key?(key.to_sym) && !_properties.dig(key.to_sym, :optional)
           raise ArgumentError, "missing 'property :#{key}' in #{self.class.name} class"
         end
       end
     end
 
-    def define_accessors(args)
-      args.each do |key, value|
+    def define_accessors
+      _args.each do |key, value|
         public_method = _properties[key.to_sym][:public]
         define_singleton_method key do
           value

data/lib/yuba/view_model/rendering.rb

@@ -0,0 +1,38 @@
+module Yuba
+  class ViewModel
+    module Rendering
+      def render(*args)
+        view_model_hash = args.find { |arg| arg.is_a?(Hash) && arg[:view_model] }
+        @_view_model = view_model_hash[:view_model] if view_model_hash && view_model_hash[:view_model]
+        super
+      end
+
+      def view_assigns
+        super.merge(view_model_assigns)
+      end
+
+      private
+
+      def _protected_ivars
+        super.merge(:@_view_model)
+      end
+
+      def view_model_assigns
+        return {} unless defined?(@_view_model)
+        methods = @_view_model.public_methods(false)
+        methods.reject! do |method_name|
+          %i[initialize].include?(method_name) ||
+            !valid_variable_name?(method_name)
+        end
+        methods.inject({}) do |hash, method_name|
+          hash[method_name] = @_view_model.public_send(method_name)
+          hash
+        end
+      end
+
+      def valid_variable_name?(name)
+        name.match?(/\A[_a-z]\w*\z/)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yuba
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - willnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,15 +152,14 @@ files:
 - lib/generators/yuba/service/templates/service.tt
 - lib/generators/yuba/view_model/templates/view_model.tt
 - lib/generators/yuba/view_model/view_model_generator.rb
-- lib/tasks/crepe_tasks.rake
 - lib/yuba.rb
 - lib/yuba/form.rb
 - lib/yuba/form/coercion.rb
 - lib/yuba/form/multi_parameter_attributes.rb
-- lib/yuba/rendering.rb
 - lib/yuba/service.rb
 - lib/yuba/version.rb
 - lib/yuba/view_model.rb
+- lib/yuba/view_model/rendering.rb
 homepage: https://github.com/willnet/yuba
 licenses:
 - MIT
@@ -181,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Add New Layers to Rails

data/lib/tasks/crepe_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :yuba do
-#   # Task goes here
-# end

data/lib/yuba/rendering.rb

@@ -1,33 +0,0 @@
-module Yuba
-  module Rendering
-    def render(*args)
-      view_model_hash = args.find { |arg| arg.is_a?(Hash) && arg[:view_model] }
-      @_view_model = view_model_hash[:view_model] if view_model_hash && view_model_hash[:view_model]
-      super
-    end
-
-    def view_assigns
-      super.merge(view_model_assigns)
-    end
-
-    private
-
-    def _protected_ivars
-      super.merge(:@_view_model)
-    end
-
-    def view_model_assigns
-      return {} unless @_view_model
-      # TODO: get all public methods between self and Yuba::ViewModel
-      #       now get only in self
-      methods = @_view_model.public_methods(false)
-      methods.reject! do |method_name|
-        %i[call initialize].include?(method_name)
-      end
-      methods.inject({}) do |hash, method_name|
-        hash[method_name] = @_view_model.public_send(method_name)
-        hash
-      end
-    end
-  end
-end