adify 0.2.0 → 0.3.0

data/.gitignore

@@ -47,4 +47,5 @@ pkg
 # For rubinius:
 #*.rbc
 
-.idea
+.idea
+.bin

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adify (0.2.0)
+    adify (0.3.0)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -5,6 +5,10 @@ Adify is a simple to use (hopefully) rails gem that builds up ad tags for cashin
 This is just the initial version and isn't really complete.  I haven't worked with other ad servers so it might be a little tailored to double click.  Also the generator is butchered right now.
 
 == Releases
+=== Version 0.3.0
+* Bugfix: clone before merging.  If key was missing from an action in a controller it would appear magically if there was a base controller
+* added tests to prove bug
+* use singletons to set the atribtutes
 === Version 0.2.0
 * Refactored everything to use one module
 * Tested with rails 2 & 3
@@ -17,7 +21,7 @@ This is just the initial version and isn't really complete.  I haven't worked wi
 * Do stuff
 * Tests.  Pull requests without tests will be flogged publically.  Feel free to flog me for forgetting tests then add them.\
 
- == Copyright
+== Copyright
 
 Copyright (c) 2011 Eric Harrison. See LICENSE.txt for
 further details.

data/lib/adify.rb

@@ -9,20 +9,23 @@ module Adify
   end
   
   def adify(args)
-    self.class_eval <<-EOM
+    if self.class == Class
       include Adify::Methods
       extend  Adify::Methods
-    EOM
+    end
+    singleton = class << self; self; end
+      singleton.module_eval do
+          define_method(:adify_attributes=) do |hash|
+            @adify_attributes = hash
+          end
+      end
+    
     self.adify_attributes = args
   end
   
   module Methods
-    def adify_attributes=(hash)
-      @adify_attributes = hash
-    end
-    
     def adify_attributes
-      my_attributes = @adify_attributes || {}
+      my_attributes = get_adify_attributes
       merge_with = self.respond_to?(:ancestors) ? self.ancestors.slice(1,self.ancestors.length).select{|c| c.respond_to?(:adify_attributes)}.first : self.class
       merge_with.respond_to?(:adify_attributes) ? merge_with.adify_attributes.adify_merge(my_attributes) : my_attributes
     end
@@ -30,10 +33,13 @@ module Adify
     def adification(item = nil)
       ad_attr = item.nil? ? self.adify_attributes : self.adify_attributes.adify_merge(item.adify_attributes)
       item_for_adification = item.nil? ? self : item
-      ad_attr.update_values{|v| get_adify_value(item_for_adification,v)}.symbolize_keys_recursively
+      ad_attr.update_values{|v| get_adify_value(item_for_adification,v)}.symbolize_keys_recursively.clone
     end
     
     private
+      def get_adify_attributes
+        (@adify_attributes || {}).clone
+      end
       def get_adify_value(item,value)
         case value.class.to_s
           when "Array"  then value.each.collect{|v| get_adify_value(item,v)}

data/lib/adify/version.rb

@@ -1,3 +1,3 @@
 module Adify
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/adify_spec.rb

@@ -8,7 +8,19 @@ class Item < ActiveRecord::Base
   end
 
   def proc
-    "proc return"
+    "item return"
+  end
+end
+
+class Thing < ActiveRecord::Base
+  adify :item_only => 'thing', :override_by_item => 'item'
+
+  def id
+    "item id via symbol"
+  end
+
+  def proc
+    "thing return"
   end
 end
 
@@ -21,17 +33,20 @@ class MyController < MyBaseController
 
   def index
     #maybe rename this
-    adify(:override_by_item => "Action", :override_by_action => 'Action', :action_only => Proc.new(){|item| item.proc})
-    item = Item.new
-    @adtag = adification(item)
+    adify(:override_by_item => "Action", :override_by_action => 'Action', :index_only => Proc.new(){|item| item.proc})
+    @adtag = adification(Item.new)
+  end
+
+  def show
+    adify(:override_by_item => "Action", :override_by_action => 'Action', :show_only =>'foo')
+    [adification(Item.new), adification(Thing.new)]
   end
 end
 
 describe Adify do
   describe 'adification' do
     it "should merge things properly" do
-      app = MyController.new
-      adify = app.index
+      adify = MyController.new.index
       adify.should_not be_nil
       adify.should == {
           :override_by_item       => "item",
@@ -39,9 +54,15 @@ describe Adify do
           :override_by_controller => "controller",
           :override_by_action     => "Action",
           :controller_only        => :symbol_no_method,
-          :action_only            => "proc return",
+          :index_only            => "item return",
           :item_only              => "item id via symbol"
       }
     end
+
+    it "should not share adify attributes between classes" do
+      adifications = MyController.new.show
+      adifications.first.should == {:override_by_item=>"item", :base_only=>["base_arry_only_1", {:item1=>"base array only 2"}], :override_by_controller=>"controller", :override_by_action=>"Action", :controller_only=>:symbol_no_method, :item_only => 'item id via symbol', :show_only => 'foo'}
+      adifications.last.should == {:override_by_item=>"item", :base_only=>["base_arry_only_1", {:item1=>"base array only 2"}], :override_by_controller=>"controller", :override_by_action=>"Action", :controller_only=>:symbol_no_method, :item_only=>"thing", :show_only => 'foo'}
+    end
   end
 end

data/spec/spec_helper.rb

@@ -24,5 +24,10 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime  :updated_at
     t.string    :name
   end
+  create_table :things do |t|
+    t.datetime  :created_at
+    t.datetime  :updated_at
+    t.string    :name
+  end
 end
 

metadata

@@ -1,61 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: adify
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Eric Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-08 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156095020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156095020
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2156089440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156089440
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2156089020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Adify lets you create ad tags easily and quickly with a simple common structure
-email: 
+  prerelease: false
+  version_requirements: *2156089020
+description: Adify lets you create ad tags easily and quickly with a simple common
+  structure
+email:
 - eric@rubynooby.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -76,34 +72,30 @@ files:
 - lib/generators/adify_generator.rb
 - spec/adify_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://www.rubynooby.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: create ad tags for common ad servers easily.
-test_files: 
+test_files:
 - spec/adify_spec.rb
 - spec/spec_helper.rb