yuba 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0f50e10de1c64847c7dfb2087e0b8ca416ed1d5
-  data.tar.gz: f1d38de018095e4b0651a0c80c842cadb2070e20
+SHA256:
+  metadata.gz: 017f6300c8cb0d9867119b0e186af6d285b385abec945a23f7745648e140d709
+  data.tar.gz: 5c67a6522565be8935e10413298640755037ed516d30105a53bb1d1bfbf30da7
 SHA512:
-  metadata.gz: 4e2b3a1cb8b9f0ac254f67d504ddf99ffc47b02d322e7eded4a1475597eb8f6374c08c59e19ec39662dd2446c299973237ec8f46fa8cc6bd62e1d22bdfe57406
-  data.tar.gz: 8673f827dd5ecf5a140bfe8774b92de85bdf20bb9f2ff1feb894dc55f1fb8f7ffd01ea4105e9060d72f26b286650678d74da30739c9b6f36e118ce171b36c0fa
+  metadata.gz: 34d21d868256f97cf550ff18a6adb20c6ed2a46c923979ef933966c13b79503835b9db16c4df86c7cb327506dcf240c72e437bc9541e9f8548d086e6dfa58e09
+  data.tar.gz: 14579a01e26e0916eb2a199ed0fc182d6902130b9ad5e9cacf35700bfd1f085d0ab4d8652bbf71bedfdd108ac97d13a43f2c71ac315c07c5acd82fb9eb466e5b

data/README.md

@@ -35,8 +35,8 @@ $ bundle install
 
 ## Support
 
-- Rails 4.2+
-- Ruby 2.2+
+- Rails 5.2+
+- Ruby 2.5+
 
 ## ViewModel
 
@@ -80,7 +80,7 @@ Property is default to private. This means you can use it in internal the instan
 You can use ViewModel in a controller like following
 
 ```ruby
-class PostsController
+class PostsController < ApplicationController
   def show
     @view_model = PostViewModel.new(post: post, author: 'willnet')
   end
@@ -90,7 +90,7 @@ end
 In view template, if you want to access post and author, you have to use `@view_model` instance variable like `@view_model.post.title`. if it feels troublesome, you can write like following
 
 ```ruby
-class PostsController
+class PostsController < ApplicationController
   def show
     view_model = PostViewModel.new(post: post, author: 'willnet')
     render view_model: view_model
@@ -154,6 +154,17 @@ end
 - `.call` invokes `#call` after assigning arguments as properties.
 - `#success?` returns `true` if you don't invoke `#fail!`
 
+You have inspection methods for properties.
+
+```ruby
+service = CreatePostService.new(user: someuser)
+service.has_property?(:user) #=> true
+service.has_public_property?(:user) #=> true
+service.has_private_property?(:user) #=> false
+service.has_required_property?(:user) #=> true
+service.has_optional_property?(:user) #=> false
+```
+
 ## Form
 
 Form is just wrapper of [reform-rails](https://github.com/trailblazer/reform-rails) for now.
@@ -178,6 +189,7 @@ class ArtistsController < ApplicationController
       render :new
     end
   end
+end
 ```
 
 ```ruby

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/service.rb

@@ -11,7 +11,7 @@ module Yuba
       end
 
       def property(name, options = {})
-        _properties[name.to_sym] = options
+        self._properties = _properties.merge(name.to_sym => options)
       end
     end
 
@@ -37,6 +37,26 @@ module Yuba
       !@_success
     end
 
+    def has_property?(property)
+      _properties.has_key?(property.to_sym)
+    end
+
+    def has_required_property?(property)
+      has_property?(property) && !_properties.dig(property.to_sym, :optional)
+    end
+
+    def has_optional_property?(property)
+      has_property?(property) && !has_required_property?(property)
+    end
+
+    def has_public_property?(property)
+      has_property?(property) && !has_private_property?(property)
+    end
+
+    def has_private_property?(property)
+      has_property?(property) && !_properties.dig(property.to_sym, :public)
+    end
+
     private
 
     def validate_arguments(args)
@@ -45,6 +65,12 @@ module Yuba
           raise ArgumentError, "missing 'property :#{key}' in #{self.class.name} class"
         end
       end
+
+      required_keys = _required_properties.keys
+      missing_keys = required_keys - args.keys
+      unless missing_keys.empty?
+        raise ArgumentError, "missing required arguments: #{missing_keys.join(',')}"
+      end
     end
 
     def define_accessors(args)
@@ -56,5 +82,9 @@ module Yuba
         self.singleton_class.class_eval { private key.to_sym } unless public_method
       end
     end
+
+    def _required_properties
+      _properties.reject { |_, value| value[:optional] }
+    end
   end
 end

data/lib/yuba/version.rb

@@ -1,3 +1,3 @@
 module Yuba
-  VERSION = '0.0.1'
+  VERSION = '0.0.6'
 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.1
+  version: 0.0.6
 platform: ruby
 authors:
 - willnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: reform-rails
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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
@@ -180,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.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]
-      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