forest_admin_datasource_toolkit 1.0.0.pre.beta.26 → 1.0.0.pre.beta.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9749205ecd01ce84b131e59b25235bd4555bd5bb64ec5620d283bc46ab51ebb3
-  data.tar.gz: 474671b8aa198bd1a2cbb1b0c95e95bab9e2275572344990376aa37d1b3773ef
+  metadata.gz: da476de3594dde88a2fba472ab9c95f835ff430aafb566000101721183462777
+  data.tar.gz: ccc40eae51cf545e43c357181f2dde06ed6b3bf3473d97c8029c0f9a588d5738
 SHA512:
-  metadata.gz: f7d84033214299dbcec6ce24d8d20a538de1895dca6349ef5b32c9cbf3744df3df3994a5cb10263055a4f8ac30c160756595a80c6b1088e100f25d389e3b4732
-  data.tar.gz: da6e1e8ead04fab78151c72117a73d89c0b4665df2c1c10c16b130fe9e492ab0ca5ec7b9b552343b8e5b90a99dbd5469a4da761d4d90ac24a753f42399e3ba2f
+  metadata.gz: 2c1918f8da7f4ebcbcd377591e63224fedd85e8e039dae2b3874599b8869cdec57052e117013762bfa5ddc8d7749c3d7b6826bd7eb46476d4616683b7e3abe02
+  data.tar.gz: c6fb011db51fcdb3f10bf8724d0fd403860b0c46862d73129514d746524c5e85a1e3183f3b95d055ea729d022ea8d7f46f10fac45f500e504bde9d7ad68e273d

data/lib/forest_admin_datasource_toolkit/collection.rb

@@ -9,9 +9,6 @@ module ForestAdminDatasourceToolkit
                 :schema,
                 :native_driver
 
-    attr_writer :searchable,
-                :countable
-
     def initialize(datasource, name, native_driver: nil)
       super()
       @datasource = datasource
@@ -19,35 +16,34 @@ module ForestAdminDatasourceToolkit
       @native_driver = native_driver
       @schema = {
         fields: {},
-        countable: false
+        countable: false,
+        searchable: false
       }
       @actions = {}
       @segments = {}
       @charts = {}
-      @searchable = false
-      @countable = false
     end
 
     def enable_count
-      @schema[:countable] = true
+      schema[:countable] = true
     end
 
     def is_countable?
-      @schema[:countable]
+      schema[:countable]
     end
 
     def is_searchable?
-      @searchable
+      schema[:searchable]
     end
 
     def fields
-      @schema[:fields]
+      schema[:fields]
     end
 
     def add_field(name, field)
       raise Exceptions::ForestException, "Field #{name} already defined in collection" if @schema[:fields].key?(name)
 
-      @schema[:fields][name] = field
+      schema[:fields][name] = field
     end
 
     def add_fields(fields)

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.26"
+  VERSION = "1.0.0-beta.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.26
+  version: 1.0.0.pre.beta.27
 platform: ruby
 authors:
 - Matthieu
@@ -84,7 +84,6 @@ files:
 - lib/forest_admin_datasource_toolkit/datasource.rb
 - lib/forest_admin_datasource_toolkit/decorators/collection_decorator.rb
 - lib/forest_admin_datasource_toolkit/decorators/datasource_decorator.rb
-- lib/forest_admin_datasource_toolkit/decorators/schema/schema_collection_decorator.rb
 - lib/forest_admin_datasource_toolkit/exceptions/forest_exception.rb
 - lib/forest_admin_datasource_toolkit/schema/column_schema.rb
 - lib/forest_admin_datasource_toolkit/schema/primitive_type.rb

data/lib/forest_admin_datasource_toolkit/decorators/schema/schema_collection_decorator.rb

@@ -1,21 +0,0 @@
-module ForestAdminDatasourceToolkit
-  module Decorators
-    module Schema
-      class SchemaCollectionDecorator < CollectionDecorator
-        def initialize(child_collection, datasource)
-          super
-          @schema_override = {}
-        end
-
-        def override_schema(value)
-          @schema_override.merge!(value)
-          mark_schema_as_dirty
-        end
-
-        def refine_schema(sub_schema)
-          sub_schema.merge(@schema_override)
-        end
-      end
-    end
-  end
-end