forest_liana 1.1.20 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ddcfda22c4ff09d0c572f50c1f9b915aaf2c594
-  data.tar.gz: 6e446ba8d2b87adbeaf577b444d9aa3bb962fdd7
+  metadata.gz: 21865b20b7689f8391863232851fae17d931a22f
+  data.tar.gz: f9fc1e5fcaee763363eb1cf08f938f729e34a4fa
 SHA512:
-  metadata.gz: de6db21eb97e3be4c111d451df11fc8e16a70047bb7caa127206a6498128ced2310e4d4926d5a9a2556de2daab19c25f064ede67b8cd89299cef5877198feeb4
-  data.tar.gz: 821e98ce6b1e834d42e86b38e39132b764b5a956919628e257ba92308a50e160921d99a5f5553d9176a2cacaead96133f66ade8b76edd185d9abbc3387a60f7a
+  metadata.gz: 59ea6edeb1719c0f12cc49a99610cbd2ce5117d9347569602814c8efe7f3bc87c4af283ed570bc1d5a82c8a00a3593f6766188de8e9c736bf2aa3d37a771aa95
+  data.tar.gz: be1c07ed787bee9dfcbf38a7153d7c624afb280c7cb8c36601de06c60377bb07b3dd6863effb233c3e32d83e4814c139ed2eae21d2942ce5df1b6a8680e65a3e

data/app/controllers/forest_liana/apimaps_controller.rb

@@ -10,7 +10,7 @@ module ForestLiana
         result << SchemaAdapter.new(model).perform if model.try(:table_exists?)
       end
 
-      render json: serialize_models(result, serializer: ApimapSerializer)
+      render json: serialize_models(result)
     end
   end
 end

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

@@ -0,0 +1,22 @@
+class ForestLiana::Model::Action
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Serialization
+  extend ActiveModel::Naming
+
+  attr_accessor :name, :endpoint, :http_method, :fields
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def persisted?
+    false
+  end
+
+  def id
+    name
+  end
+end

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

@@ -0,0 +1,24 @@
+class ForestLiana::Model::Collection
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Serialization
+  extend ActiveModel::Naming
+
+  attr_accessor :name, :fields, :actions
+
+  def initialize(attributes = {})
+    @actions = []
+
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def persisted?
+    false
+  end
+
+  def id
+    name
+  end
+end

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

@@ -0,0 +1,22 @@
+class ForestLiana::Model::Stat
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Serialization
+  extend ActiveModel::Naming
+
+  attr_accessor :value
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def persisted?
+    false
+  end
+
+  def id
+    SecureRandom.uuid
+  end
+end

data/app/serializers/forest_liana/action_serializer.rb

@@ -0,0 +1,18 @@
+require 'jsonapi-serializers'
+
+class ForestLiana::ActionSerializer
+  include JSONAPI::Serializer
+
+  attribute :name
+  attribute :http_method
+  attribute :endpoint
+  attribute :fields
+
+  def relationship_related_link(attribute_name)
+    nil
+  end
+
+  def relationship_self_link(attribute_name)
+    nil
+  end
+end

data/app/serializers/forest_liana/collection_serializer.rb

@@ -0,0 +1,20 @@
+require 'jsonapi-serializers'
+
+class ForestLiana::CollectionSerializer
+  include JSONAPI::Serializer
+
+  attribute :name
+  attribute :fields
+
+  has_many :actions do
+    object.actions
+  end
+
+  def relationship_related_link(attribute_name)
+    nil
+  end
+
+  def relationship_self_link(attribute_name)
+    nil
+  end
+end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -20,10 +20,12 @@ module ForestLiana
         "ForestLiana::StripeCardSerializer"
       elsif active_record_class == Stripe::Invoice
         "ForestLiana::StripeInvoiceSerializer"
-      elsif active_record_class == ForestLiana::Stat
+      elsif active_record_class == ForestLiana::Model::Stat
         "ForestLiana::StatSerializer"
-      elsif active_record_class == ForestLiana::Collection
-        "ForestLiana::ApimapSerializer"
+      elsif active_record_class == ForestLiana::Model::Collection
+        "ForestLiana::CollectionSerializer"
+      elsif active_record_class == ForestLiana::Model::Action
+        "ForestLiana::ActionSerializer"
       else
         class_name = active_record_class.table_name.classify
         module_name = class_name.deconstantize

data/app/services/forest_liana/collection.rb

@@ -0,0 +1,27 @@
+class ForestLiana::Collection
+  mattr_accessor :collection_name
+
+  def self.fields(fields)
+    collection = ForestLiana::Model::Collection.new({
+      name: self.collection_name,
+      fields: fields
+    })
+
+    ForestLiana.apimap << collection
+  end
+
+  def self.action(name, opts = {})
+    collection = ForestLiana.apimap.find do |x|
+      x.name == self.collection_name.try(:to_s)
+    end
+
+    return if collection.blank?
+
+    collection.actions << ForestLiana::Model::Action.new({
+      name: name,
+      http_method: opts[:http_method],
+      endpoint: opts[:endpoint],
+      fields: opts[:fields]
+    })
+  end
+end

data/app/services/forest_liana/line_stat_getter.rb

@@ -40,7 +40,7 @@ module ForestLiana
           end
         end
 
-      @record = Stat.new(value: value)
+      @record = Model::Stat.new(value: value)
     end
 
     private

data/app/services/forest_liana/pie_stat_getter.rb

@@ -24,7 +24,7 @@ module ForestLiana
             { key: k, value: v }
           end
 
-        @record = Stat.new(value: value)
+        @record = Model::Stat.new(value: value)
       end
     end
 

data/app/services/forest_liana/schema_adapter.rb

@@ -5,7 +5,7 @@ module ForestLiana
     end
 
     def perform
-      @collection = ForestLiana::Collection.new({
+      @collection = ForestLiana::Model::Collection.new({
         name: @model.name.tableize,
         fields: []
       })

data/app/services/forest_liana/value_stat_getter.rb

@@ -17,7 +17,7 @@ module ForestLiana
                                               filter_value)
       end
 
-      @record = Stat.new(value: count(value))
+      @record = Model::Stat.new(value: count(value))
     end
 
     private

data/lib/forest_liana.rb

@@ -1,4 +1,4 @@
-require "forest_liana/engine"
+require 'forest_liana/engine'
 
 module ForestLiana
   mattr_accessor :jwt_signing_key

data/lib/forest_liana/engine.rb

@@ -9,10 +9,6 @@ module ForestLiana
     isolate_namespace ForestLiana
     logger = Logger.new(STDOUT)
 
-    initializer 'forest_liana.require_all' do |app|
-      Dir["#{app.root}/app/models/forest/*.rb"].each {|file| require file }
-    end
-
     config.middleware.insert_before 0, 'Rack::Cors' do
       allow do
         origins 'http://localhost:4200', 'https://www.forestadmin.com',
@@ -21,7 +17,7 @@ module ForestLiana
       end
     end
 
-    config.after_initialize do
+    config.after_initialize do |app|
       unless Rails.env.test?
         SchemaUtils.tables_names.map do |table_name|
           model = SchemaUtils.find_model_from_table_name(table_name)
@@ -48,10 +44,13 @@ module ForestLiana
             end
           end
 
+          Dir["#{app.root}/app/models/forest/*.rb"].each {|file| require file }
+
           liana_version = Gem::Specification.find_by_name('forest_liana')
             .version.to_s
           json = JSONAPI::Serializer.serialize(ForestLiana.apimap, {
             is_collection: true,
+            include: ['actions'],
             meta: { liana: 'forest-rails', liana_version: liana_version }
           })
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.1.20"
+  VERSION = "1.1.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.1.22
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,14 +129,17 @@ files:
 - app/controllers/forest_liana/stripe_controller.rb
 - app/deserializers/forest_liana/resource_deserializer.rb
 - app/helpers/forest_liana/application_helper.rb
-- app/models/forest_liana/collection.rb
-- app/models/forest_liana/stat.rb
-- app/serializers/forest_liana/apimap_serializer.rb
+- app/models/forest_liana/model/action.rb
+- app/models/forest_liana/model/collection.rb
+- app/models/forest_liana/model/stat.rb
+- app/serializers/forest_liana/action_serializer.rb
+- app/serializers/forest_liana/collection_serializer.rb
 - app/serializers/forest_liana/serializer_factory.rb
 - app/serializers/forest_liana/stat_serializer.rb
 - app/serializers/forest_liana/stripe_card_serializer.rb
 - app/serializers/forest_liana/stripe_invoice_serializer.rb
 - app/serializers/forest_liana/stripe_payment_serializer.rb
+- app/services/forest_liana/collection.rb
 - app/services/forest_liana/has_many_getter.rb
 - app/services/forest_liana/line_stat_getter.rb
 - app/services/forest_liana/operator_value_parser.rb
@@ -147,7 +150,6 @@ files:
 - app/services/forest_liana/schema_adapter.rb
 - app/services/forest_liana/schema_utils.rb
 - app/services/forest_liana/search_query_builder.rb
-- app/services/forest_liana/smart_collection.rb
 - app/services/forest_liana/stripe_cards_getter.rb
 - app/services/forest_liana/stripe_invoices_getter.rb
 - app/services/forest_liana/stripe_payment_refunder.rb

data/app/models/forest_liana/collection.rb

@@ -1,26 +0,0 @@
-module ForestLiana
-  class Collection
-
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-    include ActiveModel::Serialization
-    extend ActiveModel::Naming
-
-    attr_accessor :name, :fields
-
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def persisted?
-      false
-    end
-
-    def id
-      name
-    end
-
-  end
-end

data/app/models/forest_liana/stat.rb

@@ -1,26 +0,0 @@
-module ForestLiana
-  class Stat
-
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-    include ActiveModel::Serialization
-    extend ActiveModel::Naming
-
-    attr_accessor :value
-
-    def initialize(attributes = {})
-      attributes.each do |name, value|
-        send("#{name}=", value)
-      end
-    end
-
-    def persisted?
-      false
-    end
-
-    def id
-      SecureRandom.uuid
-    end
-
-  end
-end

data/app/serializers/forest_liana/apimap_serializer.rb

@@ -1,10 +0,0 @@
-require 'jsonapi-serializers'
-
-module ForestLiana
-  class ApimapSerializer
-    include JSONAPI::Serializer
-
-    attribute :name
-    attribute :fields
-  end
-end

data/app/services/forest_liana/smart_collection.rb

@@ -1,12 +0,0 @@
-module ForestLiana
-  class SmartCollection
-    def self.register(name, opts)
-      smartCollection = ForestLiana::Collection.new({
-        name: name,
-        fields: opts[:fields]
-      })
-
-      ForestLiana.apimap << smartCollection
-    end
-  end
-end