anaf_habtm 0.0.89 → 0.0.92

data/Gemfile

@@ -1,4 +1,5 @@
 gem 'rails',        '3.0.0.beta4'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'jeweler'
+gem "da_huangs_ruby_extensions"
 

data/Rakefile

@@ -1,32 +1,8 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-VERSION = "0.0.85"
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the anaf_habtm plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
 
-desc 'Generate documentation for the anaf_habtm plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AnafHabtm'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 PKG_FILES = FileList[
-  'anaf_habtm.gemspec', 
+  'anaf_habtm.gemspec',
   'Gemfile',
-  'install.rb', 
+  'install.rb',
   'Rakefile', 'README', 'uninstall.rb',
   'assets/**/*',
   'lib/**/*',
@@ -34,11 +10,13 @@ PKG_FILES = FileList[
   'test/**/*'
 ]
 
+require 'rubygems'
+require 'rake'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "anaf_habtm"
-    s.version = VERSION
     s.author = "Tyler Gannon"
     s.email = "t--g__a--nnon@gmail.com"
     s.homepage = "http://github.com/tylergannon/anaf_habtm"
@@ -49,11 +27,44 @@ begin
     s.require_path = "lib"
     s.has_rdoc = false
     s.extra_rdoc_files = ["README"]
+  end
 
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
+task :test => :check_dependencies
 
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "da_huangs_ruby_extensions #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
 

data/anaf_habtm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{anaf_habtm}
-  s.version = "0.0.89"
+  s.version = "0.0.92"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-07-15}
   s.description = %q{accepts_nested_attributes_for habtm}
   s.email = %q{t--g__a--nnon@gmail.com}
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{accepts_nested_attributes_for habtm}
   s.test_files = [
-
+    "test/anaf_habtm_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/anaf_habtm/anaf_active_record.rb

@@ -10,55 +10,43 @@ module AnafHabtm
       end
     end
 
-    # options = {:named=>"name",
-    #            :ar_options=>{:autosave=>true}}
-    def anaf_habtm(association, options={}, &block)
-      raise "Must specify :find or a code block." if (block.nil? && !options.has_key?(:find) && !options[:create])
-      class_eval do
-        # Define a proc that will look up the (potentially) existing object
-        finder = proc {|id| association.to_s.singularize.camelize.constantize.where(:id=>id).first
-        }
-
-        # Define a proc that will set the association collection
-        set_collection = proc {|me, coll| me.send("#{association.to_s.tableize}=", coll)}
-        has_and_belongs_to_many association.to_sym, options[:ar_options]||={}
-        # Define the actual association setter.
-        define_method "#{association.to_s.tableize}_attributes=", lambda{|attributes_for_association|
-          coll = []
-          klass = association.to_s.singularize.camelize.constantize
-          attributes_for_association.each_value do |params|
-            next if params["_destroy"] == "1"
-            obj = finder.call(params["id"]) if params.has_key?("id")
-            params.extend(AnafHabtm::HashExtension)
-            params_copy = params.copy_without_destroy
-            # ActiveRecord::Base.attributes=() doesn't like extra parameters.
-            if block.nil?
-              unless obj
-                srch = klass
-                options[:find].each do |scope, name|
-                  if name.class==Hash
-                    srch = klass.send(scope, params[name.first[0].to_s][name.first[1].to_s])
-                  else
-                    srch = klass.send(scope, params[name.to_s])
-                  end
-                  obj = srch.first
-                end
-                obj = obj ||= klass.new if options[:create]
+    #  Needs to call scopes on a class and pass it values that are
+    #   pulled from a hash called obj_attr
+    def make_scope_string(klass, find_opts)
+      _scopes = []
+      find_opts.each{ |scope, attr_name|
+        if attr_name.class == Hash
+          _scopes << "#{scope.to_s}(obj_attr[#{name.first[0].to_s}][#{name.first[1].to_s}])"
+        else
+          _scopes << "#{scope.to_s}(obj_attr[#{name.to_s}])"
+        end
+      }
+      _scopes.join(".")
+    end
 
-                unless obj
-                  raise "Couldn't find or create #{association} named #{name}."
-                end
+    def anaf_habtm(association, opts={})
+      raise "Must specify :find " unless options.has_key?(:find)
+      klass = association.to_s.singularize.camelize
+      association = association.to_s.underscore.tableize
+      scope_string = make_scope_string(association, find_opts[:find])
+      class_eval <<END
+          def #{association}_attributes=(attr_hash)
+            obj_coll = []
+            attr_hash.each_value do |obj_attr|
+              next if obj_attr["_destroy"] == "1"
+              obj = #{klass}.find(obj_attr["id"]) if obj_attr.has_key?("id")
+              obj_attr.extend(AnafHabtm::HashExtension)
+              obj_attr = obj_attr.copy_without_destroy
+              obj = #{klass}.#{scope_string}.first unless obj
+              if obj && obj.update_attributes(obj_attr)
+                obj_coll << obj
+              elsif (obj = #{klass}.new(obj_attributes)) && obj.save
+                obj_coll << obj
               end
-              obj.attributes = params_copy
-              obj.save
-              coll << obj
-            else
-              coll << block.call(params_copy, obj)
             end
+            self.#{association} = obj_coll
           end
-          set_collection.call(self, coll)
-        }
-      end
+END
     end
 
     def association_text(association, opts={})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: anaf_habtm
 version: !ruby/object:Gem::Version 
-  hash: 173
+  hash: 167
   prerelease: false
   segments: 
   - 0
   - 0
-  - 89
-  version: 0.0.89
+  - 92
+  version: 0.0.92
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -07:00
+date: 2010-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -80,4 +80,5 @@ signing_key:
 specification_version: 3
 summary: accepts_nested_attributes_for habtm
 test_files: 
+- test/anaf_habtm_test.rb
 - test/test_helper.rb