view_models 1.5.7 → 2.0.0.ruby19

data/lib/{view_models/controller_extractor.rb → shared/lib/view_models/context_extractor.rb}

@@ -4,7 +4,9 @@ module ViewModels
   
   # Extracts controllers for a living from unsuspecting views.
   #
-  class ControllerExtractor
+  # Note: This is actually only needed in Rails. In Padrino, the context is always the app.
+  #
+  class ContextExtractor
     
     attr_reader :context
     
@@ -16,7 +18,7 @@ module ViewModels
     #
     def extract
       context = self.context
-      context.respond_to?(:controller) ? context.controller : context
+      context.respond_to?(:controller) ? context.send(:controller) : context
     end
     
   end

data/lib/{extensions → shared/lib/view_models/extensions}/active_record.rb

@@ -2,6 +2,8 @@
 #
 # Useful when the model is an AR Model.
 #
+# TODO Split into id delegations and AR/AC specific stuff.
+#
 module ViewModels
   module Extensions
     module ActiveRecord

data/lib/{extensions → shared/lib/view_models/extensions}/model_reader.rb

@@ -88,7 +88,7 @@ module ViewModels
         # Combines left parentheses and filters.
         #
         def filtered_left_parentheses
-          filters.zip(left_parentheses).to_s
+          filters.zip(left_parentheses).join
         end
         
         # Generates the needed amount of parentheses to match the left parentheses.

data/lib/{helpers → shared/lib/view_models/helpers}/collection.rb

@@ -1,6 +1,6 @@
 module ViewModels
   module Helpers
-    module Rails
+    module Mapping
       
       # Construct a view_model for a collection.
       #
@@ -103,18 +103,6 @@ module ViewModels
           
           render_partial :pagination, default_options.merge(options)
         end
-        
-        private
-          
-          # Helper method that renders a partial in the context of the context instance.
-          #
-          # Example:
-          #   If the collection view_model helper has been instantiated in the context
-          #   of a controller, render will be called in the controller.
-          #
-          def render_partial name, locals
-            @context.instance_eval { render :partial => "view_models/collection/#{name}", :locals => locals }
-          end
       end
       
     end

data/lib/{helpers/rails.rb → shared/lib/view_models/helpers/mapping.rb}

@@ -1,6 +1,6 @@
 module ViewModels
   module Helpers
-    module Rails
+    module Mapping
       
       mattr_accessor :specific_view_model_mapping
       self.specific_view_model_mapping = {}
@@ -10,7 +10,11 @@ module ViewModels
       #
       # Note: Will emit an ArgumentError if the view model class doesn't support 2 arguments.
       #
+      # Padrino: context is an app instance.
+      # Rails 2: context is either a view instance or a controller instance.
+      #
       def view_model_for model, context = self
+        # p [:view_model_for, view_model_class_for(model)]
         view_model_class_for(model).new model, context
       end
       

data/lib/{view_models → shared/lib/view_models}/render_options.rb

@@ -2,6 +2,8 @@ module ViewModels
   
   # Container object for render options.
   #
+  # TODO Make a rails exclusive.
+  # 
   module RenderOptions
     
     # Base class for Partial and Template.
@@ -39,6 +41,8 @@ module ViewModels
         @options.reverse_merge :file => file
       end
       
+      # TODO Rails specific.
+      #
       def format! view
         view.template_format = @format if @format
       end

data/lib/view_models.rb

@@ -1,3 +1,5 @@
-require 'active_support'
-
-module ViewModels; end
+if defined? Padrino
+  require File.join(File.dirname(__FILE__), '/padrino/init')
+else
+  require File.join(File.dirname(__FILE__), '/rails2/init')
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: view_models
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 1
-  - 5
-  - 7
-  version: 1.5.7
+  - 2
+  - 0
+  - 0
+  - ruby19
+  version: 2.0.0.ruby19
 platform: ruby
 authors: 
 - Florian Hanke
@@ -17,13 +18,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -38,6 +40,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -48,97 +51,58 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id002
-description: "The view models gem adds the missing R (Representation) to Rails' MVC. It provides simple proxy functionality for your models and thus helps you keep the model and view representations of a model separate, as it should be. Also, you can define helper methods on the (view) model instead of globally to keep them focused, more quickly understood and more easily testable. View Models also introduce hierarchical rendering for your hierarchical models. If the account view is not defined for the subclass FemaleUser, it checks if it is defined for User, for example, to see when there is no specific view, if there is a general view. So, in other words: Polymorphism not just in the model, but also in the view. Have fun!"
+description: "For Padrino and Rails 2 views. Adds the missing R (Representation) to Rails' MVC. Provides simple proxy functionality for your models, thus helps you keep the model and view representation separate. Define focused helper methods on the (view) model, more quickly understood and more easily testable. Also: Hierarchical rendering for your hierarchical models. So, in a nutshell: Polymorphism not just in the model, but also in the view. Have fun!"
 email: florian.hanke@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG
-- MIT-LICENSE
-- README.textile
-- Rakefile
-- TODO.textile
-- VERSION.yml
-- generators/view_models/USAGE
-- generators/view_models/templates/README
-- generators/view_models/templates/spec/view_model_spec.rb
-- generators/view_models/templates/view_models/view_model.rb
-- generators/view_models/templates/views/_empty.html.haml
-- generators/view_models/templates/views/view_models/collection/_collection.html.erb
-- generators/view_models/templates/views/view_models/collection/_collection.html.haml
-- generators/view_models/templates/views/view_models/collection/_collection.text.erb
-- generators/view_models/templates/views/view_models/collection/_list.html.erb
-- generators/view_models/templates/views/view_models/collection/_list.html.haml
-- generators/view_models/templates/views/view_models/collection/_list.text.erb
-- generators/view_models/templates/views/view_models/collection/_pagination.html.haml
-- generators/view_models/templates/views/view_models/collection/_pagination.text.erb
-- generators/view_models/templates/views/view_models/collection/_table.html.haml
-- generators/view_models/templates/views/view_models/collection/_table.text.erb
-- generators/view_models/view_models_generator.rb
-- lib/experimental/README.textile
-- lib/experimental/modules_in_render_hierarchy.rb
-- lib/extensions/active_record.rb
-- lib/extensions/model_reader.rb
-- lib/extensions/view.rb
-- lib/helpers/collection.rb
-- lib/helpers/rails.rb
-- lib/helpers/view.rb
+- lib/init.rb
+- lib/padrino/README.textile
+- lib/padrino/init.rb
+- lib/padrino/lib/helpers/collection.rb
+- lib/padrino/lib/padrino/view_models.rb
+- lib/padrino/lib/view_models/base.rb
+- lib/rails2/README.textile
+- lib/rails2/TODO.textile
+- lib/rails2/generators/view_models/templates/README
+- lib/rails2/generators/view_models/templates/spec/view_model_spec.rb
+- lib/rails2/generators/view_models/templates/view_models/view_model.rb
+- lib/rails2/generators/view_models/templates/views/_empty.html.haml
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_collection.html.erb
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_collection.html.haml
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_collection.text.erb
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_list.html.erb
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_list.text.erb
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_pagination.html.haml
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_pagination.text.erb
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_table.html.haml
+- lib/rails2/generators/view_models/templates/views/view_models/collection/_table.text.erb
+- lib/rails2/generators/view_models/USAGE
+- lib/rails2/generators/view_models/view_models_generator.rb
+- lib/rails2/init.rb
+- lib/rails2/lib/experimental/modules_in_render_hierarchy.rb
+- lib/rails2/lib/extensions/view.rb
+- lib/rails2/lib/helpers/collection.rb
+- lib/rails2/lib/helpers/view.rb
+- lib/rails2/lib/view_models/base.rb
+- lib/rails2/lib/view_models/view.rb
+- lib/rails2/lib/view_models.rb
+- lib/shared/README.textile
+- lib/shared/init.rb
+- lib/shared/lib/view_models/base.rb
+- lib/shared/lib/view_models/context_extractor.rb
+- lib/shared/lib/view_models/extensions/active_record.rb
+- lib/shared/lib/view_models/extensions/model_reader.rb
+- lib/shared/lib/view_models/helpers/collection.rb
+- lib/shared/lib/view_models/helpers/mapping.rb
+- lib/shared/lib/view_models/path_store.rb
+- lib/shared/lib/view_models/render_options.rb
+- lib/shared/lib/view_models.rb
 - lib/view_models.rb
-- lib/view_models/base.rb
-- lib/view_models/controller_extractor.rb
-- lib/view_models/path_store.rb
-- lib/view_models/render_options.rb
-- lib/view_models/view.rb
-- rails/init.rb
-- spec/integration/integration_spec.rb
-- spec/integration/models/sub_subclass.rb
-- spec/integration/models/subclass.rb
-- spec/integration/view_models/module_for_rendering.rb
-- spec/integration/view_models/project.rb
-- spec/integration/view_models/sub_subclass.rb
-- spec/integration/view_models/subclass.rb
-- spec/integration/views/view_models/collection/_collection.html.erb
-- spec/integration/views/view_models/collection/_collection.text.erb
-- spec/integration/views/view_models/collection/_list.html.erb
-- spec/integration/views/view_models/collection/_list.text.erb
-- spec/integration/views/view_models/module_for_rendering/_not_found_in_sub_subclass_but_in_module.erb
-- spec/integration/views/view_models/sub_subclass/_capture_in_template.erb
-- spec/integration/views/view_models/sub_subclass/_capture_in_view_model.erb
-- spec/integration/views/view_models/sub_subclass/_collection_example.html.erb
-- spec/integration/views/view_models/sub_subclass/_collection_example.text.erb
-- spec/integration/views/view_models/sub_subclass/_collection_item.html.erb
-- spec/integration/views/view_models/sub_subclass/_collection_item.text.erb
-- spec/integration/views/view_models/sub_subclass/_exists.erb
-- spec/integration/views/view_models/sub_subclass/_exists.html.erb
-- spec/integration/views/view_models/sub_subclass/_exists.text.erb
-- spec/integration/views/view_models/sub_subclass/_exists_in_both.erb
-- spec/integration/views/view_models/sub_subclass/_inner.also_explicit.erb
-- spec/integration/views/view_models/sub_subclass/_inner.nesting.erb
-- spec/integration/views/view_models/sub_subclass/_list_example.html.erb
-- spec/integration/views/view_models/sub_subclass/_list_example.text.erb
-- spec/integration/views/view_models/sub_subclass/_list_item.html.erb
-- spec/integration/views/view_models/sub_subclass/_list_item.text.erb
-- spec/integration/views/view_models/sub_subclass/_outer.explicit.erb
-- spec/integration/views/view_models/sub_subclass/_outer.nesting.erb
-- spec/integration/views/view_models/sub_subclass/_part_that_is_dependent_on_the_view_model.erb
-- spec/integration/views/view_models/sub_subclass/show.html.erb
-- spec/integration/views/view_models/sub_subclass/show.text.erb
-- spec/integration/views/view_models/subclass/_exists_in_both.erb
-- spec/integration/views/view_models/subclass/_no_sub_subclass.erb
-- spec/integration/views/view_models/subclass/_not_found_in_sub_subclass.erb
-- spec/lib/extensions/active_record_spec.rb
-- spec/lib/extensions/model_reader_spec.rb
-- spec/lib/helpers/collection_spec.rb
-- spec/lib/helpers/rails_spec.rb
-- spec/lib/helpers/view_spec.rb
-- spec/lib/view_models/base_spec.rb
-- spec/lib/view_models/view_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper_extensions.rb
 has_rdoc: true
 homepage: http://floere.github.com/view_models
 licenses: []
@@ -150,6 +114,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -157,6 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -166,24 +132,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A model proxy for Rails views. Helps you keep the representation of a model and the model itself separate.
-test_files: 
-- spec/integration/integration_spec.rb
-- spec/integration/models/sub_subclass.rb
-- spec/integration/models/subclass.rb
-- spec/integration/view_models/module_for_rendering.rb
-- spec/integration/view_models/project.rb
-- spec/integration/view_models/sub_subclass.rb
-- spec/integration/view_models/subclass.rb
-- spec/lib/extensions/active_record_spec.rb
-- spec/lib/extensions/model_reader_spec.rb
-- spec/lib/helpers/collection_spec.rb
-- spec/lib/helpers/rails_spec.rb
-- spec/lib/helpers/view_spec.rb
-- spec/lib/view_models/base_spec.rb
-- spec/lib/view_models/view_spec.rb
-- spec/spec_helper.rb
-- spec/spec_helper_extensions.rb
+test_files: []
+

data/CHANGELOG

