dynamic_fieldsets 0.1.8 → 0.1.9

data/CHANGELOG

@@ -1,5 +1,9 @@
 == unreleased changes
 
+== 0.1.9
+
+* A whole bunch of updates to upgrade rails 3.1 compatibility
+
 == 0.1.8
 
 * Relaxed rails version restriction

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/app/controllers/dynamic_fieldsets/fields_controller.rb

@@ -60,7 +60,7 @@ module DynamicFieldsets
         
         if @field.save
           if !parent_id.empty?
-            parent = DynamicFieldsets::Fieldset.find_by_id(parent_id)
+            parent = DynamicFieldsets::Fieldset.find(parent_id)
             DynamicFieldsets::FieldsetChild.create( :fieldset => parent, :child => @field )
             #relation = @fieldset.fieldset_children.build( :fieldset => parent )
             #relation.child = @field

data/app/controllers/dynamic_fieldsets/fieldset_associators_controller.rb

@@ -14,7 +14,7 @@ module DynamicFieldsets
 
     # show one fieldset associator
     def show
-      @fieldset_associator = DynamicFieldsets::FieldsetAssociator.find_by_id(params[:id])
+      @fieldset_associator = DynamicFieldsets::FieldsetAssociator.find(params[:id])
       respond_to do |format|
         format.html
       end

data/app/controllers/dynamic_fieldsets/fieldset_children_controller.rb

@@ -10,8 +10,8 @@ module DynamicFieldsets
 
     # Show a record and all children
     def show
-      @fieldset_child = DynamicFieldsets::FieldsetChild.find_by_id params[:id]
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id @fieldset_child.fieldset_id
+      @fieldset_child = DynamicFieldsets::FieldsetChild.find params[:id]
+      @fieldset = DynamicFieldsets::Fieldset.find @fieldset_child.fieldset_id
 
       respond_to do |format|
         format.html

data/app/controllers/dynamic_fieldsets/fieldsets_controller.rb

@@ -23,7 +23,7 @@ module DynamicFieldsets
     
     # Show single fieldset
     def show
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id(params[:id])
+      @fieldset = DynamicFieldsets::Fieldset.find(params[:id])
 
       respond_to do |format|
         format.html
@@ -41,7 +41,7 @@ module DynamicFieldsets
     
     # Edit existing record
     def edit
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id(params[:id])
+      @fieldset = DynamicFieldsets::Fieldset.find(params[:id])
 
       respond_to do |format|
         format.html
@@ -50,7 +50,7 @@ module DynamicFieldsets
 
     # Show a record and all children
     def children
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id params[:id]
+      @fieldset = DynamicFieldsets::Fieldset.find params[:id]
 
       respond_to do |format|
         format.html
@@ -59,8 +59,8 @@ module DynamicFieldsets
 
     # associates a field or fieldset with the given fieldset by creating a fieldset child
     def associate_child
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id(params[:id])
-      @field = DynamicFieldsets::Field.find_by_id(params[:field])
+      @fieldset = DynamicFieldsets::Fieldset.find(params[:id])
+      @field = DynamicFieldsets::Field.find(params[:field])
 
       @fieldset_child = DynamicFieldsets::FieldsetChild.where(:child_id => @field.id, :child_type => @field.class.name, :fieldset_id => @fieldset.id).first
       if(@fieldset_child.nil?)
@@ -112,10 +112,10 @@ module DynamicFieldsets
         if parent_identifier.eql? @order.first[0] # This is the first number:
         then parent_id = parent_identifier # the root fieldset id.
         # Otherwise, we need to retrieve the parent fieldset_id from the FieldsetChild's child_id.
-        else parent_id = DynamicFieldsets::FieldsetChild.find_by_id(parent_identifier).child_id
+        else parent_id = DynamicFieldsets::FieldsetChild.find(parent_identifier).child_id
         end
         children.each_with_index do |fieldset_child_id,index|
-          fieldset_child = DynamicFieldsets::FieldsetChild.find_by_id fieldset_child_id
+          fieldset_child = DynamicFieldsets::FieldsetChild.find fieldset_child_id
           fieldset_child.fieldset_id = parent_id
           fieldset_child.order_num = index+1
           fieldset_child.save
@@ -135,7 +135,7 @@ module DynamicFieldsets
       respond_to do |format|
         if @fieldset.save
           if !parent_id.empty?
-            parent = DynamicFieldsets::Fieldset.find_by_id(parent_id)
+            parent = DynamicFieldsets::Fieldset.find(parent_id)
             DynamicFieldsets::FieldsetChild.create( :fieldset => parent, :child => @fieldset )
             #relation = @fieldset.fieldset_children.build( :fieldset => parent )
             #relation.child = @fieldset
