adify 0.1.6 → 0.2.0

data/.gitignore

@@ -0,0 +1,50 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+.idea

data/.rvmrc

@@ -1 +1 @@
-rvm --create ruby-1.8.7@adify
+rvm --create ruby-1.9.2@adify

data/Gemfile

@@ -1,22 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-gem "rails", ">= 2.3.5"
-gem "activesupport", ">= 2.3.5"
-gem "activerecord", ">= 2.3.5"
-gem "actionpack", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec-rails", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.0"
-  gem "rcov", ">= 0"
-  gem 'ruby-debug'
-  gem 'sqlite3'
-end
-
-group :test do
-  gem 'ruby-debug'
-end
+# Specify your gem's dependencies in adify.gemspec
+gemspec

data/Gemfile.lock

@@ -1,108 +1,105 @@
+PATH
+  remote: .
+  specs:
+    adify (0.2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.10)
-    builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    linecache (0.43)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    multi_json (1.0.3)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.9.0)
-    rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.8.7)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sqlite3 (1.3.3)
+    rspec-mocks (2.6.0)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (>= 2.3.5)
-  activerecord (>= 2.3.5)
-  activesupport (>= 2.3.5)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.0)
-  rails (>= 2.3.5)
-  rcov
-  rspec-rails (~> 2.3.0)
-  ruby-debug
+  adify!
+  rails
+  rspec
   sqlite3

data/README.rdoc

@@ -2,7 +2,12 @@
 
 Adify is a simple to use (hopefully) rails gem that builds up ad tags for cashing in on your users.  Adify is built to work with any ad server.  The initial build will only include DFP (Google Ad Manager) as that is what I need this gem for.
 
-This is just the initial version and isn't really complete.  I haven't worked with other adservers so it might be a little tailored to double click.  Also the generator is butchered right now.
+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.2.0
+* Refactored everything to use one module
+* Tested with rails 2 & 3
 
 == Contributing to adify
  

data/Rakefile

@@ -1,49 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "adify"
-  gem.homepage = "http://github.com/fuelxc/adify"
-  gem.license = "MIT"
-  gem.summary = "create ad tags for common ad servers easily."
-  gem.description = "Adify lets you create ad tags easily and quickly with a simple common structure"
-  gem.email = "eharrison@classifiedadventures.com"
-  gem.authors = ["Eric Harrison"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "adify #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/adify.gemspec

@@ -1,85 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "adify/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{adify}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eric Harrison"]
-  s.date = %q{2011-07-05}
-  s.description = %q{Adify lets you create ad tags easily and quickly with a simple common structure}
-  s.email = %q{eharrison@classifiedadventures.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "adify.gemspec",
-    "lib/adify.rb",
-    "lib/adify/controller.rb",
-    "lib/adify/helper.rb",
-    "lib/adify/model.rb",
-    "lib/generators/adify/USAGE",
-    "lib/generators/adify/templates/_dfp.html.erb",
-    "lib/generators/adify_generator.rb",
-    "spec/adify_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/fuelxc/adify}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.1}
+  s.name        = "adify"
+  s.version     = Adify::VERSION
+  s.authors     = ["Eric Harrison"]
+  s.email       = ["eric@rubynooby.com"]
+  s.homepage    = "http://www.rubynooby.com"
   s.summary = %q{create ad tags for common ad servers easily.}
+  s.description = %q{Adify lets you create ad tags easily and quickly with a simple common structure}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 2.3.5"])
-      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_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"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, [">= 2.3.5"])
-      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<rspec-rails>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 2.3.5"])
-    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<rspec-rails>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  #s.add_development_dependency "ruby-debug19"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rails"
+  s.add_development_dependency "sqlite3"
 end
-

data/lib/adify.rb

@@ -1,74 +1,52 @@
-require 'action_controller'
-require "active_record"
-require "active_support"
-
-require 'adify/controller'
-require "adify/model"
+require "adify/version"
 require "adify/helper"
+require "core_ext/hash"
+require "core_ext/array"
 
-#methods both controller and models call
 module Adify
-  module InstanceMethods
-    def adify(*args)
-      self.adify_instance_attributes =  *args
+  def self.included(base)
+    base.send :extend, Adify
+  end
+  
+  def adify(args)
+    self.class_eval <<-EOM
+      include Adify::Methods
+      extend  Adify::Methods
+    EOM
+    self.adify_attributes = args
+  end
+  
+  module Methods
+    def adify_attributes=(hash)
+      @adify_attributes = hash
     end
-
+    
     def adify_attributes
-      ad_attr = self.adify_instance_attributes || {}
-      self.class.adify_attributes.adify_merge(ad_attr) rescue ad_attr
+      my_attributes = @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
-
+    
     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
-      @adification_of_item = ad_attr.update_values{|v| get_adify_value(item_for_adification,v)}
+      ad_attr.update_values{|v| get_adify_value(item_for_adification,v)}.symbolize_keys_recursively
     end
-
+    
     private
-    def get_adify_value(*args)
-      self.class.send(:get_adify_value, *args)
-    end
+      def get_adify_value(item,value)
+        case value.class.to_s
+          when "Array"  then value.each.collect{|v| get_adify_value(item,v)}
+          when "Proc"   then (value.call item).to_s
+          when "Hash"   then value.update(value){|k,v| get_adify_value(item,v)}
+          when "Symbol" then item.respond_to?(value) ? item.send(value) : value
+          else value
+        end
+      end
+      
   end
 end
 
-class ActiveRecord::Base
-  include Adify::Model
-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
-  include AdifyHelper
-end
-
-
-class Hash
-  def update_values(&block)
-    self.update(self){|k,v| block.call v}
-  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
+ActiveRecord::Base.send :include, Adify
+ActionController::Base.send :include, Adify
+ActionView::Base.send :include, Adify::Helper

data/lib/adify/helper.rb

@@ -1,13 +1,15 @@
-module AdifyHelper
-  def adify_tag(args)
-    item = args.delete(:item) rescue nil
-    partial = args.delete(:partial) || 'adify/dfp'
-    tag_attributes = adification(item).merge(args)
-    #pass in the hash as a parameter too in case they need all the value but don't know the names
-    render :partial => partial, :locals => tag_attributes.merge(:tag_attributes => tag_attributes.clone)
-  end
+module Adify
+  module Helper
+    def adify_tag(args)
+      item = args.delete(:item) rescue nil
+      partial = args.delete(:partial) || 'adify/dfp'
+      tag_attributes = adification(item).merge(args)
+      #pass in the hash as a parameter too in case they need all the value but don't know the names
+      render :partial => partial, :locals => tag_attributes.merge(:tag_attributes => tag_attributes.clone)
+    end
 
-  def random(length)
-    Array.new(length){rand 9}.join
+    def random(length)
+      Array.new(length){rand 9}.join
+    end
   end
 end

data/lib/adify/version.rb

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

data/lib/core_ext/array.rb

@@ -0,0 +1,11 @@
+class Array
+  def symbolize_keys_recursively
+    self.each do |item|
+      if item.is_a? Hash
+        item.symbolize_keys_recursively
+      elsif item.is_a? Array
+        item.symbolize_keys_recursively
+      end
+    end
+  end
+end

data/lib/core_ext/hash.rb

@@ -0,0 +1,19 @@
+class Hash
+  def update_values(&block)
+    self.update(self){|k,v| block.call v}
+  end
+  def adify_merge(h)
+    self.merge!(h) {|key, _old, _new| _old.class == Hash ? _old.adify_merge(_new) : _new  }
+  end
+  def symbolize_keys_recursively
+    self.symbolize_keys!
+    self.values.each do |v|
+      if v.is_a? Hash
+        v.symbolize_keys_recursively
+      elsif v.is_a? Array
+        v.symbolize_keys_recursively
+      end
+    end
+    self
+  end
+end

data/spec/adify_spec.rb

@@ -34,12 +34,12 @@ describe Adify do
       adify = app.index
       adify.should_not be_nil
       adify.should == {
-          :override_by_action     => "Action",
           :override_by_item       => "item",
-          :controller_only        => :symbol_no_method,
           :base_only              => ["base_arry_only_1", {:item1 => "base array only 2"}],
-          :action_only            => "proc return",
           :override_by_controller => "controller",
+          :override_by_action     => "Action",
+          :controller_only        => :symbol_no_method,
+          :action_only            => "proc return",
           :item_only              => "item id via symbol"
       }
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: adify
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Eric Harrison
@@ -15,174 +10,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 +10:00
+date: 2011-09-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rspec
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  name: rails
+        version: "0"
+  type: :development
   version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  name: activesupport
-  version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  name: activerecord
-  version_requirements: *id003
+  name: rails
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  name: actionpack
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  name: rspec-rails
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  name: bundler
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
-        version: 1.6.0
-  name: jeweler
-  version_requirements: *id007
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  version_requirements: *id008
+  name: sqlite3
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: sqlite3
-  version_requirements: *id010
-  prerelease: false
+  version_requirements: *id003
 description: Adify lets you create ad tags easily and quickly with a simple common structure
-email: eharrison@classifiedadventures.com
+email: 
+- eric@rubynooby.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
@@ -190,21 +65,21 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - adify.gemspec
 - lib/adify.rb
-- lib/adify/controller.rb
 - lib/adify/helper.rb
-- lib/adify/model.rb
+- lib/adify/version.rb
+- lib/core_ext/array.rb
+- lib/core_ext/hash.rb
 - lib/generators/adify/USAGE
 - lib/generators/adify/templates/_dfp.html.erb
 - lib/generators/adify_generator.rb
 - spec/adify_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/fuelxc/adify
-licenses: 
-- MIT
+homepage: http://www.rubynooby.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -215,18 +90,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -235,5 +104,6 @@ rubygems_version: 1.5.1
 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

data/VERSION

@@ -1 +0,0 @@
-0.1.6

data/lib/adify/controller.rb

@@ -1,47 +0,0 @@
-module Adify
-  module Controller
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
-
-    #TODO: refactor this up so both model and controller use same code.  DRY
-    module ClassMethods
-      def adify(*args)
-        class_eval <<-EOV
-          cattr_accessor :adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes
-          cattr_accessor :adify_tag_number
-
-          def self.adify_attributes=(hash)
-            self.adify_#{self.to_s.tableize.gsub(/\//,'_')}_attributes = hash
-          end
-
-          def self.adify_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
-
-        attr_accessor :adify_instance_attributes
-        helper_method :adification
-        send :include, ::Adify::InstanceMethods
-
-        def self.adification
-          @adification_of_item = self.adify_attributes.update_values{|v| get_adify_value(self,v)}
-        end
-
-        private
-          def get_adify_value(item,value)
-            case value.class.to_s
-              when 'Array'  then value.each.collect{|v| get_adify_value(item,v)}
-              when 'Proc'   then value.call item
-              when 'Hash'   then value.update(value){|k,v| get_adify_value(item,v)}
-              when 'Symbol' then item.respond_to?(value) ? item.send(value) : value
-              else value
-            end
-          end
-        self.adify_attributes = *args
-        self.adify_tag_number = 0
-      end
-    end
-  end
-end

data/lib/adify/model.rb

@@ -1,41 +0,0 @@
-module Adify
-  module Model
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
-
-    #TODO: refactor this up so both model and controller use same code.  DRY
-    module ClassMethods
-      def adify(*args)
-        @@adify_class_attributes = HashWithIndifferentAccess.new()
-        attr_accessor :adify_instance_attributes
-        send :include, ::Adify::InstanceMethods
-
-        def self.adify_attributes=(hash)
-          @@adify_class_attributes = hash
-        end
-
-        def self.adification
-          @adification_of_item = self.adify_attributes.update_values{|v| get_adify_value(self,v)}
-        end
-
-        def self.adify_attributes
-          super.deep_merge(@@adify_class_attributes) rescue @@adify_class_attributes
-        end
-
-        private
-          def get_adify_value(item,value)
-            case value.class
-              when Array  then value.each.collect{|v| self.get_adify_value(item,v)}
-              when Proc   then (value.call item).to_s
-              when Hash   then value.update(value){|k,v| self.get_adify_value(item,v)}
-              when Symbol then item.respond_to?(value) ? item.send(value) : value
-              else value
-            end
-          end
-
-        self.adify_attributes = *args
-      end
-    end
-  end
-end