vimo 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165c7157085ad7675a72fcb99f22444322f0d235635e58103425a43eaab43da1
-  data.tar.gz: e54c776796bebdde6113a7d58e77afab59d5a4779dbed48df470c9b912f83707
+  metadata.gz: 1005a992604203884f06ec2f60da43f3b990814d981f18fd53e340f68cdfddb9
+  data.tar.gz: 17a6dcf1e5b2f2e702d9e107cdf4eacb9e4aa5e421f92fb4874487d92643ccd1
 SHA512:
-  metadata.gz: 2ef13ba029adac1b3b17a3ac17c42df29f4ce1a1bc1bb693e0d73ebbc230ab4a805f4ee8f90092d014e963db06dbe8f9f145df6576430a9e6547ba7c1358f86c
-  data.tar.gz: 8b56cd796a0609b4305a759e93828d1b8fde8eabdf8e8d3b67bc3ed5f5ca0ca022c41d5226ffbfe6e2c0b14e9114b262e41505ad11a79f9a0b19c78606b67f9b
+  metadata.gz: 43b32c3e3268e1cdf280cde01ce20c9489b05db23d8ed400ab44a5e68c39b9432437d56a71e74e548d85f4e341605e7d93b61dcd71ba5fbd45e655867b3c09b0
+  data.tar.gz: a5ce59a8456d87afa1759455785035568d847e333077a2e56a3d4bad79b02cd5b4143cecc9ed62c857f4fac1b5bb5dceca98b2dabbe6bb636d1166751790d028

data/README.md

@@ -5,7 +5,7 @@ Rails engine that allow to your users create and customize their own virtual mod
 ## Warning
 
 This engine is in a very early stage and the DSL and APIs could change, if you
-are interesed on use it you can emailme: `ceritium@gmail.com`.
+are interested on use it you can emailme: `ceritium@gmail.com`.
 
 ## Installation
 
@@ -75,7 +75,7 @@ DELETE /vimo/entities/:entity/items/:id
 
 Create an item curl example:
 ```
-curl localhost:3000/vimo/entities/comments/items -X POST -H 'Content-Type: application/json' -d '{"title": "a title"}'
+curl localhost:3000/vimo/entities/comments/items -X POST -H 'Content-Type: application/json' -d '{"item" : {"title": "a title"}}'
 ```
 
 Short path version
@@ -107,6 +107,14 @@ end
 
 Setting a `owner` scope the uniquenes constraints.
 
+The owner should respond to `vimo_entities`
+
+```ruby
+class Account < ApplicationRecord
+  vimo_owner
+end
+```
+
 
 ### Expand your models
 
@@ -117,15 +125,12 @@ users expand it.
 class Post < ApplicationRecord
   belongs_to :account
 