@@ -150,7 +150,7 @@ module DynamicFieldsets
 
     # Update existing record
     def update
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id(params[:id])
+      @fieldset = DynamicFieldsets::Fieldset.find(params[:id])
 
       respond_to do |format|
         if @fieldset.update_attributes(params[:dynamic_fieldsets_fieldset])
@@ -163,7 +163,7 @@ module DynamicFieldsets
 
     # Destroy existing record
     def destroy
-      @fieldset = DynamicFieldsets::Fieldset.find_by_id(params[:id])
+      @fieldset = DynamicFieldsets::Fieldset.find(params[:id])
       @fieldset.destroy
 
       respond_to do |format|

data/app/models/dynamic_fieldsets/field_default.rb

@@ -22,7 +22,7 @@ module DynamicFieldsets
     # http://www.youtube.com/watch?v=BeP6CpUnfc0 
     def convert_option_name_to_id
       if field.uses_field_options?
-        option = FieldOption.where(:name => self.value, :field => self.field).first
+        option = FieldOption.where(:name => self.value, :field_id => self.field.id).first
         self.value = option.id unless option.nil?
       end
     end
@@ -30,7 +30,7 @@ module DynamicFieldsets
     # @return [String] Either the value or the name of the field option reference by the value
     def pretty_value
       if !self.field.nil? && field.uses_field_options?
-        option = FieldOption.find_by_id(self.value)
+        option = FieldOption.find(self.value)
         if !option.nil?
           return option.name
         end

data/app/models/dynamic_fieldsets/fieldset_associator.rb

@@ -30,7 +30,7 @@ module DynamicFieldsets
     # @params [Hash] args A hash of arguments for the scope
     # @returns [Array] An array of fieldset associators that match the arguments
     def self.find_by_fieldset_model_parameters(args)
-      fieldset = Fieldset.find_by_nkey(args[:fieldset])
+      fieldset = Fieldset.where(:nkey => args[:fieldset_nkey].to_s).first
       throw "Fieldset not found in FieldsetAssociator.find_by_fieldset_model_parameters" if fieldset.nil?
 
       where(

data/dynamic_fieldsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_fieldsets"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremiah Hemphill", "Ethan Pemble", "John Carter"]
-  s.date = "2012-04-05"
+  s.date = "2012-04-06"
   s.description = "Dynamic fieldsets for rails controllers"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [

data/lib/dynamic_fieldsets/dynamic_fieldsets_in_model.rb

@@ -199,7 +199,7 @@ module DynamicFieldsets
             :fieldset_model_name => fsa_values[:fieldset_model_name] 
           )
         else 
-          fsa = DynamicFieldsets::FieldsetAssociator.find_by_id key_id
+          fsa = DynamicFieldsets::FieldsetAssociator.find(key_id)
         end
 
         fsa.update_fieldset_records_with_form_information(fsa_values)
@@ -269,14 +269,14 @@ module DynamicFieldsets
           fsa = DynamicFieldsets::FieldsetAssociator.find_by_fieldset_model_parameters(
             :fieldset_model_id => self.id,
             :fieldset_model_type => self.class.name, 
-            :fieldset_model_name => sym,
-            :fieldset => self.dynamic_fieldsets[sym][:fieldset]).first
+            :fieldset_model_name => sym.to_s,
+            :fieldset_nkey => self.dynamic_fieldsets[sym][:fieldset].to_s).first
           if fsa.nil?
             fsa = DynamicFieldsets::FieldsetAssociator.new(
             :fieldset_model_id => self.id,
             :fieldset_model_type => self.class.name,
             :fieldset_model_name => sym.to_s,
-            :fieldset => DynamicFieldsets::Fieldset.find_by_nkey(self.dynamic_fieldsets[sym][:fieldset]))
+            :fieldset_id => DynamicFieldsets::Fieldset.where(:nkey => self.dynamic_fieldsets[sym][:fieldset].to_s).first.id)
           end
           return fsa
         else
@@ -290,7 +290,7 @@ module DynamicFieldsets
       # @param [Fieldset] The fieldset object for the named fieldset
       def fieldset(sym)
         if match_fieldset_associator?(sym)
-          return DynamicFieldsets::Fieldset.find_by_nkey(:nkey => self.dynamic_fieldsets[sym][:fieldset])
+          return DynamicFieldsets::Fieldset.where(:nkey => self.dynamic_fieldsets[sym][:fieldset]).first
         else
           return nil
         end

metadata

@@ -2,7 +2,7 @@
 name: dynamic_fieldsets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 Z
+date: 2012-04-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -431,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4273748560923190422
+      hash: 4570078976153453742
       segments: 
       - 0
       version: "0"