rerails 2.3.5.3 → 3.0.0

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 3.0.0 / 2010-09-30
+
+* 1 enhancement
+
+  * Get rid of ReactionView, for now (the previous patches are in Rails!).
+
+
 === 2.3.5.3 / 2010-01-15
 
 * 1 bugfix

data/README.rdoc

@@ -5,31 +5,6 @@ Reinforcing the Rails with assorted patches.
 
 == Features
 
-=== ReactionView
-
-*  Label tag helpers accept blocks
-   ({Rails Lighthouse ticket}[https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/3645-let-label-helpers-accept-blocks]).
-
-    <% label_tag do %>
-      <%= check_box_tag "tos" %> Accept <%= link_to "Terms", "/tos" %>.
-    <% end %>
-
-
-
-* HTML5 form helpers
-  ({Rails Lighthouse ticket}[https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/3646-html5-form-field-helpers-email_field_tag-etc]).
-
-    <% form_tag "user_search" do %>
-      <%= search_field_tag "q", nil, :autosave => true %>
-    <% end %>
-
-    <% form_for @user do |f| %>
-      <%= f.email_field :email %>
-      <%= f.url_field :homepage %>
-      <%= f.phone_field :phone %>
-    <% end %>
-
-
 === ReactiveRecord
 
 * <tt>Array#first</tt> and <tt>Array#last</tt> functionality and
@@ -43,32 +18,32 @@ Reinforcing the Rails with assorted patches.
 
 == Install
 
+These instructions are for the master branch, to be used with edge Rails. For
+Rails 2.3, try: http://github.com/stephencelis/rerails/tree/2-3-stable
+
 As a gem:
 
-  # config/environment.rb
-  config.gem "rerails", :version => '~> 2.3.5'
+  # Gemfile
+  gem "rerails", "3.0.0"
 
-  % [sudo] rake gems:install
+  % bundle
 
 
 As a plugin:
 
-  % script/plugin install git://github.com/stephencelis/rerails.git \
-                          -r 'branch 2-3-stable'
+  % script/plugin install git://github.com/stephencelis/rerails.git
 
 
 == Development
 
 Setup (to run tests):
 
-  % [sudo] gem install bundler
-  % gem bundle
-  % bin/rake
+  % bundle && rake
 
 
 == License
 
-Released under the same license as Ruby on Rails (The MIT License).
+Released under the same license as Ruby on Rails (the MIT License).
 
 (c) 2009-2010 Stephen Celis, stephen@stephencelis.com.
 

data/lib/reactive_record/first_last_limits.rb

@@ -1,70 +1,96 @@
 module ActiveRecord #:nodoc:
-  class Base
-    class << self
-      # A convenience wrapper for <tt>find(:first, *args)</tt>. You can pass in
-      # all the same arguments to this method as you can to
-      # <tt>find(:first)</tt>. The limit can be passed in directly as the
-      # first argument.
-      #
-      # ==== Examples
-      #
-      #   Post.first
-      #   # => #<Post id: 1, posted: false>
-      #   Post.first(2, :conditions => { :posted => true })
-      #   # => [#<Post id: 2, posted: true>, #<Post id: 3, posted: true>]
-      def first(*args)
-        options, limit = args.extract_options!, args.shift
-        find(:first, *(args << options.merge(:limit => limit || options[:limit])))
+  module FinderMethods #:nodoc:
+    def first(*args)
+      options = args.extract_options!
+      if options.any?
+        apply_finder_options(options).first(*args)
+      else
+        find_first(*args)
       end
+    end
 
-      # A convenience wrapper for <tt>find(:last, *args)</tt>. You can pass in
-      # all the same arguments to this method as you can to
-      # <tt>find(:last)</tt>. The limit can be passed in directly as the
-      # first argument.
-      #
-      # ==== Examples
-      #
-      #   Post.last
-      #   # => #<Post id: 50, posted: false>
-      #   Post.last(2, :conditions => { :posted => true })
-      #   # => [#<Post id: 48, posted: true>, #<Post id: 49, posted: true>]
-      def last(*args)
-        options, limit = args.extract_options!, args.shift
-        find(:last, *(args << options.merge(:limit => limit || options[:limit])))
+    def last(*args)
+      options = args.extract_options!
+      if options.any?
+        apply_finder_options(options).last(*args)
+      else
+        find_last(*args)
       end
+    end
 
-      private
-        def find_initial(options)
-          every = find_every(options.merge(:limit => options[:limit] || 1))
-          options[:limit] ? every : every.first
+    private
+      def find_first(n = nil)
+        if loaded?
+          @records.first(n)
+        elsif n.nil?
+          @first ||= limit(1).to_a[0]
+        else
+          limit(n).to_a
         end
+      end
 
-        def find_last_with_limit(options)
-          last = find_last_without_limit(options)
-          options[:limit] ? last.reverse : last
+      def find_last(n = nil)
+        if loaded?
+          @records.first(n)
+        elsif n.nil?
+          @last ||= reverse_order.limit(1).to_a[0]
+        else
+          reverse_order.limit(n).to_a.reverse
         end
-        alias_method_chain :find_last, :limit
-    end
+      end
   end
 
   module Associations #:nodoc:
     class AssociationCollection < AssociationProxy
-      # Fetches the first n records (default: 1) using SQL if possible.
+      def find(*args)
+        options = args.extract_options!
+
+        # If using a custom finder_sql, scan the entire collection.
+        if @reflection.options[:finder_sql]
+          expects_array = args.first.kind_of?(Array)
+          ids           = args.flatten.compact.uniq.map { |arg| arg.to_i }
+
+          if ids.size == 1
+            id = ids.first
+            record = load_target.detect { |r| id == r.id }
+            expects_array ? [ record ] : record
+          else
+            load_target.select { |r| ids.include?(r.id) }
+          end
+        else
+          merge_options_from_reflection!(options)
+          construct_find_options!(options)
+
+          find_scope = construct_scope[:find].slice(:conditions, :order)
+
+          with_scope(:find => find_scope) do
+            relation = @reflection.klass.send(:construct_finder_arel, options, @reflection.klass.send(:current_scoped_methods))
+
+            case args.first
+            when :first, :last
+              relation.send(*args)
+            when :all
+              records = relation.all
+              @reflection.options[:uniq] ? uniq(records) : records
+            else
+              relation.find(*args)
+            end
+          end
+        end
+      end
+
       def first(*args)
         if fetch_first_or_last_using_find?(args)
-          options, limit = args.extract_options!, args.shift
-          find(:first, *(args << options.merge(:limit => limit || options[:limit])))
+          find(:first, *args)
         else
           load_target unless loaded?
           @target.first(*args)
         end
       end
 
-      # Fetches the last n records (default: 1) using SQL if possible.
       def last(*args)
         if fetch_first_or_last_using_find?(args)
-          options, limit = args.extract_options!, args.shift
-          find(:last, *(args << options.merge(:limit => limit || options[:limit])))
+          find(:last, *args)
         else
           load_target unless loaded?
           @target.last(*args)
@@ -73,7 +99,7 @@ module ActiveRecord #:nodoc:
 
       private
         def fetch_first_or_last_using_find?(args)
-          !(loaded? || @owner.new_record? || @reflection.options[:finder_sql]) ||
+          args.first.kind_of?(Hash) || !(loaded? || @owner.new_record? || @reflection.options[:finder_sql]) ||
             @target.any? { |record| record.new_record? }
         end
     end
@@ -82,18 +108,28 @@ module ActiveRecord #:nodoc:
   module NamedScope #:nodoc:
     class Scope
       def first(*args)
-        if @found
-          proxy_found.first(*args)
+        if loaded? && !args.first.kind_of?(Hash)
+          to_a.first(*args)
         else
-          super
+          options = args.extract_options!
+          if options.any?
+            apply_finder_options(options).first(*args)
+          else
+            super
+          end
         end
       end
 
       def last(*args)
-        if @found
-          proxy_found.last(*args)
+        if loaded? && !args.first.kind_of?(Hash)
+          to_a.last(*args)
         else
-          super
+          options = args.extract_options!
+          if options.any?
+            apply_finder_options(options).last(*args)
+          else
+            super
+          end
         end
       end
     end

data/lib/rerails.rb

@@ -1,2 +1 @@
-require "reaction_view"
 require "reactive_record"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rerails
 version: !ruby/object:Gem::Version 
-  version: 2.3.5.3
+  prerelease: false
+  segments: 
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,20 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -06:00
+date: 2010-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
-description: Assorted patches to make Rails a bit better.
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id001
+description: Assorted patches for Rails.
 email: stephen@stephencelis.com
 executables: []
 
@@ -34,9 +44,6 @@ extra_rdoc_files:
 files: 
 - CHANGELOG.rdoc
 - README.rdoc
-- lib/reaction_view/block_labels.rb
-- lib/reaction_view/html5_forms.rb
-- lib/reaction_view.rb
 - lib/reactive_record/first_last_limits.rb
 - lib/reactive_record.rb
 - lib/rerails.rb
@@ -51,21 +58,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Reinforcing the Rails

data/lib/reaction_view.rb

@@ -1,2 +0,0 @@
-require "reaction_view/block_labels"
-require "reaction_view/html5_forms"

data/lib/reaction_view/block_labels.rb

@@ -1,66 +0,0 @@
-module ActionView #:nodoc:
-  module Helpers #:nodoc:
-    module FormTagHelper
-      # Creates a label tag. Accepts a block.
-      #
-      # ==== Options
-      # * Creates standard HTML attributes for the tag.
-      #
-      # ==== Examples
-      #   label_tag 'name'
-      #   # => <label for="name">Name</label>
-      #
-      #   label_tag 'name', 'Your name'
-      #   # => <label for="name">Your Name</label>
-      #
-      #   label_tag 'name', nil, :class => 'small_label'
-      #   # => <label for="name" class="small_label">Name</label>
-      #
-      #   label_tag do
-      #     '<input type="checkbox" /> Accept <a>TOS</a>'
-      #   end
-      #   # => <label><input type="checkbox" /> Accept <a>TOS</a></label>
-      def label_tag_with_block(*args, &block)
-        if block_given?
-          options = args.extract_options!
-          options["for"] = name = args.shift
-          text = capture(&block)
-          concat label_tag_without_block(name, text, options)
-        else
-          label_tag_without_block(*args, &block)
-        end
-      end
-
-      alias_method_chain :label_tag, :block
-    end
-
-    module FormHelper #:nodoc:
-      def label_with_block(object_name, *args, &block)
-        if block_given?
-          options = args.extract_options!
-          method = args.shift
-          text = capture(&block)
-          concat label_without_block(object_name, method, text, options)
-        else
-          label_without_block(object_name, *args, &block)
-        end
-      end
-
-      alias_method_chain :label, :block
-    end
-
-    class FormBuilder #:nodoc:
-      def label_with_block(method, *args, &block)
-        if block_given?
-          options = args.extract_options!
-          text = @template.capture(&block)
-          @template.concat label_without_block(method, text, options)
-        else
-          label_without_block(method, *args)
-        end
-      end
-
-      alias_method_chain :label, :block
-    end
-  end
-end

data/lib/reaction_view/html5_forms.rb

