cocktail 0.1.0 → 0.2.0

data/README.md

@@ -45,6 +45,64 @@ Here is a Mojito for you
 => nil 
 ```
 
+###  Composing Mixins
+
+``` rb
+module Scaffold
+  extend Mixin
+  
+  mixed do |*_args|
+    base, mixin_params, actions_module = _args
+    
+    exclude  = mixin_params[:exclude] || []
+    only     = mixin_params[:only] || []     
+    resource = mixin_params[:resource]
+    
+    define_method :scaffolded_resource do
+      resource
+    end
+
+    actions = actions_module.instance_methods
+    actions = only.any? ? actions & only : actions
+    actions -= exclude
+    
+    actions.each do |method_name|
+      method_proc = actions_module.instance_method method_name
+      define_method method_name, method_proc  
+    end 
+    
+  end
+  
+end
+```
+
+
+``` rb
+module MyScaffold
+  extend Mixin
+  
+  mixed do |base, params|
+    Scaffold.mixto(base, params, Actions)
+  end
+  
+  module Actions
+    def index
+      @collection = scaffolded_resource.all
+    end
+    
+    def show
+      @object = scaffolded_resource.find(@id)
+    end
+  end
+end
+```
+
+``` rb
+class PostsController < ApplicationController
+  mixin(MyScaffold, :resource => Post)
+end
+```
+
 ## Contributing to `cocktail`
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -76,4 +134,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/cocktail.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "RubyInline"
 end

data/lib/cocktail.rb

@@ -1,19 +1,16 @@
+if RUBY_VERSION < "1.9"
+  raise "Sorry, Cocktail requires ruby >= 1.9"
+end
+
 require "cocktail/version"
 require "cocktail/mixable"
 require "cocktail/target"
 
-# eg.
-# 
-# class PostsController < Controller
-#   mixin(MyScaffold, :resource => Post, :only => :show)
-#   
-# end
-
 module Cocktail
+end
 
+Class.send :include,  Cocktail::Target
+Object.send :include, Cocktail::Mixable
 
 
-end
 
-Class.send :include,  Cocktail::Target
-Object.send :include, Cocktail::Mixable

data/lib/cocktail/mixable/mixin.rb

@@ -1,20 +1,25 @@
 module Cocktail
   module Mixable
     module Mixin    
-      
-      def mixto(base, params)
-        params.freeze
-        
-        if instance_variable_defined?("@_mixed_block")
-          mixed_block = @_mixed_block
-          base.class_exec params, &mixed_block
-        end
-      end
-      module_function :mixto
     
-      def mixed(&block)
-        @_mixed_block = block
-      end
+     def mixto(base, params, *args)
+       
+       if instance_variable_defined?("@_mixed_block")
+         mixed_block = @_mixed_block
+         if mixed_block.arity == -1 
+           base.class_exec base, params, *args, &mixed_block
+         elsif mixed_block.arity == 2
+           base.class_exec base, params, &mixed_block
+         else
+           base.class_exec params, &mixed_block
+         end         
+       end
+       
+     end
+    
+     def mixed(&block)
+       @_mixed_block = block
+     end
        
     end
   end

data/lib/cocktail/version.rb

@@ -1,3 +1,3 @@
 module Cocktail
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/test_module_extension.rb

@@ -0,0 +1,63 @@
+require 'helper'
+
+banner "Extending Mixins"
+
+# A very generic scaffolding template
+module Scaffold
+  extend Mixin
+  
+  # base, params, actions
+  mixed do |*_args|
+    _base, _mixin_params, _actions = _args
+    
+    _base.send :include, _actions
+        
+    define_method :resource do
+      _mixin_params[:resource]
+    end
+    
+  end
+  
+end
+
+# A specific scaffolding template
+module MyScaffold
+  extend Mixin
+  
+  mixed do |base, params|
+    Scaffold.mixto(base, params, Actions)
+  end
+  
+  module Actions
+    def index
+      @collection = resource.all
+    end
+    
+    def show
+      @object = resource.find(@id)
+    end
+    
+  end
+
+end
+
+class Post
+  class << self
+    def all
+      "returning a collection of #{self.name}s"      
+    end
+    
+    def find(id)
+      "finding a #{self.name}"
+    end
+  
+  end
+end
+
+class Controller
+  mixin MyScaffold, :resource => Post
+  
+end
+
+
+assert Controller.new.show == "finding a Post"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocktail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,23 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-05-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: RubyInline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+dependencies: []
 description: Cocktail is a ruby gem that allows you to use parametric mixins in Ruby
 email:
 - maurizio.cas@gmail.com
@@ -50,6 +34,7 @@ files:
 - test/test_cocktail_defined.rb
 - test/test_context_clashes.rb
 - test/test_mixed_called_from_mixin.rb
+- test/test_module_extension.rb
 - test/test_parametric_method_names.rb
 - test/test_target_scope_available.rb
 homepage: ''
@@ -83,5 +68,6 @@ test_files:
 - test/test_cocktail_defined.rb
 - test/test_context_clashes.rb
 - test/test_mixed_called_from_mixin.rb
+- test/test_module_extension.rb
 - test/test_parametric_method_names.rb
 - test/test_target_scope_available.rb