forest_liana 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e5aaaf20833287b7bd967b29fc446819c729c6b
-  data.tar.gz: 42dcb1bda73a88f0c989f6abbf3432c7ea687478
+  metadata.gz: b6d16ef5862508a2c684e836320a1b9e2f288363
+  data.tar.gz: 86adb63b884cf0dcb10196a3040c85101b9a0e59
 SHA512:
-  metadata.gz: a62ec769824286587ad781b0116c59d95e56b972af8c7bd71572e87b43f5fb108ca78ca7d9078b70a6f68464fa67f58cd85a990dfcaa45960c795be99c97a8ab
-  data.tar.gz: 55013515cf0b5f3e12f25949cbcd382c99e2cbc92b51f39fa86e99eefdb9950a7768e9b4a0c4109d758587a17329102e7716afce1c4d42996f4baadb0be6858b
+  metadata.gz: d5ff620aa9503c25bdf3b43ea735be9ce9727791f1896aab03c33a188ce7983c524df48c154871876fbbb6559cbea48e068690b6bd02c61dc117d9638052f347
+  data.tar.gz: 6f0ee7f3879475e0fcd77ef978e8be98b861799cf4f92de4e079bb4939ee75ed7a8c94a84ab618f02320f7cc34e547a0d219247a5751f0c88357eee22a7ab7a6

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -13,7 +13,9 @@ module ForestLiana
       extract_relationships
       extract_paperclip
       extract_carrierwave
+      extract_acts_as_taggable
 
+      @attributes.permit! if @attributes.respond_to?(:permit!)
       @attributes
     end
 
@@ -34,7 +36,7 @@ module ForestLiana
           association = @resource.reflect_on_association(name.try(:to_sym))
 
           if [:has_one, :belongs_to].include?(association.try(:macro))
-            if data.is_a?(Hash)
+            if data.is_a?(Hash) && data[:id]
               @attributes[name] = association.klass.find(data[:id])
             elsif data.blank?
               @attributes[name] = nil
@@ -60,12 +62,24 @@ module ForestLiana
       return unless @resource.respond_to?(:uploaders)
 
       @params['data']['attributes'].each do |key, value|
-        if carrierwave_attribute?(key)
+        if value && carrierwave_attribute?(key)
           @attributes[key] = ForestLiana::Base64StringIO.new(value)
         end
       end
     end
 
+    def extract_acts_as_taggable
+      return unless has_acts_as_taggable?
+
+      @params['data']['attributes'].each do |key, value|
+        if acts_as_taggable_attribute?(key)
+          @attributes["#{key.singularize}_list"] = value
+          @attributes.delete(key)
+        end
+      end
+
+    end
+
     def paperclip_handler?(attr)
       begin
         Paperclip.io_adapters.handler_for(attr)
@@ -82,5 +96,14 @@ module ForestLiana
     def carrierwave_attribute?(attr)
       @resource.uploaders.include?(attr.try(:to_sym))
     end
+
+    def acts_as_taggable_attribute?(attr)
+      @resource.acts_as_taggable.to_a.include?(attr)
+    end
+
+    def has_acts_as_taggable?
+      @resource.respond_to?(:acts_as_taggable) &&
+        @resource.acts_as_taggable.try(:to_a)
+    end
   end
 end

data/app/models/forest_liana/model/action.rb

@@ -4,7 +4,7 @@ class ForestLiana::Model::Action
   include ActiveModel::Serialization
   extend ActiveModel::Naming
 
-  attr_accessor :name, :endpoint, :http_method, :fields
+  attr_accessor :name, :endpoint, :http_method, :fields, :redirect
 
   def initialize(attributes = {})
     attributes.each do |name, value|

data/app/serializers/forest_liana/action_serializer.rb

@@ -7,6 +7,7 @@ class ForestLiana::ActionSerializer
   attribute :http_method
   attribute :endpoint
   attribute :fields
+  attribute :redirect
 
   def relationship_related_link(attribute_name)
     nil

data/app/serializers/forest_liana/serializer_factory.rb

@@ -100,7 +100,7 @@ module ForestLiana
               if relationship_records.respond_to?(:each)
                 ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
               end
-            rescue TypeError, ActiveRecord::StatementInvalid
+            rescue TypeError, ActiveRecord::StatementInvalid, NoMethodError
               puts "Cannot load the association #{attribute_name} on #{object.class.name} #{object.id}."
             end
           end
@@ -141,6 +141,16 @@ module ForestLiana
         end
       end
 
+      # ActsAsTaggable attribute
+      if active_record_class.respond_to?(:acts_as_taggable) &&
+        active_record_class.acts_as_taggable.try(:to_a)
+        active_record_class.acts_as_taggable.to_a.each do |key, value|
+          serializer.attribute(key) do |x|
+            object.send(key).map(&:name)
+          end
+        end
+      end
+
       SchemaUtils.associations(active_record_class).each do |a|
         serializer.send(serializer_association(a), a.name) {
           if [:has_one, :belongs_to].include?(a.macro)

data/app/services/forest_liana/resource_creator.rb

@@ -8,10 +8,10 @@ module ForestLiana
     end
 
     def perform
-      if Rails::VERSION::MAJOR == 4
-        @record = @resource.create!(resource_params.permit!)
+      if @resource.method(:create).parameters.length < 2
+        @record = @resource.create(resource_params)
       else
-        @record = @resource.create!(resource_params, without_protection: true)
+        @record = @resource.create(resource_params, without_protection: true)
       end
 
       set_has_many_relationships

data/app/services/forest_liana/resource_updater.rb

@@ -10,8 +10,8 @@ module ForestLiana
     def perform
       @record = @resource.find(@params[:id])
 
-      if Rails::VERSION::MAJOR == 4
-        @record.update_attributes!(resource_params.permit!)
+      if @resource.instance_method(:update_attributes!).arity == 1
+        @record.update_attributes!(resource_params)
       else
         @record.update_attributes!(resource_params, without_protection: true)
       end

data/app/services/forest_liana/schema_adapter.rb

@@ -5,28 +5,59 @@ module ForestLiana
     end
 
     def perform
-      @collection = ForestLiana::Model::Collection.new({
-        name: @model.table_name,
-        fields: []
-      })
-
       add_columns
       add_associations
 
-      @collection
+      # ActsAsTaggable attribute
+      if @model.respond_to?(:acts_as_taggable) && @model.acts_as_taggable.try(:to_a)
+        @model.acts_as_taggable.to_a.each do |key, value|
+          field = collection.fields.find {|x| x[:field] == key.to_s}
+
+          if field
+            field[:type] = 'String'
+            field[:reference] = nil
+            field[:inverse_of] = nil
+
+            collection.fields.delete_if do |f|
+              ['taggings', 'base_tags', 'tag_taggings'].include?(f[:field])
+            end
+          end
+        end
+      end
+
+      collection
     end
 
     private
 
+    def collection
+      @collection ||= begin
+        collection = ForestLiana.apimap.find do |x|
+          x.name.to_s == @model.table_name
+        end
+
+        if collection.blank?
+          collection = ForestLiana::Model::Collection.new({
+            name: @model.table_name,
+            fields: []
+          })
+
+          ForestLiana.apimap << collection
+        end
+
+        collection
+      end
+    end
+
     def add_columns
       @model.columns.each do |column|
-        @collection.fields << get_schema_for_column(column)
+        collection.fields << get_schema_for_column(column)
       end
 
       # Intercom
       if ForestLiana.integrations.try(:[], :intercom)
         .try(:[], :user_collection) == @model.name
-        @collection.fields << {
+        collection.fields << {
           field: :intercom_conversations,
           type: ['String'],
           reference: 'intercom_conversations.id',
@@ -35,20 +66,7 @@ module ForestLiana
           integration: 'intercom'
         }
 
-        @collection.fields << {
-          field: :intercom_attributes,
-          type: 'String',
-          reference: 'intercom_attributes.id',
-          column: nil,
-          is_searchable: false,
-          integration: 'intercom'
-        }
-      end
-
-      # Stripe
-      if ForestLiana.integrations.try(:[], :stripe)
-        .try(:[], :user_collection) == @model.name
-        @collection.fields << {
+        collection.fields << {
           field: :stripe_payments,
           type: ['String'],
           reference: 'stripe_payments.id',
@@ -57,7 +75,7 @@ module ForestLiana
           integration: 'stripe'
         }
 
-        @collection.fields << {
+        collection.fields << {
           field: :stripe_invoices,
           type: ['String'],
           reference: 'stripe_invoices.id',
@@ -66,7 +84,7 @@ module ForestLiana
           integration: 'stripe'
         }
 
-        @collection.fields << {
+        collection.fields << {
           field: :stripe_cards,
           type: ['String'],
           reference: 'stripe_cards.id',
@@ -79,14 +97,19 @@ module ForestLiana
       # Paperclip url attribute
       if @model.respond_to?(:attachment_definitions)
         @model.attachment_definitions.each do |key, value|
-          @collection.fields << { field: key, type: 'File' }
+          collection.fields << { field: key, type: 'File' }
+        end
+
+        collection.fields.delete_if do |f|
+          ['picture_file_name', 'picture_file_size', 'picture_content_type',
+           'picture_updated_at'].include?(f[:field])
         end
       end
 
       # CarrierWave attribute
       if @model.respond_to?(:uploaders)
         @model.uploaders.each do |key, value|
-          field = @collection.fields.find {|x| x[:field] == key.to_s}
+          field = collection.fields.find {|x| x[:field] == key.to_s}
           field[:type] = 'File' if field
         end
       end
@@ -95,12 +118,12 @@ module ForestLiana
     def add_associations
       SchemaUtils.associations(@model).each do |association|
         begin
-          if schema = column_association(@collection, association)
+          if schema = column_association(collection, association)
             schema[:reference] = get_ref_for(association)
             schema[:field] = deforeign_key(schema[:field])
             schema[:inverseOf] = inverse_of(association)
           else
-            @collection.fields << get_schema_for_association(association)
+            collection.fields << get_schema_for_association(association)
           end
         rescue => error
           puts error.inspect

data/app/services/forest_liana/stripe_payment_refunder.rb

@@ -6,10 +6,10 @@ module ForestLiana
     end
 
     def perform
-      return unless @params[:jsonapis]
+      return unless @params[:data][:attributes][:ids]
 
-      @params[:jsonapis].each do |jsonapi|
-        ch = Stripe::Charge.retrieve(jsonapi[:data][:id])
+      @params[:data][:attributes][:ids].each do |id|
+        ch = Stripe::Charge.retrieve(id)
         ch.refunds.create
       end
     end

data/lib/forest_liana.rb

@@ -1,5 +1,8 @@
 require 'forest_liana/engine'
 
+module Forest
+end
+
 module ForestLiana
   module UserSpace
   end

data/lib/forest_liana/bootstraper.rb

@@ -54,8 +54,6 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
         end
       end
 
-      Dir["#{@app.root}/app/forest/**/*.rb"].each {|file| require file }
-
       setup_stripe_integration if stripe_integration?
       setup_intercom_integration if intercom_integration?
     end

data/lib/forest_liana/collection.rb

@@ -0,0 +1,46 @@
+module ForestLiana::Collection
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    attr_accessor :collection_name
+    attr_accessor :is_read_only
+    attr_accessor :is_searchable
+
+    def collection(name, opts = {})
+      self.collection_name = name.to_s
+      self.is_read_only = opts[:read_only] || false
+      self.is_searchable = opts[:is_searchable] || true
+    end
+
+    def action(name, opts = {})
+      opts[:name] = name
+      model.actions << ForestLiana::Model::Action.new(opts)
+    end
+
+    def field(name, opts)
+      model.fields << opts.merge({ field: name })
+    end
+
+    private
+
+    def model
+      collection = ForestLiana.apimap.find do |x|
+        x.name.to_s == self.collection_name.try(:to_s)
+      end
+
+      if collection.blank?
+        collection = ForestLiana::Model::Collection.new({
+          name: self.collection_name.to_s,
+          is_read_only: self.is_read_only,
+          is_searchable: self.is_searchable,
+          fields: []
+        })
+
+        ForestLiana.apimap << collection
+      end
+
+      collection
+    end
+  end
+end
+

data/lib/forest_liana/engine.rb

@@ -6,6 +6,7 @@ require 'useragent'
 require 'jwt'
 require 'bcrypt'
 require_relative 'bootstraper'
+require_relative 'collection'
 
 module ForestLiana
   class Engine < ::Rails::Engine

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.2.6"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -160,7 +160,6 @@ files:
 - app/serializers/forest_liana/stripe_payment_serializer.rb
 - app/services/forest_liana/activity_logger.rb
 - app/services/forest_liana/allowed_users_getter.rb
-- app/services/forest_liana/collection.rb
 - app/services/forest_liana/has_many_getter.rb
 - app/services/forest_liana/intercom_attributes_getter.rb
 - app/services/forest_liana/intercom_conversations_getter.rb
@@ -186,6 +185,7 @@ files:
 - lib/forest_liana.rb
 - lib/forest_liana/base64_string_io.rb
 - lib/forest_liana/bootstraper.rb
+- lib/forest_liana/collection.rb
 - lib/forest_liana/engine.rb
 - lib/forest_liana/version.rb
 - lib/generators/forest_liana/install_generator.rb

data/app/services/forest_liana/collection.rb

@@ -1,7 +0,0 @@
-class ForestLiana::Collection
-
-  def self.add_actions(collection_name, actions)
-    collection = ForestLiana.apimap.find {|x| x.name == collection_name}
-    collection.actions += actions if collection
-  end
-end