dynabute 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc3d0e7b6d1de057c81eee5df5be4b2d9d2b449
-  data.tar.gz: 348d882a6cbc060a772d072a19f5f472f40cd792
+  metadata.gz: 910b9f2ed8ac706b8282dbb275c7fd0fa8211187
+  data.tar.gz: 41b543b260362e618c069e4e45710f8aab029ed2
 SHA512:
-  metadata.gz: 8254f230e971e306d577cfa962daba8bf60a1138d88fd4508834fe301012ba6beb62aa004c01a1c700d6e95aa234a715a4bdf9003e294a67f541fddddeb2b945
-  data.tar.gz: a19ec2cbf89b9be2004bc04f6a59e62519548f2cb6fbcc9c5ff8c955351cafa3ca693c0b0e89350dc79cbcda6b591afc65cbf9ca82d73a7da57a8c90b9776759
+  metadata.gz: 5a52e50202b61a60938286896c32c69e43333461eb45cb73396dc422174b716c2097a1665c5cd1f2f12dc1b26e1a9d9df660307d635bda7fa2871d1d61757e65
+  data.tar.gz: 692d24bcc54085516fb9187c55b108c8b8c255fae89bedc1d6203e05b265c850f86333d1c95114d6b606c5f1cc1f847f025d86ce26ef2739ed13867b50e1a42e

data/README.md

@@ -14,30 +14,32 @@ then add some field definitions
 ```ruby
 User.dynabutes << Dynabute::Field.new( name: 'age', value_type: 'integer' )
 User.dynabutes << Dynabute::Field.new( name: 'skinny', value_type: 'boolean' )
-User.dynabutes << Dynabute::Field.new( name: 'personality', value_type: 'string', has_many: true )
+User.dynabutes << Dynabute::Field.new( name: 'personalities', value_type: 'string', has_many: true )
 ```
 
 now set value
 ```ruby
 user = User.create
 
-user.build_dynabute_value( name: 'age' )
-# => <Dynabute::Values::IntegerValue:0x007faba5279540 id: nil, field_id: 1, dynabutable_id: 1, dynabutable_type: "User", value: nil>
+user.build_dynabute_value( name: 'age', value: 35 ).save
+# => <Dynabute::Values::IntegerValue:0x007faba5279540 id: 1, field_id: 1, dynabutable_id: 1, dynabutable_type: "User", value: 35>
+```
 
-user.build_dynabute_value( name: 'age' ).update( value: 35 )
+check the value
+```ruby
 user.dynabute_value( name: 'age' ).value
-#=> 35
+# => 35
 ```
 
 values can also be referenced by `dynabute_<field name>_value(s)`
 ```ruby
-user.dynabute_age_value
-# => <Dynabute::Values::IntegerValue:0x007faba5279540 id: 1, field_id: 1, dynabutable_id: 1, dynabutable_type: "User", value: 35>
+user.dynabute_age_value.value
+# => 35
 ```
 
 nested attributes of glory
 ```ruby
-personality_field_id = User.dynabutes.find_by( name: 'personality' ).id
+personality_field_id = User.dynabutes.find_by( name: 'personalities' ).id
 user.update(
   dynabute_values_attributes: [
     { name: 'age', value: 36 }, #=> tell us which field to update by `name:`
@@ -48,13 +50,39 @@ user.update(
 )
 ```
 
-check all dynabute values
+`select` value_type is also available 
 ```ruby
-user.dynabute_values
-#=> [#<Dynabute::Values::IntegerValue:0x007ff4230e90d8 id: 1, field_id: 1, dynabutable_id: 1, dynabutable_type: "User", value: 36>,
-     #<Dynabute::Values::BooleanValue:0x007fd03ecb84f8 id: 1, field_id: 2, dynabutable_id: 1, dynabutable_type: "User", value: false>,
-     #<Dynabute::Values::StringValue:0x007fd03b347ef8 id: 1, field_id: 3, dynabutable_id: 1, dynabutable_type: "User", value: "introverted">,
-     #<Dynabute::Values::StringValue:0x007fd03e992080 id: 1, field_id: 3, dynabutable_id: 1, dynabutable_type: "User", value: "stingy">]
+User.dynabutes << Dynabute::Field.new( name: 'gender', value_type: 'select', options_attributes: [ { label: 'male' }, { label: 'female' } ] )
+User.dynabutes << Dynabute::Field.new( name: 'hobbies', has_many: true, value_type: 'select',  options_attributes: [ { label: 'running' }, { label: 'swimming' }, { label: 'hiking' } ] )
+```
+
+list the available options for a field 
+```ruby
+User.dynabutes.find_by(name: gender).options
+# => [#<Dynabute::Option:0x007ff53e2e1f90 id: 1, field_id: 4, label: "male">,
+#     #<Dynabute::Option:0x007ff53e2e1568 id: 2, field_id: 4, label: "female">]
+```
+
+set value
+```ruby
+male = User.dynabutes.find_by(name: 'gender').options.find_by(label: 'male')
+hobbies = User.dynabutes.find_by(name: 'hobbies').options
+
+user.update(dynabute_values_attributes: [
+ { name: 'gender', value: male.id },
+ { name: 'hobbies', value: hobbies[0].id },
+ { name: 'hobbies', value: hobbies[1].id }
+])
+```
+ 
+check out the selected options
+```ruby
+user.dynabute_value(name: 'gender').option
+# => <Dynabute::Option:0x007ff53e2e1f90 id: 1, field_id: 4, label: "male">,
+
+user.dynabute_value(name: 'hobbies').map(&:option)
+# => [#<Dynabute::Option:0x007fb26c4467d8 id: 5, field_id: 5, label: "running">,
+#     #<Dynabute::Option:0x007fb26c446238 id: 6, field_id: 5, label: "swimming">]
 ```
  
 ## Installation

