cached_belongs_to 0.0.2 → 0.0.3

data/Rakefile

@@ -1,10 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 
 RSpec::Core::RakeTask.new
 
-Cucumber::Rake::Task.new
-
-task :default => [ :spec, :cucumber ]
+task :default => [ :spec ]

data/cached_belongs_to.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'autotest'
   gem.add_development_dependency 'autotest-growl'
-  gem.add_development_dependency 'cucumber'
   gem.add_development_dependency 'sqlite3'
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 end

data/lib/cached_belongs_to.rb

@@ -16,29 +16,36 @@ module CachedBelongsTo
     #
     def cached_belongs_to(*args)
       caches = Array(args[1].delete(:caches))
-      klass  = args[0]
 
-      belongs_to(*args)
-      children_callback_name = "cached_belongs_to_#{name.underscore}_callback".to_sym
-      create_cached_belongs_to_child_callbacks(caches, klass, children_callback_name)
-      create_cached_belongs_to_parent_callbacks(caches, klass, children_callback_name)
+      association = belongs_to(*args)
+      create_cached_belongs_to_child_callbacks(caches, association)
+      create_cached_belongs_to_parent_callbacks(caches, association)
     end
 
     private
-    def create_cached_belongs_to_child_callbacks(caches, klass, children_callback_name)
-      define_method children_callback_name do
+
+    def cached_belongs_to_child_callback_name(association)
+      "cached_belongs_to_#{association.name}_child_callback"
+    end
+
+    def create_cached_belongs_to_child_callbacks(caches, association)
+      klass = association.name
+      define_method cached_belongs_to_child_callback_name(association) do
         caches.each do |attr|
           send("#{klass}_#{attr}=", send(klass).send(attr)) if send(klass)
         end
       end
 
-      before_save children_callback_name
+      before_save cached_belongs_to_child_callback_name(association)
     end
 
-    def create_cached_belongs_to_parent_callbacks(caches, parent_class_name, children_callback_name)
-      method_name = "cached_belongs_to_#{parent_class_name}_callback".to_sym
-      has_many_association = self.name.underscore.pluralize.to_sym
-      parent_class = parent_class_name.to_s.camelize.constantize
+    def create_cached_belongs_to_parent_callbacks(caches, association)
+      parent_class_name = association.name
+      method_name = "cached_belongs_to_#{parent_class_name}_parent_callback".to_sym
+      has_many_association = self.name.demodulize.underscore.pluralize.to_sym
+      children_callback_name = cached_belongs_to_child_callback_name(association)
+      # What is this? I don't even...
+      parent_class = association.klass.name.constantize
 
       parent_class.send(:define_method, method_name) do
         send(has_many_association).reload.each do |child|

data/lib/cached_belongs_to/version.rb

@@ -1,3 +1,3 @@
 module CachedBelongsTo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/cached_belongs_to_spec.rb

@@ -17,7 +17,7 @@ describe CachedBelongsTo do
     author_class
   end
 
-  it "Adds the cached_belongs_to class method to ActiveRecord models" do
+  specify do
     book_class.should respond_to(:cached_belongs_to)
   end
 
@@ -26,20 +26,20 @@ describe CachedBelongsTo do
       book_class.send(:cached_belongs_to, :author, { :caches => :name })
     end
 
-    it "creates the belongs_to association as usual" do
+    specify do
       book_class.new.should respond_to(:author)
     end
 
-    it "defines the cached_belongs_to_book_callback" do
-      book_class.new.should respond_to(:cached_belongs_to_book_callback)
+    specify do
+      book_class.new.should respond_to(:cached_belongs_to_author_child_callback)
     end
 
-    it "defines the cached_belongs_to_author_callback" do
-      author_class.new.should respond_to(:cached_belongs_to_author_callback)
+    specify do
+      author_class.new.should respond_to(:cached_belongs_to_author_parent_callback)
     end
   end
 
-  context "cached_belongs_to_book_callback" do
+  context "cached_belongs_to_author_child_callback" do
     before do
       book_class.send(:cached_belongs_to, :author, { :caches => :name })
     end
@@ -51,12 +51,12 @@ describe CachedBelongsTo do
 
       book.stub(:author).and_return author
 
-      book.cached_belongs_to_book_callback
+      book.cached_belongs_to_author_child_callback
       book.author_name.should eq author.name
     end
   end
 
-  context "cached_belongs_to_author_callback" do
+  context "cached_belongs_to_author_parent_callback" do
     before do
       book_class.send(:cached_belongs_to, :author, { :caches => :name })
       author_class.send(:has_many, :books)
@@ -67,10 +67,10 @@ describe CachedBelongsTo do
       book   = book_class.new
 
       author.stub_chain(:books, :reload).and_return([ book ])
-      book.should_receive(:cached_belongs_to_book_callback)
+      book.should_receive(:cached_belongs_to_author_child_callback)
       book.should_receive :save
 
-      author.cached_belongs_to_author_callback
+      author.cached_belongs_to_author_parent_callback
     end
   end
 end

data/spec/integration/callbacks_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Rankat
+  class Author < ActiveRecord::Base
+    has_many :books
+  end
+
+  class Book < ActiveRecord::Base
+    cached_belongs_to :author, :caches => :name
+  end
+end
+
+describe "Callbacks" do
+  before do
+    @author = Rankat::Author.create :name => 'John Mellencamp'
+    @book = Rankat::Book.new :title => 'Treasure Island'
+    @book.author = @author
+    @book.save!
+
+    @author.books << @book
+  end
+
+  describe "child callback" do
+    specify do
+      @book.reload.author_name.should == 'John Mellencamp'
+    end
+  end
+
+  describe "parent callback" do
+    specify do
+      @author.name = 'Dick Tracy'
+      expect { @author.save; @book.reload }.to change(@book, :author_name).to('Dick Tracy')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cached_belongs_to
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -140,15 +124,10 @@ files:
 - Rakefile
 - cached_belongs_to.gemspec
 - config/cucumber.yml
