forest_liana 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d035cfb474940bbfffb21f321501251e7d962f
-  data.tar.gz: ec0f80d79c04bd6b84b2529d0c9f97705629eb1d
+  metadata.gz: 051a5e7bf351ed5dd2d28b37ea29b5192ad9c582
+  data.tar.gz: 651bdcb3580a39e12c11c2eee7972689ae63270e
 SHA512:
-  metadata.gz: 24686c944349dc7a10fe161ceaf84c3796284f9637640d63967eb95e66fc23e959f4ab8be65209bbc4ae95df8d50e91f862fbe2f4c6a912caefd465e1facd931
-  data.tar.gz: 8fb436268fb827b14cc6da78a93488e8763f91b1e83e6824f07f7440ee824a671b3901c7e0fcc469d9be4c0e8126e8132041cf865666a586ca624fd165f9f3fd
+  metadata.gz: d5dedba47b186325219c94bf60a097deeb3ba67636a95149ed95a348b51252a29642b180a7c4932309934c32a9c4ccf689784a73256e766e61d9a7a640190a60
+  data.tar.gz: 4c4744360e8503260df8c1d63bb43b456b89ef9841e97c6535dae58b496e217e268c04bb960df35dec3f9758e5b72f176da50788417d6e9952d58bf0a158dc80

data/app/controllers/forest_liana/application_controller.rb

@@ -27,8 +27,12 @@ module ForestLiana
     end
 
     def authenticate_user_from_jwt
-      JWT.decode request.headers['Authorization'].split[1],
-        ForestLiana.jwt_signing_key
+      if request.headers['Authorization']
+        JWT.decode request.headers['Authorization'].split[1],
+          ForestLiana.jwt_signing_key
+      else
+        render nothing: true, status: 401
+      end
     end
 
   end

data/app/controllers/forest_liana/associations_controller.rb

@@ -0,0 +1,51 @@
+module ForestLiana
+  class AssociationsController < ForestLiana::ApplicationController
+
+    before_filter :find_resource
+    before_filter :find_association
+
+    def index
+      getter = HasManyGetter.new(@resource, @association, params)
+      getter.perform
+
+      render json: serialize_models(getter.records,
+                                    include: includes,
+                                    count: getter.count,
+                                    params: params)
+    end
+
+    private
+
+    def find_resource
+      @resource = SchemaUtils.find_model_from_table_name(params[:collection])
+
+      if @resource.nil? || !@resource.ancestors.include?(ActiveRecord::Base)
+        render json: {status: 404}, status: :not_found
+      end
+    end
+
+    def find_association
+      @association = @resource.reflect_on_association(
+        params[:association_name])
+
+      if @association.nil?
+        render json: {status: 404}, status: :not_found
+      end
+    end
+
+    def resource_params
+      ResourceDeserializer.new(@resource, params[:resource]).perform
+    end
+
+    def includes
+      @association.klass
+        .reflect_on_all_associations
+        .select do |a|
+          [:belongs_to, :has_and_belongs_to_many].include?(a.macro) &&
+            !a.options[:polymorphic]
+        end
+        .map {|a| a.name.to_s }
+    end
+
+  end
+end

data/app/controllers/forest_liana/resources_controller.rb

@@ -64,7 +64,10 @@ module ForestLiana
     def includes
       @resource
         .reflect_on_all_associations
-        .select {|a| a.macro == :belongs_to && !a.options[:polymorphic] }
+        .select do |a|
+          [:belongs_to, :has_and_belongs_to_many].include?(a.macro) &&
+            !a.options[:polymorphic]
+        end
         .map {|a| a.name.to_s }
     end
 

data/app/serializers/forest_liana/serializer_factory.rb

@@ -36,7 +36,7 @@ module ForestLiana
         include JSONAPI::Serializer
 
         def self_link
-          "/forest#{super}"
+          "/forest#{super.underscore}"
         end
 
         def type
@@ -56,12 +56,16 @@ module ForestLiana
         end
 
         def relationship_related_link(attribute_name)
+          ret = {
+            href: "#{self_link}/#{format_name(attribute_name)}"
+          }
+
           relationship_records = object.send(attribute_name)
-          return nil unless relationship_records.respond_to?(:each)
+          if relationship_records.respond_to?(:each)
+            ret[:meta] = { count: relationship_records.count }
+          end
 
-          {
-            meta: { count: relationship_records.count }
-          }
+          ret
         end
       }
 

data/app/services/forest_liana/has_many_getter.rb

