has_inherited 1.0.0 → 2.0.0

data/README.rdoc

@@ -8,6 +8,7 @@ Easily share variables between Rails models with inheritance.
 
 == Using has_inheritable
 
+(*NOTE*: has_inherited 2.x or greater only works with Rails 3. If you need Rails 2.x support please use has_inherited 1.0)
 The intention of this library is to make it easy to inherit particular variables between models in rails apps. We start with a parent model that will function as a pseudo-polymorphic association for children objects.
 
 === 1. Define a parent object

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = "The intention of this library is to make it easy to inherit particular variables between models in rails apps. We start with a parent model that will function as a pseudo-polymorphic association for children objects."
     gem.email = "mark@amerine.net"
     gem.homepage = "http://github.com/amerine/has_inherited"
-    gem.authors = ["Mark Turner"]
+    gem.authors = ["Mark Turner", "Steve Burkett"]
     gem.add_development_dependency "bacon", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/has_inherited.gemspec

@@ -1,45 +1,38 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{has_inherited}
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Turner"]
-  s.date = %q{2010-11-17}
+  s.authors = ["Mark Turner", "Steve Burkett"]
+  s.date = %q{2011-05-02}
   s.description = %q{The intention of this library is to make it easy to inherit particular variables between models in rails apps. We start with a parent model that will function as a pseudo-polymorphic association for children objects.}
   s.email = %q{mark@amerine.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "has_inherited.gemspec",
-     "lib/has_inherited.rb",
-     "spec/has_inherited_spec.rb",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "has_inherited.gemspec",
+    "lib/has_inherited.rb",
+    "spec/has_inherited_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/amerine/has_inherited}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Easily share variables between Rails models with inheritance.}
-  s.test_files = [
-    "spec/has_inherited_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/has_inherited.rb

@@ -8,7 +8,7 @@ module HasInherited
       attr = name.shift || :global
       assoc = "_#{attr}"
         
-      named_scope assoc.to_sym,
+      scope assoc.to_sym,
           :conditions => 'inheritable_id IS NULL AND inheritable_type IS NULL'
 
       (class << self; self; end).instance_eval do
@@ -30,7 +30,7 @@ module HasInherited
       has_many assoc.to_sym, :class_name => class_name, :as => :inheritable, :dependent => :destroy
 
       define_method attr do
-      instance_variable_get(:"@#{attr.to_s}") || instance_variable_set(:"@#{attr.to_s}", InheritAccessor.new(self, assoc.to_sym, options[:from]))
+        instance_variable_get(:"@#{attr.to_s}") || instance_variable_set(:"@#{attr.to_s}", InheritAccessor.new(self, assoc.to_sym, options[:from]))
       end
     end
   end # ClassMethods
@@ -86,7 +86,7 @@ module HasInherited
 
     def all(inherited = true)
       all_values = {}
-      @assoc.all.each {|inherited| all_values[inherited.name.to_sym] = inherited.value}
+      @assoc.all.each {|ina| all_values[ina.name.to_sym] = ina.value}
       if inherited
         parent_proxy = parent
         while parent_proxy

data/spec/has_inherited_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'logger'
 
 
 class Seo < ActiveRecord::Base
@@ -38,18 +39,18 @@ describe "HasInherited" do
         end
 
         create_table :industries do |t|
-          t.name :string
+          t.string :name
           t.timestamps
         end
 
         create_table :clients do |t|
-          t.name :string
+          t.string :name
           t.references :industry
           t.timestamps
         end
 
         create_table :stores do |t|
-          t.name :string
+          t.string :name
           t.references :client
           t.timestamps
         end
@@ -81,6 +82,12 @@ describe "HasInherited" do
     industry.seo.title.should.equal "Title"
   end
 
+  it "should be able to grab all the global values" do
+    Seo.global.title = "Global Title"
+    Seo.global.foo   = "Global Foo"
+    Seo.global.all.size.should.equal 2
+  end
+
   it "should work with two levels of nesting" do
     Seo.global.title = "SEO Title"
     industry = Industry.create

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: has_inherited
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
   - 0
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Mark Turner
+- Steve Burkett
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2011-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +44,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -57,8 +57,8 @@ homepage: http://github.com/amerine/has_inherited
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -82,10 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easily share variables between Rails models with inheritance.
-test_files: 
-- spec/has_inherited_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-test.log