active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/marked_model.rb

@@ -1,41 +1,41 @@
 module ActiveScaffold
   module MarkedModel
     # This is a module aimed at making the make session_stored marked_records available to ActiveRecord models
-    
+
     def self.included(base)
       base.class_eval do
         extend ClassMethods
-        scope :as_marked, lambda { where(primary_key => marked_record_ids) }
+        scope :as_marked, -> { where(primary_key => marked_record_ids) }
       end
     end
-    
+
     def as_marked
-      marked_records.include?(self.id.to_s)
+      marked_records.include?(id.to_s)
     end
-    
+
     def as_marked=(value)
       value = [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
       if value == true
-        marked_records[self.id.to_s] = true if !as_marked
+        marked_records[id.to_s] = true unless as_marked
       else
-        marked_records.delete(self.id.to_s)
+        marked_records.delete(id.to_s)
       end
     end
-  
+
     module ClassMethods
       def marked_records
         Thread.current[:marked_records] ||= {}
       end
 
       def marked_records=(marked)
-        Thread.current[:marked_records] = marked 
+        Thread.current[:marked_records] = marked
       end
 
       def marked_record_ids
         marked_records.keys
       end
     end
-  
+
     # Instance-level access to the marked_records
     def marked_records
       self.class.marked_records

data/lib/active_scaffold/paginator.rb

@@ -1,123 +1,121 @@
 require 'forwardable'
 
 class Paginator
-  
   VERSION = '1.0.9'
 
   class ArgumentError < ::ArgumentError; end
   class MissingCountError < ArgumentError; end
-  class MissingSelectError < ArgumentError; end  
-  
-  attr_reader :per_page, :count 
-  
+  class MissingSelectError < ArgumentError; end
+
+  attr_reader :per_page, :count
+
   # Instantiate a new Paginator object
   #
   # Provide:
   # * A total count of the number of objects to paginate
   # * The number of objects in each page
   # * A block that returns the array of items
-  #   * The block is passed the item offset 
+  #   * The block is passed the item offset
   #     (and the number of items to show per page, for
   #     convenience, if the arity is 2)
   def initialize(count, per_page, &select)
     @count, @per_page = count, per_page
     unless select
-      raise MissingSelectError, "Must provide block to select data for each page"
+      raise MissingSelectError, 'Must provide block to select data for each page'
     end
     @select = select
   end
-  
+
   # Total number of pages
   def number_of_pages
-     (@count / @per_page).to_i + (@count % @per_page > 0 ? 1 : 0)
+    (@count / @per_page).to_i + (@count % @per_page > 0 ? 1 : 0)
   end
-  
+
   # First page object
   def first
     page 1
   end
-  
+
   # Last page object
   def last
     page number_of_pages
   end
-  
+
   # Iterate through pages
   def each
-    each_with_index do |item, index|
+    each_with_index do |item, _|
       yield item
     end
   end
-  
+
   # Iterate through pages with indices
   def each_with_index
     1.upto(number_of_pages) do |number|
       yield(page(number), number - 1)
     end
   end
-  
+
   # Retrieve page object by number
   def page(number)
     number = (n = number.to_i) > 0 ? n : 1
-    Page.new(self, number, lambda { 
+    Page.new(self, number) do
       offset = (number - 1) * @per_page
       args = [offset]
       args << @per_page if @select.arity == 2
       @select.call(*args)
-    })
+    end
   end
-  
+
   # Page object
   #
   # Retrieves items for a page and provides metadata about the position
   # of the page in the paginator
   class Page
-    
     extend Forwardable
     def_delegator :@pager, :first, :first
     def_delegator :@pager, :last, :last
     def_delegator :items, :each
-    def_delegator :items, :each_with_index    
-        
+    def_delegator :items, :each_with_index
+
     attr_reader :number, :pager
-    
-    def initialize(pager, number, select) #:nodoc:
+
+    def initialize(pager, number, &select) #:nodoc:
       @pager, @number = pager, number
       @offset = (number - 1) * pager.per_page
       @select = select
     end
-    
+
     # Retrieve the items for this page
     # * Caches
     def items
       @items ||= @select.call
     end
-    
+
     # Checks to see if there's a page before this one
     def prev?
       @number > 1
     end
-    
+
     # Get previous page (if possible)
     def prev
       @pager.page(@number - 1) if prev?
     end
-    
+
     # Checks to see if there's a page after this one
     def next?
       @number < @pager.number_of_pages
     end
-    
+
     # Get next page (if possible)
     def next
       @pager.page(@number + 1) if next?
     end
-    
+
     # The "item number" of the first item on this page
     def first_item_number
       1 + @offset
     end
-    
+
     # The "item number" of the last item on this page
     def last_item_number
       if next?
@@ -126,11 +124,9 @@ class Paginator
         @pager.count
       end
     end
-    
+
     def ==(other) #:nodoc:
-      @pager == other.pager && self.number == other.number
+      @pager == other.pager && number == other.number
     end
-    
   end
-  
 end

data/lib/active_scaffold/responds_to_parent.rb

@@ -6,39 +6,38 @@ module ActiveScaffold
     # to use IFRAME base RPC.
     def responds_to_parent(&block)
       yield
+      return unless performed?
 
-      if performed?
-        # Either pull out a redirect or the request body
-        script =  if response.headers['Location']
-                    "document.location.href = '#{self.class.helpers.escape_javascript location.to_s}'"
-                  else
-                    response.body || ''
-                  end
+      # Either pull out a redirect or the request body
+      script =  if response.headers['Location']
+                  "document.location.href = '#{self.class.helpers.escape_javascript location.to_s}'"
+                else
+                  response.body || ''
+                end
 
-        # Eval in parent scope and replace document location of this frame
-        # so back button doesn't replay action on targeted forms
-        # loc = document.location to be set after parent is updated for IE
-        # with(window.parent) - pull in variables from parent window
-        # setTimeout - scope the execution in the windows parent for safari
-        # window.eval - legal eval for Opera
-        script = "<html><body><script type='text/javascript' charset='utf-8'>
-          var loc = document.location;
-          with(window.parent) { setTimeout(function() { window.eval('#{self.class.helpers.escape_javascript script}'); window.loc && loc.replace('about:blank'); }, 1) }
-        </script></body></html>"
+      # Eval in parent scope and replace document location of this frame
+      # so back button doesn't replay action on targeted forms
+      # loc = document.location to be set after parent is updated for IE
+      # with(window.parent) - pull in variables from parent window
+      # setTimeout - scope the execution in the windows parent for safari
+      # window.eval - legal eval for Opera
+      script = "<html><body><script type='text/javascript' charset='utf-8'>
+        var loc = document.location;
+        with(window.parent) { setTimeout(function() { window.eval('#{self.class.helpers.escape_javascript script}'); window.loc && loc.replace('about:blank'); }, 1) }
+      </script></body></html>"
 
-        # We're returning HTML instead of JS or XML now
-        response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+      # We're returning HTML instead of JS or XML now
+      response.headers['Content-Type'] = 'text/html; charset=UTF-8'
 
-        # Clear out the previous render to prevent double render and then render
-        if respond_to?(:erase_results, true)
-          erase_results
-        else
-          instance_variable_set(:@_response_body, nil)
-        end
-
-        render :text => script
+      # Clear out the previous render to prevent double render and then render
+      if respond_to?(:erase_results, true)
+        erase_results
+      else
+        instance_variable_set(:@_response_body, nil)
       end
+
+      render :text => script
     end
-    alias respond_to_parent responds_to_parent
+    alias_method :respond_to_parent, :responds_to_parent
   end
 end

data/lib/active_scaffold/tableless.rb

@@ -16,7 +16,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       end
     end
   end
-  
+
   class Connection < ActiveRecord::ConnectionAdapters::AbstractAdapter
     attr_reader :klass
     def initialize(klass, *args)
@@ -44,7 +44,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       @association_scope ||= overrided_association_scope if klass < ActiveScaffold::Tableless
       association_scope_without_tableless
     end
-    
+
     def overrided_association_scope
       if AssociationScope.respond_to?(:scope) # rails >= 4.1
         AssociationScope.scope(self, klass.connection)
@@ -61,7 +61,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       end
     end
   end
-  
+
   module CollectionAssociation
     def self.included(base)
       base.alias_method_chain :get_records, :tableless if Rails.version >= '4.2'
@@ -70,7 +70,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       klass < ActiveScaffold::Tableless ? scope.to_a : get_records_without_tableless
     end
   end
-  
+
   module SingularAssociation
     def self.included(base)
       base.alias_method_chain :get_records, :tableless if Rails.version >= '4.2'
@@ -81,10 +81,8 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   module RelationExtension
-    def conditions
-      @conditions
-    end
-  
+    attr_reader :conditions
+
     def initialize(klass, table)
       super
       @conditions ||= []
@@ -120,7 +118,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     end
 
     def find_one(id)
-      @klass.find_one(id, self) or raise ActiveRecord::RecordNotFound
+      @klass.find_one(id, self) || raise(ActiveRecord::RecordNotFound)
     end
 
     def execute_simple_calculation(operation, column_name, distinct)
@@ -133,6 +131,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
   class << self
     private
+
     def relation
       ActiveScaffold::Tableless::Relation.new(self, arel_table)
     end
@@ -151,7 +150,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   unless Rails.version < '4.2'
     def self.columns_hash
       if self < ActiveScaffold::Tableless
-        @columns_hash ||= Hash[self.columns.map { |c| [c.name, c] }]
+        @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
       else
         super
       end
@@ -161,17 +160,23 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     end
   end
 
-  def self.columns; @columns ||= []; end
-  def self.table_name; @table_name ||= ActiveModel::Naming.plural(self); end
-  def self.table_exists?; true; end
+  def self.columns
+    @columns ||= []
+  end
+  def self.table_name
+    @table_name ||= ActiveModel::Naming.plural(self)
+  end
+  def self.table_exists?
+    true
+  end
   self.abstract_class = true
-  
+
   def self.connection
     @connection ||= Connection.new(self)
   end
 
   def self.column(name, sql_type = nil, options = {})
-    column = Column.new(name.to_s, options[:default], sql_type.to_s, options.has_key?(:null) ? options[:null] : true)
+    column = Column.new(name.to_s, options[:default], sql_type.to_s, options.key?(:null) ? options[:null] : true)
     column.tap { columns << column }
   end
 

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 17
+    PATCH = 18
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/generators/active_scaffold/active_scaffold_generator.rb

@@ -1,21 +1,21 @@
 require 'rails/generators/rails/resource/resource_generator'
-#require 'generators/active_scaffold_controller/active_scaffold_controller_generator'
+# require 'generators/active_scaffold_controller/active_scaffold_controller_generator'
 
 module Rails
   module Generators
-    class ActiveScaffoldGenerator < ResourceGenerator #metagenerator
+    class ActiveScaffoldGenerator < ResourceGenerator # metagenerator
       remove_hook_for :resource_controller
       remove_hook_for :resource_route
       remove_class_option :actions
-      
+
       def add_resource_route
-        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ") 
+        route_config =  class_path.collect { |namespace| "namespace :#{namespace} do " }.join(' ')
         route_config << "resources :#{file_name.pluralize} do as_routes end"
-        route_config << " end" * class_path.size 
+        route_config << ' end' * class_path.size
         route route_config
-      end 
-     
-      invoke "active_scaffold_controller"
+      end
+
+      invoke 'active_scaffold_controller'
     end
   end
 end

data/lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb

@@ -1,18 +1,18 @@
-#require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+# require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Rails
   module Generators
-    class ActiveScaffoldControllerGenerator < NamedBase #metagenerator
+    class ActiveScaffoldControllerGenerator < NamedBase # metagenerator
       include ResourceHelpers
 
       def self.source_root
-         @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+        @source_root ||= File.join(File.dirname(__FILE__), 'templates')
       end
 
-      check_class_collision :suffix => "Controller"
+      check_class_collision :suffix => 'Controller'
 
-      class_option :orm, :banner => "NAME", :type => :string, :required => true,
-                         :desc => "ORM to generate the controller for"
+      class_option :orm, :banner => 'NAME', :type => :string, :required => true,
+                         :desc => 'ORM to generate the controller for'
 
       def create_controller_files
         template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
@@ -22,8 +22,8 @@ module Rails
       hook_for :test_framework, :as => :scaffold
 
       def create_view_root_folder
-        empty_directory File.join("app/views", controller_file_path)
-      end 
+        empty_directory File.join('app/views', controller_file_path)
+      end
     end
   end
-end
+end