@@ -0,0 +1,51 @@
+module ForestLiana
+  class HasManyGetter
+    def initialize(resource, association, params)
+      @resource = resource
+      @association = association
+      @params = params
+    end
+
+    def perform
+      @records = @resource.find(@params[:id]).send(@params[:association_name])
+
+      @records
+    end
+
+    def records
+      @records.limit(limit).offset(offset)
+    end
+
+    def count
+      @records.to_a.length
+    end
+
+    private
+
+    def offset
+      return 0 unless pagination?
+
+      number = @params[:page][:number]
+      if number && number.to_i > 0
+        (number.to_i - 1) * limit
+      else
+        0
+      end
+    end
+
+    def limit
+      return 10 unless pagination?
+
+      if @params[:page][:size]
+        @params[:page][:size].to_i
+      else
+        10
+      end
+    end
+
+    def pagination?
+      @params[:page] && @params[:page][:number]
+    end
+
+  end
+end

data/app/services/forest_liana/operator_value_parser.rb

@@ -0,0 +1,27 @@
+module ForestLiana
+  class OperatorValueParser
+
+    def self.parse(value)
+      operator = nil
+
+      if value.first == '!'
+        operator = '!='
+        value.slice!(0)
+      elsif value.first == '>'
+        operator = '>'
+        value.slice!(0)
+      elsif value.first == '<'
+        operator = '<'
+        value.slice!(0)
+      elsif value.include?('*')
+        operator = 'ILIKE'
+        value.gsub!('*', '%')
+      else
+        operator = '='
+      end
+
+      [operator, value]
+    end
+
+  end
+end

data/app/services/forest_liana/resources_getter.rb

@@ -6,8 +6,10 @@ module ForestLiana
     end
 
     def perform
-      @records_without_sort = @records = search_query
+      @records = search_query
       @records = sort_query
+
+      @records
     end
 
     def records
@@ -15,13 +17,13 @@ module ForestLiana
     end
 
     def count
-      @records_without_sort.count
+      @records.to_a.count
     end
 
     private
 
     def search_query
-      SearchQueryBuilder.new(@resource.includes(includes), @params).perform
+      SearchQueryBuilder.new(@resource, @params).perform
     end
 
     def sort_query
@@ -32,7 +34,8 @@ module ForestLiana
           field = detect_reference(field)
 
           association = @resource.reflect_on_association(field.to_sym)
-          if [:has_many, :has_and_belongs_to_many].include?(association.try(:macro))
+          if [:has_many, :has_and_belongs_to_many].include?(
+            association.try(:macro))
             @records = has_many_sort(association, order)
           else
             @records = @records.order("#{field} #{order.upcase}")
