erector-rails4 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a74438b8e1a5e68fb0630a400e6863d5eef429d3
-  data.tar.gz: 5a3bb013b485b9afd29a816abccf442dfec8126a
+  metadata.gz: a9340d97584f99c33a1f240e455c4d99976abff9
+  data.tar.gz: 45cad63111621752efeaca71702964bcd709072b
 SHA512:
-  metadata.gz: acc2083f696024b0ece8425d4591674dbaadc00d5cfca2e6ab61f7a06fd225c5390bb39694bdca32c70e34d24bf80eaeaf60b145339eb8166cdeadc0faebaf5d
-  data.tar.gz: af17c1bb8dbd175f441b7537f7314e4c4de03abfc0c09b44c9422f2f14a264e8499c681062e878bfc18bdc205da678c252f1f51aa040e416bf74b50394a66b4b
+  metadata.gz: ea474c7bbae811af74994baae3bae443b02f15a68f04f5e5a72516a8506c51cb7004d41e2e86478155b8a94ee9f91e29b94f9db0bc5af14c7c044fa2847745a3
+  data.tar.gz: d476856b91c0c21ad0b313a89d7ba20c736fabc48df1dce0b43b81e6b2d5f5c5299b3344a8b8f24e162458be636489331099d3cab332a9bc64c3a623f1189e9d

data/.coveralls.yml

@@ -1,2 +1,2 @@
 service_name: travis-ci
-repo_token: J1XUNT8uCGW7viYD01wooJ6PSlVc3Iyt2
+repo_token: PLlg5sgYq8Bo0YEjewCfjarEnzBu8K9jm

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 cache: bundler
-script: bundle exec rspec
+script: script/cibuild
 notifications:
   email: false
 

data/Appraisals

@@ -1,14 +1,17 @@
 appraise 'rails-3' do
+  gem 'activesupport', '3.2.7'
   gem 'rails', '3.2.7'
   gem 'simple_form', '2.1.1'
 end
 
 appraise 'rails-4.0' do
+  gem 'activesupport', '4.0.0'
   gem 'rails', '4.0.0'
   gem 'simple_form', '3.0.2'
 end
 
 appraise 'rails-4.1' do
-  gem 'rails', '4.1.0'
+  gem 'activesupport', '4.1.6'
+  gem 'rails', '4.1.6'
   gem 'simple_form', '3.0.2'
 end

data/Guardfile

@@ -0,0 +1,23 @@
+group :main do
+  guard :rspec,
+        all_on_start: false,
+        all_after_pass: false,
+        spec_paths: ['spec/dummy', 'spec/erector'],
+        cmd: 'bundle exec rspec',
+        failed_mode: :focus do
+
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})             { |m| "spec/#{m[1]}_spec.rb" }
+
+  end
+end
+
+group :perf do
+  guard :rspec,
+        all_on_start: false,
+        all_after_pass: false,
+        spec_paths: ['spec/performance'],
+        cmd: 'bundle exec rspec'  do
+
+  end
+end

data/README.md

@@ -1,10 +1,15 @@
 Erector for Rails 4
 =====
 
