variants 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1 @@
+script: 'bundle exec rspec spec'

data/Gemfile

@@ -3,5 +3,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in variants.gemspec
 gemspec
 
+gem 'rails', '~> 2.3.0'
+
 gem 'rspec'
 gem 'ZenTest'

data/README.md

@@ -0,0 +1,48 @@
+# Variants [ ![Build status](http://travis-ci.org/kossnocorp/variants.png) ](http://travis-ci.org/kossnocorp/variants)
+
+Be boss of your views.
+
+TODO: More info, stay in touch.
+
+## Installation
+
+Puts this line into Gemfile:
+
+``` ruby
+gem 'variants', '0.1.0'
+```
+
+## Examples
+
+``` haml
+- if variant :logged_in?
+  = link_to 'Sign out', sign_out_path
+```
+
+TODO: Examples, examples, examples
+
+## API
+
+TODO: Write full API
+
+## Roadmap
+
+TODO: Write roadmap
+
+## Contributors
+
+* @kossnocorp
+
+Special thanks to @brainopia.
+
+## License
+
+The MIT License
+
+Copyright (c) 2011 Sasha Koss
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 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.

data/lib/variants/helpers.rb

@@ -1,32 +1,27 @@
 module Variants
   module Helpers
-    extend ActiveSupport::Concern
+    def self.included base
+      base.send(:include, InstanceMethods)
+    end
 
     module InstanceMethods
-      def variant name, condition = nil
+      def variant name, *args
 
         # If Rails env is development
         if Rails.env.development?
           # Override conditions if params[:variant_name] is presented
-          if self.respond_to?(:params) and not self.params[name.to_sym].nil?
-            return self.params[name.to_sym].to_s == 'true'
+          unless self.params[name].nil?
+            return self.params[name].to_s == 'true'
           end
         end
 
-        # If condition is presented, return it
-        unless condition.nil?
-          return condition
-        end
-
-        # Add ? to end of name
-        method_name = "#{name.to_s}?"
-        # And try to call it
-        if self.respond_to?(method_name)
-          return self.send(method_name)
+        # If block is given
+        if block_given?
+          return yield(*args)
         end
 
-        # Else return false
-        return false
+        # Try to call condition method
+        return self.send(name, *args)
       end
 
       alias_method :v, :variant

data/lib/variants/version.rb

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

data/spec/actionview_extensions_spec.rb

@@ -8,73 +8,108 @@ describe Variants do
 
       before :each do
         Rails.stub_chain(:env, :development?).and_return(true)
+        self.stub!(:params).and_return({})
       end
 
-      it 'should respond to variant' do
-        self.should respond_to(:variant)
+      # Basic behaviour examples
+      context 'basic behaviour' do
+
+        before :each do
+          self.stub!(:variant_name).and_return(true)
+        end
+
+        it 'should respond to variant' do
+          self.should respond_to(:variant)
+        end
+
+        it 'should respond to v' do
+          self.should respond_to(:v)
+        end
+
+        it 'v should be alias to variant' do
+          self.method(:v).should eq self.method(:variant)
+        end
+
+        it 'should accept symbol' do
+          lambda {
+            self.variant :variant_name
+          }.should_not raise_error
+        end
+
+        it 'should accept string' do
+          lambda {
+            self.variant 'variant_name'
+          }.should_not raise_error
+        end
+
+        it 'should accept boolean in block' do
+          lambda {
+            self.variant(:variant_name) { true }
+          }.should_not raise_error
+        end
       end
 
-      it 'should respond to v' do
-        self.should respond_to(:v)
-      end
+      context 'calling condition method' do
 
-      it 'v should be alias to variant' do
-        self.method(:v).should eq self.method(:variant)
-      end
+        it 'should raise error if variant name is not defined' do
+          lambda {
+            self.variant :variant_name
+          }.should raise_error
+        end
 
-      it 'should accept symbol' do
-        lambda {
-          self.variant :variant_name
-        }.should_not raise_error
-      end
+        it 'should call method_name for :method_name' do
+          self.stub!(:variant_name).and_return(true)
+          self.variant(:variant_name).should eql true
+        end
 
