standardapi 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f276df6b8c02e60277971a4a7c0b4119805a813
-  data.tar.gz: f1a04f95d568360aef96f66c5544cd257c210f7c
+  metadata.gz: bae8ab8cb0e9504d2a04105b232912be7d2e800d
+  data.tar.gz: 0685d8c1c8cde8f423bc29b20443226297090814
 SHA512:
-  metadata.gz: 55a1400893f87c82b670ca5b0f523249dfdf719cb0c4521a286e879fdc5b352a95b9aae7e5f91b947562647863c58f7eae1a919aea203fb13a20d6017081559a
-  data.tar.gz: 220e40e163998406f669414adeb90d83ed0a957fac003e82532a37f94e527a9cedcb2bd9954ffe4883b6549331ba7843db4807690ff51ba48dc52ca8ea4cd446
+  metadata.gz: 3c677a3aea24f4d7f1409fd149571954a705bdc50d163131be72fe27602c85d9554498b194ad0c4635fdeb55d1b9fb91c87d96edc166630eb608f808c8827053
+  data.tar.gz: 0bf6e349cd22b92126e6d0fc15057299b36ad296349618496755bce7d1c1ff09a2f8269eba65d93781ecff74d752556c317b2b18f294706e04fd936f19ecf471

data/lib/standard_api/controller.rb

@@ -0,0 +1,146 @@
+module StandardAPI
+  module Controller
+
+    def self.included(klass)
+      klass.hide_action :current_mask
+      klass.helper_method :includes, :orders, :model
+      klass.append_view_path(File.join(File.dirname(__FILE__), 'views'))
+      klass.extend(ClassMethods)
+    end
+  
+    def ping
+      render :text => 'pong'
+    end
+
+    def tables
+      controllers = Dir[Rails.root.join('app/controllers/*_controller.rb')].map{ |path| path.match(/(\w+)_controller.rb/)[1].camelize+"Controller" }.map(&:safe_constantize)
+      controllers.select! { |c| c.ancestors.include?(self.class) && c != self.class }
+      controllers.map!(&:model).compact!.map!(&:table_name)
+    
+      render json: controllers
+    end  
+
+    def index
+      @records = resources.limit(params[:limit]).offset(params[:offset]).sort(orders)
+      instance_variable_set("@#{model.model_name.plural}", @records)
+    end
+
+    def calculate
+      @calculations = resources.reorder(nil).pluck(*calculate_selects).map do |c|
+        if c.is_a?(Array)
+          c.map { |v| v.is_a?(BigDecimal) ? v.to_f : v }
+        else
+          c.is_a?(BigDecimal) ? c.to_f : c
+        end
+      end
+      render json: @calculations
+    end
+
+    def show
+      @record = resources.find(params[:id])
+      instance_variable_set("@#{model.model_name.singular}", @record)
+    end
+
+    def create
+      @record = model.new(model_params)
+      instance_variable_set("@#{model.model_name.singular}", @record)
+      render :show, status: @record.save ? :created : :bad_request
+    end
+
+    def update
+      @record = resources.find(params[:id])
+      instance_variable_set("@#{model.model_name.singular}", @record)
+      render :show, status: @record.update_attributes(model_params) ? :ok : :bad_request
+    end
+
+    def destroy
+      resources.find(params[:id]).destroy!
+      render nothing: true, status: :no_content
+    end
+
+    # Override if you want to support masking
+    def current_mask
+      @current_mask ||= {}
+    end
+
+    module ClassMethods
+    
+      def model
+        return @model if defined?(@model)
+        @model = name.sub(/Controller\z/, '').singularize.camelize.safe_constantize
+      end
+
+    end
+  
+    private
+
+    def model
+      self.class.model
+    end
+
+    def model_params
+      params.require(model.model_name.singular).permit(self.send("#{model.model_name.singular}_params"))
+    end
+
+    def model_includes
+      self.send "#{model.model_name.singular}_includes"
+    end
+
+    def model_orders
+      self.send "#{model.model_name.singular}_orders"
+    end
+
+    def excludes_for(klass)
+      if defined?(ApplicationHelper) && ApplicationHelper.instance_methods.include?(:excludes)
+         excludes = Class.new.send(:include, ApplicationHelper).new.excludes.with_indifferent_access
+         excludes.try(:[], klass.model_name.singular) || []
+      else
+        []
+      end
+    end
+
+    def model_excludes
+      excludes_for(model)
+    end
+
+    def resources
+      model.filter(params[:where]).where(current_mask[model.table_name])
+    end
+
+    def includes
+      @includes ||= StandardAPI::Includes.normalize(params[:include])
+    end
+
+    def orders
+      @orders ||= StandardAPI::Orders.sanitize(params[:order], model_orders)
+    end
+
+    def excludes
+      @excludes ||= model_excludes
+    end
+
+    # Used in #calculate
+    # [{ count: :id }]
+    # [{ count: '*' }]
+    # [{ count: '*', maximum: :id, minimum: :id }]
+    # [{ count: '*' }, { maximum: :id }, { minimum: :id }]
+    # TODO: Sanitize (normalize_select_params(params[:select], model))
+    def calculate_selects
+      return @selects if defined?(@selects)
+
+      functions = ['minimum', 'maximum', 'average', 'sum', 'count']
+      @selects = []
+      Array(params[:select]).each do |select|
+        select.each do |func, column|
+          column = column == '*' ? Arel.star : column.to_sym
+          if functions.include?(func.to_s.downcase)
+            @selects << (model.arel_table[column].send(func).to_sql)
+          end
+        end
+      end
+
+      @selects
+    end
+
+  end
+end