@@ -1,26 +0,0 @@
-1.5.2 - 25.02.10 - floere: The capture method - if included per Capturehelper - works now in view models.
-1.5.1 - 22.02.10 - floere: Renamed ViewModels::Helper to ViewModels::Helpers.
-1.5.0 - 20.02.10 - floere: format propagates through collection rendering
-                           render_as, new sig: :partial => to explicitly define the partial. (Syntactic Discouragement)
-                           Added: render_with, an alias of render_as.
-                           Added: render_template, to render non-partials.
-1.4.2 - 10.02.10 - floere: render_as does not check the deprecated API anymore. Use the new options
-                           form to pass a format.
-                 - floere: MissingViewModelError is not thrown anymore.
-                 - floere: include ViewModels::Extensions::ActiveRecord in your Project view model to
-                           give id, dom_id, to_param capabilities to your view_models. Or include in a
-                           subclass.
-1.4.0 - 08.02.10 - floere: Changed Api of ViewModels::Base#render_as to go up through the view model
-                           class hierarchy to find a partial.
-1.3.0 - 29.01.10 - andi:   Changed Api of ViewModels::Base#render_as to take an options hash. Now supports
-                           passing locals to the render call.
-1.2.0 - 13.01.10 - floere: Simple generator written.
-1.1.0 - 30.06.09 - floere: Rewrite: Representer => ViewModel.
-1.0.2 - 08.08.08 - floere: Renamed Representers::Helper::Rails to Representers::Helper::Rails.
-                 - floere: Added Representers::Helpers::View for conveniently integrating common view-helpers.
-                 - floere: Added controller_methods for RequestForgeryProtection in ViewModels::Base.
-                 - floere: Added methods for id and dom_id in Representers::ActiveRecord.
-                 - floere: Included ActionController::Helpers in Representers::Base and removed own helper-method.
-                 - floere: Changed visibility of method view_instance in Representers::Base from private to protected.
-1.0.1 - 24.07.08 - floere: Rewrite: Presenter => Representer.
-1.0.0 - May 2008 - floere: Initial commit.

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2007 Florian Hanke & Kaspar Schiess
-
-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/README.textile

@@ -1,40 +0,0 @@
-h1. ViewModels
-
-A view model/representer solution for Rails.
-
-h2. Features
-
-* Polymorph view model objects that correspond to model objects.
-* View model specific templates.
-* Hierarchical Template Rendering: Allows generalized templates for a class tree of view models.
-* Helper methods directly on the view models.
-* No view related code in the models.
-* A clean API for use in Rails.
-* 100% rcov coverage, nice metrics, gallons of blood and sweat by excellent contributors.
-
-h2. Installation
-
-h3. Rails Plugin
-
-@script/plugin install git://github.com/floere/view_models.git@
-
-h3. Gem (for use in Rails)
-
-@gem install view_models@
-
-and then adding the line
-
-@config.gem 'view_models'@
-
-in your environment.rb.
-
-h2. Links Galore!
-
-"Usage, Examples, In-depth Infos [Wiki]":http://wiki.github.com/floere/view_models/
-"Reference [RDoc]":http://rdoc.info/projects/floere/view_models
-"Gem [RubyGems.org]":http://rubygems.org/gems/view_models
-"Mailing List":http://groups.google.com/group/view_models/topics
-"Bug Tracker":http://github.com/floere/view_models/issues
-"Metrics":http://getcaliper.com/caliper/project?repo=git://github.com/floere/view_models.git
-"Source [Github]":http://github.com/floere/view_models
-"Homepage":http://floere.github.com/view_models/

data/Rakefile

@@ -1,49 +0,0 @@
-def require_if task, name
-  require name if ARGV[0] =~ %r{^#{task}}
-end
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-
-require_if :metrics, 'metric_fu'
-
-task :default => :spec
-
-# run with rake spec
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = %w{--colour --format progress --loadby mtime --reverse}
-  t.spec_files = Dir.glob('spec/**/*_spec.rb')
-  t.warning = false
-end
-
-# run with rake rcov
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_opts = %w{--colour --format progress --loadby mtime --reverse}
-  t.spec_files = Dir.glob('spec/**/*_spec.rb')
-  t.warning = false
-  t.rcov = true
-  puts "Open coverage/index.html for the rcov results."
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "view_models"
-    gemspec.summary = "A model proxy for Rails views. Helps you keep the representation of a model and the model itself separate."
-    gemspec.email = "florian.hanke@gmail.com"
-    gemspec.homepage = "http://floere.github.com/view_models"
-    gemspec.description = "The view models gem adds the missing R (Representation) to Rails' MVC. It provides simple proxy functionality for your models and thus helps you keep the model and view representations of a model separate, as it should be. Also, you can define helper methods on the (view) model instead of globally to keep them focused, more quickly understood and more easily testable. View Models also introduce hierarchical rendering for your hierarchical models. If the account view is not defined for the subclass FemaleUser, it checks if it is defined for User, for example, to see when there is no specific view, if there is a general view. So, in other words: Polymorphism not just in the model, but also in the view. Have fun!"
-    gemspec.authors = ["Florian Hanke", "Kaspar Schiess", "Niko Dittmann", "Andreas Schacke"]
-    gemspec.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-    gemspec.files = FileList["[A-Z]*", "{generators,lib,rails,spec}/**/*"]
-    gemspec.add_dependency 'rails', '>= 2.2.0'
-    gemspec.add_development_dependency 'rspec', '>=1.2.9'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError => e
-  puts "Jeweler not available (#{e}). Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end