@@ -1,163 +0,0 @@
-module ActionView #:nodoc:
-  module Helpers #:nodoc:
-    module FormTagHelper
-      # Creates a search field.
-      #
-      # ==== Options
-      # * <tt>:autosave</tt> - If set to true, will generate a domain-based
-      #   namespace (e.g., for blog.rubyonrails.com, "com.rubyonrails.blog").
-      #   Also accepts string values.
-      # * <tt>:results</tt> - The number of previous searches displayed in the
-      #   drop-down. Default: 10, with <tt>:autosave</tt>.
-      # * Otherwise accepts the same options as text_field_tag.
-      #
-      # ==== Examples
-      #   search_field_tag 'query'
-      #   # => <input id="query" name="query" type="search" />
-      #
-      #   search_field_tag 'query', nil, :autosave => true
-      #   # => <input id="query" name="query" type="search" autosave="tld.yourdomain" results="10">
-      #
-      #   search_field_tag 'site_search', nil, :autosave => 'com.rubyonrails', :results => 5
-      #   # => <input id="site_search" name="site_search" type="search" autosave="com.rubyonrails" results="5">
-      def search_field_tag(name, value = nil, options = {})
-        options = options.stringify_keys
-
-        if options["autosave"]
-          if options["autosave"] == true
-            options["autosave"] = request.host.split(".").reverse.join(".")
-          end
-          options["results"] ||= 10
-        end
-
-        if options["onsearch"]
-          options["incremental"] = true unless options.has_key?("incremental")
-        end
-
-        text_field_tag(name, value, options.update("type" => "search"))
-      end
-
-      # Creates a text field of type "tel".
-      #
-      # ==== Options
-      # * Accepts the same options as text_field_tag.
-      def telephone_field_tag(name, value = nil, options = {})
-        text_field_tag(name, value, options.stringify_keys.update("type" => "tel"))
-      end
-      alias phone_field_tag telephone_field_tag
-
-      # Creates a text field of type "url".
-      #
-      # ==== Options
-      # * Accepts the same options as text_field_tag.
-      def url_field_tag(name, value = nil, options = {})
-        text_field_tag(name, value, options.stringify_keys.update("type" => "url"))
-      end
-
-      # Creates a text field of type "email".
-      #
-      # ==== Options
-      # * Accepts the same options as text_field_tag.
-      def email_field_tag(name, value = nil, options = {})
-        text_field_tag(name, value, options.stringify_keys.update("type" => "email"))
-      end
-
-      # Creates a number field.
-      #
-      # ==== Options
-      # * <tt>:min</tt> - The minimum acceptable value.
-      # * <tt>:max</tt> - The maximum acceptable value.
-      # * <tt>:in</tt> - A range specifying the <tt>:min</tt> and
-      #   <tt>:max</tt> values.
-      # * <tt>:step</tt> - The acceptable value granularity.
-      # * Otherwise accepts the same options as text_field_tag.
-      #
-      # ==== Examples
-      #   number_field_tag 'quantity', nil, :in => 1...10
-      #   => <input id="quantity" name="quantity" min="1" max="9" />
-      def number_field_tag(name, value = nil, options = {})
-        options = options.stringify_keys
-        options["type"] ||= "number"
-        if range = options.delete("in") || options.delete("within")
-          options.update("min" => range.min, "max" => range.max)
-        end
-        text_field_tag(name, value, options)
-      end
-
-      # Creates a range form element.
-      #
-      # ==== Options
-      # * Accepts the same options as number_field_tag.
-      def range_field_tag(name, value = nil, options = {})
-        number_field_tag(name, value, options.stringify_keys.update("type" => "range"))
-      end
-    end
-
-    module FormHelper #:nodoc:
-      def search_field(object_name, method, options = {})
-        options = options.stringify_keys
-
-        if options["autosave"]
-          if options["autosave"] == true
-            options["autosave"] = request.host.split(".").reverse.join(".")
-          end
-          options["results"] ||= 10
-        end
-
-        if options["onsearch"]
-          options["incremental"] = true unless options.has_key?("incremental")
-        end
-
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("search", options)
-      end
-
-      def telephone_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("tel", options)
-      end
-      alias phone_field telephone_field
-
-      def url_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("url", options)
-      end
-
-      def email_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("email", options)
-      end
-
-      def number_field(object_name, method, options = {})
-        options = options.stringify_keys
-        options["type"] ||= "number"
-        if range = options.delete("in") || options.delete("within")
-          options.update("min" => range.min, "max" => range.max)
-        end
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("number", options)
-      end
-
-      def range_field(object_name, method, options = {})
-        options = options.stringify_keys
-        options["type"] ||= "range"
-        if range = options.delete("in") || options.delete("within")
-          options.update("min" => range.min, "max" => range.max)
-        end
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("range", options)
-      end
-    end
-
-    class FormBuilder #:nodoc:
-      %w(search_field telephone_field url_field email_field number_field range_field).each do |selector|
-        src = <<-end_src
-          def #{selector}(method, options = {})
-            @template.send(
-              #{selector.inspect},
-              @object_name,
-              method,
-              objectify_options(options))
-          end
-        end_src
-        class_eval src, __FILE__, __LINE__
-      end
-
-      alias phone_field telephone_field
-    end
-  end
-end