cells 3.8.8 → 3.9.0

data/Rakefile

@@ -3,11 +3,11 @@ Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-desc 'Test the cells gem.'
+desc 'Default: run unit tests.'
 task :default => :test
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
-  test.test_files = FileList['test/*_test.rb', 'test/rails/*_test.rb'] - ['test/rails/capture_test.rb']
+  test.test_files = FileList['test/*_test.rb', 'test/rails/*_test.rb']
   test.verbose = true
 end

data/cells.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
@@ -13,19 +12,19 @@ Gem::Specification.new do |s|
   s.homepage    = "http://cells.rubyforge.org"
   s.summary     = %q{View Components for Rails.}
   s.description = %q{Cells are view components for Rails. They are lightweight controllers, can be rendered in views and thus provide an elegant and fast way for encapsulation and component-orientation.}
-  
+  s.license     = 'MIT'
+
   s.files         = `git ls-files`.split("\n")
   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 "actionpack",  ">= 3.0"
   s.add_dependency "railties",    ">= 3.0"
-  
+
   s.add_development_dependency "rake"
   s.add_development_dependency "haml"
   s.add_development_dependency "slim"
-  s.add_development_dependency "simple_form"
   s.add_development_dependency "tzinfo" # FIXME: why the hell do we need this for 3.1?
-  s.add_development_dependency "minitest",	">= 2.8.1"
+  s.add_development_dependency "minitest",	"~> 4.7.5"
 end

data/gemfiles/Gemfile.rails3-0

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in roar-rails.gemspec
+# Specify your gem's dependencies in cells.gemspec
 gemspec path: '../'
 
-gem 'railties', '~> 3.0.11'
+gem 'railties', '3.0.20'

data/gemfiles/Gemfile.rails3-1

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in roar-rails.gemspec
+# Specify your gem's dependencies in cells.gemspec
 gemspec path: '../'
 
 gem 'railties', '~> 3.1.0'

data/gemfiles/Gemfile.rails3-2

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in roar-rails.gemspec
+# Specify your gem's dependencies in cells.gemspec
 gemspec path: '../'
 
 gem 'railties', '~> 3.2.0'
-gem 'haml', '~> 3.1.4'

data/gemfiles/Gemfile.rails4-0

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cells.gemspec
+gemspec path: '../'
+
+gem 'railties', '4.0.0'
+gem 'activemodel'

data/lib/cell.rb

@@ -0,0 +1,27 @@
+module Cell
+  module OptionsConstructor
+  private
+    def process_args(options={})
+      if options.is_a?(Hash) # TODO: i don't like this too much.
+        process_options(options)
+      else
+        process_model(options)
+      end
+
+      super # Base.
+    end
+
+    # DISCUSS: have 2 classes for that?
+
+    def process_options(options)
+      options.each do |k, v|
+        instance_variable_set("@#{k}", v)
+        singleton_class.class_eval { attr_reader k }
+      end
+    end
+
+    def process_model(model)
+      @model = model
+    end
+  end
+end

data/lib/cell/base.rb

@@ -2,40 +2,53 @@ require 'abstract_controller'
 require 'cell/builder'
 require 'cell/caching'
 require 'cell/rendering'
+require 'cell/dsl'
 
 module Cell
   def self.rails3_0?
     ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR == 0
   end
-  
+
   def self.rails3_1_or_more?
-    ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 1
+    (::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 1) or ::ActionPack::VERSION::MAJOR > 3
   end
-  
-  def self.rails3_2_or_more?  # FIXME: move to tests.
-    ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 2
+
+  def self.rails3_2_or_more?
+    (::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 2) or ::ActionPack::VERSION::MAJOR > 3
   end
 
-  def self.rails4_0_or_more?  # FIXME: move to tests.
-    ::ActionPack::VERSION::MAJOR == 4
+  def self.rails4_0_or_more?
+    (::ActionPack::VERSION::MAJOR == 4 and ::ActionPack::VERSION::MINOR >= 0) or ::ActionPack::VERSION::MAJOR > 4
   end
-  
-  
+
+
   class Base < AbstractController::Base
+    # TODO: deprecate Base in favour of Cell.
+
     abstract!
     DEFAULT_VIEW_PATHS = [File.join('app', 'cells')]
-    
+
     extend Builder
     include AbstractController
     include AbstractController::Rendering, Layouts, Helpers, Callbacks, Translation, Logger
-    
+
     require 'cell/rails3_0_strategy' if Cell.rails3_0?
     require 'cell/rails3_1_strategy' if Cell.rails3_1_or_more?
     require 'cell/rails4_0_strategy' if Cell.rails4_0_or_more?
     include VersionStrategy
     include Rendering
     include Caching
-    
+    include Cell::DSL
+
+    def initialize(*args)
+      super() # AbC::Base.
+      process_args(*args)
+    end
+
+  private
+    def process_args(*)
+    end
+
     class View < ActionView::Base
       def self.prepare(modules)
         # TODO: remove for 4.0 if PR https://github.com/rails/rails/pull/6826 is merged.
@@ -43,27 +56,27 @@ module Cell
           include *modules.reverse
         end
       end
-      
+
       def render(*args, &block)
         options = args.first.is_a?(::Hash) ? args.first : {}  # this is copied from #render by intention.
-        
+
         return controller.render(*args, &block) if options[:state] or options[:view]
         super
       end
     end
-    
-    
+
+
     def self.view_context_class
       @view_context_class ||= begin
         Cell::Base::View.prepare(helper_modules)
       end
     end
-      
+
     # Called in Railtie at initialization time.
     def self.setup_view_paths!
       self.view_paths = self::DEFAULT_VIEW_PATHS
     end
-    
+
     def self.controller_path
       @controller_path ||= name.sub(/Cell$/, '').underscore unless anonymous?
     end

data/lib/cell/builder.rb

@@ -5,19 +5,20 @@ module Cell
     # class with Cell::Base.build - this might lead to a different cell being returned.
     def create_cell_for(name, *args)
       class_from_cell_name(name).build_for(*args)
-    end
-    
+    end # TODO: rename to #cell_for.
+    alias_method :cell_for, :create_cell_for
+
     def build_for(*args)  # DISCUSS: remove?
       build_class_for(*args).
       create_cell(*args)
     end
-    
+
     # Adds a builder to the cell class. Builders are used in #render_cell to find out the concrete
     # class for rendering. This is helpful if you frequently want to render subclasses according
     # to different circumstances (e.g. login situations) and you don't want to place these deciders in
     # your view code.
     #
-    # Passes the opts hash from #render_cell into the block. The block is executed in controller context. 
+    # Passes the opts hash from #render_cell into the block. The block is executed in controller context.
     # Multiple build blocks are ORed, if no builder matches the building cell is used.
     #
     # Example:
@@ -41,17 +42,17 @@ module Cell
     def build(&block)
       builders << block
     end
-    
+
     # The cell class constant for +cell_name+.
     def class_from_cell_name(cell_name)
       "#{cell_name}_cell".classify.constantize
     end
-    
+
     # Override this if you want to receive arguments right in the cell constructor.
     def create_cell(*args)
-      new
+      new(*args)
     end
-    
+
   private
     def build_class_for(*args)
       builders.each do |blk|
@@ -59,11 +60,11 @@ module Cell
       end
       self
     end
-    
+
     def run_builder_block(block, *args)
       block.call(*args)
     end
-    
+
     def builders
       @builders ||= []
     end

data/lib/cell/dsl.rb

@@ -0,0 +1,7 @@
+module Cell
+  module DSL
+    def cell(*args)
+      Base.cell_for(*args)
+    end
+  end
+end

data/lib/cell/rack.rb

@@ -5,7 +5,7 @@ module Cell
   # in the cell. This is especially useful when using gems like devise with your cell, without the
   # entire Cell::Rails overhead.
   #
-  # The only dependency these kinds of cells have is a rack-compatible request object.
+  # The only dependency these kinds of cells have is a Rack-compatible request object.
   #
   # Example:
   #
@@ -16,20 +16,16 @@ module Cell
   class Rack < Base
     attr_reader :request
     delegate :session, :params, :to => :request
-    
+
     class << self
       # DISCUSS: i don't like these class methods. maybe a RenderingStrategy?
-      def create_cell(request, *args) # defined in Builder.
-        new(request)
-      end
-      
       def render_cell_state(cell, state, request, *args) # defined in Rendering.
         super(cell, state, *args)
       end
     end
-    
-    def initialize(request)
-      super()
+
+    def initialize(request, *args)
+      super(*args)
       @request = request
     end
   end

data/lib/cell/rails.rb

@@ -4,10 +4,10 @@ module Cell
   class Rails < Rack
     # When this file is included we can savely assume that a rails environment with caching, etc. is available.
     include ActionController::RequestForgeryProtection
-    
+
     abstract!
     delegate :session, :params, :request, :config, :env, :url_options, :to => :parent_controller
-    
+
     class << self
       def cache_store
         # FIXME: i'd love to have an initializer in the cells gem that _sets_ the cache_store attr instead of overriding here.
@@ -15,33 +15,41 @@ module Cell
         # DISCUSS: should this be in Cell::Rails::Caching ?
         ActionController::Base.cache_store
       end
-      
+
       def expire_cache_key(key, *args)  # FIXME: move to Rails.
         expire_cache_key_for(key, cache_store ,*args)
       end
-      
+
     private
       # Run builder block in controller instance context.
       def run_builder_block(block, controller, *args)
         controller.instance_exec(*args, &block)
       end
     end
-    
-    
+
+
     attr_reader :parent_controller
     alias_method :controller, :parent_controller
-    
-    def initialize(parent_controller)
-      super
+
+    def initialize(parent_controller, *args)
+      super(parent_controller, *args) # FIXME: huh?
       @parent_controller = parent_controller
     end
-    
+
     def cache_configured?
       ActionController::Base.send(:cache_configured?) # DISCUSS: why is it private?
     end
-    
+
     def cache_store
       self.class.cache_store  # in Rails, we have a global cache store.
     end
+
+    module DSL
+      def cell(name, *args)
+        # TODO: this method should be an instance method everywhere.
+        Base.cell_for(name, parent_controller, *args)
+      end
+    end
+    include DSL
   end
 end

data/lib/cell/rails/view_model.rb

@@ -0,0 +1,115 @@
+# no helper_method calls
+# no instance variables
+# no locals
+# options are automatically made instance methods via constructor.
+# call "helpers" in class
+class Cell::Rails
+  module ViewModel
+    include Cell::OptionsConstructor
+    #include ActionView::Helpers::UrlHelper
+    include ActionView::Context # this includes CompiledTemplates, too.
+    # properties :title, :body
+    attr_reader :model
+
+    module ClassMethods
+      def property(name)
+        delegate name, :to => :model
+      end
+    end
+    extend ActiveSupport::Concern
+
+
+    def render(options={})
+      if options.is_a?(Hash)
+        options.reverse_merge!(:view => state_for_implicit_render)
+      else
+        options = {:view => options.to_s}
+      end
+
+      super
+    end
+
+    def call
+      render implicit_state
+    end
+
+  private
+    def view_context
+      self
+    end
+
+    def state_for_implicit_render()
+      caller[1].match(/`(\w+)/)[1]
+    end
+
+    def implicit_state
+      controller_path.split("/").last
+    end
+  end
+
+
+  # FIXME: this module is to fix a design flaw in Rails 4.0. the problem is that AV::UrlHelper mixes in the wrong #url_for.
+  # if we could mix in everything else from the helper except for the #url_for, it would be fine.
+  module LinkToHelper
+    include ActionView::Helpers::TagHelper
+
+    def link_to(name = nil, options = nil, html_options = nil, &block)
+      html_options, options, name = options, name, block if block_given?
+      options ||= {}
+
+      html_options = convert_options_to_data_attributes(options, html_options)
+
+      url = url_for(options)
+      html_options['href'] ||= url
+
+      content_tag(:a, name || url, html_options, &block)
+    end
+
+    def convert_options_to_data_attributes(options, html_options)
+      if html_options
+        html_options = html_options.stringify_keys
+        html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
+
+        disable_with = html_options.delete("disable_with")
+        confirm = html_options.delete('confirm')
+        method  = html_options.delete('method')
+
+        if confirm
+          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { confirm: \'Text\' }' instead."
+          ActiveSupport::Deprecation.warn message
+
+          html_options["data-confirm"] = confirm
+        end
+
+        add_method_to_attributes!(html_options, method) if method
+
+        if disable_with
+          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
+                    "Use 'data: { disable_with: \'Text\' }' instead."
+          ActiveSupport::Deprecation.warn message
+
+          html_options["data-disable-with"] = disable_with
+        end
+
+        html_options
+      else
+        link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
+      end
+    end
+
+    def link_to_remote_options?(options)
+      if options.is_a?(Hash)
+        options.delete('remote') || options.delete(:remote)
+      end
+    end
+  end
+
+  # FIXME: fix that in rails core.
+  if Cell.rails4_0_or_more?
+    include LinkToHelper
+  else
+    include ActionView::Helpers::UrlHelper
+  end
+
+end