data/lib/standard_api/helpers.rb

@@ -0,0 +1,13 @@
+module StandardAPI
+  module Helpers
+
+    def model_partial(record)
+      if lookup_context.exists?(record.model_name.element, controller_name)
+        [record.model_name.plural, record.model_name.element].join('/')
+      else
+        'application/record'
+      end
+    end
+
+  end
+end

data/lib/standard_api/railtie.rb

@@ -0,0 +1,11 @@
+module StandardAPI
+  class Railtie < ::Rails::Railtie
+
+    initializer 'standardapi' do
+      ActiveSupport.on_load(:action_view) do
+        ::ActionView::Base.send :include, StandardAPI::Helpers
+      end
+    end
+
+  end
+end

data/lib/standard_api/views/application/_record.json.jbuilder

@@ -10,11 +10,7 @@ includes.each do |inc, subinc|
     json.set! inc do
       collection = [:has_many, :has_and_belongs_to_many].include?(association.macro)
 
-      partial = if lookup_context.exists?(association.klass.model_name.element, controller_name)
-        association.klass.model_name.element
-      else
-        'record'
-      end
+      partial = model_partial(association.klass)
 
       if collection
         json.array! record.send(inc), partial: partial, as: :record, locals: { includes: subinc }

data/lib/standard_api/views/application/index.json.jbuilder

@@ -1,9 +1,3 @@
 records = @records if !records
 
-# partial = if lookup_context.exists?(association.klass.model_name.element, controller_name)
-#   association.klass.model_name.element
-# else
-#   'record'
-# end
-
-json.array! records, partial: 'application/record', as: :record, includes: includes
+json.array! records, partial: model_partial(model), as: :record, includes: includes

data/lib/standard_api/views/application/show.json.jbuilder

@@ -1,9 +1,3 @@
 record = @record if !record
 
-# partial = if lookup_context.exists?(association.klass.model_name.element, controller_name)
-#   association.klass.model_name.element
-# else
-#   'record'
-# end
-
-json.partial! 'application/record', record: record, includes: includes
+json.partial! model_partial(model), record: record, includes: includes

data/lib/standard_api.rb

@@ -8,154 +8,12 @@ require 'active_record/filter'
 require 'active_record/sort'
 require 'active_support/core_ext/hash/indifferent_access'
 
-if !ActionView::Template.registered_template_handler(:jbuilder)
-  ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+module StandardAPI
 end
 
 require 'standard_api/orders'
 require 'standard_api/includes'
+require 'standard_api/controller'
+require 'standard_api/helpers'
+require 'standard_api/railtie'
 
-module StandardAPI
-
-  def self.included(klass)
-    klass.hide_action :current_mask
-    klass.helper_method :includes, :orders, :model
-    klass.append_view_path(File.join(File.dirname(__FILE__), 'standard_api', 'views'))
-    klass.extend(ClassMethods)
-  end
-  
-  def ping
-    render :text => 'pong'
-  end
-
-  def tables
-    controllers = Dir[Rails.root.join('app/controllers/*_controller.rb')].map{ |path| path.match(/(\w+)_controller.rb/)[1].camelize+"Controller" }.map(&:safe_constantize)
-    controllers.select! { |c| c.ancestors.include?(self.class) && c != self.class }
-    controllers.map!(&:model).compact!.map!(&:table_name)
-    
-    render json: controllers
-  end  
-
-  def index
-    @records = resources.limit(params[:limit]).offset(params[:offset]).sort(orders)
-    instance_variable_set("@#{model.model_name.plural}", @records)
-  end
-
-  def calculate
-    @calculations = resources.reorder(nil).pluck(*calculate_selects).map do |c|
-      if c.is_a?(Array)
-        c.map { |v| v.is_a?(BigDecimal) ? v.to_f : v }
-      else
-        c.is_a?(BigDecimal) ? c.to_f : c
-      end
-    end
-    render json: @calculations
-  end
-
-  def show
-    @record = resources.find(params[:id])
-    instance_variable_set("@#{model.model_name.singular}", @record)
-  end
-
-  def create
-    @record = model.new(model_params)
-    instance_variable_set("@#{model.model_name.singular}", @record)
-    render :show, status: @record.save ? :created : :bad_request
-  end
-
-  def update
-    @record = resources.find(params[:id])
-    instance_variable_set("@#{model.model_name.singular}", @record)
-    render :show, status: @record.update_attributes(model_params) ? :ok : :bad_request
-  end
-
-  def destroy
-    resources.find(params[:id]).destroy!
-    render nothing: true, status: :no_content
-  end
-
-  # Override if you want to support masking
-  def current_mask
-    @current_mask ||= {}
-  end
-
-  module ClassMethods
-    
-    def model
-      return @model if defined?(@model)
-      @model = name.sub(/Controller\z/, '').singularize.camelize.safe_constantize
-    end
-
-  end
-  
-  private
-
-  def model
-    self.class.model
-  end
-
-  def model_params
-    params.require(model.model_name.singular).permit(self.send("#{model.model_name.singular}_params"))
-  end
-
-  def model_includes
-    self.send "#{model.model_name.singular}_includes"
-  end
-
-  def model_orders
-    self.send "#{model.model_name.singular}_orders"
-  end
-
-  def excludes_for(klass)
-    if defined?(ApplicationHelper) && ApplicationHelper.instance_methods.include?(:excludes)
-       excludes = Class.new.send(:include, ApplicationHelper).new.excludes.with_indifferent_access
-       excludes.try(:[], klass.model_name.singular) || []
-    else
-      []
-    end
-  end
-
-  def model_excludes
-    excludes_for(model)
-  end
-
-  def resources
-    model.filter(params[:where]).where(current_mask[model.table_name])
-  end
-
-  def includes
-    @includes ||= StandardAPI::Includes.normalize(params[:include])
-  end
-
-  def orders
-    @orders ||= StandardAPI::Orders.sanitize(params[:order], model_orders)
-  end
-
-  def excludes
-    @excludes ||= model_excludes
-  end
-
-  # Used in #calculate
-  # [{ count: :id }]
-  # [{ count: '*' }]
-  # [{ count: '*', maximum: :id, minimum: :id }]
-  # [{ count: '*' }, { maximum: :id }, { minimum: :id }]
-  # TODO: Sanitize (normalize_select_params(params[:select], model))
-  def calculate_selects
-    return @selects if defined?(@selects)
-
-    functions = ['minimum', 'maximum', 'average', 'sum', 'count']
-    @selects = []
-    Array(params[:select]).each do |select|
-      select.each do |func, column|
-        column = column == '*' ? Arel.star : column.to_sym
-        if functions.include?(func.to_s.downcase)
-          @selects << (model.arel_table[column].send(func).to_sql)
-        end
-      end
-    end
-
-    @selects
-  end
-
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-sort
@@ -189,8 +189,11 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/standard_api.rb
+- lib/standard_api/controller.rb
+- lib/standard_api/helpers.rb
 - lib/standard_api/includes.rb
 - lib/standard_api/orders.rb
+- lib/standard_api/railtie.rb
 - lib/standard_api/test_case.rb
 - lib/standard_api/test_case/calculate_tests.rb
 - lib/standard_api/test_case/create_tests.rb