liquify 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,72 +1,14 @@
 PATH
   remote: .
   specs:
-    liquify (0.2)
+    liquify (0.2.1)
       liquid (>= 2.2.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    builder (2.1.2)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
     liquid (2.2.2)
-    mail (2.2.13)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -75,22 +17,10 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.3.0)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  liquid (>= 2.2.2)
   liquify!
-  rails (~> 3.0.1)
   rspec (~> 2.3.0)
-  rspec-rails (~> 2.3.0)

data/lib/liquify/drop.rb

@@ -1,5 +1,108 @@
 module Liquify
   class Drop < Liquid::Drop
-    include Liquify::Methods
+    class << self
+      def build(obj, values)
+        obj.class.class_eval <<-STR
+          class DynamicDrop < Liquify::Drop
+            def initialize(obj, values)
+              @object = obj
+              @blocks = {}
+
+              values.each do |value|
+                if value.is_a? Hash
+                  value.each { |key, val| @blocks[key] = val }
+                end
+              end
+            end
+          end
+        STR
+
+        obj.class::DynamicDrop.class_eval do
+          values.each do |item|
+            if item.is_a? Hash
+              item.each do |key, value|
+                define_method key do
+                  block = @blocks[key]
+                  block.arity.zero? ? block.call : block.call(@object)
+                end
+              end
+            else
+              define_method item do
+                @object.send item
+              end
+            end
+          end
+        end
+
+        obj.class::DynamicDrop.new(obj, values)
+      end
+    end
   end
 end
+=begin
+      private
+        def build_hash
+          @values.each do |key, value|
+           self.class.class_eval do
+             define_method(key) { @values[key] } 
+           end
+          end
+        end
+
+        def build_default
+          @values.each do |item|
+            if item.is_a? Hash
+              item.each do |key, value|
+                self.class.class_eval do
+                  define_method key do
+                    value.arity.zero? ? value.call : value.call(@obj)
+                  end
+                end
+              end
+            else
+              self.class.class_eval do
+                define_method(item) { @obj.send(item) }
+              end
+            end
+          end
+        end
+=end
+=begin
+    def build(obj, values, options={})
+      case options[:as]
+        when :hash
+          build_hash
+        else
+          build_default
+        end
+      self
+    end
+
+    private
+      def build_hash
+        @values.each do |key, value|
+         self.class.class_eval do
+           define_method(key) { @values[key] } 
+         end
+        end
+      end
+
+      def build_default
+        @values.each do |item|
+          if item.is_a? Hash
+            item.each do |key, value|
+              self.class.class_eval do
+                define_method key do
+                  value.arity.zero? ? value.call : value.call(@obj)
+                end
+              end
+            end
+          else
+            self.class.class_eval do
+              define_method(item) { @obj.send(item) }
+            end
+          end
+        end
+      end
+  end
+=end

data/lib/liquify/methods.rb

@@ -12,40 +12,15 @@ module Liquify
       #
       #
       def liquify_method(*args)
-        liquify_args = instance_variable_get :@liquify_args
-        liquify_args ||= {}
-
-        args.each do |arg|
-          key, value = arg, :self
-
-          if Hash === arg
-            arg.each { |k, v| liquify_args[k.to_s] = v }
-          else
-            liquify_args[key.to_s] = value
-          end
-        end
-        instance_variable_set :@liquify_args, liquify_args
+        class_variable_set(:@@liquify_methods, args)
       end
+
+     alias :liquify_methods :liquify_method
   end
 
   module InstanceMethods
-    unless method_defined? :to_liquid
-      def to_liquid #:nodoc:
-        liquify_args = self.class.instance_variable_get(:@liquify_args) || {}
-        liquify_output = instance_variable_get(:@liquify_output) || {}
-
-        if liquify_output.empty?
-          liquify_args.each do |key, value|
-            if value.respond_to?(:call)
-              liquify_output[key] = value.arity.zero? ? value.call : value.call(self)
-            else
-              liquify_output[key] = self.send(key)
-            end
-          end
-        end
-
-        liquify_output
-      end
+    def to_liquid
+      Liquify::Drop.build self, self.class.class_variable_get(:@@liquify_methods)
     end
   end
 end

data/lib/liquify/version.rb

@@ -1,3 +1,3 @@
 module Liquify
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/liquify/liquify_methods_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Liquify::Methods do
+  before(:each) do
+    @baz_1 = Baz.new('baz -1')
+    @baz_2 = Baz.new('baz -2')
+  end
+
+  context 'when exposing a value as a lambda' do
+    it 'is scoped to that object instance' do
+      @baz_1.to_liquid['name']['value'].should == @baz_1.name
+      @baz_2.to_liquid['name']['value'].should == @baz_2.name
+    end
+  end
+
+  context 'when the template is rendered' do
+    it 'contains values for both baz_1 and baz_2' do
+      Liquify.setup do |c|
+        c.register_drop :baz, lambda { [@baz_1, @baz_2] }
+      end
+
+      content = <<-STR
+        {% for b in baz %}
+        <p>{{ b.name.value }}</p>
+        {% endfor %}
+      STR
+
+      output = Liquify.invoke(content)
+
+      output.should =~ /<p>#{@baz_1.name}<\/p>/
+      output.should =~ /<p>#{@baz_2.name}<\/p>/
+    end
+  end
+end

data/spec/liquify/liquify_methods_with_lambdas_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Liquify::Methods do
+  context 'when a hash with a lambda value is passed' do
+    before(:all) do
+      @cux_1 = Cux.new('John', 'Smith', {'age' => 25, 'gender' => 'M'})
+      @cux_2 = Cux.new('Jane', 'Doe', {'age' => 22, 'gender' => 'F'})
+
+      content = <<-STR
+        {% for item in items %}
+        <p>{{ item.full_name }}</p>
+        <p>{{ item.options.age }}</p>
+        {% endfor %}
+      STR
+
+      Liquify.setup do |c|
+        c.register_drop :items, lambda { [@cux_1, @cux_2] }
+      end
+
+      @output = Liquify.invoke(content)
+    end
+
+    it 'returns values scoped to the first item' do
+      @output.should =~ /<p>#{@cux_1.first_name} #{@cux_1.last_name}<\/p>/
+      @output.should =~ /<p>#{@cux_1.options['age']}<\/p>/
+    end
+
+    it 'returns values scoped to the second item' do
+      @output.should =~ /<p>#{@cux_2.first_name} #{@cux_2.last_name}<\/p>/
+      @output.should =~ /<p>#{@cux_2.options['age']}<\/p>/
+    end
+  end
+end

data/spec/support/liquify/baz_drop.rb

@@ -0,0 +1,24 @@
+class Baz
+  include Liquify::Methods
+  attr_reader :name
+  liquify_method :name => lambda { |b| NameDrop.new(b) }
+
+  def initialize(name)
+    @name = name
+  end
+end
+
+class NameDrop < Liquify::Drop
+  def initialize(obj)
+    @obj = obj
+    @values = {'value' => @obj.name}
+  end
+
+  def [](key)
+    @values[key]
+  end
+end
+
+# liquify_method
+# create drop
+# create methods

data/spec/support/liquify/cux_drop.rb

@@ -0,0 +1,24 @@
+class Cux
+  include Liquify::Methods
+  attr_reader :first_name, :last_name, :options
+  liquify_methods :full_name => lambda {|c| "#{c.first_name} #{c.last_name}"},
+    :options => lambda {|c| OptionDrop.new(c) }
+
+  def initialize(first_name, last_name, options)
+    @first_name = last_name
+    @last_name = first_name
+    @options = options
+  end
+end
+
+class OptionDrop < Liquid::Drop
+  def initialize(cux)
+    @cux = cux
+  end
+
+  def invoke_drop(key)
+    @cux.options[key]
+  end
+
+  alias :[] :invoke_drop
+end

metadata

@@ -2,7 +2,7 @@
 name: liquify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Dane Harrigan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -04:00
+date: 2011-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,8 @@ files:
 - liquify.gemspec
 - spec/liquify/active_record_hook_spec.rb
 - spec/liquify/drop_spec.rb
+- spec/liquify/liquify_methods_spec.rb
+- spec/liquify/liquify_methods_with_lambdas_spec.rb
 - spec/liquify/parameter_spec.rb
 - spec/liquify/tag_spec.rb
 - spec/liquify_spec.rb
@@ -70,6 +72,8 @@ files:
 - spec/support/liquid/foo_drop.rb
 - spec/support/liquid/foo_filters.rb
 - spec/support/liquify/bar_drop.rb
+- spec/support/liquify/baz_drop.rb
+- spec/support/liquify/cux_drop.rb
 - spec/support/liquify/foo_tag.rb
 - spec/support/rails/foo.rb
 - spec/v0.1/liquify/active_record_hook_spec.rb
@@ -106,6 +110,8 @@ summary: A wrapper for Liquid Markup to make it easier to use
 test_files: 
 - spec/liquify/active_record_hook_spec.rb
 - spec/liquify/drop_spec.rb
+- spec/liquify/liquify_methods_spec.rb
+- spec/liquify/liquify_methods_with_lambdas_spec.rb
 - spec/liquify/parameter_spec.rb
 - spec/liquify/tag_spec.rb
 - spec/liquify_spec.rb
@@ -113,6 +119,8 @@ test_files:
 - spec/support/liquid/foo_drop.rb
 - spec/support/liquid/foo_filters.rb
 - spec/support/liquify/bar_drop.rb
+- spec/support/liquify/baz_drop.rb
+- spec/support/liquify/cux_drop.rb
 - spec/support/liquify/foo_tag.rb
 - spec/support/rails/foo.rb
 - spec/v0.1/liquify/active_record_hook_spec.rb