-[![Gem Version](https://badge.fury.io/rb/erector-rails4.png)](http://badge.fury.io/rb/erector-rails4) [![Build Status](https://travis-ci.org/adamjacobbecker/erector-rails4.png?branch=master)](https://travis-ci.org/adamjacobbecker/erector-rails4) [![Coverage Status](https://coveralls.io/repos/adamjacobbecker/erector-rails4/badge.png)](https://coveralls.io/r/adamjacobbecker/erector-rails4) [![Code Climate](https://codeclimate.com/github/adamjacobbecker/erector-rails4.png)](https://codeclimate.com/github/adamjacobbecker/erector-rails4)
+[![version]](http://badge.fury.io/rb/erector-rails4) [![status]](https://travis-ci.org/ajb/erector-rails4) [![coverage]](https://coveralls.io/r/ajb/erector-rails4) [![climate]](https://codeclimate.com/github/ajb/erector-rails4)
 
 This is a fork of [Erector](https://github.com/erector/erector) with a lotta old crap removed. Currently under active development, but in regular use at [DOBT](https://www.github.com/dobtco).
 
 ```ruby
 gem 'erector-rails4', require: 'erector'
 ```
+
+[version]: http://img.shields.io/gem/v/erector-rails4.svg?style=flat
+[status]: http://img.shields.io/travis/ajb/erector-rails4.svg?style=flat
+[coverage]: http://img.shields.io/coveralls/ajb/erector-rails4.svg?style=flat
+[climate]: http://img.shields.io/codeclimate/github/ajb/erector-rails4.svg?style=flat

data/erector-rails4.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name = "erector-rails4"
   s.version = Erector::VERSION
 
-  s.required_ruby_version = Gem::Requirement.new('>= 2.0.0')
+  s.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
   s.authors = ["Alex Chaffee", "Brian Takita", "Jeff Dean", "Jim Kingdon", "John Firebaugh", "Adam Becker"]
   s.summary = "Erector, for Rails 4"
   s.description = "This is a fork of Erector, updated for Rails 4."
@@ -18,16 +18,18 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {features,spec}/*`.split("\n")
 
-  s.homepage = "http://github.com/adamjacobbecker/erector-rails4"
+  s.homepage = "http://github.com/ajb/erector-rails4"
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 3.0.0'
+  s.add_dependency 'activesupport', '>= 3.0.0'
   s.add_dependency 'treetop'
 
   s.add_development_dependency 'appraisal', '1.0.0'
   s.add_development_dependency 'coveralls', '0.7.0'
   s.add_development_dependency 'haml', '4.0.5'
+  s.add_development_dependency 'guard-rspec', '4.3.1'
   s.add_development_dependency 'nokogiri', '1.6.1'
+  s.add_development_dependency 'rails', '>= 3.0.0'
   s.add_development_dependency 'rr', '1.1.2'
   s.add_development_dependency 'rspec-rails', '2.14.2'
   s.add_development_dependency 'sass', '3.3.4'
@@ -35,4 +37,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3', '1.3.9'
   s.add_development_dependency 'wrong', '0.7.1'
 
+  if RUBY_VERSION >= '2.1'
+    s.add_development_dependency 'allocation_stats', '0.1.5'
+    s.add_development_dependency 'ruby-prof', '0.15.1'
+  end
+
 end

data/gemfiles/rails_3.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "activesupport", "3.2.7"
 gem "rails", "3.2.7"
 gem "simple_form", "2.1.1"
 

data/gemfiles/rails_4.0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "activesupport", "4.0.0"
 gem "rails", "4.0.0"
 gem "simple_form", "3.0.2"
 

data/gemfiles/rails_4.1.gemfile

@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.0"
+gem "activesupport", "4.1.6"
+gem "rails", "4.1.6"
 gem "simple_form", "3.0.2"
 
 gemspec :path => "../"

data/lib/erector-rails4.rb

@@ -0,0 +1 @@
+require 'erector'

data/lib/erector.rb

@@ -1,15 +1,12 @@
 module Erector
 end
 
-require "cgi"
+require "active_support/core_ext/string"
 
-require "erector/raw_string"
 require "erector/dependencies"
 require "erector/dependency"
 require "erector/externals"
 require "erector/output"
-require "erector/cache"
-require "erector/caching"
 require "erector/after_initialize"
 require "erector/needs"
 require "erector/html"

data/lib/erector/abstract_widget.rb

@@ -71,7 +71,7 @@ module Erector
       @_parent = eval("self", block.binding) if block
       @_block = block
 
-      self.class.after_initialize(self)
+      self.class.call_after_initialize(self)
     end
 
     # Entry point for rendering a widget (and all its children). This method
@@ -101,16 +101,6 @@ module Erector
       _emit(options).to_s
     end
 
-    # alias for #emit
-    # @deprecated Please use {#emit} instead
-    def to_s(*args)
-      unless defined? @@already_warned_to_s
-        $stderr.puts "Erector::Widget#to_s is deprecated. Please use #to_html instead. Called from #{caller.first}"
-        @@already_warned_to_s = true
-      end
-      to_html(*args)
-    end
-
     # Entry point for rendering a widget (and all its children). Same as
     # #render / #to_html only it returns an array, for theoretical performance
     # improvements when using a Rack server (like Sinatra or Rails Metal).
@@ -183,7 +173,6 @@ module Erector
     ensure
       @_output = original
     end
-    alias_method :capture, :capture_content
 
     protected
     # executes this widget's #content method, which emits stuff onto the

data/lib/erector/after_initialize.rb

@@ -5,18 +5,18 @@ module Erector
     end
 
     module ClassMethods
-      def after_initialize(instance=nil, &blk)
-        if blk
-          after_initialize_parts << blk
-        elsif instance
+      def after_initialize(&blk)
+        after_initialize_parts << blk
+      end
+
+      def call_after_initialize(instance)
+        if instance
           if superclass.respond_to?(:after_initialize)
-            superclass.after_initialize instance
+            superclass.call_after_initialize instance
           end
           after_initialize_parts.each do |part|
             instance.instance_eval &part
           end
-        else
-          raise ArgumentError, "You must provide either an instance or a block"
         end
       end
 

data/lib/erector/caching.rb

@@ -5,93 +5,57 @@ module Erector
     end
 
     module ClassMethods
-      def cacheable(value = true, opts = {})
-        @cachable, @cache_opts = value, opts
+      def cacheable(*args)
+        options = args.extract_options!
 
-        if value && value != true
-          @cache_version = value
-        end
-      end
-
-      alias_method :cachable, :cacheable
-
-      def cachable?
-        if @cachable.nil?
-          superclass.respond_to?(:cachable?) && superclass.cachable?
-        else
-          @cachable
-        end
-      end
-
-      def cache_opts
-        if cachable?
-          @cache_opts || {}
-        end
-      end
-
-      def cache_version
-        @cache_version || nil
+        @cacheable_opts = {
+          static_keys: args,
+          dynamic_keys: if options[:needs_keys]
+            needed_variables & options[:needs_keys]
+          else
+            needed_variables
+          end,
+          skip_digest: options[:skip_digest]
+        }
       end
 
-      def cache
-        Erector::Cache.instance
+      def cacheable_opts
+        @cacheable_opts
       end
     end
 
-    def cache
-      self.class.cache
+    def cacheable?
+      !self.class.cacheable_opts.nil?
     end
 
-    def should_cache?
-      if block.nil? && self.class.cachable? && caching_configured?
-        true
-      else
-        false
-      end
-    end
+    def cache_name
+      [].tap do |a|
+        self.class.cacheable_opts[:static_keys].each do |x|
+          if x.is_a?(Symbol) && respond_to?(x)
+            a << send(x)
+          else
+            a << x
+          end
+        end
 
-    def caching_configured?
-      return true if !defined?(Rails)
-      ::Rails.configuration.action_controller.perform_caching &&
-      ::Rails.configuration.action_controller.cache_store
+        self.class.cacheable_opts[:dynamic_keys].each do |x|
+          a << instance_variable_get(:"@#{x}")
+        end
+      end.reject(&:nil?)
     end
 
-    def cache_key_assigns
-      if self.class.cache_opts[:only_keys]
-        assigns.slice(*self.class.cache_opts[:only_keys])
-      else
-        assigns
-      end
+    def cache_options
+      {
+        skip_digest: self.class.cacheable_opts[:skip_digest]
+      }
     end
 
     protected
     def _emit(options = {})
-      if should_cache?
-        if options[:output]
-          # todo: document that either :buffer or :output can be used to specify an output buffer, and deprecate :output
-          if options[:output].is_a? Output
-            @_output = options[:output]
-          else
-            @_output = Output.new({:buffer => options[:output]}.merge(options))
-          end
-        else
-          @_output = Output.new(options)
+      if cacheable? && options[:helpers].try(:respond_to?, :cache)
+        options[:helpers].cache cache_name, cache_options do
+          super
         end
-
-        if (cached_str = cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]])
-          output << cached_str
-        else
-          cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]] = super
-        end
-      else
-        super
-      end
-    end
-
-    def _emit_via(parent, options = {})
-      if should_cache?
-        parent.output << cache[self.class, self.class.cache_version, cache_key_assigns, options[:content_method_name]] ||= parent.capture_content { super }
-        parent.output.widgets << self.class # todo: test!!!
       else
         super
       end

data/lib/erector/element.rb

@@ -86,7 +86,7 @@ module Erector
 
       attributes ||= {}
       promise = if !value.nil?
-        Promise.new(output, tag_name,  attributes, false, newliney?(tag_name)) do
+        Promise.new(output, tag_name,  attributes, false, self.class.newliney?(tag_name)) do
           if value.is_a? AbstractWidget
             widget value
           else
@@ -94,16 +94,16 @@ module Erector
           end
         end
       elsif block
-        Promise.new(output, tag_name, attributes, false, newliney?(tag_name), &block)
+        Promise.new(output, tag_name, attributes, false, self.class.newliney?(tag_name), &block)
       else
-        Promise.new(output, tag_name, attributes, false, newliney?(tag_name))
+        Promise.new(output, tag_name, attributes, false, self.class.newliney?(tag_name))
       end
       promise._render
       promise
     end
 
     def _empty_element(tag_name, attributes={})
-      promise = Promise.new(output, tag_name, attributes, true, newliney?(tag_name))
+      promise = Promise.new(output, tag_name, attributes, true, self.class.newliney?(tag_name))
       promise._render
       promise
     end

data/lib/erector/externals.rb

@@ -30,14 +30,6 @@ module Erector
         my_dependencies.push(x)
       end
 
-      # deprecated in favor of #depends_on
-      # todo: warning
-      def external(type, value, options = {})
-        type = type.to_sym
-        x = Dependency.new(type, value, options)
-        my_dependencies << x unless my_dependencies.include?(x)
-      end
-
       # returns all dependencies of the given type from this class and all its
       # superclasses
       def dependencies(type)

data/lib/erector/html_widget.rb

@@ -45,7 +45,6 @@ module Erector
   # * Attributes
   # * Text
   # * Needs
-  # * Caching
   # * Externals
   # * AfterInitialize
   #
@@ -200,16 +199,6 @@ module Erector
       _render(options).to_s
     end
 
-    # alias for #to_html
-    # @deprecated Please use {#to_html} instead
-    def to_s(*args)
-      unless defined? @@already_warned_to_s
-        $stderr.puts "Erector::Widget#to_s is deprecated. Please use #to_html instead. Called from #{caller.first}"
-        @@already_warned_to_s = true
-      end
-      to_html(*args)
-    end
-
   end
 
   public

data/lib/erector/needs.rb

@@ -36,28 +36,39 @@ module Erector
       #   FancyForm.new(:name => 'Login')
       # will fail.
       #
+      def inherited(subclass)
+        subclass.needs(*self.get_needs)
+      end
+
       def needs(*args)
+        @needs ||= []
+
         args.each do |arg|
-          (@needs ||= []) << (arg.nil? ? nil : (arg.is_a? Hash) ? arg : arg.to_sym)
+          @needs.push(if arg.nil?
+            nil
+          elsif arg.is_a? Hash
+            arg
+          elsif arg.is_a? Symbol
+            arg
+          else
+            fail 'arguments passed to :needs must be Nil, a Hash, or a Symbol'
+          end)
         end
       end
 
       def get_needs
-        @needs ||= []
-
-        ancestors[1..-1].inject(@needs.dup) do |needs, ancestor|
-          needs.push(*ancestor.get_needs) if ancestor.respond_to?(:get_needs)
-          needs
-        end
+        @needs || []
       end
 
       def needed_variables
-        @needed_variables ||= get_needs.map{|need| need.is_a?(Hash) ? need.keys : need}.flatten
+        @needed_variables ||= get_needs.map { |need|
+          need.is_a?(Hash) ? need.keys : need
+        }.flatten
       end
 
       def needed_defaults
         @needed_defaults ||= get_needs.inject({}) do |defaults, need|
-          defaults = need.merge(defaults) if need.is_a? Hash
+          defaults = defaults.merge(need) if need.is_a? Hash
           defaults
         end
       end