data/lib/dynabute/dynabutable.rb

@@ -29,8 +29,8 @@ module Dynabute
 
       def dynabute_values
         @dynabute_values ||= dynabute_fields
-                               .group_by{|f| f.value_type}
-                               .map { |type, fields|
+                               .group_by{|f| f.value_type }
+                               .map { |_, fields|
                                  fields.first.value_class.where(field_id: fields.map(&:id), dynabutable_id: id)
                                }.flatten.compact
       end
@@ -45,9 +45,9 @@ module Dynabute
         end
       end
 
-      def build_dynabute_value(name: nil, id: nil, field: nil)
+      def build_dynabute_value(name: nil, id: nil, field: nil, **rest)
         field = find_field(name, id, field)
-        send(Util.value_relation_name(field.value_type)).build(field_id: field.id)
+        send(Util.value_relation_name(field.value_type)).build(field_id: field.id, **rest)
       end
 
       def method_missing(*args)

data/lib/dynabute/field.rb

@@ -4,20 +4,18 @@ require 'dynabute/joins'
 module Dynabute
   class Field < ActiveRecord::Base
     include Joins::Field
-    def self.table_name_prefix; 'dynabute_'; end
-
+    def self.table_name_prefix; Util.table_name_prefix; end
     TYPES = %w(string integer boolean datetime select)
     validates :value_type, inclusion: {in: TYPES}
-    scope :for, ->(klass){ where(target_model: klass) }
+    validates :name, presence: true, uniqueness: { scope: :target_model }
+    validates_presence_of :target_model
     has_many :options, class_name: 'Dynabute::Option', dependent: :destroy
     accepts_nested_attributes_for :options, allow_destroy: true
-    def is_select?
-      ['select'].include? value_type
-    end
+
+    scope :for, ->(klass){ where(target_model: klass) }
 
     def value_class
-      type = is_select? ? :integer : value_type
-      Util.value_class_name(type).safe_constantize
+      Util.value_class_name(value_type).safe_constantize
     end
 
     def self.<<(records)

data/lib/dynabute/nested_attributes.rb

@@ -15,6 +15,7 @@ module Dynabute
         collect_fields(@attributes_list)
         @attributes_list.each do |attrs|
           field = resolve_field(attrs)
+          next if field.nil?
           next let_go(field, attrs) if field.has_many
           next let_go(field, attrs) if attrs[:id].present?
           desperados.push([attrs, field])

data/lib/dynabute/option.rb

@@ -1,6 +1,11 @@
+require 'dynabute/util'
+
 module Dynabute
   class Option < ActiveRecord::Base
-    belongs_to :dynabute_field, class_name: 'Dynabute::Field'
-    validates_presence_of :label
+    def self.table_name_prefix; Util.table_name_prefix; end
+    belongs_to :field, class_name: 'Dynabute::Field'
+    has_many :values, class_name: Util.value_class_name(:select), foreign_key: 'value'
+    validates :label, presence: true, uniqueness: { scope: ['field_id'] }
+    validate Util.nested_attributable_presence_validator(:field_id, :field)
   end
 end

data/lib/dynabute/util.rb

@@ -1,21 +1,31 @@
 module Dynabute
-  module Util
-    def value_class_name(type)
-      name = %i(select).include?(type.to_sym) ? :integer : type
-      "Dynabute::Values::#{name.to_s.classify}Value"
-    end
-    module_function :value_class_name
+  class Util
+    class << self
+      def nested_attributable_presence_validator(id_attr, id_relation_accessor, halt: false)
+        return -> {
+          attr = id_attr.to_sym
+          if (persisted? && self[attr].nil?) || (new_record? && send(id_relation_accessor).nil?)
+            errors[attr] << I18n.t('errors.messages.blank')
+            return fail(:abort) if(halt)
+          end
+        }
+      end
+
+      def table_name_prefix
+        'dynabute_'
+      end
 
-    def value_relation_name(type)
-      %i(select).include?(type.to_sym) ?
-        :integer_values :
+      def value_class_name(type)
+        "Dynabute::Values::#{type.to_s.classify}Value"
+      end
+
+      def value_relation_name(type)
         "#{type}_values".to_sym
-    end
-    module_function :value_relation_name
+      end
 
-    def all_value_relation_names
-      Dynabute::Field::TYPES.map{|t| Util.value_relation_name(t).uniq }
+      def all_value_relation_names
+        Dynabute::Field::TYPES.map{|t| Util.value_relation_name(t).uniq }
+      end
     end
-    module_function :all_value_relation_names
   end
 end

data/lib/dynabute/values/base.rb

@@ -1,14 +1,19 @@
+require 'dynabute/util'
+
 module Dynabute::Values
   module Base
     extend ActiveSupport::Concern
 
     included do
-      def self.table_name_prefix; 'dynabute_'; end
+      def self.table_name_prefix; Dynabute::Util.table_name_prefix; end
       belongs_to :dynabutable, polymorphic: true
-      belongs_to :dynabute_field, class_name: 'Dynabute::Field'
+      belongs_to :field, class_name: 'Dynabute::Field'
+      validate Dynabute::Util.nested_attributable_presence_validator(:field_id, :field)
+      validate Dynabute::Util.nested_attributable_presence_validator(:dynabutable_id, :dynabutable)
+      validate Dynabute::Util.nested_attributable_presence_validator(:dynabutable_type, :dynabutable)
 
       def value_type
-        dynabute_field.value_type
+        field.value_type
       end
     end
 

data/lib/dynabute/values/select_value.rb

@@ -0,0 +1,17 @@
+module Dynabute
+  module Values
+    class SelectValue < ActiveRecord::Base
+      include Dynabute::Values::Base
+      belongs_to :option, class_name: "Dynabute::Option", foreign_key: 'value'
+      validate :ensure_option_is_in_same_field
+
+      def ensure_option_is_in_same_field
+        if option && (option.field_id != field_id)
+          errors[:value] << I18n.t('errors.messages.dynabutes.wrong_field_option',
+                      default: 'is pointing to the option for other dynabute field')
+        end
+      end
+
+    end
+  end
+end

data/lib/dynabute/values.rb

@@ -3,3 +3,4 @@ require('dynabute/values/boolean_value')
 require('dynabute/values/datetime_value')
 require('dynabute/values/integer_value')
 require('dynabute/values/string_value')
+require('dynabute/values/select_value')

data/lib/dynabute/version.rb

@@ -1,3 +1,3 @@
 module Dynabute
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/generators/dynabute/templates/migration.rb

@@ -44,4 +44,19 @@ class CreateDynabutes < ActiveRecord::Migration[5.1]
     add_index "dynabute_datetime_values", ["dynabutable_id"], name: "dynabute_datetime_values_on_recordable_id", using: :btree
     add_index "dynabute_datetime_values", ["dynabutable_id", "field_id"], name: "dynabute_datetime_values_on_record_id_and_recordable_id", using: :btree
   end
+
+  create_table "dynabute_select_values", force: :cascade do |t|
+    t.integer  "field_id", limit: 4
+    t.integer  "dynabutable_id", limit: 4
+    t.string   "dynabutable_type", limit: 50
+    t.integer  "value"
+  end
+  add_index "dynabute_select_values", ["dynabutable_id"], name: "dynabute_select_values_on_recordable_id", using: :btree
+  add_index "dynabute_select_values", ["dynabutable_id", "field_id"], name: "dynabute_select_values_on_record_id_and_recordable_id", using: :btree
+
+  create_table "dynabute_options", force: :cascade do |t|
+    t.integer "field_id", limit: 4
+    t.string "label"
+    t.index ["field_id"], name: "index_dynabute_options_on_field_id"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynabute
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Liooo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,6 +116,7 @@ files:
 - lib/dynabute/values/boolean_value.rb
 - lib/dynabute/values/datetime_value.rb
 - lib/dynabute/values/integer_value.rb
+- lib/dynabute/values/select_value.rb
 - lib/dynabute/values/string_value.rb
 - lib/dynabute/version.rb
 - lib/generators/dynabute/install_generator.rb