-  include Vimo::Expandable # OR add it to ApplicationRecord
-  expandable owner: :account
+  vimo_expand owner: :account
 end
 ```
 
-Now can manage the virtual attributes of the model `Post` with the identifier `_extend_posts`.
-
+Now can manage the virtual attributes of the model `Post` with the identifier `_expand_posts`.
 
-WIP
 
 ## Contributing
 Contribution directions go here.

data/app/controllers/vimo/items_controller.rb

@@ -34,7 +34,7 @@ module Vimo
     private
 
     def save_and_respond
-      @item.assign_params(params)
+      @item.data = params[:item]
       @item.save
 
       respond_with @entity, @item

data/app/models/vimo/item.rb

@@ -7,6 +7,9 @@ module Vimo
     belongs_to :expandable, polymorphic: true, required: false
 
     validate :entity_definition
+    validate :expanded
+    validates :expandable_id, uniqueness: { scope: :expandable_type },
+      allow_nil: true
 
     class << self
       def parse(value_o, kind)
@@ -43,26 +46,21 @@ module Vimo
       ({ id: id }).merge(data)
     end
 
-    def assign_params(params)
-      self.data ||= {}
-      self.data = entity.fields.inject(self.data) do |memo, field|
-
-        name = field.name.to_s
-        kind = field.kind.to_s
+    private
 
-        att = params[name]
-        if params.keys.include?(name)
-          memo[name] = self.class.parse(att, kind)
+    def expanded
+      if entity.expand_model.present?
+        if expandable.present?
+          unless expandable.model_name.name == entity.expand_model
+            errors.add(:expandable, "is invalid")
+          end
+        else
+          errors.add(:expandable, "is required")
         end
-
-        memo
       end
     end
 
-    private
-
     def entity_definition
-      self.data ||= {}
       entity.fields.each do |field|
         name = field.name.to_s
         if field.required

data/db/migrate/20180208181633_create_vimo_entities.rb

@@ -4,6 +4,7 @@ class CreateVimoEntities < ActiveRecord::Migration[5.0]
       t.string :name
       t.string :system_name
       t.references :owner, polymorphic: true, index: true
+      t.string :expand_model
 
       t.timestamps
     end

data/db/migrate/20180210104430_create_vimo_items.rb

@@ -2,7 +2,7 @@ class CreateVimoItems < ActiveRecord::Migration[5.1]
   def change
     create_table :vimo_items do |t|
       t.references :entity, foreign_key: true
-      t.references :expandable, polymorphic: true, index: true
+      t.references :expandable, polymorphic: true, index: { unique: true }
       t.text :data
 
       t.timestamps

data/lib/vimo.rb

@@ -2,6 +2,8 @@
 
 require "vimo/engine"
 require "vimo/configuration"
+require "vimo/ownerable"
+require "vimo/expandable"
 
 module Vimo
   # Your code goes here...

data/{app/models → lib}/vimo/expandable.rb

@@ -7,15 +7,15 @@ module Vimo
     included do
 
       def self.vimo_expand(options = {})
-        @@belongs_to_owner = options[:owner]
+        @belongs_to_owner = options[:owner]
+        data_method = options[:data_method] || "data"
 
         self.class_eval do
-
-          has_one :expanded, as: :expandable, class_name: "Vimo::Item"
-          delegate :data, to: :expanded
+          has_one :expanded, as: :expandable, class_name: "Vimo::Item", autosave: true
+          delegate data_method, "#{data_method}=", to: :expanded
 
           def vimo_owner
-            send(@@belongs_to_owner) if @@belongs_to_owner
+            send(@belongs_to_owner) if @belongs_to_owner
           end
 
           def entities
@@ -27,7 +27,7 @@ module Vimo
           end
 
           def expanded
-            super || build_expanded(entity: entities.find_or_create_by!(name: "_expand_#{self.class.table_name}"))
+            super || build_expanded(entity: entities.find_or_create_by!(name: "_expand_#{self.class.table_name}", expand_model: self.model_name.name))
           end
 
           def entity_fields
@@ -38,3 +38,5 @@ module Vimo
     end
   end
 end
+
+ActiveRecord::Base.send :include, Vimo::Expandable

data/lib/vimo/ownerable.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Vimo
+  module Ownerable
+    extend ActiveSupport::Concern
+
+    included do
+      def self.vimo_owner(options = {})
+        self.class_eval do
+          has_many :vimo_entities, class_name: "Vimo::Entity", as: :owner
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Vimo::Ownerable

data/lib/vimo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vimo
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Jose Galisteo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -149,7 +149,6 @@ files:
 - app/mailers/vimo/application_mailer.rb
 - app/models/vimo/application_record.rb
 - app/models/vimo/entity.rb
-- app/models/vimo/expandable.rb
 - app/models/vimo/field.rb
 - app/models/vimo/item.rb
 - app/models/vimo/system_name.rb
@@ -166,6 +165,8 @@ files:
 - lib/vimo.rb
 - lib/vimo/configuration.rb
 - lib/vimo/engine.rb
+- lib/vimo/expandable.rb
+- lib/vimo/ownerable.rb
 - lib/vimo/version.rb
 homepage: https://github.com/ceritium/vimo
 licenses: