active_scaffold 3.0.0 → 3.0.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 3.0.1
+
+- Fixing the requiring of files.
+
+= 3.0.0
+
+- Packaging up vhochstein's fork for Rails 3.0 as a gem.
+
 = 1.2RC1
 
 == FEATURES

data/README

@@ -29,16 +29,22 @@ Rails < 2.1: Active Scaffold 1-1-stable (no guarantees)
 Since Rails 2.3, render_component plugin is needed for nested and embbeded scaffolds. It works with rails-2.3 branch from ewildgoose repository:
 script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3
 
-Rails 3.0 compatible fork of activesaffold by Volker Hochstein:
+== Rails 3.0 compatible fork of activesaffold by Volker Hochstein:
 
-Since Rails 3.0 render_component is nt used for nesting, but optional for embedded scaffolds
-Rails 3.0 version of render_component:
-rails plugin install git://github.com/vhochstein/render_component.git
+Since Rails 3.0 render_component is not used for nesting, but is optional for embedded scaffolds.
+Since Rails 3.0, https://github.com/rails/verification.git is also needed.
 
-Since Rails 3.0, the following is needed:
-rails plugin install git://github.com/rails/verification.git
+If you want to install as plugins under vendor/plugins, install these versions:
+  rails plugin install git://github.com/vhochstein/render_component.git
+  rails plugin install git://github.com/rails/verification.git
+  rails plugin install git://github.com/vhochstein/active_scaffold.git
 
-Fork uses unobtrusive Javascript, so you are basically free to pick your javascript framework
+If you want to use the gem, add to your Gemfile:
+  gem "active_scaffold"
+
+== Pick your own javascript framework
+
+The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
 Out of the box Prototype or JQuery are supported:
 
 Prototype 1.7 (default js framework)
@@ -46,6 +52,12 @@ rails.js in git://github.com/vhochstein/prototype-ujs.git
 
 JQuery 1.4.1
 rails.js in git://github.com/vhochstein/jquery-ujs.git
-uncomment last line in ...plugins/active_scaffold/environment.rb in order tu use jquery instead of prototype
+
+To configure the javascript framework when installed under vendor/plugins/
+uncomment last line in ...plugins/active_scaffold/environment.rb in order to use jquery instead of prototype
+
+To configure the javascript framework when installed as a gem:
+Add a config/initializers/active_scaffold.rb containing:
+ActiveScaffold.js_framework = :jquery # :prototype is the default
 
 Released under the MIT license (included)

data/active_scaffold.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "active_scaffold"
-  s.version     = "3.0.0"
+  s.version     = "3.0.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Many, see README"]
   s.email       = ["activescaffold@googlegroups.com"]

data/lib/active_scaffold/bridges/bridge.rb

@@ -3,39 +3,39 @@ module ActiveScaffold
     def self.bridge(name, &block)
       ActiveScaffold::Bridges::Bridge.new(name, &block)
     end
-    
+
     class Bridge
       attr_accessor :name
       cattr_accessor :bridges
       cattr_accessor :bridges_run
       self.bridges = []
-      
+
       def initialize(name, &block)
         self.name = name
         @install = nil
         # by convention and default, use the bridge name as the required constant for installation
         @install_if = lambda { Object.const_defined?(name) }
         self.instance_eval(&block)
-        
+
         ActiveScaffold::Bridges::Bridge.bridges << self
       end
-      
+
       # Set the install block
       def install(&block)
         @install = block
       end
-      
+
       # Set the install_if block (to check to see whether or not to install the block)
       def install?(&block)
         @install_if = block
       end
-      
-      
+
+
       def run
         raise(ArgumentError, "install and install? not defined for bridge #{name}" ) unless @install && @install_if
         @install.call if @install_if.call
       end
-      
+
       def self.run_all
         return false if self.bridges_run
         ActiveScaffold::Bridges::Bridge.bridges.each{|bridge|
@@ -47,6 +47,7 @@ module ActiveScaffold
   end
 end
 
+require "#{File.dirname(__FILE__)}/shared/date_bridge"
 Dir[File.join(File.dirname(__FILE__), "*/bridge.rb")].each{|bridge_require|
   require bridge_require
-} 
+}

data/lib/active_scaffold/bridges/calendar_date_select/bridge.rb

@@ -2,14 +2,14 @@ ActiveScaffold::Bridges.bridge "CalendarDateSelect" do
   install do
     # check to see if the old bridge was installed.  If so, warn them
     # we can detect this by checking to see if the bridge was installed before calling this code
-       
+
     if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select")
       raise RuntimeError, "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
     end
-    
+
     require File.join(File.dirname(__FILE__), "lib/as_cds_bridge.rb")
   end
-  
+
   install? do
     Object.const_defined?(name) && ActiveScaffold.js_framework == :prototype
   end

data/lib/active_scaffold/bridges/carrierwave/bridge.rb

@@ -2,6 +2,8 @@ ActiveScaffold::Bridges.bridge "CarrierWave" do
   install do
     require File.join(File.dirname(__FILE__), "lib/form_ui")
     require File.join(File.dirname(__FILE__), "lib/list_ui")
+    require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge")
+    require File.join(File.dirname(__FILE__), "lib/carrierwave_bridge_helpers")
     ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Carrierwave::Lib::CarrierwaveBridge
   end
-end
+end

data/lib/active_scaffold/bridges/date_picker/bridge.rb

@@ -15,7 +15,7 @@ ActiveScaffold::Bridges.bridge "DatePicker" do
       FileUtils.rm(File.join(destination, 'date_picker_bridge.js')) if File.exist?(File.join(destination, 'date_picker_bridge.js'))
     end
   end
-  
+
   install? do
     true
   end

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -14,26 +14,26 @@ module ActiveScaffold
             tags << active_scaffold_search_date_bridge_range_tag(column, options, current_search)
             tags.join("&nbsp;").html_safe
           end
-          
+
           def active_scaffold_search_date_bridge_comparator_options(column)
             select_options = ActiveScaffold::Finder::DateComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
             select_options + ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
           end
-          
+
           def active_scaffold_search_date_bridge_comparator_tag(column, options, current_search)
             select_tag("#{options[:name]}[opt]", options_for_select(active_scaffold_search_date_bridge_comparator_options(column),current_search['opt']), :id => "#{options[:id]}_opt", :class => "as_search_range_option as_search_date_time_option")
           end
-          
+
           def active_scaffold_search_date_bridge_numeric_tag(column, options, current_search)
-            numeric_controls = "" << 
+            numeric_controls = "" <<
             active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from') <<
             content_tag(:span, (" - " + active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')).html_safe,
-              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{current_search['opt'] == 'BETWEEN' ? '' : 'none'}")  
+              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{current_search['opt'] == 'BETWEEN' ? '' : 'none'}")
             content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :style => "display:#{ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? '' : 'none'}")
           end
-  
+
           def active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
-            active_scaffold_date_bridge_trend_tag(column, options, 
+            active_scaffold_date_bridge_trend_tag(column, options,
                                                  {:name_prefix => 'search',
                                                   :number_value => current_search['number'],
                                                   :unit_value => current_search["unit"],
@@ -53,14 +53,14 @@ module ActiveScaffold
              options = ActiveScaffold::Finder::TimeUnits.collect{|unit| [as_(unit.downcase.to_sym), unit]} + options if column_datetime?(column)
              options
           end
-          
+
           def active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            range_controls = select_tag("search[#{column.name}][range]", 
-              options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]), 
+            range_controls = select_tag("search[#{column.name}][range]",
+              options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]),
              :class => 'text-input')
             content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => "display:#{(current_search['opt'] == 'RANGE') ? '' : 'none'}")
           end
-          
+
           def column_datetime?(column)
             (!column.column.nil? && [:datetime, :time].include?(column.column.type))
           end
@@ -79,24 +79,24 @@ module ActiveScaffold
             end
           end
         end
-        
+
         module Finder
           module ClassMethods
             def condition_for_date_bridge_type(column, value, like_pattern)
               operator = ActiveScaffold::Finder::NumericComparators.include?(value[:opt]) && value[:opt] != 'BETWEEN' ? value[:opt] : nil
               from_value, to_value = date_bridge_from_to(column, value)
-              
+
               if column.search_sql.is_a? Proc
                 column.search_sql.call(from_value, to_value, operator)
               else
                 unless operator.nil?
                   ["#{column.search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
                 else
-                  ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
+                  ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?
                 end
               end
             end
-            
+
             def date_bridge_from_to(column, value)
               conversion = column.column.type == :date ? :to_date : :to_time
               case value[:opt]
@@ -108,7 +108,7 @@ module ActiveScaffold
                 ['from', 'to'].collect { |field| condition_value_for_datetime(value[field], conversion)}
               end
             end
-            
+
             def date_bridge_from_to_for_trend(column, value)
               case value['opt']
               when "PAST"
@@ -135,7 +135,7 @@ module ActiveScaffold
                 return from, to
               end
             end
-            
+
             def date_bridge_from_to_for_range(column, value)
               case value[:range]
               when 'TODAY'
@@ -155,7 +155,7 @@ module ActiveScaffold
                 when 'next'
                   return Time.zone.now.in(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), Time.zone.now.in(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
                 else
-                  return nil, nil    
+                  return nil, nil
                 end
               end
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency