matestack-ui-core 1.0.0.rc.1 → 1.0.0

data/app/lib/matestack/ui/core/properties.rb

@@ -18,21 +18,63 @@ module Matestack::Ui::Core::Properties
   module Initializer
     def initialize(model=nil, options={})
       options = model.dup if options.empty? && model.is_a?(Hash)
-      required_hooks(options)
-      optional_hooks(options)
+      # required_hooks(options)
+      # optional_hooks(options)
+      set_values(options) unless options[:skip_set_values]
       super
     end
   end
   
   module ClassMethods
+
+    def inherited(subclass)
+      super
+      # self.new(nil, skip_set_values: true)
+      subclass.property_keys *self.all_property_keys
+      subclass.all_required_properties.concat(self.all_required_properties)
+      subclass.created_properties.concat(self.created_properties)
+    end
+    
+    # contains all property keys, or property hashes regardless of wheter they are optional or required
+    # used in order to initialize values of properties correctly for subclasses and make properties inheritable
+    def all_property_keys
+      @all_properties.flatten!&.uniq! if defined? @all_properties
+      @all_properties ||= []
+    end
+
+    def all_required_properties
+      @all_required_properties ||= []
+    end
+
+    def created_properties
+      @created_properties ||= []
+    end
+
+    # add property keys to array containing all property keys
+    def property_keys(*attributes)
+      attributes.each do |attribute|
+        if attribute.is_a?(Hash)
+          attribute.each do |temp|
+            all_property_keys.push({ "#{temp.first}": temp.last})
+          end
+        else
+          all_property_keys.push(attribute) 
+        end
+      end
+    end
+
     # define optinoal properties for custom components with `optional :foo, :bar`
     def optional(*properties)
+      property_keys *properties
       add_properties_to_list(optional_properties, properties)
+      optional_hooks
     end
   
     # define required properties for custom components with `requires :title, :foo, :bar`
     def requires(*properties)
+      property_keys *properties
       add_properties_to_list(requires_properties, properties)
+      required_hooks
     end
 
     def add_properties_to_list(list, properties)
@@ -47,42 +89,73 @@ module Matestack::Ui::Core::Properties
   
     # array of properties created from the component
     def optional_properties
-      @component_properties ||= []
+      @optional_properties ||= []
     end
   
     # array of required properties from the component
     def requires_properties
       @requires_properties ||= []
     end
-  end
 
-  def optional_hooks(options)
-    self.class.optional_properties.compact.each do |prop|
-      if prop.is_a? Array
-        hash = prop.flatten
-        options[hash.last[:as]] = options[hash.first]
-        prop = hash.last[:as]
+    def optional_hooks
+      self.optional_properties.compact.each do |prop|
+        prop = extract_property_key({}, prop)
+        define_getter_and_setter_for_property(prop)
       end
-      raise PropertyOverwritingExistingMethodException, "Optional property #{prop} would overwrite already defined instance method for #{self.class}" if self.respond_to? prop
-      send(:define_singleton_method, prop) do 
-        options[prop]
+    end
+
+    def required_hooks
+      self.requires_properties.compact.each do |prop|
+        prop = extract_property_key({}, prop)
+        self.all_required_properties.push(prop).uniq!
+        define_getter_and_setter_for_property(prop)
       end
     end
-  end
 
-  def required_hooks(options)
-    self.class.requires_properties.compact.each do |prop|
-      if prop.is_a? Array
+    def extract_property_key(options, prop)
+      if prop.is_a?(Array) || prop.is_a?(Hash)
         hash = prop.flatten
-        options[hash.last[:as]] = options[hash.first]
         prop = hash.last[:as]
       end
-      raise PropertyMissingException, "Required property #{prop} is missing for #{self.class}" if options[prop].nil?
-      raise PropertyOverwritingExistingMethodException, "Required property #{prop} would overwrite already defined instance method for #{self.class}" if self.respond_to? prop
-      send(:define_singleton_method, prop) do
-        options[prop]
+      prop
+    end
+
+    def define_getter_and_setter_for_property(prop)
+      self.created_properties.push(prop)
+      self.send(:define_method, prop) do 
+        self.instance_variable_get(:"@#{prop}")
+      end
+      self.send(:define_method, :"#{prop}=") do |value|
+        self.instance_variable_set(:"@#{prop}", value)
+      end
+    end
+
+    def method_added(name)
+      if all_property_keys.include?(name) && !created_properties.include?(name)
+        raise PropertyOverwritingExistingMethodException, "Property \"#{name}\" would overwrite already defined instance method for #{self}"
+      end
+    end
+  end
+
+  def set_values(options)
+    self.class.all_property_keys.compact.each do |prop|
+      value_key = prop
+      prop = extract_property_key(options, prop)
+      if self.class.all_required_properties.include?(prop) && options[prop].nil?
+        raise PropertyMissingException, "Required property #{prop} is missing for #{self.class}" 
       end
+      send(:"#{prop}=", options[prop])
+    end
+  end
+
+  # returns property key and sets alias if hash with as option is given
+  def extract_property_key(options, prop)
+    if prop.is_a?(Array) || prop.is_a?(Hash)
+      hash = prop.flatten
+      options[hash.last[:as]] = options[hash.first]
+      prop = hash.last[:as]
     end
+    prop
   end
 
 end

data/lib/matestack/ui/core/components.rb

@@ -44,6 +44,8 @@ module Matestack::Ui::Core::Components
   require_core_component "caption"
   require_core_component "cite"
   require_core_component "code"
+  require_core_component "form" # required before collection
+  require_app_path "concepts/matestack/ui/core/form/has_input_html_attributes" # required before collection
   require_app_path "concepts/matestack/ui/core/collection/helper"
   require_core_component "collection/content"
   require_core_component "collection/content/next"
@@ -71,7 +73,6 @@ module Matestack::Ui::Core::Components
   require_core_component "fieldset"
   require_core_component "figure"
   require_core_component "footer"
-  require_core_component "form"
   require_core_component "form/checkbox"
   require_core_component "form/input"
   require_core_component "form/radio"

data/lib/matestack/ui/core/version.rb

@@ -1,7 +1,7 @@
 module Matestack
   module Ui
     module Core
-      VERSION = '1.0.0.rc.1'
+      VERSION = '1.0.0'
     end
   end
 end

data/vendor/assets/javascripts/dist/manifest.json

@@ -2,17 +2,21 @@
   "entrypoints": {
     "matestack-ui-core": {
       "css": [
-        "/dist/matestack-ui-core.min.css"
+        "/dist/matestack-ui-core.css"
       ],
       "js": [
-        "/dist/matestack-ui-core.min.js"
+        "/dist/matestack-ui-core.js"
+      ],
+      "css.map": [
+        "/dist/matestack-ui-core.css.map"
       ],
       "js.map": [
-        "/dist/matestack-ui-core.min.js.map"
+        "/dist/matestack-ui-core.js.map"
       ]
     }
   },
-  "matestack-ui-core.css": "/dist/matestack-ui-core.min.css",
-  "matestack-ui-core.js": "/dist/matestack-ui-core.min.js",
-  "matestack-ui-core.js.map": "/dist/matestack-ui-core.min.js.map"
+  "matestack-ui-core.css": "/dist/matestack-ui-core.css",
+  "matestack-ui-core.css.map": "/dist/matestack-ui-core.css.map",
+  "matestack-ui-core.js": "/dist/matestack-ui-core.js",
+  "matestack-ui-core.js.map": "/dist/matestack-ui-core.js.map"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matestack-ui-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonas Jabari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,7 +151,6 @@ files:
 - app/concepts/matestack/ui/core/collection/content/previous/previous.rb
 - app/concepts/matestack/ui/core/collection/filter/filter.js
 - app/concepts/matestack/ui/core/collection/filter/filter.rb
-- app/concepts/matestack/ui/core/collection/filter/input/input.haml
 - app/concepts/matestack/ui/core/collection/filter/input/input.rb
 - app/concepts/matestack/ui/core/collection/filter/reset/reset.haml
 - app/concepts/matestack/ui/core/collection/filter/reset/reset.rb
@@ -407,7 +406,6 @@ files:
 - lib/matestack/ui/core/version.rb
 - lib/tasks/matestack/ui/core_tasks.rake
 - vendor/assets/javascripts/dist/manifest.json
-- vendor/assets/javascripts/dist/manifest.json.br
 - vendor/assets/javascripts/dist/manifest.json.gz
 - vendor/assets/javascripts/dist/matestack-ui-core.css
 - vendor/assets/javascripts/dist/matestack-ui-core.css.map
@@ -438,9 +436,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

data/app/concepts/matestack/ui/core/collection/filter/input/input.haml

@@ -1,2 +0,0 @@
-- if [:text, :number, :email, :date, :password].include?(options[:type])
-  %input{@tag_attributes}