zobi 4.0.2 → 5.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f51cb3ce3c2c79ea07404701681a4af63673814
-  data.tar.gz: 7de5688023e861d0ac5f049ad8358e6f29ff276f
+  metadata.gz: e7041240f181625bb66d7c362635be76947693f8
+  data.tar.gz: 3cde43da32739b1140bbc15c554e6e3e25798d02
 SHA512:
-  metadata.gz: 9c75084d6080751307ac85ccc446f6f7efcce7995b99093d8d9404caff51e51547ef5e44b1726b662d4a64bdbcef5398dd64bce2a78e94df911b9bf70c76d966
-  data.tar.gz: 8776ace9dab152adb558e87d4d7114a4aafdd3500e556b75d64136d7383577e54dcb0252f1e580184989261049fd1e914db69d7a79c58855889f05c07a421ff2
+  metadata.gz: 5bedfd22dd1f6542f7e6a8ada8fb2913c741401178c64f5c79ed75707d53a1f105b0ddf9b032b7c714c53db400074cab740bb761673419c333f46c7c8b054beb
+  data.tar.gz: ad2c3746ba5295d0deb6e64bf2dbcb3957226091a1dc1cc62119a519d9f0d0720cc0d812d4e7726bf137ca7b34d122b117dacd2aaa493027a5c606f85909a9ee

data/README.md

@@ -5,7 +5,6 @@ Zobi
 Zobi helps you to orchestrate your controller behaviors using the following gems :
 
 - [**devise**](https://github.com/plataformatec/devise)
-- [**inherited_resources**](https://github.com/josevalim/inherited_resources)
 - [**has_scope**](https://github.com/plataformatec/has_scope)
 - [**kaminari**](https://github.com/amatsuda/kaminari)
 - [**pundit**](https://github.com/elabs/pundit)
@@ -17,7 +16,7 @@ How to use it?
 Add it in your `Gemfile` and run `bundle install`:
 
 ```ruby
-gem 'zobi', '~> 4.0.1'
+gem 'zobi', '~> 4.0.2'
 ```
 
 Next, include Zobi module in your controller and set modules you want to
@@ -33,20 +32,26 @@ Available modules
 
 ### Inherited
 
-This module uses
-[inherited_resources](https://github.com/josevalim/inherited_resources) gem
-(for version >= 1.4.0).
+This module historically use
+[inherited_resources](https://github.com/josevalim/inherited_resources) gem, which is now deprecated.
 
-This module deals with String Parameters using Parameters classes.
-
-A Parameters inherits from Zobi::ParametersSanitizer, and should define the list
-of parameters and nested parameters to accept.
+Now it only defines create/update/destroy methods to easily build CRUD backend.
 
 If your controller is namespaced, you should define the `resource_type` method to
 override its generic behavior.
 
-If your model is namespaced, you should define the defaults resource_class for
-Inherited Resource, ie : `defaults resource_class: ::User::Address`
+If your model is namespaced, you should define the defaults resource_class:
+
+```
+def resource_class
+::User::Address`
+end
+```
+
+This module also deals with Strong Parameters using Parameters classes.
+
+A Parameters inherits from Zobi::ParametersSanitizer, and should define the list
+of parameters and nested parameters to accept.
 
 Here is an example :
 

data/lib/zobi.rb

@@ -6,7 +6,8 @@ module Zobi
   BEHAVIORS = [:inherited, :scoped, :included, :paginated, :controlled_access, :decorated].freeze
 
   def self.extended base
-    base.helper_method :collection, :resource
+    base.helper_method :collection, :resource, :resource_class,
+      :collection_path, :new_resource_path, :edit_resource_path, :resource_path
   end
 
   def behaviors *behaviors
@@ -27,9 +28,19 @@ module Zobi
   module InstanceMethods
 
     def zobi_resource_class
-      return resource_class if self.class.behavior_included?(:inherited)
-      self.class.name.demodulize.gsub('Controller', '').singularize.constantize
+      @_zobi_resource_class ||= zobi_resource_name.classify.constantize
     end
+    alias_method :resource_class, :zobi_resource_class
+
+    def zobi_resource_name
+      @_zobi_resource_name ||= self.class.to_s.demodulize.gsub(/Controller$/, '').singularize
+    end
+    alias_method :resource_name, :zobi_resource_name
+
+    def zobi_resource_key
+      @_zobi_resource_key ||= zobi_resource_name.underscore
+    end
+    alias_method :resource_key, :zobi_resource_key
 
     def collection
       return @collection if @collection
@@ -41,5 +52,20 @@ module Zobi
       @collection = (c.is_a?(Class) ? c.all : c)
     end
 
+    def collection_path
+      url_for controller: zobi_resource_key.pluralize, action: :index
+    end
+
+    def new_resource_path
+      url_for controller: zobi_resource_key.pluralize, action: :new
+    end
+
+    def edit_resource_path r
+      url_for controller: zobi_resource_key.pluralize, action: :edit, id: r.id
+    end
+
+    def resource_path r
+      url_for controller: zobi_resource_key.pluralize, action: :show, id: r.id
+    end
   end
 end

data/lib/zobi/controlled_access.rb

@@ -8,7 +8,7 @@ module Zobi
     def self.included base
       base.send :include, Pundit
       base.class_eval do
-        before_filter :authorize_resource
+        before_action :authorize_resource
 
         def policy_scope scope
           Pundit.policy_scope!(controlled_access_user, scope)

data/lib/zobi/inherited.rb

@@ -8,14 +8,56 @@ module Zobi
   #
   module Inherited
     def self.included(klass)
-      klass.inherit_resources
-      klass.send('include', Inherited::Hidden)
+      klass.send 'include', Inherited::Hidden
+      klass.send 'respond_to', :html
+    end
+
+    def create
+      r = zobi_resource_class.create permitted_params[zobi_resource_key]
+      instance_variable_set "@#{resource_key}", r
+      args = route_namespace
+      args << r
+      block_given? ? yield(r) : respond_with(*args)
+    end
+    alias_method :create!, :create
+
+    def update
+      resource.update_attributes permitted_params[zobi_resource_key]
+      args = route_namespace
+      args << resource
+      block_given? ? yield(resource) : respond_with(*args)
+    end
+    alias_method :update!, :update
+
+    def destroy
+      resource.destroy
+      block_given? ? yield(resource) : redirect_to(collection_path)
+    end
+    alias_method :destroy!, :destroy
+
+    protected
+
+    def resource
+      r = instance_variable_get "@#{resource_key}"
+      return r if r.present?
+      instance_variable_set(
+        "@#{resource_key}",
+        (params[:id].present? ?
+          resource_class.find(params[:id]) :
+          resource_class.new
+        )
+      )
+      return instance_variable_get "@#{resource_key}"
+    end
+
+    def route_namespace
+      self.class.name.split('::')[0...-1].map(&:downcase)
     end
 
     private
 
     def inherited_collection c
-      end_of_association_chain
+      c
     end
 
     module Hidden

data/lib/zobi/scoped.rb

@@ -6,7 +6,7 @@ module Zobi
   module Scoped
     def self.included(klass)
       klass.helper_method :filters_list
-      klass.before_filter :default_order
+      klass.before_action :default_order
     end
 
     protected

data/lib/zobi/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Zobi
-  VERSION = "4.0.2"
+  VERSION = "5.0.0.beta1"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: zobi
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - klacointe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -220,8 +206,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: Keep your rails controllers DRY while using devise, inherited_resources,
-  has_scope, kaminari, pundit and draper
+description: Keep your rails controllers DRY while using devise, has_scope, kaminari,
+  pundit and draper
 email: kevinlacointe@gmail.com
 executables: []
 extensions: []
@@ -242,7 +228,7 @@ files:
 - lib/zobi/responders/pagination_responder.rb
 - lib/zobi/scoped.rb
 - lib/zobi/version.rb
-homepage: https://github.com/af83/zobi
+homepage: https://github.com/klacointe/zobi
 licenses:
 - MIT
 metadata: {}
@@ -257,12 +243,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Keep your rails controllers DRY.