controller_less 0.0.4.pre → 0.0.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f2efb325cfc55aecc4a067b81564e8fbb19dae
-  data.tar.gz: cc9c8f8a44dcc146292c236715fd5c3b496d2507
+  metadata.gz: 2f7d3c34f2e8f650993fb84cefe0a92e61746049
+  data.tar.gz: 038c1b0118c7ae0f215dac510cc70aaa67ec44f1
 SHA512:
-  metadata.gz: 62897d2c10d958bf0c2ea72e5e72459bbddd01e7f1a39a53865170e5e45a921a4005f419832360d900d00d9371f877225735c7330d27c7d7e2951235dcc4b7cc
-  data.tar.gz: b1c70d1918333febf0359978fda21525b40ed4c1ad78a69f242f200b12c26c7750dd3d3b91c0eff408865601777dcb2a6b74d0b638861b85d94304aab8b16370
+  metadata.gz: dbd4bba8327cf43405ea300c19a96208696a3c80d36a3a2fbb5939f99c565d701d3c035913c819fd1ecd064bee35564fd37ba5602c0ace0cd7c692af708f8c68
+  data.tar.gz: 152dddfab40e1fe1d6fd6d15d60e54d7fc14bf507f07b4afe16332b883fe3c31235239d92a3ecb8ff528fc3c1b0ef66e8fe8fe06440dffc099f41af13718fa80

data/lib/controller_less/application.rb

@@ -20,13 +20,15 @@ module ControllerLess
       resource = ControllerLess::Resource.new(name, options)
       eval "class ::#{resource.controller_name} < ControllerLess::ResourcesController; end"
       resource.controller.cl_config = resource
-      block_given? && hook_methods(resource, resource.resource_class, &block)
+      block_given? && hook_methods( resource, &block )
       add_route(resource.route)
     end
-    def hook_methods(config, resource_class, &block)
-      rdsl = ControllerLess::ResourceDsl.new(config, resource_class)
-      rdsl.run_registration_block(&block)
+
+    def hook_methods(rsource, &block)
+      resource_dsl = ControllerLess::ResourceDsl.new rsource
+      resource_dsl.run_registration_block &block
     end
+
     def add_route(route_name)
       (self.routes_list ||= Array.new).push(route_name)
     end

data/lib/controller_less/resource.rb

@@ -41,19 +41,38 @@ module ControllerLess
     def build_namespace_route
       func  = "lambda do;"
       arry = options.fetch(:namespace).split("::")
-      func += arry.map { |val| "namespace(:#{val.downcase}) do" }.join(";") << (";#{simple_routes_for_namespace.join(" ")}" + ";end" * arry.size + ";end")
+      func += arry.map { |val| "namespace(:#{val.downcase}) do" }.join(";") << (";#{  belongs_to_or_simple_route }" + ";end" * arry.size + ";end")
       @build_namespace_route = eval(func)
     end
     def simple_route
-      [:resources, route_name.to_sym]
+      belongs_to_list.present? && build_nested_routes_func || [:resources, route_name.to_sym]
     end
-    def simple_routes_for_namespace
-      [:resources, "'#{route_name}'"]
+    def build_nested_routes_func
+      eval("lambda do; #{build_nested_routes};end")
+    end
+    def build_nested_routes
+      @build_nested_routes = belongs_to_list.map { |val| "resources(:#{val.to_s.pluralize}) do" }.join(";") << (";#{nested_route}" + ";end;" * belongs_to_list.size)
+      any_optional_belongs_to && @build_nested_routes << nested_route
+      @build_nested_routes
+    end
+    def belongs_to_or_simple_route
+      belongs_to_list.present? && build_nested_routes || nested_route
+    end
+    def nested_route
+      "resources '#{route_name}'"
     end
     def controller
       @controller ||= controller_name.constantize
     end
-
+    def any_optional_belongs_to=(value)
+      @any_optional_belongs_to = value
+    end
+    def any_optional_belongs_to
+      @any_optional_belongs_to ||= false
+    end
+    def belongs_to_list
+      @belongs_to_list ||= Array.new
+    end
     def param_key
       if resource_class.respond_to? :model_name
         resource_class.model_name.param_key

data/lib/controller_less/resource_dsl.rb

@@ -1,23 +1,28 @@
 module ControllerLess
   class ResourceDsl
-    attr_accessor :config, :resource_class
-    def initialize(conf, rclass)
-      self.config, self.resource_class = conf, rclass
+    attr_accessor :resource
+    def initialize(rs)
+      self.resource = rs
+    end
+    def run_registration_block(&block)
+      instance_exec &block
+    end
+    def controller(&block)
+      block_given? && resource.controller.class_exec(&block)
+      resource.controller
+    end
+    def permitted_params(*args, &block)
+      p_key = resource.param_key.to_sym
+      controller do
+        define_method :permitted_params do
+          params.permit(p_key => block ? instance_exec(&block) : args)
+        end
+      end
+    end
+    def belongs_to(target, options={})
+      resource.belongs_to_list.push target
+      resource.any_optional_belongs_to || (resource.any_optional_belongs_to = options.fetch(:optional, false))
+      resource.controller.send :belongs_to, target, options
     end
-     def run_registration_block(&block)
-       instance_exec &block
-     end
-     def controller(&block)
-        block_given? && config.controller.class_exec(&block)
-        config.controller
-     end
-     def permitted_params(*args, &block)
-       param_key = config.param_key.to_sym
-       controller do
-          define_method :permitted_params do
-            params.permit(param_key => block ? instance_exec(&block) : args)
-          end
-       end
-     end
   end
 end

data/lib/controller_less/version.rb

@@ -1,3 +1,3 @@
 module ControllerLess
-  VERSION = '0.0.4.pre'
+  VERSION = '0.0.5.pre'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controller_less
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
+  version: 0.0.5.pre
 platform: ruby
 authors:
 - Kamal Ejaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inherited_resources