softwear-lib 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4747a563a62d0fa81d639b3451f08f16f08504fd
-  data.tar.gz: 965f5f4c0a52c1f27246774087cf867db3dd1016
+  metadata.gz: 18852132ef59f403e4bf39ccbfb9924d26aa7a1b
+  data.tar.gz: 25a246735e20b6e342b804955844d0303daca545
 SHA512:
-  metadata.gz: ba81d1344a8b00df0410f2f149911a2ecaeb3344a8d1ef596cc535ee7f1ee049f3cbfaa22ceec1988910e408bfc08ae89a2d4861610d071e5647fb28310fd2eb
-  data.tar.gz: 982eef95324c1a19a775d02c7db7d81426c08f9bcb64fc1d48670fe350ab89cc4fc061e4566f23d04a56f1b1886a402ce80be4dddbf2ae5a798664b3bea37b9e
+  metadata.gz: 276834739a66871a69a863e85dcb6529f900d5c58d409ee5bd5b874f7fe13e92d31c4f9f28546906baa02de865c41103f1ea1c50df112a66f5178624e885a331
+  data.tar.gz: 80e35e5017f1343c848ca76a650dadbaf890da1116ca890719d802b46806756c8d8938b7248e39e4c72cabef0a8afa93ed5f63f1297c2195dd384167db5c3a82

data/lib/softwear/lib/api_controller.rb

@@ -1,115 +1,118 @@
-module Api
-  class ApiController < ActionController::Base
-    include InheritedResources::Actions
-    include InheritedResources::BaseHelpers
-    extend  InheritedResources::ClassMethods
-    extend  InheritedResources::UrlHelpers
+require 'inherited_resources'
 
-    acts_as_token_authentication_handler_for User
-    skip_before_filter :authenticate_user!
-    skip_before_filter :verify_authenticity_token
+module Softwear
+  module Lib
+    class ApiController < ActionController::Base
+      include ::InheritedResources::Actions
+      include ::InheritedResources::BaseHelpers
+      extend  ::InheritedResources::ClassMethods
+      extend  ::InheritedResources::UrlHelpers
 
-    before_filter :allow_origin
+      skip_before_filter :authenticate_user!
+      skip_before_filter :verify_authenticity_token
 
-    respond_to :json
-    self.responder = InheritedResources::Responder
+      before_filter :allow_origin
 
-    self.class_attribute :resource_class, :instance_writer => false unless self.respond_to? :resource_class
-    self.class_attribute :parents_symbols,  :resources_configuration, :instance_writer => false
+      respond_to :json
+      self.responder = InheritedResources::Responder
 
-    def index(&block)
-      yield if block_given?
+      self.class_attribute :resource_class, :instance_writer => false unless self.respond_to? :resource_class
+      self.class_attribute :parents_symbols,  :resources_configuration, :instance_writer => false
 
-      key_values = permitted_attributes.map do |a|
-        [a, params[a]] if params.key?(a)
-      end
-        .compact
+      def index(&block)
+        yield if block_given?
 
-      self.records ||= resource_class
-      self.records = records.where(Hash[key_values])
+        key_values = permitted_attributes.map do |a|
+          [a, params[a]] if params.key?(a)
+        end
+          .compact
 
-      respond_to do |format|
-        format.json(&render_json(records))
-      end
-    end
+        self.records ||= resource_class
+        self.records = records.where(Hash[key_values])
 
-    def show
-      super do |format|
-        format.json(&render_json)
+        respond_to do |format|
+          format.json(&render_json(records))
+        end
       end
-    end
 
-    def update
-      super do |format|
-        format.json(&render_json)
+      def show
+        super do |format|
+          format.json(&render_json)
+        end
       end
-    end
 
-    def create
-      create! do |success, failure|
-        success.json do
-          headers['Location'] = resource_url(record.id)
-          render_json(status: 201).call
+      def update
+        super do |format|
+          format.json(&render_json)
         end
-        failure.json(&render_json)
       end
-    end
 
-    def options
-      head(:ok) if request.request_method == 'OPTIONS'
-    end
+      def create
+        create! do |success, failure|
+          success.json do
+            headers['Location'] = resource_url(record.id)
+            render_json(status: 201).call
+          end
+          failure.json(&render_json)
+        end
+      end
 
-    protected
+      def options
+        head(:ok) if request.request_method == 'OPTIONS'
+      end
 
-    def render_json(options = {})
-      proc do
-        if options.is_a?(Hash)
-          records = nil
-        else
-          records = options
-          options = {}
+      protected
+
+      def render_json(options = {})
+        proc do
+          if options.is_a?(Hash)
+            records = nil
+          else
+            records = options
+            options = {}
+          end
+          rendering = {
+            json: (records || record),
+            methods: [:id] + permitted_attributes,
+            include: includes
+          }
+            .merge(options)
+
+          render rendering
         end
-        rendering = {
-          json: (records || record),
-          methods: [:id] + permitted_attributes,
-          include: includes
-        }
-          .merge(options)
-
-        render rendering
       end
-    end
 
-    def self.model_name
-      name.gsub('Api::', '').gsub('Controller', '').singularize
-    end
+      def self.model_name
+        name.gsub('Api::', '').gsub('Controller', '').singularize
+      end
 
-    # Override this to specify the :include option of rendering json.
-    def includes
-      {}
-    end
+      # Override this to specify the :include option of rendering json.
+      def includes
+        {}
+      end
 
-    def records
-      instance_variable_get("@#{self.class.model_name.underscore.pluralize}")
-    end
+      def records
+        instance_variable_get("@#{self.class.model_name.underscore.pluralize}")
+      end
 
-    def records=(r)
-      instance_variable_set("@#{self.class.model_name.underscore.pluralize}", r)
-    end
+      def records=(r)
+        instance_variable_set("@#{self.class.model_name.underscore.pluralize}", r)
+      end
 
-    def record
-      instance_variable_get("@#{self.class.model_name.underscore}")
-    end
+      def record
+        instance_variable_get("@#{self.class.model_name.underscore}")
+      end
 
-    def allow_origin
-      headers['Access-Control-Allow-Origin'] = '*'
-      headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, PATCH, DELETE'
-      headers['Access-Control-Allow-Headers'] = 'X-Requested-With'
-      headers['Access-Control-Allow-Credentials'] = 'true'
-    end
+      def allow_origin
+        headers['Access-Control-Allow-Origin'] = '*'
+        headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, PATCH, DELETE'
+        headers['Access-Control-Allow-Headers'] = 'X-Requested-With'
+        headers['Access-Control-Allow-Credentials'] = 'true'
+      end
 
-    def permitted_attributes
-      resource_class.column_names
+      def permitted_attributes
+        resource_class.column_names
+      end
     end
   end
 end

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Nigel Baillie