-- features/step_definitions/.gitkeep
-- features/step_definitions/active_record_model_steps.rb
-- features/step_definitions/cached_belongs_to_steps.rb
-- features/support/env.rb
-- features/update_cached_attributes_after_save_child_record.feature
-- features/update_cached_attributes_after_save_parent_record.feature
 - lib/cached_belongs_to.rb
 - lib/cached_belongs_to/version.rb
 - spec/cached_belongs_to_spec.rb
+- spec/integration/callbacks_spec.rb
 - spec/spec_helper.rb
 - spec/support/warnings.rb
 homepage: ''
@@ -165,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1027759858126045779
+      hash: -168795518375412283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1027759858126045779
+      hash: -168795518375412283
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -182,12 +161,7 @@ signing_key:
 specification_version: 3
 summary: Denormalize your belongs_to associations
 test_files:
-- features/step_definitions/.gitkeep
-- features/step_definitions/active_record_model_steps.rb
-- features/step_definitions/cached_belongs_to_steps.rb
-- features/support/env.rb
-- features/update_cached_attributes_after_save_child_record.feature
-- features/update_cached_attributes_after_save_parent_record.feature
 - spec/cached_belongs_to_spec.rb
+- spec/integration/callbacks_spec.rb
 - spec/spec_helper.rb
 - spec/support/warnings.rb

data/features/step_definitions/active_record_model_steps.rb

@@ -1,39 +0,0 @@
-Given /^model "(.*?)" exists with attributes:$/ do |model_class_name, attributes|
-  klass = Class.new(ActiveRecord::Base)
-  suppress_warnings { Object.const_set model_class_name, klass }
-
-  ActiveRecord::Schema.define(:version => 0) do
-    create_table model_class_name.tableize, :force => true do |t|
-      attributes.hashes.each do |row|
-        t.send(row["type"], row["attribute"])
-      end
-    end
-  end
-end
-
-Given /^a (.*?) exists:$/ do |model_name, table|
-  @models ||= {}
-  @models[model_name] = model_name.constantize.new
-  table.rows_hash.each do |attribute, value|
-    @models[model_name].send("#{attribute}=", value)
-  end
-  @models[model_name].save!
-end
-
-Given /^that (.*?) belongs to that (.*?)$/ do |child, parent|
-  @models[parent].send(child.underscore.pluralize).send(:push, @models[child])
-
-  #@models[child].send("#{parent.underscore}=", @models[parent])
-end
-
-When /^I save the (.*?)$/ do |model_name|
-  @models[model_name].save!
-end
-
-When /^I change the (.*?)'s name to "(.*?)"$/ do |model_name, new_name|
-  @models[model_name].name = new_name
-end
-
-Given /^(.*?) has many (.*?)$/ do |parent, child|
-  parent.constantize.send(:has_many, child.underscore)
-end

data/features/step_definitions/cached_belongs_to_steps.rb

@@ -1,7 +0,0 @@
-Given /^(.*?) cached_belongs_to (.*?) with cached: "(.*?)"$/ do |model1, model2, cached_attribute|
-  model1.constantize.send(:cached_belongs_to, model2.underscore.to_sym, :caches => cached_attribute)
-end
-
-Then /^(.*?)'s author name should be "(.*?)"$/ do |model_name, author_name|
-  @models[model_name].reload.author_name.should == author_name
-end

data/features/support/env.rb

@@ -1,6 +0,0 @@
-require 'cached_belongs_to'
-require './spec/support/warnings.rb'
-
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.logger = Logger.new("test.log")
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"

data/features/update_cached_attributes_after_save_child_record.feature

@@ -1,20 +0,0 @@
-Feature: Update cached attributes after saving the child record
-
-  Scenario:
-    Given model "Author" exists with attributes:
-      | attribute | type   |
-      | name      | string |
-    And model "Book" exists with attributes:
-      | attribute   | type    |
-      | title       | string  |
-      | author_id   | integer |
-      | author_name | string  |
-    And Book cached_belongs_to Author with cached: "name"
-    And Author has many Books
-    And a Author exists:
-      | name | John Mellencamp |
-    And a Book exists:
-      | title | Treasure Island |
-    And that Book belongs to that Author
-    When I save the Book
-    Then Book's author name should be "John Mellencamp"

data/features/update_cached_attributes_after_save_parent_record.feature

@@ -1,21 +0,0 @@
-Feature: Update cached attributes after saving the parent record
-
-  Scenario:
-    Given model "Author" exists with attributes:
-      | attribute | type   |
-      | name      | string |
-    And model "Book" exists with attributes:
-      | attribute   | type    |
-      | title       | string  |
-      | author_id   | integer |
-      | author_name | string  |
-    And Book cached_belongs_to Author with cached: "name"
-    And Author has many Books
-    And a Author exists:
-      | name | John Mellencamp |
-    And a Book exists:
-      | title | Treasure Island |
-    And that Book belongs to that Author
-    When I change the Author's name to "Deeprak Chopa"
-    And I save the Author
-    Then Book's author name should be "Deeprak Chopa"