effective_resources 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c81fb1d207d2a80098702d0539cce1304db0388c
-  data.tar.gz: d588a94d7b30875b233d130c798b469e289835ae
+  metadata.gz: 042a1e7ebafddc560f55cc76c3b4c4271dc53d56
+  data.tar.gz: cd9e12a5646863cac21983f01520b9594a658c86
 SHA512:
-  metadata.gz: 3bffe8691feaf152e672de6fc5239fea4aa155b67fbc776d1a408388e1554290b14cdb53da6bd79346725466a167c4b5c9f003e6121e150c491492e924d659c5
-  data.tar.gz: 77d22eed11ba2e26b1b7a1082141755c64b99fe7a9c5dd7b42be97a81ee1b72e7ad0a2b907461c767d7e9e6e943eab207ba1e78b0c4e08d9b24c16cd8f2e3a8c
+  metadata.gz: 041fbf5b5709d5293117f4d88d2f6c389bc4fd8182cd3572b499b520d0e7229e35dd02f3317d59b1e2b40a197b0aa366bd0256566be1b692b956b4cf7ced584f
+  data.tar.gz: 3800490cf26e3ef45fffe0b2ebe59aa99684204d3feaa8f7c3d06295d9c8d7a56d6a04b0031499ff0b28f1ea986380d427feb3549d2c4e3aba98820eebf35fe3

data/README.md

@@ -26,6 +26,12 @@ Add to your contoller:
 class PostsController < ApplicationController
   include Effective::CrudController
 
+  protected
+
+  def post_scope
+    {client_id: current_user.client_id} # Or a symbol
+  end
+
   def post_params
     params.require(:post).permit(:id, :title, :body)
   end

data/app/controllers/concerns/effective/crud_controller.rb

@@ -10,12 +10,12 @@ module Effective
 
     def index
       @page_title ||= resource_plural_name.titleize
-      EffectiveResources.authorized?(self, :index, resource_class)
+      EffectiveResources.authorized?(self, :index, resource_class.new)
 
       self.resources ||= resource_class.all
 
       if resource_datatable_class
-        @datatable ||= resource_datatable_class.new(params[:scopes])
+        @datatable ||= resource_datatable_class.new(resource_datatable_attributes, params[:scopes])
       end
     end
 
@@ -87,6 +87,15 @@ module Effective
 
     protected
 
+    def resource_redirect_path
+      case params[:commit].to_s
+      when 'Save'               ; send(effective_resource.edit_path, resource)
+      when 'Save and Continue'  ; send(effective_resource.index_path)
+      when 'Save and Add New'   ; send(effective_resource.new_path)
+      else send(effective_resource.show_path, resource)
+      end
+    end
+
     def resource # @thing
       instance_variable_get("@#{resource_name}")
     end
@@ -103,9 +112,7 @@ module Effective
       send(:instance_variable_set, "@#{resource_plural_name}", instance)
     end
 
-    def resource_class # Thing
-      effective_resource.klass
-    end
+    private
 
     def resource_name # 'thing'
       effective_resource.name
@@ -115,6 +122,35 @@ module Effective
       effective_resource.plural_name
     end
 
+    # Scoped to resource_scope_method_name
+    def resource_class # Thing
+      @resource_class ||= (
+        if resource_scope_method_name.blank?
+          effective_resource.klass
+        else
+          case (resource_scope = send(resource_scope_method_name))
+          when Hash   ; effective_resource.klass.where(resource_scope)
+          when Symbol ; effective_resource.klass.send(resource_scope)
+          when nil    ; effective_resource.klass
+          else
+            raise "expected #{resource_scope_method_name} to return a Hash or Symbol"
+          end
+        end
+      )
+    end
+
+    def resource_datatable_attributes
+      return {} unless resource_scope_method_name.present?
+
+      case (resource_scope = send(resource_scope_method_name))
+      when Hash   ; resource_scope
+      when Symbol ; {resource_scope: true}
+      when nil    ; {}
+      else
+        raise "expected #{resource_scope_method_name} to return a Hash or Symbol"
+      end
+    end
+
     def resource_datatable_class # ThingsDatatable
       effective_resource.datatable_klass
     end
@@ -123,17 +159,12 @@ module Effective
       ["#{resource_name}_params", "#{resource_plural_name}_params", 'permitted_params'].find { |name| respond_to?(name, true) } || 'params'
     end
 
-    def resource_index_path
-      effective_resource.index_path
+    def resource_scope_method_name
+      ["#{resource_name}_scope", "#{resource_plural_name}_scope", 'resource_scope', 'default_scope'].find { |name| respond_to?(name, true) }
     end
 
-    def resource_redirect_path
-      case params[:commit].to_s
-      when 'Save'               ; send(effective_resource.edit_path, resource)
-      when 'Save and Continue'  ; send(effective_resource.index_path)
-      when 'Save and Add New'   ; send(effective_resource.new_path)
-      else send(effective_resource.show_path, resource)
-      end
+    def resource_index_path
+      effective_resource.index_path
     end
 
     private

data/app/helpers/effective_resources_helper.rb

@@ -10,4 +10,10 @@ module EffectiveResourcesHelper
     end
   end
 
+  def simple_form_save(form)
+    content_tag(:p, class: 'text-right') do
+      form.button(:submit, 'Save', data: { disable_with: 'Saving...' })
+    end
+  end
+
 end

data/app/models/effective/resources/associations.rb

@@ -3,10 +3,14 @@ module Effective
     module Associations
 
       def belong_tos
+        return [] unless klass
+
         @belong_tos ||= klass.reflect_on_all_associations(:belongs_to)
       end
 
       def nested_resources
+        return {} unless klass
+
         @nested ||= klass.reflect_on_all_autosave_associations.inject({}) do |hash, reference|
           hash[reference] = Effective::Resource.new(reference); hash
         end

data/app/models/effective/resources/init.rb

@@ -25,6 +25,8 @@ module Effective
         @written_belong_tos = []
         @written_scopes = []
 
+        return unless File.exists?(model_file)
+
         Effective::CodeReader.new(model_file) do |reader|
           first = reader.index { |line| line == '# Attributes' }
           last = reader.index(from: first) { |line| line.start_with?('#') == false && line.length > 0 } if first

data/app/models/effective/resources/klass.rb

@@ -3,7 +3,7 @@ module Effective
     module Klass
 
       def klass
-        namespaced_class_name.safe_constantize || class_name.safe_constantize || name.constantize
+        namespaced_class_name.safe_constantize || class_name.safe_constantize || name.safe_constantize
       end
 
       def datatable_klass

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails