forest_liana 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65bc0a94633ab9554e51ace04fb84e302b2afb0b
-  data.tar.gz: f026a0b61db387f8045b4f50a48ba54288e75b20
+  metadata.gz: ce8dc1b8cf30b7f5734362bcd69b549d990a2b71
+  data.tar.gz: 5aca5a5e19a92349d6503a0f8b3b72b3cbc40ab6
 SHA512:
-  metadata.gz: 80fd90903e69868ed3132c6b5a49b9526922ca38a7961b415fcf977db027c03589f3142ed77b39511921aef38061b6928cd774322d7981ac10eb260197ebd739
-  data.tar.gz: c818a6da4a756d1deafbb07caef9299866fea4d72fb85aa20ae49d68017abc5f25d626a6c39970e48e355bb9d150fe628f69caf21a8ce791aa2d6e9bec48149d
+  metadata.gz: 3e7c2b6a3afbe0c786ac13efa22874e400cedbe85f8e9fb7ff076d83335f49db441239effcf598b705b37320a72057d7b0f6ac697f51b3040f335b209774239c
+  data.tar.gz: 1567b0fe318660845cf31b843eaafe32ab09d79ab061cd526cfeb3e863900a35f273e23c9bd4d3addf8eca1c83ca8537bbc1b99a9ad5c6134f855daedc8f577e

data/app/controllers/forest_liana/associations_controller.rb

@@ -42,7 +42,7 @@ module ForestLiana
     private
 
     def find_resource
-      @resource = SchemaUtils.find_model_from_table_name(params[:collection])
+      @resource = SchemaUtils.find_model_from_collection_name(params[:collection])
 
       if @resource.nil? || !@resource.ancestors.include?(ActiveRecord::Base)
         render serializer: nil, json: {status: 404}, status: :not_found

data/app/controllers/forest_liana/devise_controller.rb

@@ -1,7 +1,7 @@
 module ForestLiana
   class DeviseController < ForestLiana::ApplicationController
     def change_password
