forest_liana 1.3.45 → 1.3.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1197ecc6859d426da4304284756562c149d411a2
-  data.tar.gz: b70fa41d65454624496f6f83b39c793b1b897683
+  metadata.gz: 4417439c5b1e59fdcf52126d5d8f7d7a85984620
+  data.tar.gz: 7f020978c76103078c2d955ea58105cc7d905b9f
 SHA512:
-  metadata.gz: 87acdf552773f941b0f3665281287b30f79110fa787b331e7cefa9d84e2380ac4506db1d96294135d420309fea4e916a7063f59ef33240fa706dbdfba34fddec
-  data.tar.gz: c283ed7a3619616b353dde7fc0ad60c67e853afbffb30120081f63abe28d891babbd1955dbb14cd82a2d014d4b3eb65d770af08dcfb1e27cb00032c36abd4ed7
+  metadata.gz: bf0583159be382733ebdd1b70a8f1a795b411906de86141f2b5c802292e0a83bfbd55ac268a64a815124e89cddd3a5967616f3e7e9b512190723be8afaa02fb4
+  data.tar.gz: e96f7df98db3f5e87ab9b957d36bf14b506ed7d14358584df3b297d29bdacbe59d77c09c2aff26c3a4abbcdcbe215be6d2fb1782b07ce0dea24435bb1c7a5130

data/app/controllers/forest_liana/associations_controller.rb

@@ -66,7 +66,8 @@ module ForestLiana
       @association.klass
         .reflect_on_all_associations
         .select do |a|
-          [:belongs_to, :has_and_belongs_to_many].include?(a.macro) &&
+          SchemaUtils.model_included?(a.klass) &&
+            [:belongs_to, :has_and_belongs_to_many].include?(a.macro) &&
             !a.options[:polymorphic]
         end
         .map {|a| a.name.to_s }

data/app/controllers/forest_liana/resources_controller.rb

@@ -62,7 +62,8 @@ module ForestLiana
     def find_resource
       @resource = SchemaUtils.find_model_from_table_name(params[:collection])
 
-      if @resource.nil? || !@resource.ancestors.include?(ActiveRecord::Base)
+      if @resource.nil? || !SchemaUtils.model_included?(@resource) ||
+          !@resource.ancestors.include?(ActiveRecord::Base)
         render serializer: nil, json: {status: 404}, status: :not_found
       end
     end
@@ -72,8 +73,9 @@ module ForestLiana
     end
 
     def includes
-      SchemaUtils.one_associations(@resource).map {|a| a.name.to_s}
+      SchemaUtils.one_associations(@resource)
+        .select { |a| SchemaUtils.model_included?(a.klass) }
+        .map { |a| a.name.to_s }
     end
-
   end
 end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -182,17 +182,19 @@ module ForestLiana
       end
 
       SchemaUtils.associations(active_record_class).each do |a|
-        serializer.send(serializer_association(a), a.name) {
-          if [:has_one, :belongs_to].include?(a.macro)
-            begin
-              object.send(a.name).try(:reload)
-            rescue ActiveRecord::RecordNotFound
-              nil
+        if SchemaUtils.model_included?(a.klass)
+          serializer.send(serializer_association(a), a.name) {
+            if [:has_one, :belongs_to].include?(a.macro)
+              begin
+                object.send(a.name).try(:reload)
+              rescue ActiveRecord::RecordNotFound
+                nil
+              end
+            else
+              []
             end
-          else
-            []
-          end
-        }
+          }
+        end
       end
 
       # Intercom

data/app/services/forest_liana/resources_getter.rb

@@ -77,7 +77,9 @@ module ForestLiana
     end
 
     def includes
-      SchemaUtils.one_associations(@resource).map(&:name)
+      SchemaUtils.one_associations(@resource)
+        .select { |a| SchemaUtils.model_included?(a.klass) }
+        .map(&:name)
     end
 
     def offset

data/app/services/forest_liana/schema_adapter.rb

@@ -173,10 +173,19 @@ module ForestLiana
     def add_associations
       SchemaUtils.associations(@model).each do |association|
         begin
-          if schema = column_association(collection, association)
-            schema[:reference] = get_ref_for(association)
-            schema[:field] = deforeign_key(schema[:field])
-            schema[:inverseOf] = inverse_of(association)
+          # NOTICE: delete the association if the targeted model is excluded.
+          if !SchemaUtils.model_included?(association.klass)
+            field = collection.fields.find do |x|
+              x[:field] == association.foreign_key
+            end
+
+            collection.fields.delete(field) if field
+          # NOTICE: The foreign key exists, so it's a belongsTo relationship.
+          elsif field = column_association(collection, association)
+            field[:reference] = get_ref_for(association)
+            field[:field] = deforeign_key(field[:field])
+            field[:inverseOf] = inverse_of(association)
+          # NOTICE: Create the fields of hasOne, HasMany, … relationships.
           else
             collection.fields << get_schema_for_association(association)
           end

data/app/services/forest_liana/schema_utils.rb

@@ -48,6 +48,14 @@ module ForestLiana
         end
       end
     end
+
+    def self.model_included?(model)
+      ForestLiana.excluded_models.exclude?(model)
+    end
+
+    def self.habtm?(model)
+      model.name.starts_with?('HABTM')
+    end
   end
 end
 

data/lib/forest_liana.rb

@@ -13,6 +13,7 @@ module ForestLiana
   mattr_accessor :apimap
   mattr_accessor :allowed_users
   mattr_accessor :models
+  mattr_accessor :excluded_models
 
   # Legacy.
   mattr_accessor :jwt_signing_key
@@ -20,4 +21,5 @@ module ForestLiana
   self.apimap = []
   self.allowed_users = []
   self.models = []
+  self.excluded_models = []
 end

data/lib/forest_liana/bootstraper.rb

@@ -45,9 +45,16 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
 
     private
 
+    def analyze_model?(model)
+      return model && model.table_exists? && !SchemaUtils.habtm?(model) &&
+        SchemaUtils.model_included?(model)
+    end
+
     def fetch_models
-      ActiveRecord::Base.subclasses.each do |subclass|
-        ForestLiana.models << subclass
+      ActiveRecord::Base.subclasses.each do |model|
+        if analyze_model?(model)
+          ForestLiana.models << model
+        end
       end
     end
 
@@ -58,8 +65,9 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
     def create_serializers
       SchemaUtils.tables_names.map do |table_name|
         model = SchemaUtils.find_model_from_table_name(table_name)
-        ForestLiana::SerializerFactory.new.serializer_for(model) if \
-          model.try(:table_exists?)
+        if analyze_model?(model)
+          ForestLiana::SerializerFactory.new.serializer_for(model)
+        end
       end
 
       # Monkey patch the find_serializer_class_name method to specify the
@@ -76,7 +84,7 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
     end
 
     def check_integrations_setup
-     if stripe_integration?
+      if stripe_integration?
         if stripe_integration_valid? || stripe_integration_deprecated?
           ForestLiana.integrations[:stripe][:mapping] =
             cast_to_array(ForestLiana.integrations[:stripe][:mapping])
@@ -100,7 +108,8 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
     def create_apimap
       SchemaUtils.tables_names.map do |table_name|
         model = SchemaUtils.find_model_from_table_name(table_name)
-        if model.try(:table_exists?)
+
+        if analyze_model?(model)
           SchemaAdapter.new(model).perform
         end
       end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.45"
+  VERSION = "1.3.46"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.45
+  version: 1.3.46
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails