adify 0.1.2 → 0.1.6

data/Gemfile

@@ -5,7 +5,6 @@ gem "rails", ">= 2.3.5"
 gem "activesupport", ">= 2.3.5"
 gem "activerecord", ">= 2.3.5"
 gem "actionpack", ">= 2.3.5"
-gem 'deep_merge'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -31,7 +31,6 @@ GEM
     arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.2)
-    deep_merge (0.1.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -101,7 +100,6 @@ DEPENDENCIES
   activerecord (>= 2.3.5)
   activesupport (>= 2.3.5)
   bundler (~> 1.0.0)
-  deep_merge
   jeweler (~> 1.6.0)
   rails (>= 2.3.5)
   rcov

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.6

data/adify.gemspec

@@ -51,7 +51,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<actionpack>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<deep_merge>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
@@ -63,7 +62,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<activerecord>, [">= 2.3.5"])
       s.add_dependency(%q<actionpack>, [">= 2.3.5"])
-      s.add_dependency(%q<deep_merge>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
@@ -76,7 +74,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     s.add_dependency(%q<activerecord>, [">= 2.3.5"])
     s.add_dependency(%q<actionpack>, [">= 2.3.5"])
-    s.add_dependency(%q<deep_merge>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])

data/lib/adify.rb

@@ -15,11 +15,11 @@ module Adify
 
     def adify_attributes
       ad_attr = self.adify_instance_attributes || {}
-      self.class.adify_attributes.deep_merge(ad_attr) rescue ad_attr
+      self.class.adify_attributes.adify_merge(ad_attr) rescue ad_attr
     end
 
     def adification(item = nil)
-      ad_attr = item.nil? ? self.adify_attributes : self.adify_attributes.deep_merge(item.adify_attributes)
+      ad_attr = item.nil? ? self.adify_attributes : self.adify_attributes.adify_merge(item.adify_attributes)
       item_for_adification = item.nil? ? self : item
       @adification_of_item = ad_attr.update_values{|v| get_adify_value(item_for_adification,v)}
     end
@@ -37,6 +37,26 @@ end
 
 class ActionController::Base
   include Adify::Controller
+  helper_method :adification, :registered_ad_spots, :register_ad_spot, :tag_number
+
+  @registered_ad_spots
+
+  def tag_number
+    adify_tag_number += 1
+  end
+
+  def registered_ad_spots
+    @registered_ad_spots || []
+  end
+
+  def register_ad_spot(val)
+    @registered_ad_spots ||= []
+    @registered_ad_spots << val
+  end
+
+  def self.adification
+    @adification_of_item = self.adify_attributes.update_values{|v| get_adify_value(self,v)}
+  end
 end
 
 class ActionView::Base
@@ -48,7 +68,7 @@ class Hash
   def update_values(&block)
     self.update(self){|k,v| block.call v}
   end
-  def deep_merge(h)
-    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.deep_merge(_new) else _new end  }
+  def adify_merge(h)
+    self.merge!(h) {|key, _old, _new| if _old.class == Hash then _old.adify_merge(_new) else _new end  }
   end
 end

data/lib/adify/controller.rb

@@ -12,11 +12,12 @@ module Adify
           cattr_accessor :adify_tag_number
 
           def self.adify_attributes=(hash)
-            self.adify_#{self.to_s.tableize}_attributes = hash
+            self.adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes = hash
           end
 
           def self.adify_attributes
-            self.ancestors[1].adify_attributes.deep_merge(self.adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes) rescue self.adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes
+             ancestor = self.ancestors.slice(1,self.ancestors.length).select{|c| c.respond_to?(:adify_attributes)}.first
+             ancestor.adify_attributes.deep_merge(self.adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes) rescue self.adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes
           end
         EOV
 

data/lib/adify/helper.rb

@@ -1,5 +1,4 @@
 module AdifyHelper
-
   def adify_tag(args)
     item = args.delete(:item) rescue nil
     partial = args.delete(:partial) || 'adify/dfp'
@@ -11,8 +10,4 @@ module AdifyHelper
   def random(length)
     Array.new(length){rand 9}.join
   end
-
-  def tag_number
-    @controller.class.adify_tag_number += 1
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adify
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Eric Harrison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +10:00
+date: 2011-07-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,23 +82,9 @@ dependencies:
   name: actionpack
   version_requirements: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: deep_merge
-  version_requirements: *id005
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,11 +96,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec-rails
-  version_requirements: *id006
+  version_requirements: *id005
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,11 +112,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id007
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,11 +128,11 @@ dependencies:
         - 0
         version: 1.6.0
   name: jeweler
-  version_requirements: *id008
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,11 +142,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id009
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,11 +156,11 @@ dependencies:
         - 0
         version: "0"
   name: ruby-debug
-  version_requirements: *id010
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -184,7 +170,7 @@ dependencies:
         - 0
         version: "0"
   name: sqlite3
-  version_requirements: *id011
+  version_requirements: *id010
   prerelease: false
 description: Adify lets you create ad tags easily and quickly with a simple common structure
 email: eharrison@classifiedadventures.com