scaffolding_extensions 1.6.0 → 1.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 872960f23d1949998f8cc0ea351cd25fe6f86628
+  data.tar.gz: 56808d4a4119b089f7ae05b7750c58fe8a47a75a
+SHA512:
+  metadata.gz: 5070abc1e3cda325816d9bfdd45c3b5597352d3e67e205cdc250b6f9e236aed8345b0f8dc5434db763e3ddeeda294caa21cd9570b087781eb3d20040aca69e56
+  data.tar.gz: 1bf61a5380e319e99660e127e797a8497c238397062e6e2500a3615f7ef43ad92cf65127965332a4a7cea0b3b36a9ee55fb29e216037bae16facc3e6b8cdd2f2

data/README

@@ -21,14 +21,14 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 3.2.9
-  * Ramaze 2011.12.28
+  * Rails 4.0.0
+  * Ramaze 2012.12.08
   * Camping 2.1
-  * Sinatra 1.3.2
-  * Rack 1.4.1
+  * Sinatra 1.4.3
+  * Rack 1.5.2
 * Object Relational Mappers
-  * ActiveRecord 3.2.9
-  * Sequel 3.39.0
+  * ActiveRecord 4.0.0
+  * Sequel 3.48.0
   * DataMapper 1.0.2 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting, default is now JQuery)
   * Prototype 1.6.0.3

data/lib/scaffolding_extensions/model/active_record.rb

@@ -96,8 +96,30 @@ module ScaffoldingExtensions::MetaActiveRecord
 
   # Retrieve multiple objects given a hash of options
   def scaffold_get_objects(options)
-    options[:conditions] = scaffold_merge_conditions(options[:conditions])
-    find(:all, options)
+    records = self
+    if options[:include]
+      records = records.includes(*options[:include])
+      records = records.references(*options[:include]) if scaffold_use_references
+    end
+    records = records.order(*options[:order]) if options[:order]
+    records = records.limit(options[:limit]) if options[:limit]
+    records = records.offset(options[:offset]) if options[:offset]
+    conditions = options[:conditions]
+    if conditions && Array === conditions && conditions.length > 0
+      if String === conditions[0]
+        records = records.where(*conditions)
+      else
+        conditions.each do |cond|
+          next if cond.nil?
+          records = case cond
+            when Hash, String then records.where(cond)
+            when Array then records.where(*cond)
+            when Proc then records.where(&cond)
+          end
+        end
+      end
+    end
+    records.to_a
   end
 
   # Return the class, left foreign key, right foreign key, and join table for this habtm association
@@ -139,33 +161,14 @@ module ScaffoldingExtensions::MetaActiveRecord
     table_name
   end
 
-  private
-    # Merge an array of conditions into a single condition array
-    def scaffold_merge_conditions(conditions)
-      new_conditions = [[]]
-      if Array === conditions
-        if conditions.length == 0 || (conditions.length == 1 && conditions[0].nil?)
-          nil
-        elsif Array === conditions[0]
-          conditions.each do |cond|
-            next unless cond
-            new_conditions[0] << cond.shift
-            cond.each{|c| new_conditions << c}
-          end
-          if new_conditions[0].length > 0
-            new_conditions[0] = "(#{new_conditions[0].join(") AND (")})"
-            new_conditions
-          else
-            nil
-          end
-        else
-          conditions
-        end
-      else
-        conditions
-      end
-    end
+  # Whether to use references in addition to includes for eager loading.  This is
+  # necessary if you need to reference associated tables when filtering.
+  # Can be set with an instance variable. 
+  def scaffold_use_references
+    @scaffold_use_references ||= false
+  end
 
+  private
     # Updates associated records for a given reflection and from record to point to the
     # to record
     def scaffold_reflection_merge(reflection, from, to)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: code@jeremyevans.net
@@ -75,6 +74,7 @@ files:
 - scaffolds/search.rhtml
 homepage: http://scaffolding-ext.rubyforge.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --inline-source
@@ -97,21 +97,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: scaffolding-ext
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Administrative database front-end for multiple web-frameworks and ORMs
 test_files: []