forest_liana 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65522d7ac20a108bfbe9cf9670775bdac5a9c4f7
-  data.tar.gz: 62cf805130476977ad2a43100998efea2e28781c
+  metadata.gz: 0e5aaaf20833287b7bd967b29fc446819c729c6b
+  data.tar.gz: 42dcb1bda73a88f0c989f6abbf3432c7ea687478
 SHA512:
-  metadata.gz: 82988dc221f349a1fd34eb5f7ff6455af77299cd827bf2de10a12a6eb39ed7453ae9d1cd43d3f1b025306844137f08c16b12e6c7d7bc8452615d94d5d31ed5b6
-  data.tar.gz: fb34fcae2db4436ac8434b4f8bbb76481d53e58d3bfa5dd0337a43afe284153fad5bbfb5dd9847008f3dcf008888ee13f98c46a5f450557d2ca0903f1b249218
+  metadata.gz: a62ec769824286587ad781b0116c59d95e56b972af8c7bd71572e87b43f5fb108ca78ca7d9078b70a6f68464fa67f58cd85a990dfcaa45960c795be99c97a8ab
+  data.tar.gz: 55013515cf0b5f3e12f25949cbcd382c99e2cbc92b51f39fa86e99eefdb9950a7768e9b4a0c4109d758587a17329102e7716afce1c4d42996f4baadb0be6858b

data/app/controllers/forest_liana/apimaps_controller.rb

@@ -1,16 +1,7 @@
-require 'jsonapi-serializers'
-
 module ForestLiana
-  class ApimapsController < ForestLiana::ApplicationController
+  class ApimapsController < ActionController::Base
     def index
-      result = []
-
-      SchemaUtils.tables_names.map do |table_name|
-        model = SchemaUtils.find_model_from_table_name(table_name)
-        result << SchemaAdapter.new(model).perform if model.try(:table_exists?)
-      end
-
-      render json: serialize_models(result)
+      render nothing: true, status: 204
     end
   end
 end

data/app/controllers/forest_liana/sessions_controller.rb

@@ -2,38 +2,52 @@ module ForestLiana
   class SessionsController < ActionController::Base
 
     def create
-      user = ForestLiana.allowed_users.find do |allowed_user|
+      fetch_allowed_users
+      user = check_user
+      token = encode_token(user) if user
+
+      if token
+        render json: { token: token }
+      else
+        render nothing: true, status: 401
+      end
+    end
+
+    private
+
+    def fetch_allowed_users
+      AllowedUsersGetter.new.perform
+    end
+
+    def check_user
+      ForestLiana.allowed_users.find do |allowed_user|
         allowed_user['email'] == params['email'] &&
           allowed_user['outlines'].include?(params['outlineId']) &&
           BCrypt::Password.new(allowed_user['password']) == params['password']
       end
+    end
 
-      if user
-        token = JWT.encode({
-          exp: Time.now.to_i + 2.weeks.to_i,
+    def encode_token(user)
+      JWT.encode({
+        exp: Time.now.to_i + 2.weeks.to_i,
+        data: {
+          id: user['id'],
+          type: 'users',
           data: {
-            id: user['id'],
-            type: 'users',
-            data: {
-              email: user['email'],
-              first_name: user['first_name'],
-              last_name: user['last_name']
-            },
-            relationships: {
-              outlines: {
-                data: [{
-                  type: 'outlines',
-                  id: params['outlineId']
-                }]
-              }
+            email: user['email'],
+            first_name: user['first_name'],
+            last_name: user['last_name']
+          },
+          relationships: {
+            outlines: {
+              data: [{
+                type: 'outlines',
+                id: params['outlineId']
+              }]
             }
           }
-        } , ForestLiana.auth_key, 'HS256')
-
-        render json: { token: token }
-      else
-        render nothing: true, status: 401
-      end
+        }
+      } , ForestLiana.auth_key, 'HS256')
     end
   end
 end

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -1,3 +1,5 @@
+require_relative '../../../lib/forest_liana/base64_string_io'
+
 module ForestLiana
   class ResourceDeserializer
 
@@ -10,6 +12,7 @@ module ForestLiana
       @attributes = extract_attributes
       extract_relationships
       extract_paperclip
+      extract_carrierwave
 
       @attributes
     end
@@ -53,6 +56,16 @@ module ForestLiana
       @attributes.merge!(paperclip_attr) if paperclip_attr
     end
 
+    def extract_carrierwave
+      return unless @resource.respond_to?(:uploaders)
+
+      @params['data']['attributes'].each do |key, value|
+        if carrierwave_attribute?(key)
+          @attributes[key] = ForestLiana::Base64StringIO.new(value)
+        end
+      end
+    end
+
     def paperclip_handler?(attr)
       begin
         Paperclip.io_adapters.handler_for(attr)
@@ -65,5 +78,9 @@ module ForestLiana
     def column?(attribute)
       @resource.columns.find {|x| x.name == attribute}.present?
     end
+
+    def carrierwave_attribute?(attr)
+      @resource.uploaders.include?(attr.try(:to_sym))
+    end
   end
 end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -98,15 +98,7 @@ module ForestLiana
               relationship_records = object.send(attribute_name)
 
               if relationship_records.respond_to?(:each)
-                if Rails::VERSION::MAJOR == 4
-                  ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
-                  ret[:meta] = { count: relationship_records.distinct.count }
-                else
-                  ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
-                  ret[:meta] = {
-                    count: relationship_records.count(:id, distinct: true)
-                  }
-                end
+                ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
               end
             rescue TypeError, ActiveRecord::StatementInvalid
               puts "Cannot load the association #{attribute_name} on #{object.class.name} #{object.id}."

data/app/services/forest_liana/allowed_users_getter.rb

@@ -0,0 +1,36 @@
+module ForestLiana
+  class AllowedUsersGetter
+    def perform
+      uri = URI.parse("#{forest_url}/forest/allowed-users")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if forest_url.start_with?('https')
+      http.start do |client|
+        request = Net::HTTP::Get.new(uri.path)
+        request['Content-Type'] = 'application/json'
+        request['forest-secret-key'] = ForestLiana.secret_key
+        response = client.request(request)
+
+        if response.is_a?(Net::HTTPOK)
+          body = JSON.parse(response.body)['data']
+          ForestLiana.allowed_users = body.map do |d|
+            user = d['attributes']
+            user['id'] = d['id']
+            user['outlines'] = d['relationships']['outlines']['data'].map {
+              |x| x['id']
+            }
+
+            user
+          end
+        else
+          []
+        end
+      end
+    end
+
+    private
+
+    def forest_url
+      ENV['FOREST_URL'] || 'https://forestadmin-server.herokuapp.com';
+    end
+  end
+end

data/app/services/forest_liana/collection.rb

@@ -1,37 +1,7 @@
 class ForestLiana::Collection
-  mattr_accessor :collection_name
-  mattr_accessor :is_read_only
 
-  def self.field(field, opts)
-    collection = ForestLiana.apimap.find do |x|
-      x.name ==  self.collection_name.try(:to_s)
-    end
-
-    collection.fields << opts.merge({ field: field }) if collection
-  end
-
-  def self.fields(fields)
-    collection = ForestLiana::Model::Collection.new({
-      name: self.collection_name,
-      is_read_only: self.is_read_only,
-      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]
-    })
+  def self.add_actions(collection_name, actions)
+    collection = ForestLiana.apimap.find {|x| x.name == collection_name}
+    collection.actions += actions if collection
   end
 end

data/app/services/forest_liana/has_many_getter.rb

@@ -7,7 +7,10 @@ module ForestLiana
     end
 
     def perform
-      @records = @resource.find(@params[:id]).send(@params[:association_name])
+      @records = @resource
+        .unscoped
+        .find(@params[:id])
+        .send(@params[:association_name])
     end
 
     def records

data/app/services/forest_liana/resources_getter.rb

@@ -91,7 +91,7 @@ module ForestLiana
     end
 
     def includes
-      SchemaUtils.associations(@resource).map(&:name)
+      SchemaUtils.one_associations(@resource).map(&:name)
     end
 
     def offset

data/app/services/forest_liana/schema_adapter.rb

@@ -82,6 +82,14 @@ module ForestLiana
           @collection.fields << { field: key, type: 'File' }
         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[:type] = 'File' if field
+        end
+      end
     end
 
     def add_associations

data/lib/forest_liana/base64_string_io.rb

@@ -0,0 +1,30 @@
+module ForestLiana
+  class Base64StringIO < StringIO
+    class ArgumentError < StandardError; end
+
+    attr_accessor :file_format
+
+    def initialize(encoded_file)
+      description, encoded_bytes = encoded_file.split(",")
+
+      raise ArgumentError unless encoded_bytes
+      raise ArgumentError if encoded_bytes.eql?("(null)")
+
+      @file_format = get_file_format description
+      bytes = ::Base64.decode64 encoded_bytes
+
+      super bytes
+    end
+
+    def original_filename
+      File.basename("file.#{@file_format}")
+    end
+
+    private
+
+    def get_file_format(description)
+      regex = /([a-z0-9]+);base64\z/
+      regex.match(description).try(:[], 1)
+    end
+  end
+end

data/lib/forest_liana/bootstraper.rb

@@ -37,7 +37,11 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
       # good serializer to use.
       ::JSONAPI::Serializer.class_eval do
         def self.find_serializer_class_name(obj)
-          ForestLiana::SerializerFactory.get_serializer_name(obj.class)
+          if obj.respond_to?(:jsonapi_serializer_class_name)
+            obj.jsonapi_serializer_class_name.to_s
+          else
+            ForestLiana::SerializerFactory.get_serializer_name(obj.class)
+          end
         end
       end
     end
@@ -50,7 +54,7 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
         end
       end
 
-      Dir["#{@app.root}/app/models/forest/*.rb"].each {|file| require file }
+      Dir["#{@app.root}/app/forest/**/*.rb"].each {|file| require file }
 
       setup_stripe_integration if stripe_integration?
       setup_intercom_integration if intercom_integration?
@@ -76,17 +80,6 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
         if response.is_a?(Net::HTTPNotFound)
           @logger.warn "Forest cannot find your project secret key. " \
             "Please, run `rails g forest_liana:install`."
-        else
-          body = JSON.parse(response.body)['data']
-          ForestLiana.allowed_users = body.map do |d|
-            user = d['attributes']
-            user['id'] = d['id']
-            user['outlines'] = d['relationships']['outlines']['data'].map {
-              |x| x['id']
-            }
-
-            user
-          end
         end
       end
     end

data/lib/forest_liana/version.rb

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

data/test/services/forest_liana/resources_getter_test.rb

@@ -74,35 +74,5 @@ module ForestLiana
       assert records.first.belongs_to_field.id == 30
       assert records.last.belongs_to_field.id == 21
     end
-
-    #test 'Sort by a has_many association' do
-      #getter = ResourcesGetter.new(HasManyField, {
-        #page: { size: 10, number: 1 },
-        #sort: '-belongs_to_fields'
-      #})
-      #getter.perform
-      #records = getter.records
-      #count = getter.count
-
-      #assert records.count == 10
-      #assert count = 30
-      #assert records.first.id = 7
-    #end
-
-    #test 'Sort by a has_many through association' do
-      #getter = ResourcesGetter.new(HasManyThroughField, {
-        #page: { size: 10, number: 1 },
-        #sort: '-belongs_to_fields'
-      #})
-      #getter.perform
-      #records = getter.records
-      #count = getter.count
-
-      #assert records.count == 10
-      #assert count = 30
-      #assert records.first.id = 2
-      #assert records.second.id = 3
-    #end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -159,6 +159,7 @@ files:
 - app/serializers/forest_liana/stripe_invoice_serializer.rb
 - 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
@@ -183,6 +184,7 @@ files:
 - config/initializers/time_formats.rb
 - config/routes.rb
 - lib/forest_liana.rb
+- lib/forest_liana/base64_string_io.rb
 - lib/forest_liana/bootstraper.rb
 - lib/forest_liana/engine.rb
 - lib/forest_liana/version.rb