@@ -52,11 +55,12 @@ module ForestLiana
     def has_many_sort(association, order)
       @records
         .select("#{@resource.table_name}.*,
-                COUNT(#{association.table_name}.id) has_many_count")
+                COUNT(#{association.table_name}.id)
+                #{association.table_name}_has_many_count")
         .joins(ArelHelpers.join_association(@resource, association.name,
                                             Arel::Nodes::OuterJoin))
         .group("#{@resource.table_name}.id")
-        .order("has_many_count #{order.upcase}")
+        .order("#{association.table_name}_has_many_count #{order.upcase}")
     end
 
     def detect_sort_order(field)
@@ -81,8 +85,7 @@ module ForestLiana
     end
 
     def includes
-      SchemaUtils.associations(@resource).select {|x| !x.options[:through]}
-        .map(&:name)
+      SchemaUtils.associations(@resource).map(&:name)
     end
 
     def offset

data/app/services/forest_liana/search_query_builder.rb

@@ -2,16 +2,16 @@ module ForestLiana
   class SearchQueryBuilder
 
     def initialize(resource, params)
-      @resource = resource
+      @resource = @records = resource
       @params = params
     end
 
     def perform
-      search_param
-      filter_param
-      associations_param
+      @records = search_param
+      @records = filter_param
+      @records = has_many_filter
 
-      @resource
+      @records
     end
 
     def search_param
@@ -28,49 +28,85 @@ module ForestLiana
           end
         end
 
-        @resource = @resource.where(conditions.join(' OR '))
+        @records = @resource.where(conditions.join(' OR '))
       end
+
+      @records
     end
 
     def filter_param
       if @params[:filter]
         @params[:filter].each do |field, value|
+          next if association?(field)
 
-          operator = nil
-          if value.first == '!'
-            operator = '!='
-            value.slice!(0)
-          elsif value.first == '>'
-            operator = '>'
-            value.slice!(0)
-          elsif value.first == '<'
-            operator = '<'
-            value.slice!(0)
-          elsif value.include?('*')
-            operator = 'ILIKE'
-            value.gsub!('*', '%')
-          else
-            operator = '='
-          end
-
-          @resource = @resource.where("#{field} #{operator} '#{value}'")
+          operator, value = OperatorValueParser.parse(value)
+          @records = @resource.where("#{field} #{operator} '#{value}'")
         end
       end
+
+      @records
+    end
+
+    def association?(field)
+      field = field.split(':').first if field.include?(':')
+      @resource.reflect_on_association(field.to_sym).present?
     end
 
-    def associations_param
-      associations = @resource.reflect_on_all_associations(:belongs_to)
+    def has_many_association?(field)
+      field = field.split(':').first if field.include?(':')
+      association = @resource.reflect_on_association(field.to_sym)
+
+      association.try(:macro) === :has_many
+    end
 
-      associations.each do |association|
-        name = association.name.to_s
+    def has_many_filter
+      if @params[:filter]
+        @params[:filter].each do |field, value|
+          next unless has_many_association?(field)
 
-        if @params[name + 'Id']
-          @resource = @resource.where("#{name.foreign_key} =
-                                      #{@params[name + 'Id']}")
+          if field.include?(':')
+            @records = has_many_subfield_filter(field, value)
+          else
+            @records = has_many_field_filter(field, value)
+          end
         end
       end
+
+      @records
+    end
+
+    def has_many_field_filter(field, value)
+      association = @resource.reflect_on_association(field.to_sym)
+      return if association.blank?
+
+      operator, value = OperatorValueParser.parse(value)
+
+      @records = @records
+        .select("#{@resource.table_name}.*,
+                COUNT(#{association.table_name}.id)
+                #{association.table_name}_has_many_count")
+        .joins(ArelHelpers.join_association(@resource, association.name,
+                                            Arel::Nodes::OuterJoin))
+        .group("#{@resource.table_name}.id")
+        .having("COUNT(#{association.table_name}) #{operator} #{value}")
     end
 
+    def has_many_subfield_filter(field, value)
+      field, subfield = field.split(':')
+
+      association = @resource.reflect_on_association(field.to_sym)
+      return if association.blank?
+
+      operator, value = OperatorValueParser.parse(value)
+
+      @records = @records
+        .select("#{@resource.table_name}.*,
+                COUNT(#{association.table_name}.id)
+                #{association.table_name}_has_many_count")
+        .joins(ArelHelpers.join_association(@resource, association.name,
+                                            Arel::Nodes::OuterJoin))
+        .group("#{@resource.table_name}.id, #{association.table_name}.#{subfield}")
+        .having("#{association.table_name}.#{subfield} #{operator} '#{value}'")
+    end
   end
 end
-

data/app/services/forest_liana/stripe_cards_getter.rb

@@ -19,7 +19,11 @@ module ForestLiana
       resource = @reference_model.find(reference_model_id)
       customer = resource[@reference_field]
 
-      fetch_cards(customer, params)
+      if customer.blank?
+        @records = []
+      else
+        fetch_cards(customer, params)
+      end
     end
 
     def fetch_cards(customer, params)

data/app/services/forest_liana/stripe_invoices_getter.rb

@@ -27,8 +27,9 @@ module ForestLiana
         d.date = Time.at(d.date).to_datetime
         d.period_start = Time.at(d.period_start).to_datetime
         d.period_end = Time.at(d.period_end).to_datetime
-        d.subtotal /= 100
-        d.total /= 100
+        d.subtotal /= 100.00
+        d.total /= 100.00
+        d.amount_due /= 100.00
 
         query = {}
         query[@reference_field] = d.customer

data/app/services/forest_liana/stripe_payments_getter.rb

@@ -27,7 +27,7 @@ module ForestLiana
 
       @records = @charges.data.map do |d|
         d.created = Time.at(d.created).to_datetime
-        d.amount /= 100
+        d.amount /= 100.00
 
         query = {}
         query[@reference_field] = d.customer

data/config/routes.rb

@@ -1,14 +1,18 @@
 ForestLiana::Engine.routes.draw do
+  # Stripe Integration
   get 'stripe_payments' => 'stripe#payments'
   post 'stripe_payments/refunds' => 'stripe#refund'
   get 'stripe_cards' => 'stripe#cards'
   get 'stripe_invoices' => 'stripe#invoices'
 
+  # CRUD
   get '/' => 'apimaps#index'
   get ':collection' => 'resources#index'
   get ':collection/:id' => 'resources#show'
-  get ':collection/:id' => 'resources#show'
   post ':collection' => 'resources#create'
   put ':collection/:id' => 'resources#update'
   delete ':collection/:id' => 'resources#destroy'
+
+  # Associations
+  get ':collection/:id/:association_name' => 'associations#index'
 end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.0.11"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.1.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/assets/stylesheets/scaffold.css
 - app/controllers/forest_liana/apimaps_controller.rb
 - app/controllers/forest_liana/application_controller.rb
+- app/controllers/forest_liana/associations_controller.rb
 - app/controllers/forest_liana/resources_controller.rb
 - app/controllers/forest_liana/stripe_controller.rb
 - app/deserializers/forest_liana/resource_deserializer.rb
@@ -119,6 +120,8 @@ files:
 - 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/has_many_getter.rb
+- app/services/forest_liana/operator_value_parser.rb
 - app/services/forest_liana/resource_getter.rb
 - app/services/forest_liana/resources_getter.rb
 - app/services/forest_liana/schema_adapter.rb