-      it 'should accept string' do
-        lambda {
-          self.variant 'variant_name'
-        }.should_not raise_error
       end
 
-      it 'should accept boolean' do
-        lambda {
-          self.variant :variant_name, true
-        }.should_not raise_error
-      end
+      context 'passing condition in block' do
 
-      it 'should return false if variant and condition is not presented' do
-        self.variant(:variant_name).should eql false
-      end
+        it 'should return condition value if variant is not overrided' do
+          self.variant(:variant_name) { true }.should eql true
+          self.variant(:variant_name) { false }.should eql false
+        end
 
-      it 'should return condition value if variant is not overrided' do
-        self.variant(:variant_name, true).should eql true
-        self.variant(:variant_name, false).should eql false
-      end
+        it 'should return condition before calling method' do
+          self.stub!(:variant_name).and_return(true)
+          self.variant(:variant_name) { false }.should eql false
+        end
 
-      it 'should call method_name? for :method_name' do
-        self.stub!(:variant_name?).and_return(true)
-        self.variant(:variant_name).should eql true
-      end
+        it 'should pass arguments to condition method' do
+          self.should_receive(:variant_name).with(42).and_return(true)
+          self.should_receive(:another_variant_name).with(42, 11).and_return(true)
+          self.variant(:variant_name, 42)
+          self.variant(:another_variant_name, 42, 11)
+        end
 
-      it 'should return condition before calling method' do
-        self.stub!(:variant_name?).and_return(true)
-        self.variant(:variant_name, false).should eql false
-      end
+        it 'should pass arguments to block' do
+          self.variant(:variant_name, 42, 11) { |a, b| a + b == 53 }.should be_true
+        end
 
-      it 'should look for params[:variant_name]' do
-        self.stub!(:params).and_return( { :variant_name => true } )
-        self.variant(:variant_name).should eql true
-        self.variant(:variant_name, false).should eql true
       end
 
-      it 'should convert params[:variant_name] to boolean' do
-        self.stub!(:params).and_return( { :variant_name => 'true' } )
-        self.variant(:variant_name).should eql true
-      end
+      context 'looking for params' do
+
+        it 'should look for params[:variant_name]' do
+          self.stub!(:params).and_return( { 'variant_name' => true }.with_indifferent_access )
+          self.variant(:variant_name).should eql true
+          self.variant(:variant_name) { false }.should eql true
+        end
+
+        it 'should convert params[:variant_name] to boolean' do
+          self.stub!(:params).and_return( { 'variant_name' => 'true' }.with_indifferent_access )
+          self.variant(:variant_name).should eql true
+        end
+
+        it 'should look for params only if Rails.env.delevopment?' do
+          Rails.stub_chain(:env, :development?).and_return(false)
+          self.stub!(:params).and_return( { 'variant_name' => true } )
+          self.stub!(:variant_name).and_return(false)
+          self.variant(:variant_name).should eql false
+          self.variant(:variant_name) { false }.should eql false
+        end
 
-      it 'should look for params only if Rails.env.delevopment?' do
-        Rails.stub_chain(:env, :development?).and_return(false)
-        self.stub!(:params).and_return( { :variant_name => true } )
-        self.variant(:variant_name).should eql false
-        self.variant(:variant_name, false).should eql false
       end
 
     end

data/variants.gemspec

@@ -18,7 +18,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.add_dependency 'activesupport', '>= 3.0.7'
-  s.add_dependency 'actionpack', '>= 3.0.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: variants
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sasha Koss
@@ -16,39 +16,8 @@ bindir: bin
 cert_chain: []
 
 date: 2011-05-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
-  type: :runtime
-  version_requirements: *id002
+dependencies: []
+
 description: Be boss of your views
 email: 
 - kossnocorp@gmail.com
@@ -62,7 +31,9 @@ files:
 - .autotest
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
+- README.md
 - Rakefile
 - lib/variants.rb
 - lib/variants/helpers.rb