-      resource = SchemaUtils.find_model_from_table_name(
+      resource = SchemaUtils.find_model_from_collection_name(
         params['data']['attributes']['collection_name'])
 
       user = resource.find(params['data']['attributes']['ids'].first)

data/app/controllers/forest_liana/resources_controller.rb

@@ -72,7 +72,7 @@ module ForestLiana
     private
 
     def find_resource
-      @resource = SchemaUtils.find_model_from_table_name(params[:collection])
+      @resource = SchemaUtils.find_model_from_collection_name(params[:collection])
 
       if @resource.nil? || !SchemaUtils.model_included?(@resource) ||
           !@resource.ancestors.include?(ActiveRecord::Base)

data/app/controllers/forest_liana/router.rb

@@ -1,9 +1,10 @@
 class ForestLiana::Router
   def call(env)
     params = env['action_dispatch.request.path_parameters']
-    resource = ForestLiana::SchemaUtils.find_model_from_table_name(params[:collection])
+    resource = ForestLiana::SchemaUtils.find_model_from_collection_name(
+      params[:collection])
 
-    class_name = resource.table_name.classify
+    class_name = ForestLiana.name_for(resource).classify
     module_name = class_name.deconstantize
 
     name = module_name if module_name

data/app/controllers/forest_liana/stats_controller.rb

@@ -27,7 +27,8 @@ module ForestLiana
     private
 
     def find_resource
-      @resource = SchemaUtils.find_model_from_table_name(params[:collection])
+      @resource = SchemaUtils.find_model_from_collection_name(
+        params[:collection])
 
       if @resource.nil? || !@resource.ancestors.include?(ActiveRecord::Base)
         render json: {status: 404}, status: :not_found, serializer: nil

data/app/serializers/forest_liana/serializer_factory.rb

@@ -4,7 +4,7 @@ module ForestLiana
   class SerializerFactory
 
     def self.define_serializer(active_record_class, serializer)
-      class_name = active_record_class.table_name.classify
+      class_name = ForestLiana.name_for(active_record_class).classify
       module_name = class_name.deconstantize
 
       name = module_name if module_name
@@ -46,7 +46,7 @@ module ForestLiana
       elsif active_record_class == ForestLiana::Model::Segment
         "ForestLiana::SegmentSerializer"
       else
-        class_name = active_record_class.table_name.classify
+        class_name = ForestLiana.name_for(active_record_class).classify
         module_name = class_name.deconstantize
 
         name = module_name if module_name
@@ -65,7 +65,7 @@ module ForestLiana
         end
 
         def type
-          object.class.table_name.demodulize
+          ForestLiana.name_for(object.class).demodulize
         end
 
         def format_name(attribute_name)
@@ -86,27 +86,27 @@ module ForestLiana
           # Has many smart field
           current = self.has_many_relationships[attribute_name]
           if current.try(:[], :options).try(:[], :name) == attribute_name
-            ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
+            ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/#{attribute_name}"
             return ret
           end
 
           if intercom_integration?
             case attribute_name
             when :intercom_conversations
-              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/intercom_conversations"
+              ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/intercom_conversations"
             when :intercom_attributes
-              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/intercom_attributes"
+              ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/intercom_attributes"
             end
           end
 
           if stripe_integration?
             case attribute_name
             when :stripe_payments
-              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/stripe_payments"
+              ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/stripe_payments"
             when :stripe_invoices
-              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/stripe_invoices"
+              ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/stripe_invoices"
             when :stripe_cards
-              ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/stripe_cards"
+              ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/stripe_cards"
             end
           end
 
@@ -118,7 +118,7 @@ module ForestLiana
 
               SchemaUtils.many_associations(object.class).each do |a|
                 if a.name == attribute_name
-                  ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/relationships/#{attribute_name}"
+                  ret[:href] = "/forest/#{ForestLiana.name_for(object.class)}/#{object.id}/relationships/#{attribute_name}"
                 end
               end
             rescue TypeError, ActiveRecord::StatementInvalid, NoMethodError

data/app/services/forest_liana/controller_factory.rb

@@ -2,7 +2,7 @@ module ForestLiana
   class ControllerFactory
 
     def self.define_controller(active_record_class, service)
-      class_name = active_record_class.table_name.classify
+      class_name = ForestLiana.name_for(active_record_class).classify
       module_name = class_name.deconstantize
 
       name = module_name if module_name
@@ -12,7 +12,7 @@ module ForestLiana
     end
 
     def self.get_controller_name(active_record_class)
-      class_name = active_record_class.table_name.classify
+      class_name = ForestLiana.name_for(active_record_class).classify
       module_name = class_name.deconstantize
 
       name = module_name if module_name

data/app/services/forest_liana/schema_adapter.rb

@@ -50,12 +50,12 @@ module ForestLiana
     def collection
       @collection ||= begin
         collection = ForestLiana.apimap.find do |x|
-          x.name.to_s == @model.table_name
+          x.name.to_s == ForestLiana.name_for(@model)
         end
 
         if collection.blank?
           collection = ForestLiana::Model::Collection.new({
-            name: @model.table_name,
+            name: ForestLiana.name_for(@model),
             fields: []
           })
 
@@ -80,7 +80,7 @@ module ForestLiana
       if ForestLiana.integrations.try(:[], :intercom)
         .try(:[], :mapping).try(:include?, @model.name)
 
-        model_name = @model.table_name
+        model_name = ForestLiana.name_for(@model)
 
         collection.fields << {
           field: :intercom_conversations,
@@ -110,7 +110,7 @@ module ForestLiana
             .select { |mapping| mapping.split('.')[0] == @model.name }
             .size > 0
 
-          model_name = @model.table_name
+          model_name = ForestLiana.name_for(@model)
 
           collection.fields << {
             field: :stripe_payments,
@@ -235,7 +235,7 @@ module ForestLiana
       {
         field: association.name.to_s,
         type: get_type_for_association(association),
-        reference: "#{association.klass.table_name}.id",
+        reference: "#{ForestLiana.name_for(association.klass)}.id",
         inverseOf: inverse_of(association)
       }
     end
@@ -298,7 +298,7 @@ module ForestLiana
       if association.options[:polymorphic] == true
         '*.id'
       else
-        "#{association.klass.table_name.underscore}.id"
+        "#{ForestLiana.name_for(association.klass).underscore}.id"
       end
     end
 

data/app/services/forest_liana/schema_utils.rb

@@ -19,13 +19,13 @@ module ForestLiana
       end
     end
 
-    def self.find_model_from_table_name(table_name)
+    def self.find_model_from_collection_name(collection_name)
       model = nil
 
       ForestLiana.models.each do |subclass|
         if subclass.abstract_class?
-          model = self.find_model_from_abstract_class(subclass, table_name)
-        elsif subclass.table_name == table_name
+          model = self.find_model_from_abstract_class(subclass, collection_name)
+        elsif ForestLiana.name_for(subclass) == collection_name
           model = subclass.base_class
         end
 
@@ -45,12 +45,12 @@ module ForestLiana
       association.options[:polymorphic]
     end
 
-    def self.find_model_from_abstract_class(abstract_class, table_name)
+    def self.find_model_from_abstract_class(abstract_class, collection_name)
       abstract_class.subclasses.find do |subclass|
         if subclass.abstract_class?
-          return self.find_model_from_table_name(subclass, table_name)
+          return self.find_model_from_collection_name(subclass, collection_name)
         else
-          subclass.table_name == table_name
+          ForestLiana.name_for(subclass) == collection_name
         end
       end
     end
@@ -75,7 +75,7 @@ module ForestLiana
       begin
         parent = model.try(:superclass)
 
-        if parent.try(:table_name)
+        if ForestLiana.name_for(parent)
           inheritance_column = parent.columns.find do |c|
             (parent.inheritance_column && c.name == parent.inheritance_column)\
               || c.name == 'type'

data/app/services/forest_liana/stripe_bank_accounts_getter.rb

@@ -79,7 +79,7 @@ module ForestLiana
     def field
       ForestLiana.integrations[:stripe][:mapping].select { |value|
         value.split('.')[0] == ForestLiana::SchemaUtils
-          .find_model_from_table_name(@params[:collection]).try(:name)
+          .find_model_from_collection_name(@params[:collection]).try(:name)
       }.first.split('.')[1]
     end
   end

data/app/services/forest_liana/stripe_cards_getter.rb

@@ -79,7 +79,7 @@ module ForestLiana
     def field
       ForestLiana.integrations[:stripe][:mapping].select { |value|
         value.split('.')[0] == ForestLiana::SchemaUtils
-          .find_model_from_table_name(@params[:collection]).try(:name)
+          .find_model_from_collection_name(@params[:collection]).try(:name)
       }.first.split('.')[1]
     end
   end

data/app/services/forest_liana/stripe_invoices_getter.rb

@@ -88,7 +88,7 @@ module ForestLiana
     def field
       ForestLiana.integrations[:stripe][:mapping].select { |value|
         value.split('.')[0] == ForestLiana::SchemaUtils
-          .find_model_from_table_name(@params[:collection]).try(:name)
+          .find_model_from_collection_name(@params[:collection]).try(:name)
       }.first.split('.')[1]
     end
   end

data/app/services/forest_liana/stripe_payments_getter.rb

@@ -86,7 +86,7 @@ module ForestLiana
     def field
       ForestLiana.integrations[:stripe][:mapping].select { |value|
         value.split('.')[0] == ForestLiana::SchemaUtils
-          .find_model_from_table_name(@params[:collection]).try(:name)
+          .find_model_from_collection_name(@params[:collection]).try(:name)
       }.first.split('.')[1]
     end
   end

data/app/services/forest_liana/stripe_subscriptions_getter.rb

@@ -90,7 +90,7 @@ module ForestLiana
     def field
       ForestLiana.integrations[:stripe][:mapping].select { |value|
         value.split('.')[0] == ForestLiana::SchemaUtils
-          .find_model_from_table_name(@params[:collection]).try(:name)
+          .find_model_from_collection_name(@params[:collection]).try(:name)
       }.first.split('.')[1]
     end
   end

data/lib/forest_liana.rb

@@ -20,6 +20,7 @@ module ForestLiana
   mattr_accessor :excluded_models
   mattr_accessor :included_models
   mattr_accessor :user_class_name
+  mattr_accessor :names_overriden
 
   self.apimap = []
   self.allowed_users = []
@@ -27,8 +28,16 @@ module ForestLiana
   self.excluded_models = []
   self.included_models = []
   self.user_class_name = nil
+  self.names_overriden = {}
 
   def self.schema_for_resource resource
-    self.apimap.find {|collection| collection.name == resource.table_name}
+    self.apimap.find do |collection|
+      SchemaUtils.find_model_from_collection_name(collection.name)
+        .try(:table_name) == resource.table_name
+    end
+  end
+
+  def self.name_for(model)
+    self.names_overriden[model] || model.try(:table_name)
   end
 end

data/lib/forest_liana/bootstraper.rb

@@ -20,6 +20,7 @@ module ForestLiana
     def perform
       fetch_models
       check_integrations_setup
+      namespace_duplicated_models
       create_factories
 
       if ForestLiana.env_secret
@@ -100,6 +101,19 @@ module ForestLiana
       end
     end
 
+    def namespace_duplicated_models
+      ForestLiana.models
+        .group_by {|model| model.table_name}
+        .select {|table_name, models| models.length > 1}
+        .try(:each) do |table_name, models|
+          models.each do |model|
+            ForestLiana.names_overriden[model] =
+              "#{model.name.deconstantize.downcase}__#{model.table_name}"
+          end
+        end
+
+    end
+
     def create_apimap
       ForestLiana.models.map do |model|
         if analyze_model?(model)

data/lib/forest_liana/collection.rb

@@ -100,7 +100,8 @@ module ForestLiana::Collection
     end
 
     def active_record_class
-      ForestLiana::SchemaUtils.find_model_from_table_name(self.collection_name)
+      ForestLiana::SchemaUtils.find_model_from_collection_name(
+        self.collection_name)
     end
 
     def serializer_name

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.6.5"
+  VERSION = "1.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails